diff -Nru gnome-control-center-3.36.4/debian/changelog gnome-control-center-3.36.5/debian/changelog --- gnome-control-center-3.36.4/debian/changelog 2020-09-24 15:03:01.000000000 +0000 +++ gnome-control-center-3.36.5/debian/changelog 2020-11-26 12:47:43.000000000 +0000 @@ -1,3 +1,17 @@ +gnome-control-center (1:3.36.5-0ubuntu1) focal; urgency=medium + + * New upstream release (lp: #1905740) + * debian/patches/git_useraccount_segfault.patch, + debian/patches/git_row_collide.patch, + debian/patches/0033-sound-update-the-profile-list-after-getting-the-sign.patch: + - removed, included in the new version + * debian/patches/revert_vino_deprecated.patch: + - revert the upstream change to remove the vino control option, it's + still working in Ubuntu because we reverted the g-s-d commit + which deprecated the backend handling + + -- Sebastien Bacher Thu, 26 Nov 2020 13:47:43 +0100 + gnome-control-center (1:3.36.4-0ubuntu2) focal; urgency=medium * debian/patches/git_useraccount_segfault.patch: diff -Nru gnome-control-center-3.36.4/debian/control gnome-control-center-3.36.5/debian/control --- gnome-control-center-3.36.4/debian/control 2020-09-24 15:03:01.000000000 +0000 +++ gnome-control-center-3.36.5/debian/control 2020-11-26 12:47:43.000000000 +0000 @@ -7,7 +7,7 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian GNOME Maintainers -Uploaders: Iain Lane , Jeremy Bicha , Laurent Bigonville +Uploaders: Iain Lane , Jeremy Bicha , Laurent Bigonville , Sebastien Bacher Build-Depends: debhelper-compat (= 12), dh-migrations, libaccountsservice-dev (>= 0.6.39), diff -Nru gnome-control-center-3.36.4/debian/gbp.conf gnome-control-center-3.36.5/debian/gbp.conf --- gnome-control-center-3.36.4/debian/gbp.conf 2020-09-24 15:03:01.000000000 +0000 +++ gnome-control-center-3.36.5/debian/gbp.conf 2020-11-26 12:47:43.000000000 +0000 @@ -1,7 +1,7 @@ [DEFAULT] pristine-tar = True debian-branch=ubuntu/focal -upstream-branch=upstream/latest +upstream-branch=upstream/3.36.x debian-tag=ubuntu/%(version)s upstream-vcs-tag = %(version)s diff -Nru gnome-control-center-3.36.4/debian/patches/0007-sound-Allow-volume-to-be-set-above-100.patch gnome-control-center-3.36.5/debian/patches/0007-sound-Allow-volume-to-be-set-above-100.patch --- gnome-control-center-3.36.4/debian/patches/0007-sound-Allow-volume-to-be-set-above-100.patch 2020-09-24 15:03:01.000000000 +0000 +++ gnome-control-center-3.36.5/debian/patches/0007-sound-Allow-volume-to-be-set-above-100.patch 2020-11-26 12:47:43.000000000 +0000 @@ -22,10 +22,10 @@ panels/sound/cc-sound-panel.ui | 92 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 112 insertions(+) -diff --git a/panels/sound/cc-sound-panel.c b/panels/sound/cc-sound-panel.c -index 7a7e20b..30f12e1 100644 ---- a/panels/sound/cc-sound-panel.c -+++ b/panels/sound/cc-sound-panel.c +Index: gnome-control-center/panels/sound/cc-sound-panel.c +=================================================================== +--- gnome-control-center.orig/panels/sound/cc-sound-panel.c ++++ gnome-control-center/panels/sound/cc-sound-panel.c @@ -65,6 +65,9 @@ struct _CcSoundPanel CcProfileComboBox *output_profile_combo_box; GtkListBoxRow *output_profile_row; @@ -36,7 +36,7 @@ CcStreamListBox *stream_list_box; GtkListBoxRow *subwoofer_row; CcSubwooferSlider *subwoofer_slider; -@@ -88,6 +91,8 @@ allow_amplified_changed_cb (CcSoundPanel *self) +@@ -88,6 +91,8 @@ allow_amplified_changed_cb (CcSoundPanel { cc_volume_slider_set_is_amplified (self->output_volume_slider, g_settings_get_boolean (self->sound_settings, "allow-volume-above-100-percent")); @@ -45,7 +45,7 @@ } static void -@@ -107,6 +112,7 @@ output_device_changed_cb (CcSoundPanel *self) +@@ -104,6 +109,7 @@ output_device_changed_cb (CcSoundPanel * stream = gvc_mixer_control_get_stream_from_device (self->mixer_control, device); cc_volume_slider_set_stream (self->output_volume_slider, stream, CC_STREAM_TYPE_OUTPUT); @@ -53,7 +53,7 @@ cc_level_bar_set_stream (self->output_level_bar, stream, CC_STREAM_TYPE_OUTPUT); if (stream != NULL) -@@ -210,6 +216,9 @@ cc_sound_panel_class_init (CcSoundPanelClass *klass) +@@ -232,6 +238,9 @@ cc_sound_panel_class_init (CcSoundPanelC gtk_widget_class_bind_template_child (widget_class, CcSoundPanel, output_profile_combo_box); gtk_widget_class_bind_template_child (widget_class, CcSoundPanel, output_profile_row); gtk_widget_class_bind_template_child (widget_class, CcSoundPanel, output_volume_slider); @@ -63,7 +63,7 @@ gtk_widget_class_bind_template_child (widget_class, CcSoundPanel, stream_list_box); gtk_widget_class_bind_template_child (widget_class, CcSoundPanel, subwoofer_row); gtk_widget_class_bind_template_child (widget_class, CcSoundPanel, subwoofer_slider); -@@ -254,12 +263,23 @@ cc_sound_panel_init (CcSoundPanel *self) +@@ -276,12 +285,23 @@ cc_sound_panel_init (CcSoundPanel *self) G_CONNECT_SWAPPED); allow_amplified_changed_cb (self); @@ -87,15 +87,14 @@ cc_subwoofer_slider_set_mixer_control (self->subwoofer_slider, self->mixer_control); cc_device_combo_box_set_mixer_control (self->input_device_combo_box, self->mixer_control, FALSE); cc_device_combo_box_set_mixer_control (self->output_device_combo_box, self->mixer_control, TRUE); -diff --git a/panels/sound/cc-sound-panel.ui b/panels/sound/cc-sound-panel.ui -index 588c578..18a2995 100644 ---- a/panels/sound/cc-sound-panel.ui -+++ b/panels/sound/cc-sound-panel.ui -@@ -37,6 +37,98 @@ - True +Index: gnome-control-center/panels/sound/cc-sound-panel.ui +=================================================================== +--- gnome-control-center.orig/panels/sound/cc-sound-panel.ui ++++ gnome-control-center/panels/sound/cc-sound-panel.ui +@@ -38,6 +38,98 @@ -+ + + + False + @@ -187,6 +186,7 @@ + + + - ++ True + 0 diff -Nru gnome-control-center-3.36.4/debian/patches/0025-applications-Hide-buttons-that-launch-gnome-software.patch gnome-control-center-3.36.5/debian/patches/0025-applications-Hide-buttons-that-launch-gnome-software.patch --- gnome-control-center-3.36.4/debian/patches/0025-applications-Hide-buttons-that-launch-gnome-software.patch 2020-09-24 15:03:01.000000000 +0000 +++ gnome-control-center-3.36.5/debian/patches/0025-applications-Hide-buttons-that-launch-gnome-software.patch 2020-11-26 12:47:43.000000000 +0000 @@ -9,10 +9,10 @@ panels/applications/cc-applications-panel.ui | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) -diff --git a/panels/applications/cc-applications-panel.c b/panels/applications/cc-applications-panel.c -index 7352ba5..0a228a0 100644 ---- a/panels/applications/cc-applications-panel.c -+++ b/panels/applications/cc-applications-panel.c +Index: gnome-control-center/panels/applications/cc-applications-panel.c +=================================================================== +--- gnome-control-center.orig/panels/applications/cc-applications-panel.c ++++ gnome-control-center/panels/applications/cc-applications-panel.c @@ -75,6 +75,7 @@ struct _CcApplicationsPanel GSettings *search_settings; @@ -44,7 +44,7 @@ g_clear_pointer (&self->current_app_id, g_free); g_clear_pointer (&self->current_portal_app_id, g_free); -@@ -1876,6 +1884,7 @@ cc_applications_panel_class_init (CcApplicationsPanelClass *klass) +@@ -1876,6 +1884,7 @@ cc_applications_panel_class_init (CcAppl gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, handler_section); gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, handler_reset); gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, handler_list); @@ -52,7 +52,7 @@ gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, integration_list); gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, integration_section); gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, location); -@@ -1934,6 +1943,8 @@ cc_applications_panel_init (CcApplicationsPanel *self) +@@ -1937,6 +1946,8 @@ cc_applications_panel_init (CcApplicatio gtk_widget_init_template (GTK_WIDGET (self)); @@ -61,10 +61,10 @@ provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ()); gtk_css_provider_load_from_resource (GTK_CSS_PROVIDER (provider), "/org/gnome/control-center/applications/cc-applications-panel.css"); -diff --git a/panels/applications/cc-applications-panel.ui b/panels/applications/cc-applications-panel.ui -index d52fd6a..09f939e 100644 ---- a/panels/applications/cc-applications-panel.ui -+++ b/panels/applications/cc-applications-panel.ui +Index: gnome-control-center/panels/applications/cc-applications-panel.ui +=================================================================== +--- gnome-control-center.orig/panels/applications/cc-applications-panel.ui ++++ gnome-control-center/panels/applications/cc-applications-panel.ui @@ -55,7 +55,7 @@ diff -Nru gnome-control-center-3.36.4/debian/patches/0026-applications-Launch-snap-store-if-it-is-installed.patch gnome-control-center-3.36.5/debian/patches/0026-applications-Launch-snap-store-if-it-is-installed.patch --- gnome-control-center-3.36.4/debian/patches/0026-applications-Launch-snap-store-if-it-is-installed.patch 2020-09-24 15:03:01.000000000 +0000 +++ gnome-control-center-3.36.5/debian/patches/0026-applications-Launch-snap-store-if-it-is-installed.patch 2020-11-26 12:47:43.000000000 +0000 @@ -6,10 +6,10 @@ panels/applications/cc-applications-panel.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) -diff --git a/panels/applications/cc-applications-panel.c b/panels/applications/cc-applications-panel.c -index 0a228a0..baf03fa 100644 ---- a/panels/applications/cc-applications-panel.c -+++ b/panels/applications/cc-applications-panel.c +Index: gnome-control-center/panels/applications/cc-applications-panel.c +=================================================================== +--- gnome-control-center.orig/panels/applications/cc-applications-panel.c ++++ gnome-control-center/panels/applications/cc-applications-panel.c @@ -148,6 +148,13 @@ gnome_software_is_installed (void) return path != NULL; } @@ -24,7 +24,7 @@ /* Callbacks */ static gboolean -@@ -168,6 +175,9 @@ open_software_cb (GtkButton *button, +@@ -168,6 +175,9 @@ open_software_cb (GtkButton *b { const gchar *argv[] = { "gnome-software", "--details", "appid", NULL }; @@ -43,7 +43,7 @@ g_clear_pointer (&self->current_app_id, g_free); g_clear_pointer (&self->current_portal_app_id, g_free); -@@ -1943,7 +1953,7 @@ cc_applications_panel_init (CcApplicationsPanel *self) +@@ -1946,7 +1956,7 @@ cc_applications_panel_init (CcApplicatio gtk_widget_init_template (GTK_WIDGET (self)); diff -Nru gnome-control-center-3.36.4/debian/patches/0033-sound-update-the-profile-list-after-getting-the-sign.patch gnome-control-center-3.36.5/debian/patches/0033-sound-update-the-profile-list-after-getting-the-sign.patch --- gnome-control-center-3.36.4/debian/patches/0033-sound-update-the-profile-list-after-getting-the-sign.patch 2020-09-24 15:03:01.000000000 +0000 +++ gnome-control-center-3.36.5/debian/patches/0033-sound-update-the-profile-list-after-getting-the-sign.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,107 +0,0 @@ -From 9b81e0ee4522ca27ca3ffe9a7d9fb4583f507752 Mon Sep 17 00:00:00 2001 -From: Hui Wang -Date: Fri, 4 Sep 2020 17:06:27 +0800 -Subject: [PATCH] sound: update the profile list after getting the signal from - gvc - -In the ubuntu 20.04, we found a regression on HDMI audio. We plug a -HDMI/DP monitor, the output device is the speaker in the output device -combo box, then we select the HDMI from the combo box, the output -device is switched to HDMI audio successfully, but the configuration -box is empty. This will not happen in the ubuntu 18.04, the profile -will show hdmi-stereo in this situation. So I think this is a -regression. - -When problem happens, I could see the errors from log: -Gvc: DEBUG: Matching profile for 'output:analog-stereo' is '(null)' -Gvc: DEBUG: Matching profile for 'output:analog-stereo' is '(null)' -Gvc: DEBUG: Matching profile for 'output:analog-stereo' is '(null)' - -Through debugging, I found the cc_profile_combo_box_set_device() is -called too early. In the ubuntu 18.04, this function is called after -pulseaudio changes the active_profile, but in the ubuntu 20.04, it is -called ahead of pulseaudio changes the active_profile. - -To fix it, add a signal callback function, after pulseaudio changes -the active_profile, this callback function will be called, then call -cc_profile_combo_box_set_device(). - -Signed-off-by: Hui Wang ---- - panels/sound/cc-sound-panel.c | 44 ++++++++++++++++++++++++++++++----- - 1 file changed, 38 insertions(+), 6 deletions(-) - -Index: gnome-control-center/panels/sound/cc-sound-panel.c -=================================================================== ---- gnome-control-center.orig/panels/sound/cc-sound-panel.c -+++ gnome-control-center/panels/sound/cc-sound-panel.c -@@ -104,9 +104,6 @@ output_device_changed_cb (CcSoundPanel * - gboolean can_fade = FALSE, has_lfe = FALSE; - - device = cc_device_combo_box_get_device (self->output_device_combo_box); -- cc_profile_combo_box_set_device (self->output_profile_combo_box, self->mixer_control, device); -- gtk_widget_set_visible (GTK_WIDGET (self->output_profile_row), -- cc_profile_combo_box_get_profile_count (self->output_profile_combo_box) > 1); - - if (device != NULL) - stream = gvc_mixer_control_get_stream_from_device (self->mixer_control, device); -@@ -139,9 +136,6 @@ input_device_changed_cb (CcSoundPanel *s - GvcMixerStream *stream = NULL; - - device = cc_device_combo_box_get_device (self->input_device_combo_box); -- cc_profile_combo_box_set_device (self->input_profile_combo_box, self->mixer_control, device); -- gtk_widget_set_visible (GTK_WIDGET (self->input_profile_row), -- cc_profile_combo_box_get_profile_count (self->input_profile_combo_box) > 1); - - if (device != NULL) - stream = gvc_mixer_control_get_stream_from_device (self->mixer_control, device); -@@ -154,6 +148,34 @@ input_device_changed_cb (CcSoundPanel *s - } - - static void -+output_device_update_cb (CcSoundPanel *self, -+ guint id) -+{ -+ GvcMixerUIDevice *device; -+ gboolean has_multi_profiles; -+ -+ device = cc_device_combo_box_get_device (self->output_device_combo_box); -+ cc_profile_combo_box_set_device (self->output_profile_combo_box, self->mixer_control, device); -+ has_multi_profiles = (cc_profile_combo_box_get_profile_count (self->output_profile_combo_box) > 1); -+ gtk_widget_set_visible (GTK_WIDGET (self->output_profile_row), -+ has_multi_profiles); -+} -+ -+static void -+input_device_update_cb (CcSoundPanel *self, -+ guint id) -+{ -+ GvcMixerUIDevice *device; -+ gboolean has_multi_profiles; -+ -+ device = cc_device_combo_box_get_device (self->input_device_combo_box); -+ cc_profile_combo_box_set_device (self->input_profile_combo_box, self->mixer_control, device); -+ has_multi_profiles = (cc_profile_combo_box_get_profile_count (self->input_profile_combo_box) > 1); -+ gtk_widget_set_visible (GTK_WIDGET (self->input_profile_row), -+ has_multi_profiles); -+} -+ -+static void - test_output_configuration_button_clicked_cb (CcSoundPanel *self) - { - GvcMixerUIDevice *device; -@@ -283,4 +305,14 @@ cc_sound_panel_init (CcSoundPanel *self) - cc_subwoofer_slider_set_mixer_control (self->subwoofer_slider, self->mixer_control); - cc_device_combo_box_set_mixer_control (self->input_device_combo_box, self->mixer_control, FALSE); - cc_device_combo_box_set_mixer_control (self->output_device_combo_box, self->mixer_control, TRUE); -+ g_signal_connect_object (self->mixer_control, -+ "active-output-update", -+ G_CALLBACK (output_device_update_cb), -+ self, -+ G_CONNECT_SWAPPED); -+ g_signal_connect_object (self->mixer_control, -+ "active-input-update", -+ G_CALLBACK (input_device_update_cb), -+ self, -+ G_CONNECT_SWAPPED); - } diff -Nru gnome-control-center-3.36.4/debian/patches/git_row_collide.patch gnome-control-center-3.36.5/debian/patches/git_row_collide.patch --- gnome-control-center-3.36.4/debian/patches/git_row_collide.patch 2020-09-24 15:03:01.000000000 +0000 +++ gnome-control-center-3.36.5/debian/patches/git_row_collide.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,51 +0,0 @@ -From d7e546d486ef18b9613b6fd23e053a8e64b40d75 Mon Sep 17 00:00:00 2001 -From: Bin Li -Date: Wed, 29 Jul 2020 15:16:17 +0800 -Subject: [PATCH] details-page.ui: Fixed rows of text collide, increased - child's top_attach after auto_connect_check. - -Closes: https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/933 ---- - panels/network/connection-editor/details-page.ui | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/panels/network/connection-editor/details-page.ui b/panels/network/connection-editor/details-page.ui -index eb8416918..fba3aa7be 100644 ---- a/panels/network/connection-editor/details-page.ui -+++ b/panels/network/connection-editor/details-page.ui -@@ -385,7 +385,7 @@ - - - 0 -- 9 -+ 10 - 2 - 1 - -@@ -402,7 +402,7 @@ - - - 0 -- 10 -+ 11 - 2 - 1 - -@@ -453,7 +453,7 @@ - - - 0 -- 12 -+ 13 - 2 - 1 - -@@ -474,7 +474,7 @@ - - - 0 -- 13 -+ 14 - 2 - 1 - diff -Nru gnome-control-center-3.36.4/debian/patches/git_useraccount_segfault.patch gnome-control-center-3.36.5/debian/patches/git_useraccount_segfault.patch --- gnome-control-center-3.36.4/debian/patches/git_useraccount_segfault.patch 2020-09-24 15:03:01.000000000 +0000 +++ gnome-control-center-3.36.5/debian/patches/git_useraccount_segfault.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,40 +0,0 @@ -From 0c689f6a2bb29923f5c07814106a888f392a98bb Mon Sep 17 00:00:00 2001 -From: Sebastien Bacher -Date: Thu, 6 Aug 2020 13:19:58 +0200 -Subject: [PATCH] user-account: don't segfault trying to get the user initials - -it's possible that act_user_get_real_name returns null, handle that case -fixes bug #959 ---- - panels/user-accounts/user-utils.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/panels/user-accounts/user-utils.c b/panels/user-accounts/user-utils.c -index 68d8b61a4..ca3f7bd49 100644 ---- a/panels/user-accounts/user-utils.c -+++ b/panels/user-accounts/user-utils.c -@@ -592,6 +592,8 @@ extract_initials_from_name (const gchar *name) - gunichar unichar; - gpointer q = NULL; - -+ g_return_val_if_fail (name != NULL, NULL); -+ - p = g_utf8_strup (name, -1); - normalized = g_utf8_normalize (g_strstrip (p), -1, G_NORMALIZE_DEFAULT_COMPOSE); - if (normalized == NULL) { -@@ -748,10 +750,14 @@ set_user_icon_data (ActUser *user, - GdkPixbuf * - generate_default_avatar (ActUser *user, gint size) - { -+ const gchar *name; - GdkPixbuf *pixbuf = NULL; - cairo_surface_t *surface; - -- surface = generate_user_picture (act_user_get_real_name (user), size); -+ name = act_user_get_real_name (user); -+ if (name == NULL) -+ name = ""; -+ surface = generate_user_picture (name, size); - - pixbuf = gdk_pixbuf_get_from_surface (surface, 0, 0, size, size); - cairo_surface_destroy (surface); diff -Nru gnome-control-center-3.36.4/debian/patches/revert_vino_deprecated.patch gnome-control-center-3.36.5/debian/patches/revert_vino_deprecated.patch --- gnome-control-center-3.36.4/debian/patches/revert_vino_deprecated.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-control-center-3.36.5/debian/patches/revert_vino_deprecated.patch 2020-11-26 12:47:43.000000000 +0000 @@ -0,0 +1,289 @@ +diff --git a/panels/sharing/cc-sharing-panel.c b/panels/sharing/cc-sharing-panel.c +index 595d71d80..058f2b513 100644 +--- a/panels/sharing/cc-sharing-panel.c ++++ b/panels/sharing/cc-sharing-panel.c +@@ -24,6 +24,7 @@ + + #include "list-box-helper.h" + #include "cc-sharing-resources.h" ++#include "vino-preferences.h" + #include "cc-remote-login.h" + #include "file-share-properties.h" + #include "cc-media-sharing.h" +@@ -42,6 +43,7 @@ static void cc_sharing_panel_setup_label_with_hostname (CcSharingPanel *self, Gt + static GtkWidget *cc_sharing_panel_new_media_sharing_row (const char *uri_or_path, + CcSharingPanel *self); + ++#define VINO_SCHEMA_ID "org.gnome.Vino" + #define FILE_SHARING_SCHEMA_ID "org.gnome.desktop.file-sharing" + #define GNOME_REMOTE_DESKTOP_SCHEMA_ID "org.gnome.desktop.remote-desktop" + #define GNOME_REMOTE_DESKTOP_VNC_SCHEMA_ID "org.gnome.desktop.remote-desktop.vnc" +@@ -1020,6 +1022,67 @@ screen_sharing_password_insert_text_cb (GtkEditable *editable, + } + #undef MAX_PASSWORD_SIZE + ++static void ++cc_sharing_panel_setup_screen_sharing_dialog_vino (CcSharingPanel *self) ++{ ++ GSettings *settings; ++ GtkWidget *networks, *box, *w; ++ ++ cc_sharing_panel_bind_switch_to_widgets (self->require_password_radiobutton, ++ self->password_grid, ++ NULL); ++ ++ cc_sharing_panel_setup_label_with_hostname (self, ++ self->screen_sharing_label); ++ ++ /* settings bindings */ ++ settings = g_settings_new (VINO_SCHEMA_ID); ++ g_settings_bind (settings, "view-only", self->remote_control_checkbutton, ++ "active", ++ G_SETTINGS_BIND_DEFAULT | G_SETTINGS_BIND_INVERT_BOOLEAN); ++ g_settings_bind (settings, "prompt-enabled", ++ self->approve_connections_radiobutton, "active", ++ G_SETTINGS_BIND_DEFAULT); ++ g_settings_bind_with_mapping (settings, "authentication-methods", ++ self->require_password_radiobutton, ++ "active", ++ G_SETTINGS_BIND_DEFAULT, ++ vino_get_authtype, vino_set_authtype, NULL, NULL); ++ ++ g_settings_bind_with_mapping (settings, "vnc-password", ++ self->remote_control_password_entry, ++ "text", ++ G_SETTINGS_BIND_DEFAULT, ++ vino_get_password, vino_set_password, NULL, NULL); ++ ++ g_object_bind_property (self->show_password_checkbutton, "active", ++ self->remote_control_password_entry, "visibility", ++ G_BINDING_SYNC_CREATE); ++ ++ /* make sure the password entry is hidden by default */ ++ g_signal_connect (self->screen_sharing_dialog, "show", ++ G_CALLBACK (screen_sharing_show_cb), self); ++ ++ g_signal_connect (self->screen_sharing_dialog, "hide", ++ G_CALLBACK (screen_sharing_hide_cb), self); ++ ++ /* accept at most 8 bytes in password entry */ ++ g_signal_connect (self->remote_control_password_entry, "insert-text", ++ G_CALLBACK (screen_sharing_password_insert_text_cb), self); ++ ++ networks = cc_sharing_networks_new (self->sharing_proxy, "vino-server"); ++ box = self->remote_control_box; ++ gtk_box_pack_end (GTK_BOX (box), networks, TRUE, TRUE, 0); ++ gtk_widget_show (networks); ++ ++ w = cc_sharing_switch_new (networks); ++ gtk_header_bar_pack_start (GTK_HEADER_BAR (self->screen_sharing_headerbar), w); ++ self->screen_sharing_switch = w; ++ ++ cc_sharing_panel_bind_networks_to_label (self, networks, ++ self->screen_sharing_status_label); ++} ++ + static void + cc_sharing_panel_setup_screen_sharing_dialog_gnome_remote_desktop (CcSharingPanel *self) + { +@@ -1166,8 +1229,18 @@ sharing_proxy_ready (GObject *source, + cc_sharing_panel_setup_remote_login_dialog (self); + + /* screen sharing */ +- check_remote_desktop_available (self); +- gtk_widget_hide (self->screen_sharing_button); ++#ifdef GDK_WINDOWING_WAYLAND ++ if (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default ())) ++ { ++ check_remote_desktop_available (self); ++ gtk_widget_hide (self->screen_sharing_button); ++ } ++ else ++#endif ++ if (cc_sharing_panel_check_schema_available (self, VINO_SCHEMA_ID)) ++ cc_sharing_panel_setup_screen_sharing_dialog_vino (self); ++ else ++ gtk_widget_hide (self->screen_sharing_button); + } + + static void +diff --git a/panels/sharing/meson.build b/panels/sharing/meson.build +index b3803bcda..1ad1878a3 100644 +--- a/panels/sharing/meson.build ++++ b/panels/sharing/meson.build +@@ -45,6 +45,7 @@ sources = files( + 'cc-sharing-switch.c', + 'cc-gnome-remote-desktop.c', + 'file-share-properties.c', ++ 'vino-preferences.c' + ) + + resource_data = files( +diff --git a/panels/sharing/vino-preferences.c b/panels/sharing/vino-preferences.c +new file mode 100644 +index 000000000..029459dab +--- /dev/null ++++ b/panels/sharing/vino-preferences.c +@@ -0,0 +1,111 @@ ++/* ++ * Copyright (C) 2003 Sun Microsystems, Inc. ++ * Copyright (C) 2006 Jonh Wendell ++ * Copyright © 2010 Codethink Limited ++ * Copyright (C) 2013 Intel, Inc ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of the ++ * License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, but ++ * WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, see . ++ * ++ * Authors: ++ * Mark McLoughlin ++ * Jonh Wendell ++ * Ryan Lortie ++ */ ++ ++#include "vino-preferences.h" ++#include ++ ++#include ++ ++gboolean ++vino_get_authtype (GValue *value, ++ GVariant *variant, ++ gpointer user_data) ++{ ++ GVariantIter iter; ++ const gchar *type; ++ ++ g_variant_iter_init (&iter, variant); ++ g_value_set_boolean (value, TRUE); ++ ++ while (g_variant_iter_next (&iter, "&s", &type)) ++ if (strcmp (type, "none") == 0) ++ g_value_set_boolean (value, FALSE); ++ ++ return TRUE; ++} ++ ++GVariant * ++vino_set_authtype (const GValue *value, ++ const GVariantType *type, ++ gpointer user_data) ++{ ++ const gchar *authtype; ++ ++ if (g_value_get_boolean (value)) ++ authtype = "vnc"; ++ else ++ authtype = "none"; ++ ++ return g_variant_new_strv (&authtype, 1); ++} ++ ++gboolean ++vino_get_password (GValue *value, ++ GVariant *variant, ++ gpointer user_data) ++{ ++ const gchar *setting; ++ ++ setting = g_variant_get_string (variant, NULL); ++ ++ if (strcmp (setting, "keyring") == 0) ++ { ++ /* "keyring" is the default value, even though vino doesn't support it at ++ * the moment */ ++ ++ g_value_set_static_string (value, ""); ++ return TRUE; ++ } ++ else ++ { ++ gchar *decoded; ++ gsize length; ++ gboolean ok; ++ ++ decoded = (gchar *) g_base64_decode (setting, &length); ++ ++ if ((ok = g_utf8_validate (decoded, length, NULL))) ++ g_value_take_string (value, g_strndup (decoded, length)); ++ ++ return ok; ++ } ++} ++ ++GVariant * ++vino_set_password (const GValue *value, ++ const GVariantType *type, ++ gpointer user_data) ++{ ++ const gchar *string; ++ gchar *base64; ++ ++ string = g_value_get_string (value); ++ ++ base64 = g_base64_encode ((guchar *) string, strlen (string)); ++ return g_variant_new_from_data (G_VARIANT_TYPE_STRING, ++ base64, strlen (base64) + 1, ++ TRUE, g_free, base64); ++} ++ +diff --git a/panels/sharing/vino-preferences.h b/panels/sharing/vino-preferences.h +new file mode 100644 +index 000000000..f992d8d7c +--- /dev/null ++++ b/panels/sharing/vino-preferences.h +@@ -0,0 +1,45 @@ ++/* ++ * Copyright (C) 2003 Sun Microsystems, Inc. ++ * Copyright (C) 2006 Jonh Wendell ++ * Copyright © 2010 Codethink Limited ++ * Copyright (C) 2013 Intel, Inc ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of the ++ * License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, but ++ * WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, see . ++ * ++ * Authors: ++ * Mark McLoughlin ++ * Jonh Wendell ++ * Ryan Lortie ++ */ ++ ++#pragma once ++ ++#include ++#include ++ ++GVariant * vino_set_authtype (const GValue *value, ++ const GVariantType *type, ++ gpointer user_data); ++gboolean vino_get_authtype (GValue *value, ++ GVariant *variant, ++ gpointer user_data); ++ ++GVariant * ++vino_set_password (const GValue *value, ++ const GVariantType *type, ++ gpointer user_data); ++gboolean ++vino_get_password (GValue *value, ++ GVariant *variant, ++ gpointer user_data); diff -Nru gnome-control-center-3.36.4/debian/patches/series gnome-control-center-3.36.5/debian/patches/series --- gnome-control-center-3.36.4/debian/patches/series 2020-09-24 15:03:01.000000000 +0000 +++ gnome-control-center-3.36.5/debian/patches/series 2020-11-26 12:47:43.000000000 +0000 @@ -1,10 +1,8 @@ # Upstream -git_useraccount_segfault.patch # on master only git-nongnome-segfault.patch git-user-accounts-Use-newly-designed-fingerprint-enroll-dialo.patch -git_row_collide.patch # Ubuntu changes 0001-Expose-touchpad-settings-if-synaptics-is-in-use.patch @@ -37,7 +35,7 @@ 0029-applications-Use-new-snapd-glib-API-for-labelling-Sn.patch 0030-temporarily-revert-alt-char-key.patch 0032-online-accounts-maybe-leak-a-reference-to-the-panel.patch +revert_vino_deprecated.patch gitlab_ucm_mixer_control_select.patch -0033-sound-update-the-profile-list-after-getting-the-sign.patch diff -Nru gnome-control-center-3.36.4/meson.build gnome-control-center-3.36.5/meson.build --- gnome-control-center-3.36.4/meson.build 2020-07-03 05:10:57.785430700 +0000 +++ gnome-control-center-3.36.5/meson.build 2020-11-20 00:57:42.552795200 +0000 @@ -1,6 +1,6 @@ project( 'gnome-control-center', 'c', - version : '3.36.4', + version : '3.36.5', license : 'GPL2+', meson_version : '>= 0.51.0' ) diff -Nru gnome-control-center-3.36.4/NEWS gnome-control-center-3.36.5/NEWS --- gnome-control-center-3.36.4/NEWS 2020-07-03 05:10:57.785430700 +0000 +++ gnome-control-center-3.36.5/NEWS 2020-11-20 00:57:42.548795000 +0000 @@ -1,4 +1,38 @@ ================ +Version 3.36.5 +================ + +Applications: +- Fix NULL hash table being unreffed. +- Ensure private types used by the template. + +Keyboard: +- Fix behavior of "Replace" when adding custom shortcut +- fix gtk_widget_get_can_default assertion error. + +Network: +- Correctly detect when ethernet devices are hotplugged. +- Fix overlapping text rows in connection editor. + +Printers: +- Make printers panel have a smaller minimum width. +- Fix leak of printer name in callbacks. + +Sharing: +- Disable Tracker 3. +- Replace vino with gnome-remote-desktop for X11 sessions. + +Sound: +- Update the profile list after getting the signal from gvc. +- Fix subwoofer slider. + +Users: +- Don't segfault trying to get the user initials. + +Wacom: +- Fix a critical warning if loading a cursor fails. + +================ Version 3.36.4 ================ diff -Nru gnome-control-center-3.36.4/panels/applications/cc-applications-panel.c gnome-control-center-3.36.5/panels/applications/cc-applications-panel.c --- gnome-control-center-3.36.4/panels/applications/cc-applications-panel.c 2020-07-03 05:10:57.789430900 +0000 +++ gnome-control-center-3.36.5/panels/applications/cc-applications-panel.c 2020-11-20 00:57:42.552795200 +0000 @@ -1762,10 +1762,10 @@ g_clear_object (&self->privacy_settings); g_clear_object (&self->search_settings); - g_free (self->current_app_id); - g_free (self->current_portal_app_id); - g_hash_table_unref (self->globs); - g_hash_table_unref (self->search_providers); + g_clear_pointer (&self->current_app_id, g_free); + g_clear_pointer (&self->current_portal_app_id, g_free); + g_clear_pointer (&self->globs, g_hash_table_unref); + g_clear_pointer (&self->search_providers, g_hash_table_unref); G_OBJECT_CLASS (cc_applications_panel_parent_class)->finalize (object); } @@ -1921,6 +1921,9 @@ g_resources_register (cc_applications_get_resource ()); + g_type_ensure(CC_TYPE_TOGGLE_ROW); + g_type_ensure(CC_TYPE_INFO_ROW); + gtk_widget_init_template (GTK_WIDGET (self)); provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ()); diff -Nru gnome-control-center-3.36.4/panels/keyboard/cc-keyboard-shortcut-editor.c gnome-control-center-3.36.5/panels/keyboard/cc-keyboard-shortcut-editor.c --- gnome-control-center-3.36.4/panels/keyboard/cc-keyboard-shortcut-editor.c 2020-07-03 05:10:57.829430800 +0000 +++ gnome-control-center-3.36.5/panels/keyboard/cc-keyboard-shortcut-editor.c 2020-11-20 00:57:42.596795600 +0000 @@ -66,6 +66,7 @@ static void command_entry_changed_cb (CcKeyboardShortcutEditor *self); static void name_entry_changed_cb (CcKeyboardShortcutEditor *self); +static void set_button_clicked_cb (CcKeyboardShortcutEditor *self); G_DEFINE_TYPE (CcKeyboardShortcutEditor, cc_keyboard_shortcut_editor, GTK_TYPE_DIALOG) @@ -514,9 +515,10 @@ static void replace_button_clicked_cb (CcKeyboardShortcutEditor *self) { - update_shortcut (self); - - gtk_widget_hide (GTK_WIDGET (self)); + if (self->mode == CC_SHORTCUT_EDITOR_CREATE) + add_button_clicked_cb (self); + else + set_button_clicked_cb (self); } static void diff -Nru gnome-control-center-3.36.4/panels/keyboard/cc-keyboard-shortcut-editor.ui gnome-control-center-3.36.5/panels/keyboard/cc-keyboard-shortcut-editor.ui --- gnome-control-center-3.36.4/panels/keyboard/cc-keyboard-shortcut-editor.ui 2020-07-03 05:10:57.829430800 +0000 +++ gnome-control-center-3.36.5/panels/keyboard/cc-keyboard-shortcut-editor.ui 2020-11-20 00:57:42.596795600 +0000 @@ -382,6 +382,7 @@ Replace True True + True True diff -Nru gnome-control-center-3.36.4/panels/network/cc-network-panel.c gnome-control-center-3.36.5/panels/network/cc-network-panel.c --- gnome-control-center-3.36.4/panels/network/cc-network-panel.c 2020-07-03 05:10:57.833431000 +0000 +++ gnome-control-center-3.36.5/panels/network/cc-network-panel.c 2020-11-20 00:57:42.600795700 +0000 @@ -391,9 +391,6 @@ NetDeviceBluetooth *device_bluetooth; g_autoptr(GDBusObject) modem_object = NULL; - if (!nm_device_get_managed (device)) - return; - /* does already exist */ if (g_hash_table_lookup (self->nm_device_to_device, device) != NULL) return; @@ -517,19 +514,36 @@ } static void -device_added_cb (CcNetworkPanel *self, NMDevice *device) +device_managed_cb (CcNetworkPanel *self, GParamSpec *pspec, NMDevice *device) { - g_debug ("New device added"); + if (!nm_device_get_managed (device)) + return; + panel_add_device (self, device); panel_refresh_device_titles (self); } static void +device_added_cb (CcNetworkPanel *self, NMDevice *device) +{ + g_debug ("New device added"); + + if (nm_device_get_managed (device)) + device_managed_cb (self, NULL, device); + else + g_signal_connect_object (device, "notify::managed", G_CALLBACK (device_managed_cb), self, G_CONNECT_SWAPPED); +} + +static void device_removed_cb (CcNetworkPanel *self, NMDevice *device) { g_debug ("Device removed"); panel_remove_device (self, device); panel_refresh_device_titles (self); + + g_signal_handlers_disconnect_by_func (device, + G_CALLBACK (device_managed_cb), + self); } static void @@ -537,7 +551,6 @@ { const GPtrArray *devices; int i; - NMDevice *device_tmp; /* clear all devices we added */ if (!nm_client_get_nm_running (self->client)) { @@ -552,8 +565,8 @@ return; } for (i = 0; i < devices->len; i++) { - device_tmp = g_ptr_array_index (devices, i); - panel_add_device (self, device_tmp); + NMDevice *device = g_ptr_array_index (devices, i); + device_added_cb (self, device); } out: panel_refresh_device_titles (self); diff -Nru gnome-control-center-3.36.4/panels/network/connection-editor/ce-page-ip4.c gnome-control-center-3.36.5/panels/network/connection-editor/ce-page-ip4.c --- gnome-control-center-3.36.4/panels/network/connection-editor/ce-page-ip4.c 2020-07-03 05:10:57.837431000 +0000 +++ gnome-control-center-3.36.5/panels/network/connection-editor/ce-page-ip4.c 2020-11-20 00:57:42.604795700 +0000 @@ -152,13 +152,13 @@ } static void -remove_row (CEPageIP4 *self) +remove_row (CEPageIP4 *self, GtkButton *button) { GtkWidget *list; GtkWidget *row; GtkWidget *row_box; - row_box = gtk_widget_get_parent (GTK_WIDGET (self)); + row_box = gtk_widget_get_parent (GTK_WIDGET (button)); row = gtk_widget_get_parent (row_box); list = gtk_widget_get_parent (row); diff -Nru gnome-control-center-3.36.4/panels/network/connection-editor/ce-page-ip6.c gnome-control-center-3.36.5/panels/network/connection-editor/ce-page-ip6.c --- gnome-control-center-3.36.4/panels/network/connection-editor/ce-page-ip6.c 2020-07-03 05:10:57.837431000 +0000 +++ gnome-control-center-3.36.5/panels/network/connection-editor/ce-page-ip6.c 2020-11-20 00:57:42.604795700 +0000 @@ -135,13 +135,13 @@ } static void -remove_row (CEPageIP6 *self) +remove_row (CEPageIP6 *self, GtkButton *button) { GtkWidget *row; GtkWidget *row_box; GtkWidget *list; - row_box = gtk_widget_get_parent (GTK_WIDGET (self)); + row_box = gtk_widget_get_parent (GTK_WIDGET (button)); row = gtk_widget_get_parent (row_box); list = gtk_widget_get_parent (row); diff -Nru gnome-control-center-3.36.4/panels/network/connection-editor/details-page.ui gnome-control-center-3.36.5/panels/network/connection-editor/details-page.ui --- gnome-control-center-3.36.4/panels/network/connection-editor/details-page.ui 2020-07-03 05:10:57.837431000 +0000 +++ gnome-control-center-3.36.5/panels/network/connection-editor/details-page.ui 2020-11-20 00:57:42.604795700 +0000 @@ -385,7 +385,7 @@ 0 - 9 + 10 2 1 @@ -402,7 +402,7 @@ 0 - 10 + 11 2 1 @@ -453,7 +453,7 @@ 0 - 12 + 13 2 1 @@ -474,7 +474,7 @@ 0 - 13 + 14 2 1 diff -Nru gnome-control-center-3.36.4/panels/printers/pp-details-dialog.c gnome-control-center-3.36.5/panels/printers/pp-details-dialog.c --- gnome-control-center-3.36.4/panels/printers/pp-details-dialog.c 2020-07-03 05:10:57.849431000 +0000 +++ gnome-control-center-3.36.5/panels/printers/pp-details-dialog.c 2020-11-20 00:57:42.616796000 +0000 @@ -95,7 +95,7 @@ } } -static void set_ppd_cb (gchar *printer_name, gboolean success, gpointer user_data); +static void set_ppd_cb (const gchar *printer_name, gboolean success, gpointer user_data); static void get_ppd_names_cb (PPDName **names, @@ -140,7 +140,7 @@ } static void -set_ppd_cb (gchar *printer_name, +set_ppd_cb (const gchar *printer_name, gboolean success, gpointer user_data) { diff -Nru gnome-control-center-3.36.4/panels/printers/pp-new-printer-dialog.c gnome-control-center-3.36.5/panels/printers/pp-new-printer-dialog.c --- gnome-control-center-3.36.4/panels/printers/pp-new-printer-dialog.c 2020-07-03 05:10:57.849431000 +0000 +++ gnome-control-center-3.36.5/panels/printers/pp-new-printer-dialog.c 2020-11-20 00:57:42.620796000 +0000 @@ -1496,7 +1496,7 @@ data->dialog); pp_samba_get_devices_async (self->samba_host, - TRUE, + FALSE, self->remote_host_cancellable, get_samba_host_devices_cb, data->dialog); diff -Nru gnome-control-center-3.36.4/panels/printers/pp-utils.c gnome-control-center-3.36.5/panels/printers/pp-utils.c --- gnome-control-center-3.36.4/panels/printers/pp-utils.c 2020-07-03 05:10:57.853431000 +0000 +++ gnome-control-center-3.36.5/panels/printers/pp-utils.c 2020-11-20 00:57:42.620796000 +0000 @@ -1501,7 +1501,7 @@ /* Don't call callback if cancelled */ if (!data->cancellable || !g_cancellable_is_cancelled (data->cancellable)) - data->callback (g_strdup (data->printer_name), + data->callback (data->printer_name, result, data->user_data); @@ -1574,7 +1574,7 @@ return; out: - callback (g_strdup (printer_name), FALSE, user_data); + callback (printer_name, FALSE, user_data); if (data->cancellable) g_object_unref (data->cancellable); @@ -1631,7 +1631,7 @@ return; out: - data->callback (g_strdup (data->printer_name), FALSE, data->user_data); + data->callback (data->printer_name, FALSE, data->user_data); if (data->cancellable) g_object_unref (data->cancellable); @@ -1693,7 +1693,7 @@ return; out: - callback (g_strdup (printer_name), FALSE, user_data); + callback (printer_name, FALSE, user_data); if (data->cancellable) g_object_unref (data->cancellable); diff -Nru gnome-control-center-3.36.4/panels/printers/pp-utils.h gnome-control-center-3.36.5/panels/printers/pp-utils.h --- gnome-control-center-3.36.4/panels/printers/pp-utils.h 2020-07-03 05:10:57.853431000 +0000 +++ gnome-control-center-3.36.5/panels/printers/pp-utils.h 2020-11-20 00:57:42.620796000 +0000 @@ -138,7 +138,7 @@ const gchar *device_uri, const gchar *printer_uri); -typedef void (*PSPCallback) (gchar *printer_name, +typedef void (*PSPCallback) (const gchar *printer_name, gboolean success, gpointer user_data); diff -Nru gnome-control-center-3.36.4/panels/printers/printer-entry.ui gnome-control-center-3.36.5/panels/printers/printer-entry.ui --- gnome-control-center-3.36.4/panels/printers/printer-entry.ui 2020-07-03 05:10:57.853431000 +0000 +++ gnome-control-center-3.36.5/panels/printers/printer-entry.ui 2020-11-20 00:57:42.624796000 +0000 @@ -278,6 +278,7 @@ 1 3 + 2 diff -Nru gnome-control-center-3.36.4/panels/sharing/cc-media-sharing.c gnome-control-center-3.36.5/panels/sharing/cc-media-sharing.c --- gnome-control-center-3.36.4/panels/sharing/cc-media-sharing.c 2020-07-03 05:10:57.857431000 +0000 +++ gnome-control-center-3.36.5/panels/sharing/cc-media-sharing.c 2020-11-20 00:57:42.628796000 +0000 @@ -106,6 +106,7 @@ g_key_file_set_boolean (file, "general", "upnp-enabled", TRUE); g_key_file_set_boolean (file, "Tracker", "enabled", FALSE); + g_key_file_set_boolean (file, "Tracker3", "enabled", FALSE); g_key_file_set_boolean (file, "MediaExport", "enabled", TRUE); str_list = folders; diff -Nru gnome-control-center-3.36.4/panels/sharing/cc-sharing-panel.c gnome-control-center-3.36.5/panels/sharing/cc-sharing-panel.c --- gnome-control-center-3.36.4/panels/sharing/cc-sharing-panel.c 2020-07-03 05:10:57.857431000 +0000 +++ gnome-control-center-3.36.5/panels/sharing/cc-sharing-panel.c 2020-11-20 00:57:42.628796000 +0000 @@ -24,7 +24,6 @@ #include "list-box-helper.h" #include "cc-sharing-resources.h" -#include "vino-preferences.h" #include "cc-remote-login.h" #include "file-share-properties.h" #include "cc-media-sharing.h" @@ -43,7 +42,6 @@ static GtkWidget *cc_sharing_panel_new_media_sharing_row (const char *uri_or_path, CcSharingPanel *self); -#define VINO_SCHEMA_ID "org.gnome.Vino" #define FILE_SHARING_SCHEMA_ID "org.gnome.desktop.file-sharing" #define GNOME_REMOTE_DESKTOP_SCHEMA_ID "org.gnome.desktop.remote-desktop" #define GNOME_REMOTE_DESKTOP_VNC_SCHEMA_ID "org.gnome.desktop.remote-desktop.vnc" @@ -1023,67 +1021,6 @@ #undef MAX_PASSWORD_SIZE static void -cc_sharing_panel_setup_screen_sharing_dialog_vino (CcSharingPanel *self) -{ - GSettings *settings; - GtkWidget *networks, *box, *w; - - cc_sharing_panel_bind_switch_to_widgets (self->require_password_radiobutton, - self->password_grid, - NULL); - - cc_sharing_panel_setup_label_with_hostname (self, - self->screen_sharing_label); - - /* settings bindings */ - settings = g_settings_new (VINO_SCHEMA_ID); - g_settings_bind (settings, "view-only", self->remote_control_checkbutton, - "active", - G_SETTINGS_BIND_DEFAULT | G_SETTINGS_BIND_INVERT_BOOLEAN); - g_settings_bind (settings, "prompt-enabled", - self->approve_connections_radiobutton, "active", - G_SETTINGS_BIND_DEFAULT); - g_settings_bind_with_mapping (settings, "authentication-methods", - self->require_password_radiobutton, - "active", - G_SETTINGS_BIND_DEFAULT, - vino_get_authtype, vino_set_authtype, NULL, NULL); - - g_settings_bind_with_mapping (settings, "vnc-password", - self->remote_control_password_entry, - "text", - G_SETTINGS_BIND_DEFAULT, - vino_get_password, vino_set_password, NULL, NULL); - - g_object_bind_property (self->show_password_checkbutton, "active", - self->remote_control_password_entry, "visibility", - G_BINDING_SYNC_CREATE); - - /* make sure the password entry is hidden by default */ - g_signal_connect (self->screen_sharing_dialog, "show", - G_CALLBACK (screen_sharing_show_cb), self); - - g_signal_connect (self->screen_sharing_dialog, "hide", - G_CALLBACK (screen_sharing_hide_cb), self); - - /* accept at most 8 bytes in password entry */ - g_signal_connect (self->remote_control_password_entry, "insert-text", - G_CALLBACK (screen_sharing_password_insert_text_cb), self); - - networks = cc_sharing_networks_new (self->sharing_proxy, "vino-server"); - box = self->remote_control_box; - gtk_box_pack_end (GTK_BOX (box), networks, TRUE, TRUE, 0); - gtk_widget_show (networks); - - w = cc_sharing_switch_new (networks); - gtk_header_bar_pack_start (GTK_HEADER_BAR (self->screen_sharing_headerbar), w); - self->screen_sharing_switch = w; - - cc_sharing_panel_bind_networks_to_label (self, networks, - self->screen_sharing_status_label); -} - -static void cc_sharing_panel_setup_screen_sharing_dialog_gnome_remote_desktop (CcSharingPanel *self) { g_autoptr(GSettings) vnc_settings = NULL; @@ -1229,18 +1166,8 @@ cc_sharing_panel_setup_remote_login_dialog (self); /* screen sharing */ -#ifdef GDK_WINDOWING_WAYLAND - if (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default ())) - { - check_remote_desktop_available (self); - gtk_widget_hide (self->screen_sharing_button); - } - else -#endif - if (cc_sharing_panel_check_schema_available (self, VINO_SCHEMA_ID)) - cc_sharing_panel_setup_screen_sharing_dialog_vino (self); - else - gtk_widget_hide (self->screen_sharing_button); + check_remote_desktop_available (self); + gtk_widget_hide (self->screen_sharing_button); } static void diff -Nru gnome-control-center-3.36.4/panels/sharing/meson.build gnome-control-center-3.36.5/panels/sharing/meson.build --- gnome-control-center-3.36.4/panels/sharing/meson.build 2020-07-03 05:10:57.857431000 +0000 +++ gnome-control-center-3.36.5/panels/sharing/meson.build 2020-11-20 00:57:42.628796000 +0000 @@ -45,7 +45,6 @@ 'cc-sharing-switch.c', 'cc-gnome-remote-desktop.c', 'file-share-properties.c', - 'vino-preferences.c' ) resource_data = files( diff -Nru gnome-control-center-3.36.4/panels/sharing/vino-preferences.c gnome-control-center-3.36.5/panels/sharing/vino-preferences.c --- gnome-control-center-3.36.4/panels/sharing/vino-preferences.c 2020-07-03 05:10:57.857431000 +0000 +++ gnome-control-center-3.36.5/panels/sharing/vino-preferences.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,111 +0,0 @@ -/* - * Copyright (C) 2003 Sun Microsystems, Inc. - * Copyright (C) 2006 Jonh Wendell - * Copyright © 2010 Codethink Limited - * Copyright (C) 2013 Intel, Inc - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see . - * - * Authors: - * Mark McLoughlin - * Jonh Wendell - * Ryan Lortie - */ - -#include "vino-preferences.h" -#include - -#include - -gboolean -vino_get_authtype (GValue *value, - GVariant *variant, - gpointer user_data) -{ - GVariantIter iter; - const gchar *type; - - g_variant_iter_init (&iter, variant); - g_value_set_boolean (value, TRUE); - - while (g_variant_iter_next (&iter, "&s", &type)) - if (strcmp (type, "none") == 0) - g_value_set_boolean (value, FALSE); - - return TRUE; -} - -GVariant * -vino_set_authtype (const GValue *value, - const GVariantType *type, - gpointer user_data) -{ - const gchar *authtype; - - if (g_value_get_boolean (value)) - authtype = "vnc"; - else - authtype = "none"; - - return g_variant_new_strv (&authtype, 1); -} - -gboolean -vino_get_password (GValue *value, - GVariant *variant, - gpointer user_data) -{ - const gchar *setting; - - setting = g_variant_get_string (variant, NULL); - - if (strcmp (setting, "keyring") == 0) - { - /* "keyring" is the default value, even though vino doesn't support it at - * the moment */ - - g_value_set_static_string (value, ""); - return TRUE; - } - else - { - gchar *decoded; - gsize length; - gboolean ok; - - decoded = (gchar *) g_base64_decode (setting, &length); - - if ((ok = g_utf8_validate (decoded, length, NULL))) - g_value_take_string (value, g_strndup (decoded, length)); - - return ok; - } -} - -GVariant * -vino_set_password (const GValue *value, - const GVariantType *type, - gpointer user_data) -{ - const gchar *string; - gchar *base64; - - string = g_value_get_string (value); - - base64 = g_base64_encode ((guchar *) string, strlen (string)); - return g_variant_new_from_data (G_VARIANT_TYPE_STRING, - base64, strlen (base64) + 1, - TRUE, g_free, base64); -} - diff -Nru gnome-control-center-3.36.4/panels/sharing/vino-preferences.h gnome-control-center-3.36.5/panels/sharing/vino-preferences.h --- gnome-control-center-3.36.4/panels/sharing/vino-preferences.h 2020-07-03 05:10:57.857431000 +0000 +++ gnome-control-center-3.36.5/panels/sharing/vino-preferences.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,45 +0,0 @@ -/* - * Copyright (C) 2003 Sun Microsystems, Inc. - * Copyright (C) 2006 Jonh Wendell - * Copyright © 2010 Codethink Limited - * Copyright (C) 2013 Intel, Inc - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see . - * - * Authors: - * Mark McLoughlin - * Jonh Wendell - * Ryan Lortie - */ - -#pragma once - -#include -#include - -GVariant * vino_set_authtype (const GValue *value, - const GVariantType *type, - gpointer user_data); -gboolean vino_get_authtype (GValue *value, - GVariant *variant, - gpointer user_data); - -GVariant * -vino_set_password (const GValue *value, - const GVariantType *type, - gpointer user_data); -gboolean -vino_get_password (GValue *value, - GVariant *variant, - gpointer user_data); diff -Nru gnome-control-center-3.36.4/panels/sound/cc-sound-panel.c gnome-control-center-3.36.5/panels/sound/cc-sound-panel.c --- gnome-control-center-3.36.4/panels/sound/cc-sound-panel.c 2020-07-03 05:10:57.861431100 +0000 +++ gnome-control-center-3.36.5/panels/sound/cc-sound-panel.c 2020-11-20 00:57:42.628796000 +0000 @@ -99,9 +99,6 @@ gboolean can_fade = FALSE, has_lfe = FALSE; device = cc_device_combo_box_get_device (self->output_device_combo_box); - cc_profile_combo_box_set_device (self->output_profile_combo_box, self->mixer_control, device); - gtk_widget_set_visible (GTK_WIDGET (self->output_profile_row), - cc_profile_combo_box_get_profile_count (self->output_profile_combo_box) > 1); if (device != NULL) stream = gvc_mixer_control_get_stream_from_device (self->mixer_control, device); @@ -133,9 +130,6 @@ GvcMixerStream *stream = NULL; device = cc_device_combo_box_get_device (self->input_device_combo_box); - cc_profile_combo_box_set_device (self->input_profile_combo_box, self->mixer_control, device); - gtk_widget_set_visible (GTK_WIDGET (self->input_profile_row), - cc_profile_combo_box_get_profile_count (self->input_profile_combo_box) > 1); if (device != NULL) stream = gvc_mixer_control_get_stream_from_device (self->mixer_control, device); @@ -148,6 +142,34 @@ } static void +output_device_update_cb (CcSoundPanel *self, + guint id) +{ + GvcMixerUIDevice *device; + gboolean has_multi_profiles; + + device = cc_device_combo_box_get_device (self->output_device_combo_box); + cc_profile_combo_box_set_device (self->output_profile_combo_box, self->mixer_control, device); + has_multi_profiles = (cc_profile_combo_box_get_profile_count (self->output_profile_combo_box) > 1); + gtk_widget_set_visible (GTK_WIDGET (self->output_profile_row), + has_multi_profiles); +} + +static void +input_device_update_cb (CcSoundPanel *self, + guint id) +{ + GvcMixerUIDevice *device; + gboolean has_multi_profiles; + + device = cc_device_combo_box_get_device (self->input_device_combo_box); + cc_profile_combo_box_set_device (self->input_profile_combo_box, self->mixer_control, device); + has_multi_profiles = (cc_profile_combo_box_get_profile_count (self->input_profile_combo_box) > 1); + gtk_widget_set_visible (GTK_WIDGET (self->input_profile_row), + has_multi_profiles); +} + +static void test_output_configuration_button_clicked_cb (CcSoundPanel *self) { GvcMixerUIDevice *device; @@ -263,4 +285,14 @@ cc_subwoofer_slider_set_mixer_control (self->subwoofer_slider, self->mixer_control); cc_device_combo_box_set_mixer_control (self->input_device_combo_box, self->mixer_control, FALSE); cc_device_combo_box_set_mixer_control (self->output_device_combo_box, self->mixer_control, TRUE); + g_signal_connect_object (self->mixer_control, + "active-output-update", + G_CALLBACK (output_device_update_cb), + self, + G_CONNECT_SWAPPED); + g_signal_connect_object (self->mixer_control, + "active-input-update", + G_CALLBACK (input_device_update_cb), + self, + G_CONNECT_SWAPPED); } diff -Nru gnome-control-center-3.36.4/panels/sound/cc-subwoofer-slider.c gnome-control-center-3.36.5/panels/sound/cc-subwoofer-slider.c --- gnome-control-center-3.36.4/panels/sound/cc-subwoofer-slider.c 2020-07-03 05:10:57.861431100 +0000 +++ gnome-control-center-3.36.5/panels/sound/cc-subwoofer-slider.c 2020-11-20 00:57:42.628796000 +0000 @@ -59,7 +59,7 @@ volumes = gvc_channel_map_get_volume (self->channel_map); g_signal_handlers_block_by_func (self->adjustment, volume_changed_cb, self); - gtk_adjustment_set_value (self->adjustment, volumes[BALANCE]); + gtk_adjustment_set_value (self->adjustment, volumes[LFE]); g_signal_handlers_unblock_by_func (self->adjustment, volume_changed_cb, self); } diff -Nru gnome-control-center-3.36.4/panels/user-accounts/user-utils.c gnome-control-center-3.36.5/panels/user-accounts/user-utils.c --- gnome-control-center-3.36.4/panels/user-accounts/user-utils.c 2020-07-03 05:10:57.877431200 +0000 +++ gnome-control-center-3.36.5/panels/user-accounts/user-utils.c 2020-11-20 00:57:42.644796400 +0000 @@ -592,6 +592,8 @@ gunichar unichar; gpointer q = NULL; + g_return_val_if_fail (name != NULL, NULL); + p = g_utf8_strup (name, -1); normalized = g_utf8_normalize (g_strstrip (p), -1, G_NORMALIZE_DEFAULT_COMPOSE); if (normalized == NULL) { @@ -748,10 +750,14 @@ GdkPixbuf * generate_default_avatar (ActUser *user, gint size) { + const gchar *name; GdkPixbuf *pixbuf = NULL; cairo_surface_t *surface; - surface = generate_user_picture (act_user_get_real_name (user), size); + name = act_user_get_real_name (user); + if (name == NULL) + name = ""; + surface = generate_user_picture (name, size); pixbuf = gdk_pixbuf_get_from_surface (surface, 0, 0, size, size); cairo_surface_destroy (surface); diff -Nru gnome-control-center-3.36.4/panels/wacom/calibrator/calibrator-gui.c gnome-control-center-3.36.5/panels/wacom/calibrator/calibrator-gui.c --- gnome-control-center-3.36.4/panels/wacom/calibrator/calibrator-gui.c 2020-07-03 05:10:57.877431200 +0000 +++ gnome-control-center-3.36.5/panels/wacom/calibrator/calibrator-gui.c 2020-11-20 00:57:42.644796400 +0000 @@ -309,7 +309,7 @@ GdkMonitor *monitor; #ifndef FAKE_AREA GdkWindow *window; - GdkCursor *cursor; + g_autoptr(GdkCursor) cursor = NULL; #endif /* FAKE_AREA */ GtkGesture *press; @@ -344,7 +344,6 @@ window = gtk_widget_get_window (calib_area->window); cursor = gdk_cursor_new_for_display (gdk_display_get_default (), GDK_BLANK_CURSOR); gdk_window_set_cursor (window, cursor); - g_object_unref (cursor); gtk_widget_set_can_focus (calib_area->window, TRUE); gtk_window_set_keep_above (GTK_WINDOW (calib_area->window), TRUE); diff -Nru gnome-control-center-3.36.4/po/pt_BR.po gnome-control-center-3.36.5/po/pt_BR.po --- gnome-control-center-3.36.4/po/pt_BR.po 2020-07-03 05:10:58.005431400 +0000 +++ gnome-control-center-3.36.5/po/pt_BR.po 2020-11-20 00:57:42.772797800 +0000 @@ -33,8 +33,8 @@ "Project-Id-Version: gnome-control-center\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-control-center/" "issues\n" -"POT-Creation-Date: 2020-02-13 21:10+0000\n" -"PO-Revision-Date: 2020-02-14 04:15-0300\n" +"POT-Creation-Date: 2020-07-17 03:27+0000\n" +"PO-Revision-Date: 2020-07-17 18:33-0300\n" "Last-Translator: Rafael Fontenelle \n" "Language-Team: Brazilian Portuguese \n" "Language: pt_BR\n" @@ -42,74 +42,74 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" -"X-Generator: Gtranslator 3.32.0\n" +"X-Generator: Gtranslator 3.36.0\n" "X-Project-Style: gnome\n" -#: panels/applications/cc-applications-panel.c:737 +#: panels/applications/cc-applications-panel.c:741 msgid "System Bus" msgstr "Barramento de sistema" -#: panels/applications/cc-applications-panel.c:737 -#: panels/applications/cc-applications-panel.c:739 -#: panels/applications/cc-applications-panel.c:752 -#: panels/applications/cc-applications-panel.c:757 +#: panels/applications/cc-applications-panel.c:741 +#: panels/applications/cc-applications-panel.c:743 +#: panels/applications/cc-applications-panel.c:756 +#: panels/applications/cc-applications-panel.c:761 msgid "Full access" msgstr "Acesso completo" -#: panels/applications/cc-applications-panel.c:739 +#: panels/applications/cc-applications-panel.c:743 msgid "Session Bus" msgstr "Barramento de sessão" -#: panels/applications/cc-applications-panel.c:743 -#: panels/power/cc-power-panel.c:2467 panels/thunderbolt/cc-bolt-panel.ui:466 +#: panels/applications/cc-applications-panel.c:747 +#: panels/power/cc-power-panel.c:2472 panels/thunderbolt/cc-bolt-panel.ui:466 #: panels/thunderbolt/cc-bolt-panel.ui:525 msgid "Devices" msgstr "Dispositivos" -#: panels/applications/cc-applications-panel.c:743 +#: panels/applications/cc-applications-panel.c:747 msgid "Full access to /dev" msgstr "Acesso completo a /dev" -#: panels/applications/cc-applications-panel.c:747 +#: panels/applications/cc-applications-panel.c:751 #: panels/network/gnome-network-panel.desktop.in.in:3 #: panels/network/network-mobile.ui:252 msgid "Network" msgstr "Rede" -#: panels/applications/cc-applications-panel.c:747 +#: panels/applications/cc-applications-panel.c:751 #: panels/applications/cc-snap-row.c:109 msgid "Has network access" msgstr "Tem acesso à rede" -#: panels/applications/cc-applications-panel.c:752 -#: panels/applications/cc-applications-panel.c:754 +#: panels/applications/cc-applications-panel.c:756 +#: panels/applications/cc-applications-panel.c:758 #: panels/search/cc-search-locations-dialog.c:361 msgid "Home" msgstr "Pasta pessoal" -#: panels/applications/cc-applications-panel.c:754 -#: panels/applications/cc-applications-panel.c:759 +#: panels/applications/cc-applications-panel.c:758 +#: panels/applications/cc-applications-panel.c:763 msgid "Read-only" msgstr "somente leitura" -#: panels/applications/cc-applications-panel.c:757 -#: panels/applications/cc-applications-panel.c:759 +#: panels/applications/cc-applications-panel.c:761 +#: panels/applications/cc-applications-panel.c:763 msgid "File System" msgstr "Sistema de arquivos" -#: panels/applications/cc-applications-panel.c:763 +#: panels/applications/cc-applications-panel.c:767 #: panels/keyboard/01-launchers.xml.in:6 shell/cc-window.c:281 #: shell/cc-window.c:964 shell/cc-window.ui:125 #: shell/gnome-control-center.desktop.in.in:3 msgid "Settings" msgstr "Configurações" -#: panels/applications/cc-applications-panel.c:763 +#: panels/applications/cc-applications-panel.c:767 #: panels/applications/cc-snap-row.c:73 msgid "Can change settings" msgstr "Pode alterar as configurações" -#: panels/applications/cc-applications-panel.c:765 +#: panels/applications/cc-applications-panel.c:769 #, c-format msgid "" "%s has the following permissions built-in. These cannot be altered. If you " @@ -119,66 +119,66 @@ "Se você estiver preocupado com essas permissões, considere remover esse " "aplicativo." -#: panels/applications/cc-applications-panel.c:926 +#: panels/applications/cc-applications-panel.c:930 msgid "Web Links" msgstr "Links web" -#: panels/applications/cc-applications-panel.c:936 +#: panels/applications/cc-applications-panel.c:940 msgid "Git Links" msgstr "Links git" -#: panels/applications/cc-applications-panel.c:942 +#: panels/applications/cc-applications-panel.c:946 #, c-format msgid "%s Links" msgstr "Links %s" -#: panels/applications/cc-applications-panel.c:950 -#: panels/applications/cc-applications-panel.c:986 +#: panels/applications/cc-applications-panel.c:954 +#: panels/applications/cc-applications-panel.c:990 msgid "Unset" msgstr "Remover definição" -#: panels/applications/cc-applications-panel.c:1041 +#: panels/applications/cc-applications-panel.c:1045 msgid "Links" msgstr "Links" -#: panels/applications/cc-applications-panel.c:1049 +#: panels/applications/cc-applications-panel.c:1053 msgid "Hypertext Files" msgstr "Arquivos de hipertexto" -#: panels/applications/cc-applications-panel.c:1063 +#: panels/applications/cc-applications-panel.c:1067 msgid "Text Files" msgstr "Arquivos de texto" -#: panels/applications/cc-applications-panel.c:1077 +#: panels/applications/cc-applications-panel.c:1081 msgid "Image Files" msgstr "Arquivos de imagem" -#: panels/applications/cc-applications-panel.c:1093 +#: panels/applications/cc-applications-panel.c:1097 msgid "Font Files" msgstr "Arquivos de fonte" -#: panels/applications/cc-applications-panel.c:1154 +#: panels/applications/cc-applications-panel.c:1158 msgid "Archive Files" msgstr "Arquivos de arquivamento" -#: panels/applications/cc-applications-panel.c:1174 +#: panels/applications/cc-applications-panel.c:1178 msgid "Package Files" msgstr "Arquivos de pacote" -#: panels/applications/cc-applications-panel.c:1197 +#: panels/applications/cc-applications-panel.c:1201 msgid "Audio Files" msgstr "Arquivos de áudio" -#: panels/applications/cc-applications-panel.c:1214 +#: panels/applications/cc-applications-panel.c:1218 msgid "Video Files" msgstr "Arquivos de vídeo" -#: panels/applications/cc-applications-panel.c:1222 +#: panels/applications/cc-applications-panel.c:1226 msgid "Other Files" msgstr "Outros arquivos" #. List of applications. -#: panels/applications/cc-applications-panel.c:1564 +#: panels/applications/cc-applications-panel.c:1568 #: panels/applications/cc-applications-panel.ui:418 #: panels/applications/gnome-applications-panel.desktop.in.in:3 #: panels/notifications/cc-notifications-panel.ui:167 @@ -225,7 +225,7 @@ #: panels/keyboard/cc-keyboard-option.c:378 #: panels/keyboard/cc-keyboard-shortcut-editor.ui:96 #: panels/keyboard/keyboard-shortcuts.c:425 panels/network/network-proxy.ui:126 -#: panels/user-accounts/um-fingerprint-dialog.c:211 +#: panels/user-accounts/um-fingerprint-dialog.c:219 #: subprojects/gvc/gvc-mixer-control.c:1876 msgid "Disabled" msgstr "Desabilitado" @@ -595,16 +595,16 @@ msgstr "" "aplicativo;application;flatpak;permissão;permission;configuração;setting;" -#: panels/background/cc-background-chooser.c:350 +#: panels/background/cc-background-chooser.c:346 msgid "Select a picture" msgstr "Selecionar uma imagem" -#: panels/background/cc-background-chooser.c:353 +#: panels/background/cc-background-chooser.c:349 #: panels/color/cc-color-calibrate.ui:25 panels/color/cc-color-panel.c:240 #: panels/color/cc-color-panel.c:893 panels/color/cc-color-panel.ui:657 #: panels/common/cc-language-chooser.ui:24 #: panels/display/cc-display-panel.c:947 -#: panels/info-overview/cc-info-overview-panel.ui:235 +#: panels/info-overview/cc-info-overview-panel.ui:236 #: panels/network/cc-wifi-hotspot-dialog.ui:122 #: panels/network/connection-editor/connection-editor.ui:17 #: panels/network/connection-editor/vpn-helpers.c:176 @@ -619,14 +619,14 @@ #: panels/user-accounts/cc-avatar-chooser.c:107 #: panels/user-accounts/cc-avatar-chooser.c:235 #: panels/user-accounts/cc-password-dialog.ui:20 -#: panels/user-accounts/cc-user-panel.c:636 -#: panels/user-accounts/cc-user-panel.c:654 +#: panels/user-accounts/cc-user-panel.c:638 +#: panels/user-accounts/cc-user-panel.c:656 #: panels/user-accounts/data/join-dialog.ui:20 -#: panels/user-accounts/um-fingerprint-dialog.c:260 +#: panels/user-accounts/um-fingerprint-dialog.c:335 msgid "_Cancel" msgstr "_Cancelar" -#: panels/background/cc-background-chooser.c:354 +#: panels/background/cc-background-chooser.c:350 #: panels/network/connection-editor/vpn-helpers.c:177 #: panels/printers/pp-details-dialog.c:253 #: panels/sharing/cc-sharing-panel.c:411 @@ -634,22 +634,6 @@ msgid "_Open" msgstr "_Abrir" -#: panels/background/cc-background-chooser.ui:104 -msgid "Set Background and Lock Screen" -msgstr "Definir plano de fundo e tela de bloqueio" - -#: panels/background/cc-background-chooser.ui:114 -msgid "Set Background" -msgstr "Definir plano de fundo" - -#: panels/background/cc-background-chooser.ui:121 -msgid "Set Lock Screen" -msgstr "Definir tela de bloqueio" - -#: panels/background/cc-background-chooser.ui:143 -msgid "Remove Background" -msgstr "Remover plano de fundo" - #: panels/background/cc-background-item.c:140 msgid "multiple sizes" msgstr "múltiplos tamanhos" @@ -665,11 +649,11 @@ msgid "No Desktop Background" msgstr "Nenhum plano de fundo" -#: panels/background/cc-background-panel.c:143 +#: panels/background/cc-background-panel.c:115 msgid "Current background" msgstr "Plano de fundo atual" -#: panels/background/cc-background-panel.ui:63 +#: panels/background/cc-background-panel.ui:55 msgid "Add Picture…" msgstr "Adicionar imagem…" @@ -1174,7 +1158,7 @@ "Microsoft Windows." #: panels/color/cc-color-panel.ui:607 -#: panels/user-accounts/um-fingerprint-dialog.c:719 +#: panels/user-accounts/um-fingerprint-dialog.c:818 msgid "Summary" msgstr "Resumo" @@ -1777,9 +1761,6 @@ #. translators: The first '%s' is the distributor's name, such as 'Fedora', the second '%s' is a link to the privacy policy #: panels/diagnostics/cc-diagnostics-panel.c:145 #, c-format -#| msgid "" -#| "Sending reports of technical problems helps us improve %s. Reports are " -#| "sent anonymously and are scrubbed of personal data." msgid "" "Sending reports of technical problems helps us improve %s. Reports are sent " "anonymously and are scrubbed of personal data. %s" @@ -1885,17 +1866,17 @@ #: panels/display/cc-display-settings.c:107 msgctxt "Display rotation" msgid "Portrait Right" -msgstr "Retrato direito" +msgstr "Retrato (virado)" #: panels/display/cc-display-settings.c:110 msgctxt "Display rotation" msgid "Portrait Left" -msgstr "Retrato esquerdo" +msgstr "Retrato" #: panels/display/cc-display-settings.c:113 msgctxt "Display rotation" msgid "Landscape (flipped)" -msgstr "Paisagem (virado)" +msgstr "Paisagem (virada)" #: panels/display/cc-display-settings.c:187 #, c-format @@ -2013,11 +1994,11 @@ "Noturna;Luz;Azul;Desvio para o vermelho;redshift;cor;pôr do sol;nascer do " "sol;" -#: panels/info-overview/cc-info-overview-panel.c:406 -#: panels/info-overview/cc-info-overview-panel.c:421 -#: panels/info-overview/cc-info-overview-panel.c:433 -#: panels/info-overview/cc-info-overview-panel.c:479 -#: panels/info-overview/cc-info-overview-panel.c:509 +#: panels/info-overview/cc-info-overview-panel.c:416 +#: panels/info-overview/cc-info-overview-panel.c:431 +#: panels/info-overview/cc-info-overview-panel.c:443 +#: panels/info-overview/cc-info-overview-panel.c:489 +#: panels/info-overview/cc-info-overview-panel.c:519 msgid "Unknown" msgstr "Desconhecido" @@ -2025,32 +2006,32 @@ #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: panels/info-overview/cc-info-overview-panel.c:441 +#: panels/info-overview/cc-info-overview-panel.c:451 #, c-format msgid "%s; Build ID: %s" msgstr "%s; ID de compilação: %s" #. translators: This is the type of architecture for the OS -#: panels/info-overview/cc-info-overview-panel.c:456 +#: panels/info-overview/cc-info-overview-panel.c:466 #, c-format msgid "64-bit" msgstr "64 bits" #. translators: This is the type of architecture for the OS -#: panels/info-overview/cc-info-overview-panel.c:459 +#: panels/info-overview/cc-info-overview-panel.c:469 #, c-format msgid "32-bit" msgstr "32 bits" -#: panels/info-overview/cc-info-overview-panel.c:665 +#: panels/info-overview/cc-info-overview-panel.c:675 msgid "X11" msgstr "X11" -#: panels/info-overview/cc-info-overview-panel.c:669 +#: panels/info-overview/cc-info-overview-panel.c:679 msgid "Wayland" msgstr "Wayland" -#: panels/info-overview/cc-info-overview-panel.c:671 +#: panels/info-overview/cc-info-overview-panel.c:681 msgctxt "Windowing system (Wayland, X11, or Unknown)" msgid "Unknown" msgstr "Desconhecido" @@ -2116,7 +2097,7 @@ "O nome do dispositivo é usado para identificar este dispositivo quando é " "visualizado na rede ou ao parear dispositivos Bluetooth." -#: panels/info-overview/cc-info-overview-panel.ui:226 +#: panels/info-overview/cc-info-overview-panel.ui:227 msgid "_Rename" msgstr "_Renomear" @@ -2197,31 +2178,35 @@ #: panels/keyboard/01-input-sources.xml.in:8 msgid "Switch to next input source" -msgstr "Alternar para próxima fonte de entrada" +msgstr "Alternar para a próxima fonte de entrada" #: panels/keyboard/01-input-sources.xml.in:13 msgid "Switch to previous input source" -msgstr "Alternar para fonte de entrada anterior" +msgstr "Alternar para a fonte de entrada anterior" #: panels/keyboard/01-launchers.xml.in:2 msgid "Launchers" msgstr "Lançadores" +# Retirado Lançar conforme sugestão em https://gitlab.gnome.org/Teams/Translation/pt_BR/-/issues/14 #: panels/keyboard/01-launchers.xml.in:4 msgid "Launch help browser" -msgstr "Lançar o navegador de ajuda" +msgstr "Navegador de ajuda" +# Retirado Lançar conforme sugestão em https://gitlab.gnome.org/Teams/Translation/pt_BR/-/issues/14 #: panels/keyboard/01-launchers.xml.in:8 msgid "Launch calculator" -msgstr "Lançar calculadora" +msgstr "Calculadora" +# Retirado Lançar conforme sugestão em https://gitlab.gnome.org/Teams/Translation/pt_BR/-/issues/14 #: panels/keyboard/01-launchers.xml.in:10 msgid "Launch email client" -msgstr "Lançar o cliente de e-mail" +msgstr "Cliente de e-mail" +# Retirado Lançar conforme sugestão em https://gitlab.gnome.org/Teams/Translation/pt_BR/-/issues/14 #: panels/keyboard/01-launchers.xml.in:12 msgid "Launch web browser" -msgstr "Lançar navegador web" +msgstr "Navegador web" #: panels/keyboard/01-launchers.xml.in:14 msgid "Home folder" @@ -2230,7 +2215,7 @@ #: panels/keyboard/01-launchers.xml.in:16 msgctxt "keybinding" msgid "Search" -msgstr "Pesquisa" +msgstr "Pesquisar" #: panels/keyboard/01-screenshot.xml.in:2 msgid "Screenshots" @@ -2238,15 +2223,15 @@ #: panels/keyboard/01-screenshot.xml.in:6 msgid "Save a screenshot to $PICTURES" -msgstr "Tirar uma captura de tela para $PICTURES" +msgstr "Salvar uma captura de tela para $PICTURES" #: panels/keyboard/01-screenshot.xml.in:10 msgid "Save a screenshot of a window to $PICTURES" -msgstr "Tirar uma captura de tela de uma janela para $PICTURES" +msgstr "Salvar uma captura de tela de uma janela para $PICTURES" #: panels/keyboard/01-screenshot.xml.in:14 msgid "Save a screenshot of an area to $PICTURES" -msgstr "Tirar uma captura de tela de uma área para $PICTURES" +msgstr "Salvar uma captura de tela de uma área para $PICTURES" #: panels/keyboard/01-screenshot.xml.in:17 msgid "Copy a screenshot to clipboard" @@ -2262,7 +2247,7 @@ #: panels/keyboard/01-screenshot.xml.in:26 msgid "Record a short screencast" -msgstr "Gravar uma pequena gravação de tela" +msgstr "Fazer uma pequena gravação de tela" #: panels/keyboard/01-system.xml.in:2 msgid "System" @@ -2299,19 +2284,19 @@ #: panels/keyboard/50-accessibility.xml.in:12 msgid "Turn on-screen keyboard on or off" -msgstr "Ativar ou desativar teclado virtual" +msgstr "Ativar ou desativar o teclado virtual" #: panels/keyboard/50-accessibility.xml.in:14 msgid "Increase text size" -msgstr "Aumentar tamanho do texto" +msgstr "Aumentar o tamanho do texto" #: panels/keyboard/50-accessibility.xml.in:16 msgid "Decrease text size" -msgstr "Diminuir tamanho do texto" +msgstr "Diminuir o tamanho do texto" #: panels/keyboard/50-accessibility.xml.in:18 msgid "High contrast on or off" -msgstr "Ativar ou desativar alto contraste" +msgstr "Ativar ou desativar o alto contraste" #: panels/keyboard/cc-alt-chars-key-dialog.ui:8 #: panels/keyboard/cc-keyboard-panel.ui:72 @@ -2467,7 +2452,7 @@ #: panels/keyboard/cc-keyboard-shortcut-editor.c:592 #, c-format msgid "Enter new shortcut to change %s." -msgstr "Insira um novo atalho para alterar %s." +msgstr "Insira um novo atalho para %s." #: panels/keyboard/cc-keyboard-shortcut-editor.c:1016 msgid "Add Custom Shortcut" @@ -2931,7 +2916,7 @@ #: panels/network/net-device-ethernet.c:318 #: panels/network/network-bluetooth.ui:76 #: panels/network/network-ethernet.ui:102 panels/network/network-mobile.ui:414 -#: panels/network/network-vpn.ui:78 +#: panels/network/network-vpn.ui:75 msgid "Options…" msgstr "Opções…" @@ -3631,7 +3616,7 @@ #: panels/network/net-proxy.c:70 #: panels/notifications/cc-notifications-panel.c:267 -#: panels/power/cc-power-panel.c:2063 panels/power/cc-power-panel.c:2074 +#: panels/power/cc-power-panel.c:2068 panels/power/cc-power-panel.c:2079 #: panels/universal-access/cc-ua-panel.c:480 #: panels/universal-access/cc-ua-panel.c:843 #: panels/universal-access/cc-ua-panel.c:856 @@ -4128,7 +4113,7 @@ #: panels/sharing/cc-sharing-panel.ui:351 #: panels/user-accounts/cc-add-user-dialog.ui:310 #: panels/user-accounts/cc-add-user-dialog.ui:547 -#: panels/user-accounts/cc-user-panel.ui:385 +#: panels/user-accounts/cc-user-panel.ui:389 msgid "_Password" msgstr "_Senha" @@ -4454,7 +4439,7 @@ msgstr "Mostrar c_onteúdo da mensagem na tela de bloqueio" #: panels/notifications/cc-notifications-panel.c:267 -#: panels/power/cc-power-panel.c:2069 panels/power/cc-power-panel.c:2076 +#: panels/power/cc-power-panel.c:2074 panels/power/cc-power-panel.c:2081 #: panels/universal-access/cc-ua-panel.c:480 #: panels/universal-access/cc-ua-panel.c:843 #: panels/universal-access/cc-ua-panel.c:856 @@ -4527,7 +4512,7 @@ "ReadItLater;" #. Translators: This is the button which allows undoing the removal of the printer. -#: panels/online-accounts/online-accounts.ui:38 panels/printers/printers.ui:54 +#: panels/online-accounts/online-accounts.ui:38 panels/printers/printers.ui:61 msgid "Undo" msgstr "Desfazer" @@ -4686,7 +4671,7 @@ #. TRANSLATORS: secondary battery, misc #: panels/power/cc-power-panel.c:657 panels/power/cc-power-panel.c:939 -#: panels/power/cc-power-panel.c:2420 +#: panels/power/cc-power-panel.c:2425 msgid "Battery" msgstr "Bateria" @@ -4734,93 +4719,93 @@ msgid "When _idle" msgstr "_Quando ocioso" -#: panels/power/cc-power-panel.c:1824 +#: panels/power/cc-power-panel.c:1829 msgid "Power Saving" msgstr "Economia de energia" -#: panels/power/cc-power-panel.c:1858 +#: panels/power/cc-power-panel.c:1863 msgid "_Screen Brightness" msgstr "_Brilho da tela" -#: panels/power/cc-power-panel.c:1879 +#: panels/power/cc-power-panel.c:1884 msgid "Automatic Brightness" msgstr "Brilho automático" -#: panels/power/cc-power-panel.c:1892 +#: panels/power/cc-power-panel.c:1897 msgid "_Keyboard Brightness" msgstr "Brilho do _teclado" -#: panels/power/cc-power-panel.c:1903 +#: panels/power/cc-power-panel.c:1908 msgid "_Dim Screen When Inactive" msgstr "_Escurecer a tela quando inativo" -#: panels/power/cc-power-panel.c:1921 +#: panels/power/cc-power-panel.c:1926 msgid "_Blank Screen" msgstr "A_pagar a tela" -#: panels/power/cc-power-panel.c:1944 +#: panels/power/cc-power-panel.c:1949 msgid "_Wi-Fi" msgstr "_Wi-Fi" -#: panels/power/cc-power-panel.c:1945 +#: panels/power/cc-power-panel.c:1950 msgid "Wi-Fi can be turned off to save power." msgstr "Wi-Fi pode ser desligado para poupar energia." -#: panels/power/cc-power-panel.c:1961 +#: panels/power/cc-power-panel.c:1966 msgid "_Mobile Broadband" msgstr "Banda larga _móvel" -#: panels/power/cc-power-panel.c:1962 +#: panels/power/cc-power-panel.c:1967 msgid "Mobile broadband (LTE, 4G, 3G, etc.) can be turned off to save power." msgstr "" "Banda larga móvel (LTE, 4G, 3G, etc.) pode ser desligada para poupar energia." -#: panels/power/cc-power-panel.c:2012 +#: panels/power/cc-power-panel.c:2017 msgid "_Bluetooth" msgstr "_Bluetooth" -#: panels/power/cc-power-panel.c:2013 +#: panels/power/cc-power-panel.c:2018 msgid "Bluetooth can be turned off to save power." msgstr "Bluetooth pode ser desligado para poupar energia." -#: panels/power/cc-power-panel.c:2065 +#: panels/power/cc-power-panel.c:2070 msgid "When on battery power" msgstr "Quando estiver usando a energia da bateria" -#: panels/power/cc-power-panel.c:2067 +#: panels/power/cc-power-panel.c:2072 msgid "When plugged in" msgstr "Ligado na tomada" -#: panels/power/cc-power-panel.c:2161 +#: panels/power/cc-power-panel.c:2166 msgid "Suspend" msgstr "Suspender" -#: panels/power/cc-power-panel.c:2162 +#: panels/power/cc-power-panel.c:2167 msgid "Power Off" msgstr "Desligar" -#: panels/power/cc-power-panel.c:2163 +#: panels/power/cc-power-panel.c:2168 msgid "Hibernate" msgstr "Hibernar" -#: panels/power/cc-power-panel.c:2164 +#: panels/power/cc-power-panel.c:2169 msgid "Nothing" msgstr "Nada" #. Frame header -#: panels/power/cc-power-panel.c:2264 +#: panels/power/cc-power-panel.c:2269 msgid "Suspend & Power Button" msgstr "Botão de suspender & desligar" -#: panels/power/cc-power-panel.c:2305 +#: panels/power/cc-power-panel.c:2310 msgid "_Automatic Suspend" msgstr "Suspensão _automática" -#: panels/power/cc-power-panel.c:2306 +#: panels/power/cc-power-panel.c:2311 msgid "Automatic suspend" msgstr "Suspensão automática" -#: panels/power/cc-power-panel.c:2364 +#: panels/power/cc-power-panel.c:2369 msgid "Po_wer Button Action" msgstr "Ação do botão de e_nergia" @@ -4939,18 +4924,18 @@ msgstr "Autenticação necessária" #. Translators: %s is the printer name -#: panels/printers/cc-printers-panel.c:699 +#: panels/printers/cc-printers-panel.c:695 #, c-format msgid "Printer “%s” has been deleted" msgstr "A impressora “%s” foi excluída" #. Translators: Addition of the new printer failed. -#: panels/printers/cc-printers-panel.c:922 +#: panels/printers/cc-printers-panel.c:918 msgid "Failed to add new printer." msgstr "Falha ao adicionar nova impressora." #. Translators: The XML file containing user interface can not be loaded -#: panels/printers/cc-printers-panel.c:1216 +#: panels/printers/cc-printers-panel.c:1212 #, c-format msgid "Could not load ui: %s" msgstr "Não foi possível carregar a interface: %s" @@ -5560,21 +5545,21 @@ msgstr "Reiniciar" #. Translators: This button adds new printer. -#: panels/printers/printers.ui:8 +#: panels/printers/printers.ui:12 msgid "Add…" msgstr "Adicionar…" -#: panels/printers/printers.ui:174 +#: panels/printers/printers.ui:186 msgid "No printers" msgstr "Sem impressora" #. Translators: This button adds new printer. -#: panels/printers/printers.ui:188 +#: panels/printers/printers.ui:200 msgid "Add a Printer…" msgstr "Adicionar uma impressora…" #. Translators: The CUPS server is not running (we can not connect to it). -#: panels/printers/printers.ui:220 +#: panels/printers/printers.ui:232 msgid "" "Sorry! The system printing service\n" "doesn’t seem to be available." @@ -5676,7 +5661,7 @@ msgstr "Tela de início de _sessão" #: panels/region/cc-region-panel.ui:64 -#: panels/user-accounts/cc-user-panel.ui:313 +#: panels/user-accounts/cc-user-panel.ui:317 msgid "_Language" msgstr "_Idioma" @@ -5698,7 +5683,7 @@ #: panels/region/cc-region-panel.ui:209 msgid "Choose keyboard layouts or input methods." -msgstr "Escolha layouts de teclado ou métodos de entrada." +msgstr "Escolha os layouts de teclado ou métodos de entrada." #: panels/region/cc-region-panel.ui:266 msgid "No input source selected" @@ -5745,7 +5730,7 @@ #: panels/region/cc-region-panel.ui:494 msgid "These keyboard shortcuts can be changed in the keyboard settings" msgstr "" -"Esses atalhos de teclado podem ser alterados nas configurações de teclado" +"Estes atalhos de teclado podem ser alterados nas configurações de teclado" #: panels/region/gnome-region-panel.desktop.in.in:3 msgid "Region & Language" @@ -5964,14 +5949,14 @@ "of search results can also be changed by moving rows in the list." msgstr "" "Controla quais resultados de pesquisa são mostrados no Panorama de " -"atividades. A ordem dos resultados de pesquisa podem ser alterados ao mover " +"Atividades. A ordem dos resultados de pesquisa podem ser alterados ao mover " "as linhas da lista." #: panels/search/gnome-search-panel.desktop.in.in:4 msgid "" "Control which applications show search results in the Activities Overview" msgstr "" -"Controle quais aplicativos mostram resultados de pesquisa no Panorama de " +"Controle quais aplicativos mostram resultados de pesquisa no panorama de " "atividades" #. Translators: Search terms to find the Search panel. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! @@ -5991,12 +5976,12 @@ #: panels/sharing/cc-sharing-panel.c:302 msgctxt "service is enabled" msgid "On" -msgstr "Ligada" +msgstr "Ligado" #: panels/sharing/cc-sharing-panel.c:304 panels/sharing/cc-sharing-panel.c:331 msgctxt "service is disabled" msgid "Off" -msgstr "Desligada" +msgstr "Desligado" #: panels/sharing/cc-sharing-panel.c:334 msgctxt "service is enabled" @@ -6048,10 +6033,10 @@ msgid "Copy" msgstr "Copiar" -#: panels/sharing/cc-sharing-panel.c:1277 +#: panels/sharing/cc-sharing-panel.c:1279 #: panels/sharing/gnome-sharing-panel.desktop.in.in:3 msgid "Sharing" -msgstr "Compartilhar" +msgstr "Compartilhamento" #: panels/sharing/cc-sharing-panel.ui:34 msgid "_Computer Name" @@ -6092,44 +6077,44 @@ msgstr "Sessão remota" #: panels/sharing/cc-sharing-panel.ui:517 -#: panels/sharing/cc-sharing-panel.ui:763 +#: panels/sharing/cc-sharing-panel.ui:739 msgid "Screen Sharing" msgstr "Compartilhamento de tela" -#: panels/sharing/cc-sharing-panel.ui:575 +#: panels/sharing/cc-sharing-panel.ui:571 msgid "_Allow connections to control the screen" msgstr "_Permitir que as conexões controlem a tela" -#: panels/sharing/cc-sharing-panel.ui:620 +#: panels/sharing/cc-sharing-panel.ui:596 msgid "_Password:" msgstr "_Senha:" -#: panels/sharing/cc-sharing-panel.ui:650 +#: panels/sharing/cc-sharing-panel.ui:626 msgid "_Show Password" msgstr "_Mostrar senha" -#: panels/sharing/cc-sharing-panel.ui:681 +#: panels/sharing/cc-sharing-panel.ui:657 msgid "Access Options" msgstr "Opções de acesso" -#: panels/sharing/cc-sharing-panel.ui:695 +#: panels/sharing/cc-sharing-panel.ui:671 msgid "_New connections must ask for access" msgstr "_Novas conexões devem solicitar acesso" -#: panels/sharing/cc-sharing-panel.ui:713 +#: panels/sharing/cc-sharing-panel.ui:689 msgid "_Require a password" msgstr "Exigi_r uma senha" -#: panels/sharing/cc-sharing-panel.ui:774 -#: panels/sharing/cc-sharing-panel.ui:868 +#: panels/sharing/cc-sharing-panel.ui:750 +#: panels/sharing/cc-sharing-panel.ui:844 msgid "Media Sharing" msgstr "Compartilhamento de multimídia" -#: panels/sharing/cc-sharing-panel.ui:807 +#: panels/sharing/cc-sharing-panel.ui:783 msgid "Share music, photos and videos over the network." msgstr "Compartilhe músicas, fotos e vídeos através da rede." -#: panels/sharing/cc-sharing-panel.ui:822 +#: panels/sharing/cc-sharing-panel.ui:798 msgid "Folders" msgstr "Pastas" @@ -6158,19 +6143,19 @@ msgid "Custom" msgstr "Personalizado" -#: panels/sound/cc-alert-chooser.ui:12 panels/sound/cc-alert-selector.ui:9 +#: panels/sound/cc-alert-chooser.ui:12 msgid "Bark" msgstr "Latido" -#: panels/sound/cc-alert-chooser.ui:19 panels/sound/cc-alert-selector.ui:15 +#: panels/sound/cc-alert-chooser.ui:19 msgid "Drip" msgstr "Pingo d'água" -#: panels/sound/cc-alert-chooser.ui:26 panels/sound/cc-alert-selector.ui:21 +#: panels/sound/cc-alert-chooser.ui:26 msgid "Glass" msgstr "Copo" -#: panels/sound/cc-alert-chooser.ui:33 panels/sound/cc-alert-selector.ui:27 +#: panels/sound/cc-alert-chooser.ui:33 msgid "Sonar" msgstr "Sonar" @@ -7323,7 +7308,7 @@ #. Translators: This is a time format string in the style of "22:58". #. It indicates a login time which follows a date. #: panels/user-accounts/cc-login-history-dialog.c:173 -#: panels/user-accounts/cc-user-panel.c:766 +#: panels/user-accounts/cc-user-panel.c:768 msgctxt "login date-time" msgid "%k:%M" msgstr "%k:%M" @@ -7331,7 +7316,7 @@ #. Translators: This indicates a login date-time. #. The first %s is a date, and the second %s a time. #: panels/user-accounts/cc-login-history-dialog.c:176 -#: panels/user-accounts/cc-user-panel.c:770 +#: panels/user-accounts/cc-user-panel.c:772 #, c-format msgctxt "login date-time" msgid "%s, %s" @@ -7416,30 +7401,30 @@ msgid "Couldn’t connect to the %s domain: %s" msgstr "Não foi possível conectar ao domínio %s: %s" -#: panels/user-accounts/cc-user-panel.c:209 +#: panels/user-accounts/cc-user-panel.c:211 msgid "Your account" msgstr "Sua conta" -#: panels/user-accounts/cc-user-panel.c:384 +#: panels/user-accounts/cc-user-panel.c:386 msgid "Failed to delete user" msgstr "Falha ao excluir usuário" -#: panels/user-accounts/cc-user-panel.c:442 -#: panels/user-accounts/cc-user-panel.c:501 -#: panels/user-accounts/cc-user-panel.c:553 +#: panels/user-accounts/cc-user-panel.c:444 +#: panels/user-accounts/cc-user-panel.c:503 +#: panels/user-accounts/cc-user-panel.c:555 msgid "Failed to revoke remotely managed user" msgstr "Falha ao revogar usuário gerenciado remotamente" -#: panels/user-accounts/cc-user-panel.c:605 +#: panels/user-accounts/cc-user-panel.c:607 msgid "You cannot delete your own account." msgstr "Você não pode excluir sua própria conta." -#: panels/user-accounts/cc-user-panel.c:614 +#: panels/user-accounts/cc-user-panel.c:616 #, c-format msgid "%s is still logged in" msgstr "%s ainda está conectado" -#: panels/user-accounts/cc-user-panel.c:618 +#: panels/user-accounts/cc-user-panel.c:620 msgid "" "Deleting a user while they are logged in can leave the system in an " "inconsistent state." @@ -7447,12 +7432,12 @@ "Excluindo um usuário enquanto ele está conectado pode deixar o sistema em um " "estado inconsistente." -#: panels/user-accounts/cc-user-panel.c:627 +#: panels/user-accounts/cc-user-panel.c:629 #, c-format msgid "Do you want to keep %s’s files?" msgstr "Você deseja manter os arquivos de %s?" -#: panels/user-accounts/cc-user-panel.c:631 +#: panels/user-accounts/cc-user-panel.c:633 msgid "" "It is possible to keep the home directory, mail spool and temporary files " "around when deleting a user account." @@ -7460,48 +7445,48 @@ "É possível manter o diretório home, fila de e-mail e arquivos temporários ao " "excluir uma conta de usuário." -#: panels/user-accounts/cc-user-panel.c:634 +#: panels/user-accounts/cc-user-panel.c:636 msgid "_Delete Files" msgstr "_Excluir arquivos" -#: panels/user-accounts/cc-user-panel.c:635 +#: panels/user-accounts/cc-user-panel.c:637 msgid "_Keep Files" msgstr "_Manter arquivos" -#: panels/user-accounts/cc-user-panel.c:649 +#: panels/user-accounts/cc-user-panel.c:651 #, c-format msgid "Are you sure you want to revoke remotely managed %s’s account?" msgstr "" "Tem certeza de que deseja revogar a conta gerenciada remotamente do %s?" -#: panels/user-accounts/cc-user-panel.c:653 +#: panels/user-accounts/cc-user-panel.c:655 msgid "_Delete" msgstr "_Excluir" -#: panels/user-accounts/cc-user-panel.c:703 +#: panels/user-accounts/cc-user-panel.c:705 msgctxt "Password mode" msgid "Account disabled" msgstr "Conta desabilitada" -#: panels/user-accounts/cc-user-panel.c:711 +#: panels/user-accounts/cc-user-panel.c:713 msgctxt "Password mode" msgid "To be set at next login" msgstr "Para ser definido no próximo início de sessão" -#: panels/user-accounts/cc-user-panel.c:714 +#: panels/user-accounts/cc-user-panel.c:716 msgctxt "Password mode" msgid "None" msgstr "Nenhum" -#: panels/user-accounts/cc-user-panel.c:759 +#: panels/user-accounts/cc-user-panel.c:761 msgid "Logged in" msgstr "Acesso autorizado" -#: panels/user-accounts/cc-user-panel.c:1137 +#: panels/user-accounts/cc-user-panel.c:1165 msgid "Failed to contact the accounts service" msgstr "Falhou ao contactar o serviço de contas" -#: panels/user-accounts/cc-user-panel.c:1139 +#: panels/user-accounts/cc-user-panel.c:1167 msgid "Please make sure that the AccountService is installed and enabled." msgstr "" "Por favor, certifique-se de que o Serviço de Contas esteja instalado " @@ -7511,7 +7496,7 @@ #. * We split the line in 2 here to "make it look good", as there's #. * no good way to do this in GTK+ for tooltips. See: #. * https://bugzilla.gnome.org/show_bug.cgi?id=657168 -#: panels/user-accounts/cc-user-panel.c:1171 +#: panels/user-accounts/cc-user-panel.c:1199 msgid "" "To make changes,\n" "click the * icon first" @@ -7519,12 +7504,12 @@ "Para fazer alterações,\n" "clique no ícone * primeiro" -#: panels/user-accounts/cc-user-panel.c:1244 +#: panels/user-accounts/cc-user-panel.c:1265 msgid "Create a user account" msgstr "Cria uma conta de usuário" -#: panels/user-accounts/cc-user-panel.c:1255 -#: panels/user-accounts/cc-user-panel.c:1383 +#: panels/user-accounts/cc-user-panel.c:1276 +#: panels/user-accounts/cc-user-panel.c:1410 msgid "" "To create a user account,\n" "click the * icon first" @@ -7532,12 +7517,12 @@ "Para criar uma conta de usuário,\n" "clique primeiro no ícone *" -#: panels/user-accounts/cc-user-panel.c:1264 +#: panels/user-accounts/cc-user-panel.c:1291 msgid "Delete the selected user account" msgstr "Exclui a conta de usuário selecionada" -#: panels/user-accounts/cc-user-panel.c:1276 -#: panels/user-accounts/cc-user-panel.c:1387 +#: panels/user-accounts/cc-user-panel.c:1303 +#: panels/user-accounts/cc-user-panel.c:1414 msgid "" "To delete the selected user account,\n" "click the * icon first" @@ -7549,29 +7534,29 @@ msgid "_Add User…" msgstr "_Adicionar usuário…" -#: panels/user-accounts/cc-user-panel.ui:52 +#: panels/user-accounts/cc-user-panel.ui:61 msgid "Your session needs to be restarted for changes to take effect" msgstr "" "Sua sessão precisa ser reiniciada para que as alterações sejam efetivadas" -#: panels/user-accounts/cc-user-panel.ui:60 +#: panels/user-accounts/cc-user-panel.ui:69 msgid "Restart Now" msgstr "Reiniciar agora" -#: panels/user-accounts/cc-user-panel.ui:146 -#: panels/user-accounts/cc-user-panel.ui:162 +#: panels/user-accounts/cc-user-panel.ui:150 +#: panels/user-accounts/cc-user-panel.ui:166 msgid "User Icon" msgstr "Ícone do usuário" -#: panels/user-accounts/cc-user-panel.ui:238 +#: panels/user-accounts/cc-user-panel.ui:242 msgid "Account Settings" msgstr "Configurações da conta" -#: panels/user-accounts/cc-user-panel.ui:265 +#: panels/user-accounts/cc-user-panel.ui:269 msgid "_Administrator" msgstr "_Administrador" -#: panels/user-accounts/cc-user-panel.ui:285 +#: panels/user-accounts/cc-user-panel.ui:289 msgid "" "Administrators can add and remove other users, and can change settings for " "all users." @@ -7579,32 +7564,32 @@ "Administradores podem adicionar e remover outros usuários e podem alterar " "configurações para todos os usuários." -#: panels/user-accounts/cc-user-panel.ui:359 +#: panels/user-accounts/cc-user-panel.ui:363 msgid "Authentication & Login" msgstr "Autenticação & Início de sessão" -#: panels/user-accounts/cc-user-panel.ui:428 +#: panels/user-accounts/cc-user-panel.ui:432 msgid "_Fingerprint Login" msgstr "Início de sessão por _impressão digital" -#: panels/user-accounts/cc-user-panel.ui:470 +#: panels/user-accounts/cc-user-panel.ui:474 msgid "A_utomatic Login" msgstr "Início a_utomático de sessão" -#: panels/user-accounts/cc-user-panel.ui:500 +#: panels/user-accounts/cc-user-panel.ui:504 msgid "Account Activity" msgstr "Atividade da conta" -#: panels/user-accounts/cc-user-panel.ui:541 +#: panels/user-accounts/cc-user-panel.ui:545 msgid "Remove User…" msgstr "Remover usuário…" #. Translators: This is the empty state page label which states that there are no users to show in the panel. -#: panels/user-accounts/cc-user-panel.ui:580 +#: panels/user-accounts/cc-user-panel.ui:584 msgid "No Users Found" msgstr "Nenhum usuário encontrado" -#: panels/user-accounts/cc-user-panel.ui:590 +#: panels/user-accounts/cc-user-panel.ui:594 msgid "Unlock to add a user account." msgstr "Desbloquear para adicionar uma conta de usuário." @@ -7641,7 +7626,7 @@ msgstr "Dedo pequeno direito" #: panels/user-accounts/data/account-fingerprint.ui:39 -#: panels/user-accounts/um-fingerprint-dialog.c:676 +#: panels/user-accounts/um-fingerprint-dialog.c:775 msgid "Enable Fingerprint Login" msgstr "Habilita o início de sessão por impressão digital" @@ -7657,7 +7642,7 @@ msgid "_Other finger:" msgstr "_Outro dedo:" -#: panels/user-accounts/data/account-fingerprint.ui:324 +#: panels/user-accounts/data/account-fingerprint.ui:222 msgid "" "Your fingerprint was successfully saved. You should now be able to log in " "using your fingerprint reader." @@ -7867,34 +7852,34 @@ msgid "Unknown error" msgstr "Erro desconhecido" -#: panels/user-accounts/um-fingerprint-dialog.c:139 +#: panels/user-accounts/um-fingerprint-dialog.c:147 msgid "" "You are not allowed to access the device. Contact your system administrator." msgstr "" "Você não tem permissão para acessar o dispositivo. Contate seu administrador " "de sistemas." -#: panels/user-accounts/um-fingerprint-dialog.c:141 +#: panels/user-accounts/um-fingerprint-dialog.c:149 msgid "The device is already in use." msgstr "O dispositivo já está em uso." -#: panels/user-accounts/um-fingerprint-dialog.c:143 +#: panels/user-accounts/um-fingerprint-dialog.c:151 msgid "An internal error occurred." msgstr "Ocorreu um erro interno." -#: panels/user-accounts/um-fingerprint-dialog.c:214 +#: panels/user-accounts/um-fingerprint-dialog.c:216 msgid "Enabled" msgstr "Habilitado" -#: panels/user-accounts/um-fingerprint-dialog.c:259 +#: panels/user-accounts/um-fingerprint-dialog.c:334 msgid "Delete registered fingerprints?" msgstr "Excluir impressões digitais registradas?" -#: panels/user-accounts/um-fingerprint-dialog.c:263 +#: panels/user-accounts/um-fingerprint-dialog.c:338 msgid "_Delete Fingerprints" msgstr "E_xcluir impressões digitais" -#: panels/user-accounts/um-fingerprint-dialog.c:269 +#: panels/user-accounts/um-fingerprint-dialog.c:344 msgid "" "Do you want to delete your registered fingerprints so fingerprint login is " "disabled?" @@ -7902,15 +7887,15 @@ "Você deseja excluir suas impressões digitais registradas para desabilitar o " "início de sessão por impressão digital?" -#: panels/user-accounts/um-fingerprint-dialog.c:439 +#: panels/user-accounts/um-fingerprint-dialog.c:526 msgid "Done!" msgstr "Feito!" #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: panels/user-accounts/um-fingerprint-dialog.c:500 -#: panels/user-accounts/um-fingerprint-dialog.c:542 +#: panels/user-accounts/um-fingerprint-dialog.c:588 +#: panels/user-accounts/um-fingerprint-dialog.c:630 #, c-format msgid "Could not access “%s” device" msgstr "Não foi possível acessar o dispositivo “%s”" @@ -7918,17 +7903,17 @@ #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: panels/user-accounts/um-fingerprint-dialog.c:583 +#: panels/user-accounts/um-fingerprint-dialog.c:677 #, c-format msgid "Could not start finger capture on “%s” device" msgstr "" "Não foi possível iniciar o dispositivo de captura de impressões digitais “%s”" -#: panels/user-accounts/um-fingerprint-dialog.c:627 +#: panels/user-accounts/um-fingerprint-dialog.c:724 msgid "Could not access any fingerprint readers" msgstr "Não foi possível acessar qualquer leitor de impressões digitais" -#: panels/user-accounts/um-fingerprint-dialog.c:628 +#: panels/user-accounts/um-fingerprint-dialog.c:725 msgid "Please contact your system administrator for help." msgstr "Por favor, contate seu administrador de sistemas para ajuda." @@ -7937,7 +7922,7 @@ #. * "To enable fingerprint login, you need to save one of your fingerprints, using the #. * 'Digital Persona U.are.U 4000/4000B' device." #. -#: panels/user-accounts/um-fingerprint-dialog.c:710 +#: panels/user-accounts/um-fingerprint-dialog.c:809 #, c-format msgid "" "To enable fingerprint login, you need to save one of your fingerprints, " @@ -7946,11 +7931,11 @@ "Para habilitar o início de sessão por impressão digital, você precisa salvar " "uma de suas impressões digitais, usando o dispositivo “%s”." -#: panels/user-accounts/um-fingerprint-dialog.c:717 +#: panels/user-accounts/um-fingerprint-dialog.c:816 msgid "Selecting finger" msgstr "Selecionando dedo" -#: panels/user-accounts/um-fingerprint-dialog.c:718 +#: panels/user-accounts/um-fingerprint-dialog.c:817 msgid "Enrolling fingerprints" msgstr "Inscrição de impressões digitais" @@ -8243,7 +8228,7 @@ msgid "Privacy" msgstr "Privacidade" -#: shell/cc-panel-loader.c:292 +#: shell/cc-panel-loader.c:288 msgid "Available panels:" msgstr "Painéis disponíveis:" @@ -8356,6 +8341,18 @@ msgid "System Sounds" msgstr "Sons do sistema" +#~ msgid "Set Background and Lock Screen" +#~ msgstr "Definir plano de fundo e tela de bloqueio" + +#~ msgid "Set Background" +#~ msgstr "Definir plano de fundo" + +#~ msgid "Set Lock Screen" +#~ msgstr "Definir tela de bloqueio" + +#~ msgid "Remove Background" +#~ msgstr "Remover plano de fundo" + #~ msgid "Reports are sent anonymously and are scrubbed of personal data." #~ msgstr "" #~ "Os relatórios são enviados de forma anônima e não contêm dados pessoais." diff -Nru gnome-control-center-3.36.4/po/ro.po gnome-control-center-3.36.5/po/ro.po --- gnome-control-center-3.36.4/po/ro.po 2020-07-03 05:10:58.005431400 +0000 +++ gnome-control-center-3.36.5/po/ro.po 2020-11-20 00:57:42.776798000 +0000 @@ -17,8 +17,8 @@ "Project-Id-Version: gnome-control-center\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-control-center/" "issues\n" -"POT-Creation-Date: 2020-04-02 10:17+0000\n" -"PO-Revision-Date: 2020-04-13 15:10+0300\n" +"POT-Creation-Date: 2020-07-03 05:13+0000\n" +"PO-Revision-Date: 2020-07-06 13:32+0200\n" "Last-Translator: Florentina Mușat \n" "Language-Team: Romanian Gnome Team\n" @@ -28,75 +28,75 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " "20)) ? 1 : 2);\n" -"X-Generator: Poedit 2.3\n" +"X-Generator: Poedit 2.3.1\n" "X-Launchpad-Export-Date: 2014-07-13 17:08+0000\n" "X-Project-Style: gnome\n" -#: panels/applications/cc-applications-panel.c:737 +#: panels/applications/cc-applications-panel.c:741 msgid "System Bus" msgstr "Magistrala sistemului" -#: panels/applications/cc-applications-panel.c:737 -#: panels/applications/cc-applications-panel.c:739 -#: panels/applications/cc-applications-panel.c:752 -#: panels/applications/cc-applications-panel.c:757 +#: panels/applications/cc-applications-panel.c:741 +#: panels/applications/cc-applications-panel.c:743 +#: panels/applications/cc-applications-panel.c:756 +#: panels/applications/cc-applications-panel.c:761 msgid "Full access" msgstr "Acces complet" -#: panels/applications/cc-applications-panel.c:739 +#: panels/applications/cc-applications-panel.c:743 msgid "Session Bus" msgstr "Magistrala sesiunilor" -#: panels/applications/cc-applications-panel.c:743 +#: panels/applications/cc-applications-panel.c:747 #: panels/power/cc-power-panel.c:2472 panels/thunderbolt/cc-bolt-panel.ui:466 #: panels/thunderbolt/cc-bolt-panel.ui:525 msgid "Devices" msgstr "Dispozitive" -#: panels/applications/cc-applications-panel.c:743 +#: panels/applications/cc-applications-panel.c:747 msgid "Full access to /dev" msgstr "Acces total la /dev" -#: panels/applications/cc-applications-panel.c:747 +#: panels/applications/cc-applications-panel.c:751 #: panels/network/gnome-network-panel.desktop.in.in:3 #: panels/network/network-mobile.ui:252 msgid "Network" msgstr "Rețea" -#: panels/applications/cc-applications-panel.c:747 +#: panels/applications/cc-applications-panel.c:751 #: panels/applications/cc-snap-row.c:109 msgid "Has network access" msgstr "Are acces la rețea" -#: panels/applications/cc-applications-panel.c:752 -#: panels/applications/cc-applications-panel.c:754 +#: panels/applications/cc-applications-panel.c:756 +#: panels/applications/cc-applications-panel.c:758 #: panels/search/cc-search-locations-dialog.c:361 msgid "Home" msgstr "Acasă" -#: panels/applications/cc-applications-panel.c:754 -#: panels/applications/cc-applications-panel.c:759 +#: panels/applications/cc-applications-panel.c:758 +#: panels/applications/cc-applications-panel.c:763 msgid "Read-only" msgstr "Doar citire" -#: panels/applications/cc-applications-panel.c:757 -#: panels/applications/cc-applications-panel.c:759 +#: panels/applications/cc-applications-panel.c:761 +#: panels/applications/cc-applications-panel.c:763 msgid "File System" msgstr "Sistem de fișiere" -#: panels/applications/cc-applications-panel.c:763 +#: panels/applications/cc-applications-panel.c:767 #: panels/keyboard/01-launchers.xml.in:6 shell/cc-window.c:281 #: shell/cc-window.c:964 shell/cc-window.ui:125 #: shell/gnome-control-center.desktop.in.in:3 msgid "Settings" msgstr "Configurări" -#: panels/applications/cc-applications-panel.c:763 +#: panels/applications/cc-applications-panel.c:767 #: panels/applications/cc-snap-row.c:73 msgid "Can change settings" msgstr "Poate administra configurări" -#: panels/applications/cc-applications-panel.c:765 +#: panels/applications/cc-applications-panel.c:769 #, c-format msgid "" "%s has the following permissions built-in. These cannot be altered. If you " @@ -106,66 +106,66 @@ "Dacă sunteți îngrijorat de aceste permisiuni, considerați eliminarea acestei " "aplicații." -#: panels/applications/cc-applications-panel.c:926 +#: panels/applications/cc-applications-panel.c:930 msgid "Web Links" msgstr "Legături web" -#: panels/applications/cc-applications-panel.c:936 +#: panels/applications/cc-applications-panel.c:940 msgid "Git Links" msgstr "Legături git" -#: panels/applications/cc-applications-panel.c:942 +#: panels/applications/cc-applications-panel.c:946 #, c-format msgid "%s Links" msgstr "Legături %s" -#: panels/applications/cc-applications-panel.c:950 -#: panels/applications/cc-applications-panel.c:986 +#: panels/applications/cc-applications-panel.c:954 +#: panels/applications/cc-applications-panel.c:990 msgid "Unset" msgstr "Nestabilit" -#: panels/applications/cc-applications-panel.c:1041 +#: panels/applications/cc-applications-panel.c:1045 msgid "Links" msgstr "Legături" -#: panels/applications/cc-applications-panel.c:1049 +#: panels/applications/cc-applications-panel.c:1053 msgid "Hypertext Files" msgstr "Fișiere hypertext" -#: panels/applications/cc-applications-panel.c:1063 +#: panels/applications/cc-applications-panel.c:1067 msgid "Text Files" msgstr "Fișiere text" -#: panels/applications/cc-applications-panel.c:1077 +#: panels/applications/cc-applications-panel.c:1081 msgid "Image Files" msgstr "Fișiere imagine" -#: panels/applications/cc-applications-panel.c:1093 +#: panels/applications/cc-applications-panel.c:1097 msgid "Font Files" msgstr "Fișiere font" -#: panels/applications/cc-applications-panel.c:1154 +#: panels/applications/cc-applications-panel.c:1158 msgid "Archive Files" msgstr "Arhivează fișiere" -#: panels/applications/cc-applications-panel.c:1174 +#: panels/applications/cc-applications-panel.c:1178 msgid "Package Files" msgstr "Împachetează fișiere" -#: panels/applications/cc-applications-panel.c:1197 +#: panels/applications/cc-applications-panel.c:1201 msgid "Audio Files" msgstr "Fișiere audio" -#: panels/applications/cc-applications-panel.c:1214 +#: panels/applications/cc-applications-panel.c:1218 msgid "Video Files" msgstr "Fișiere video" -#: panels/applications/cc-applications-panel.c:1222 +#: panels/applications/cc-applications-panel.c:1226 msgid "Other Files" msgstr "Alte fișiere" #. List of applications. -#: panels/applications/cc-applications-panel.c:1564 +#: panels/applications/cc-applications-panel.c:1568 #: panels/applications/cc-applications-panel.ui:418 #: panels/applications/gnome-applications-panel.desktop.in.in:3 #: panels/notifications/cc-notifications-panel.ui:167 @@ -212,7 +212,7 @@ #: panels/keyboard/cc-keyboard-option.c:378 #: panels/keyboard/cc-keyboard-shortcut-editor.ui:96 #: panels/keyboard/keyboard-shortcuts.c:425 panels/network/network-proxy.ui:126 -#: panels/user-accounts/um-fingerprint-dialog.c:211 +#: panels/user-accounts/um-fingerprint-dialog.c:219 #: subprojects/gvc/gvc-mixer-control.c:1876 msgid "Disabled" msgstr "Dezactivat" @@ -607,10 +607,10 @@ #: panels/user-accounts/cc-avatar-chooser.c:107 #: panels/user-accounts/cc-avatar-chooser.c:235 #: panels/user-accounts/cc-password-dialog.ui:20 -#: panels/user-accounts/cc-user-panel.c:636 -#: panels/user-accounts/cc-user-panel.c:654 +#: panels/user-accounts/cc-user-panel.c:638 +#: panels/user-accounts/cc-user-panel.c:656 #: panels/user-accounts/data/join-dialog.ui:20 -#: panels/user-accounts/um-fingerprint-dialog.c:260 +#: panels/user-accounts/um-fingerprint-dialog.c:335 msgid "_Cancel" msgstr "_Renunță" @@ -1141,7 +1141,7 @@ "\"windows\">Microsoft Windows." #: panels/color/cc-color-panel.ui:607 -#: panels/user-accounts/um-fingerprint-dialog.c:719 +#: panels/user-accounts/um-fingerprint-dialog.c:818 msgid "Summary" msgstr "Rezumat" @@ -1976,11 +1976,11 @@ "redshift;color;sunset;sunrise;Panou;Proiector;Ecran;Rezoluție;Lumină;" "Albastru;culoare;apus;răsărit;" -#: panels/info-overview/cc-info-overview-panel.c:407 -#: panels/info-overview/cc-info-overview-panel.c:422 -#: panels/info-overview/cc-info-overview-panel.c:434 -#: panels/info-overview/cc-info-overview-panel.c:480 -#: panels/info-overview/cc-info-overview-panel.c:510 +#: panels/info-overview/cc-info-overview-panel.c:416 +#: panels/info-overview/cc-info-overview-panel.c:431 +#: panels/info-overview/cc-info-overview-panel.c:443 +#: panels/info-overview/cc-info-overview-panel.c:489 +#: panels/info-overview/cc-info-overview-panel.c:519 msgid "Unknown" msgstr "Necunoscut" @@ -1988,32 +1988,32 @@ #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: panels/info-overview/cc-info-overview-panel.c:442 +#: panels/info-overview/cc-info-overview-panel.c:451 #, c-format msgid "%s; Build ID: %s" msgstr "%s; ID-ul compilării: %s" #. translators: This is the type of architecture for the OS -#: panels/info-overview/cc-info-overview-panel.c:457 +#: panels/info-overview/cc-info-overview-panel.c:466 #, c-format msgid "64-bit" msgstr "64-biți" #. translators: This is the type of architecture for the OS -#: panels/info-overview/cc-info-overview-panel.c:460 +#: panels/info-overview/cc-info-overview-panel.c:469 #, c-format msgid "32-bit" msgstr "32-biți" -#: panels/info-overview/cc-info-overview-panel.c:666 +#: panels/info-overview/cc-info-overview-panel.c:675 msgid "X11" msgstr "X11" -#: panels/info-overview/cc-info-overview-panel.c:670 +#: panels/info-overview/cc-info-overview-panel.c:679 msgid "Wayland" msgstr "Wayland" -#: panels/info-overview/cc-info-overview-panel.c:672 +#: panels/info-overview/cc-info-overview-panel.c:681 msgctxt "Windowing system (Wayland, X11, or Unknown)" msgid "Unknown" msgstr "Necunoscut" @@ -4082,7 +4082,7 @@ #: panels/sharing/cc-sharing-panel.ui:351 #: panels/user-accounts/cc-add-user-dialog.ui:310 #: panels/user-accounts/cc-add-user-dialog.ui:547 -#: panels/user-accounts/cc-user-panel.ui:385 +#: panels/user-accounts/cc-user-panel.ui:389 msgid "_Password" msgstr "_Parolă" @@ -5635,7 +5635,7 @@ msgstr "_Ecran de autentificare" #: panels/region/cc-region-panel.ui:64 -#: panels/user-accounts/cc-user-panel.ui:313 +#: panels/user-accounts/cc-user-panel.ui:317 msgid "_Language" msgstr "_Limbă" @@ -7288,7 +7288,7 @@ #. Translators: This is a time format string in the style of "22:58". #. It indicates a login time which follows a date. #: panels/user-accounts/cc-login-history-dialog.c:173 -#: panels/user-accounts/cc-user-panel.c:766 +#: panels/user-accounts/cc-user-panel.c:768 msgctxt "login date-time" msgid "%k:%M" msgstr "%k:%M" @@ -7296,7 +7296,7 @@ #. Translators: This indicates a login date-time. #. The first %s is a date, and the second %s a time. #: panels/user-accounts/cc-login-history-dialog.c:176 -#: panels/user-accounts/cc-user-panel.c:770 +#: panels/user-accounts/cc-user-panel.c:772 #, c-format msgctxt "login date-time" msgid "%s, %s" @@ -7380,30 +7380,30 @@ msgid "Couldn’t connect to the %s domain: %s" msgstr "Nu se poate realiza conectarea la domeniul %s: %s" -#: panels/user-accounts/cc-user-panel.c:209 +#: panels/user-accounts/cc-user-panel.c:211 msgid "Your account" msgstr "Contul tău" -#: panels/user-accounts/cc-user-panel.c:384 +#: panels/user-accounts/cc-user-panel.c:386 msgid "Failed to delete user" msgstr "Ștergerea utilizatorului a eșuat" -#: panels/user-accounts/cc-user-panel.c:442 -#: panels/user-accounts/cc-user-panel.c:501 -#: panels/user-accounts/cc-user-panel.c:553 +#: panels/user-accounts/cc-user-panel.c:444 +#: panels/user-accounts/cc-user-panel.c:503 +#: panels/user-accounts/cc-user-panel.c:555 msgid "Failed to revoke remotely managed user" msgstr "A eșuat eliminarea utilizatorului gestionat la distanță" -#: panels/user-accounts/cc-user-panel.c:605 +#: panels/user-accounts/cc-user-panel.c:607 msgid "You cannot delete your own account." msgstr "Nu vă puteți șterge propriul cont." -#: panels/user-accounts/cc-user-panel.c:614 +#: panels/user-accounts/cc-user-panel.c:616 #, c-format msgid "%s is still logged in" msgstr "%s este încă autentificat" -#: panels/user-accounts/cc-user-panel.c:618 +#: panels/user-accounts/cc-user-panel.c:620 msgid "" "Deleting a user while they are logged in can leave the system in an " "inconsistent state." @@ -7411,12 +7411,12 @@ "Ștergerea unui utilizator când acesta este încă autentificat poate aduce " "sistemul într-o stare inconsistentă." -#: panels/user-accounts/cc-user-panel.c:627 +#: panels/user-accounts/cc-user-panel.c:629 #, c-format msgid "Do you want to keep %s’s files?" msgstr "Doriți să păstrați fișierele lui %s?" -#: panels/user-accounts/cc-user-panel.c:631 +#: panels/user-accounts/cc-user-panel.c:633 msgid "" "It is possible to keep the home directory, mail spool and temporary files " "around when deleting a user account." @@ -7424,47 +7424,47 @@ "Este posibil să păstrați dosarul personal, emailurile și fișierele temporare " "după ștergerea unui cont." -#: panels/user-accounts/cc-user-panel.c:634 +#: panels/user-accounts/cc-user-panel.c:636 msgid "_Delete Files" msgstr "Ș_terge fișierele" -#: panels/user-accounts/cc-user-panel.c:635 +#: panels/user-accounts/cc-user-panel.c:637 msgid "_Keep Files" msgstr "_Păstrează fișierele" -#: panels/user-accounts/cc-user-panel.c:649 +#: panels/user-accounts/cc-user-panel.c:651 #, c-format msgid "Are you sure you want to revoke remotely managed %s’s account?" msgstr "Sigur doriți să eliminați contul %s gestionat de la distanță?" -#: panels/user-accounts/cc-user-panel.c:653 +#: panels/user-accounts/cc-user-panel.c:655 msgid "_Delete" msgstr "Ș_terge fișierele" -#: panels/user-accounts/cc-user-panel.c:703 +#: panels/user-accounts/cc-user-panel.c:705 msgctxt "Password mode" msgid "Account disabled" msgstr "Cont dezactivat" -#: panels/user-accounts/cc-user-panel.c:711 +#: panels/user-accounts/cc-user-panel.c:713 msgctxt "Password mode" msgid "To be set at next login" msgstr "Va fi definită la următoarea autentificare" -#: panels/user-accounts/cc-user-panel.c:714 +#: panels/user-accounts/cc-user-panel.c:716 msgctxt "Password mode" msgid "None" msgstr "Niciuna" -#: panels/user-accounts/cc-user-panel.c:759 +#: panels/user-accounts/cc-user-panel.c:761 msgid "Logged in" msgstr "Autentificat" -#: panels/user-accounts/cc-user-panel.c:1137 +#: panels/user-accounts/cc-user-panel.c:1165 msgid "Failed to contact the accounts service" msgstr "Contactarea serviciului pentru conturi a eșuat" -#: panels/user-accounts/cc-user-panel.c:1139 +#: panels/user-accounts/cc-user-panel.c:1167 msgid "Please make sure that the AccountService is installed and enabled." msgstr "Asigurați-vă că aplicația AccountService este corect instalată." @@ -7472,20 +7472,20 @@ #. * We split the line in 2 here to "make it look good", as there's #. * no good way to do this in GTK+ for tooltips. See: #. * https://bugzilla.gnome.org/show_bug.cgi?id=657168 -#: panels/user-accounts/cc-user-panel.c:1171 +#: panels/user-accounts/cc-user-panel.c:1199 msgid "" "To make changes,\n" "click the * icon first" msgstr "" "Pentru a face schimbări,\n" -"dați clic întâi pe iconița *" +"apăsați întâi clic pe iconița *" -#: panels/user-accounts/cc-user-panel.c:1244 +#: panels/user-accounts/cc-user-panel.c:1265 msgid "Create a user account" msgstr "Creează un cont de utilizator" -#: panels/user-accounts/cc-user-panel.c:1255 -#: panels/user-accounts/cc-user-panel.c:1383 +#: panels/user-accounts/cc-user-panel.c:1276 +#: panels/user-accounts/cc-user-panel.c:1410 msgid "" "To create a user account,\n" "click the * icon first" @@ -7493,12 +7493,12 @@ "Pentru a crea un cont de utilizator,\n" "efectuați clic pe iconița *" -#: panels/user-accounts/cc-user-panel.c:1264 +#: panels/user-accounts/cc-user-panel.c:1291 msgid "Delete the selected user account" msgstr "Șterge contul de utilizator selectat" -#: panels/user-accounts/cc-user-panel.c:1276 -#: panels/user-accounts/cc-user-panel.c:1387 +#: panels/user-accounts/cc-user-panel.c:1303 +#: panels/user-accounts/cc-user-panel.c:1414 msgid "" "To delete the selected user account,\n" "click the * icon first" @@ -7510,28 +7510,28 @@ msgid "_Add User…" msgstr "_Adaugă utilizator…" -#: panels/user-accounts/cc-user-panel.ui:52 +#: panels/user-accounts/cc-user-panel.ui:61 msgid "Your session needs to be restarted for changes to take effect" msgstr "Sesiunea trebuie repornită pentru ca schimbările să aibă efect" -#: panels/user-accounts/cc-user-panel.ui:60 +#: panels/user-accounts/cc-user-panel.ui:69 msgid "Restart Now" msgstr "Repornește acum" -#: panels/user-accounts/cc-user-panel.ui:146 -#: panels/user-accounts/cc-user-panel.ui:162 +#: panels/user-accounts/cc-user-panel.ui:150 +#: panels/user-accounts/cc-user-panel.ui:166 msgid "User Icon" msgstr "Iconiță utilizator" -#: panels/user-accounts/cc-user-panel.ui:238 +#: panels/user-accounts/cc-user-panel.ui:242 msgid "Account Settings" msgstr "Configurări cont" -#: panels/user-accounts/cc-user-panel.ui:265 +#: panels/user-accounts/cc-user-panel.ui:269 msgid "_Administrator" msgstr "_Administrator" -#: panels/user-accounts/cc-user-panel.ui:285 +#: panels/user-accounts/cc-user-panel.ui:289 msgid "" "Administrators can add and remove other users, and can change settings for " "all users." @@ -7539,32 +7539,32 @@ "Administratorii pot adăuga sau elimina alți utilizatori, și pot modifica " "configurări pentru toți utilizatorii." -#: panels/user-accounts/cc-user-panel.ui:359 +#: panels/user-accounts/cc-user-panel.ui:363 msgid "Authentication & Login" msgstr "Autentificare & Conectare" -#: panels/user-accounts/cc-user-panel.ui:428 +#: panels/user-accounts/cc-user-panel.ui:432 msgid "_Fingerprint Login" msgstr "Autenti_ficare cu amprentă digitală" -#: panels/user-accounts/cc-user-panel.ui:470 +#: panels/user-accounts/cc-user-panel.ui:474 msgid "A_utomatic Login" msgstr "Autentificare a_utomată" -#: panels/user-accounts/cc-user-panel.ui:500 +#: panels/user-accounts/cc-user-panel.ui:504 msgid "Account Activity" msgstr "Activitate cont" -#: panels/user-accounts/cc-user-panel.ui:541 +#: panels/user-accounts/cc-user-panel.ui:545 msgid "Remove User…" msgstr "Șterge utilizator…" #. Translators: This is the empty state page label which states that there are no users to show in the panel. -#: panels/user-accounts/cc-user-panel.ui:580 +#: panels/user-accounts/cc-user-panel.ui:584 msgid "No Users Found" msgstr "Nu au fost găsiți utilizatori" -#: panels/user-accounts/cc-user-panel.ui:590 +#: panels/user-accounts/cc-user-panel.ui:594 msgid "Unlock to add a user account." msgstr "Deblochează pentru a adăuga un cont de utilizator." @@ -7601,7 +7601,7 @@ msgstr "Degetul mic drept" #: panels/user-accounts/data/account-fingerprint.ui:39 -#: panels/user-accounts/um-fingerprint-dialog.c:676 +#: panels/user-accounts/um-fingerprint-dialog.c:775 msgid "Enable Fingerprint Login" msgstr "Autentificare pe bază de amprente" @@ -7617,7 +7617,7 @@ msgid "_Other finger:" msgstr "Al_t deget:" -#: panels/user-accounts/data/account-fingerprint.ui:324 +#: panels/user-accounts/data/account-fingerprint.ui:222 msgid "" "Your fingerprint was successfully saved. You should now be able to log in " "using your fingerprint reader." @@ -7829,34 +7829,34 @@ msgid "Unknown error" msgstr "Eroare necunoscută" -#: panels/user-accounts/um-fingerprint-dialog.c:139 +#: panels/user-accounts/um-fingerprint-dialog.c:147 msgid "" "You are not allowed to access the device. Contact your system administrator." msgstr "" "Nu sunteți autorizat să accesați acest dispozitiv. Contactați " "administratorul de sistem." -#: panels/user-accounts/um-fingerprint-dialog.c:141 +#: panels/user-accounts/um-fingerprint-dialog.c:149 msgid "The device is already in use." msgstr "Acest dispozitivul este deja folosit." -#: panels/user-accounts/um-fingerprint-dialog.c:143 +#: panels/user-accounts/um-fingerprint-dialog.c:151 msgid "An internal error occurred." msgstr "A apărut o eroare internă." -#: panels/user-accounts/um-fingerprint-dialog.c:214 +#: panels/user-accounts/um-fingerprint-dialog.c:216 msgid "Enabled" msgstr "Activat" -#: panels/user-accounts/um-fingerprint-dialog.c:259 +#: panels/user-accounts/um-fingerprint-dialog.c:334 msgid "Delete registered fingerprints?" msgstr "Ștergeți amprentele înregistrate?" -#: panels/user-accounts/um-fingerprint-dialog.c:263 +#: panels/user-accounts/um-fingerprint-dialog.c:338 msgid "_Delete Fingerprints" msgstr "Ș_terge amprentele" -#: panels/user-accounts/um-fingerprint-dialog.c:269 +#: panels/user-accounts/um-fingerprint-dialog.c:344 msgid "" "Do you want to delete your registered fingerprints so fingerprint login is " "disabled?" @@ -7864,15 +7864,15 @@ "Doriți să ștergeți amprentele înregistrate astfel încât autentificarea pe " "bază de amprente să fie dezactivată?" -#: panels/user-accounts/um-fingerprint-dialog.c:439 +#: panels/user-accounts/um-fingerprint-dialog.c:526 msgid "Done!" msgstr "Gata!" #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: panels/user-accounts/um-fingerprint-dialog.c:500 -#: panels/user-accounts/um-fingerprint-dialog.c:542 +#: panels/user-accounts/um-fingerprint-dialog.c:588 +#: panels/user-accounts/um-fingerprint-dialog.c:630 #, c-format msgid "Could not access “%s” device" msgstr "Nu s-a putut accesa dispozitivul „%s”" @@ -7880,16 +7880,16 @@ #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: panels/user-accounts/um-fingerprint-dialog.c:583 +#: panels/user-accounts/um-fingerprint-dialog.c:677 #, c-format msgid "Could not start finger capture on “%s” device" msgstr "Nu s-a putut porni înregistrarea degetului pe dispozitivul „%s”" -#: panels/user-accounts/um-fingerprint-dialog.c:627 +#: panels/user-accounts/um-fingerprint-dialog.c:724 msgid "Could not access any fingerprint readers" msgstr "Nu s-a putut accesa niciun cititor de amprente" -#: panels/user-accounts/um-fingerprint-dialog.c:628 +#: panels/user-accounts/um-fingerprint-dialog.c:725 msgid "Please contact your system administrator for help." msgstr "Contactați administratorul de sistem pentru ajutor." @@ -7898,7 +7898,7 @@ #. * "To enable fingerprint login, you need to save one of your fingerprints, using the #. * 'Digital Persona U.are.U 4000/4000B' device." #. -#: panels/user-accounts/um-fingerprint-dialog.c:710 +#: panels/user-accounts/um-fingerprint-dialog.c:809 #, c-format msgid "" "To enable fingerprint login, you need to save one of your fingerprints, " @@ -7907,11 +7907,11 @@ "Pentru a activa autentificarea pe bază de amprente, trebuie să salvați una " "din amprentele dumneavoastră folosind dispozitivul „%s”." -#: panels/user-accounts/um-fingerprint-dialog.c:717 +#: panels/user-accounts/um-fingerprint-dialog.c:816 msgid "Selecting finger" msgstr "Selectare deget" -#: panels/user-accounts/um-fingerprint-dialog.c:718 +#: panels/user-accounts/um-fingerprint-dialog.c:817 msgid "Enrolling fingerprints" msgstr "Impunere amprente" diff -Nru gnome-control-center-3.36.4/po/sl.po gnome-control-center-3.36.5/po/sl.po --- gnome-control-center-3.36.4/po/sl.po 2020-07-03 05:10:58.009431600 +0000 +++ gnome-control-center-3.36.5/po/sl.po 2020-11-20 00:57:42.780798000 +0000 @@ -12,8 +12,8 @@ "Project-Id-Version: gnome-control-center master\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-control-center/" "issues\n" -"POT-Creation-Date: 2020-02-27 12:48+0000\n" -"PO-Revision-Date: 2020-02-27 20:51+0100\n" +"POT-Creation-Date: 2020-08-19 23:34+0000\n" +"PO-Revision-Date: 2020-08-28 21:27+0200\n" "Last-Translator: Matej Urbančič \n" "Language-Team: Slovenian GNOME Translation Team \n" "Language: sl_SI\n" @@ -23,73 +23,73 @@ "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" "%100==4 ? 3 : 0);\n" "X-Poedit-SourceCharset: utf-8\n" -"X-Generator: Poedit 2.2.4\n" +"X-Generator: Poedit 2.3\n" -#: panels/applications/cc-applications-panel.c:737 +#: panels/applications/cc-applications-panel.c:741 msgid "System Bus" msgstr "Sistemsko vodilo" -#: panels/applications/cc-applications-panel.c:737 -#: panels/applications/cc-applications-panel.c:739 -#: panels/applications/cc-applications-panel.c:752 -#: panels/applications/cc-applications-panel.c:757 +#: panels/applications/cc-applications-panel.c:741 +#: panels/applications/cc-applications-panel.c:743 +#: panels/applications/cc-applications-panel.c:756 +#: panels/applications/cc-applications-panel.c:761 msgid "Full access" msgstr "Poln dostop" -#: panels/applications/cc-applications-panel.c:739 +#: panels/applications/cc-applications-panel.c:743 msgid "Session Bus" msgstr "Vodilo seje" -#: panels/applications/cc-applications-panel.c:743 +#: panels/applications/cc-applications-panel.c:747 #: panels/power/cc-power-panel.c:2472 panels/thunderbolt/cc-bolt-panel.ui:466 #: panels/thunderbolt/cc-bolt-panel.ui:525 msgid "Devices" msgstr "Naprave" -#: panels/applications/cc-applications-panel.c:743 +#: panels/applications/cc-applications-panel.c:747 msgid "Full access to /dev" msgstr "Poln dostop do mape /dev" -#: panels/applications/cc-applications-panel.c:747 +#: panels/applications/cc-applications-panel.c:751 #: panels/network/gnome-network-panel.desktop.in.in:3 #: panels/network/network-mobile.ui:252 msgid "Network" msgstr "Omrežje" -#: panels/applications/cc-applications-panel.c:747 +#: panels/applications/cc-applications-panel.c:751 #: panels/applications/cc-snap-row.c:109 msgid "Has network access" msgstr "Ima dostop do omrežja" -#: panels/applications/cc-applications-panel.c:752 -#: panels/applications/cc-applications-panel.c:754 +#: panels/applications/cc-applications-panel.c:756 +#: panels/applications/cc-applications-panel.c:758 #: panels/search/cc-search-locations-dialog.c:361 msgid "Home" msgstr "Domača mapa" -#: panels/applications/cc-applications-panel.c:754 -#: panels/applications/cc-applications-panel.c:759 +#: panels/applications/cc-applications-panel.c:758 +#: panels/applications/cc-applications-panel.c:763 msgid "Read-only" msgstr "Le za branje" -#: panels/applications/cc-applications-panel.c:757 -#: panels/applications/cc-applications-panel.c:759 +#: panels/applications/cc-applications-panel.c:761 +#: panels/applications/cc-applications-panel.c:763 msgid "File System" msgstr "Datotečni sistem" -#: panels/applications/cc-applications-panel.c:763 +#: panels/applications/cc-applications-panel.c:767 #: panels/keyboard/01-launchers.xml.in:6 shell/cc-window.c:281 #: shell/cc-window.c:964 shell/cc-window.ui:125 #: shell/gnome-control-center.desktop.in.in:3 msgid "Settings" msgstr "Nastavitve" -#: panels/applications/cc-applications-panel.c:763 +#: panels/applications/cc-applications-panel.c:767 #: panels/applications/cc-snap-row.c:73 msgid "Can change settings" msgstr "Dovoljeno spreminjati nastavitve" -#: panels/applications/cc-applications-panel.c:765 +#: panels/applications/cc-applications-panel.c:769 #, c-format msgid "" "%s has the following permissions built-in. These cannot be altered. If you " @@ -99,66 +99,66 @@ "V kolikor vas dovoljenja skrbijo, razmislite o odstranitvi oziroma zamenjavi " "programa." -#: panels/applications/cc-applications-panel.c:926 +#: panels/applications/cc-applications-panel.c:930 msgid "Web Links" msgstr "Spletne povezave" -#: panels/applications/cc-applications-panel.c:936 +#: panels/applications/cc-applications-panel.c:940 msgid "Git Links" msgstr "Povezave Git" -#: panels/applications/cc-applications-panel.c:942 +#: panels/applications/cc-applications-panel.c:946 #, c-format msgid "%s Links" msgstr "Povezave %s" -#: panels/applications/cc-applications-panel.c:950 -#: panels/applications/cc-applications-panel.c:986 +#: panels/applications/cc-applications-panel.c:954 +#: panels/applications/cc-applications-panel.c:990 msgid "Unset" msgstr "Odstrani nastavitve" -#: panels/applications/cc-applications-panel.c:1041 +#: panels/applications/cc-applications-panel.c:1045 msgid "Links" msgstr "Povezave" -#: panels/applications/cc-applications-panel.c:1049 +#: panels/applications/cc-applications-panel.c:1053 msgid "Hypertext Files" msgstr "Spletne datoteke" -#: panels/applications/cc-applications-panel.c:1063 +#: panels/applications/cc-applications-panel.c:1067 msgid "Text Files" msgstr "Besedilne datoteke" -#: panels/applications/cc-applications-panel.c:1077 +#: panels/applications/cc-applications-panel.c:1081 msgid "Image Files" msgstr "Slikovne datoteke" -#: panels/applications/cc-applications-panel.c:1093 +#: panels/applications/cc-applications-panel.c:1097 msgid "Font Files" msgstr "Datoteke pisav" -#: panels/applications/cc-applications-panel.c:1154 +#: panels/applications/cc-applications-panel.c:1158 msgid "Archive Files" msgstr "Datoteke arhivov" -#: panels/applications/cc-applications-panel.c:1174 +#: panels/applications/cc-applications-panel.c:1178 msgid "Package Files" msgstr "Datoteke paketov" -#: panels/applications/cc-applications-panel.c:1197 +#: panels/applications/cc-applications-panel.c:1201 msgid "Audio Files" msgstr "Zvokovne datoteke" -#: panels/applications/cc-applications-panel.c:1214 +#: panels/applications/cc-applications-panel.c:1218 msgid "Video Files" msgstr "Video datoteke" -#: panels/applications/cc-applications-panel.c:1222 +#: panels/applications/cc-applications-panel.c:1226 msgid "Other Files" msgstr "Druge datoteke" #. List of applications. -#: panels/applications/cc-applications-panel.c:1564 +#: panels/applications/cc-applications-panel.c:1568 #: panels/applications/cc-applications-panel.ui:418 #: panels/applications/gnome-applications-panel.desktop.in.in:3 #: panels/notifications/cc-notifications-panel.ui:167 @@ -204,7 +204,7 @@ #: panels/keyboard/cc-keyboard-option.c:378 #: panels/keyboard/cc-keyboard-shortcut-editor.ui:96 #: panels/keyboard/keyboard-shortcuts.c:425 panels/network/network-proxy.ui:126 -#: panels/user-accounts/um-fingerprint-dialog.c:211 +#: panels/user-accounts/um-fingerprint-dialog.c:219 #: subprojects/gvc/gvc-mixer-control.c:1876 msgid "Disabled" msgstr "Onemogočeno" @@ -337,22 +337,20 @@ msgstr "Počisti predpomnilnik …" #: panels/applications/cc-snap-row.c:55 -#, fuzzy -#| msgid "Add or remove users and change your password" msgid "Add user accounts and change passwords" msgstr "Upravljanje uporabnikov in spreminjanje gesel" #: panels/applications/cc-snap-row.c:57 panels/applications/cc-snap-row.c:133 msgid "Play and record sound" -msgstr "" +msgstr "Predvajaj in snemaj zvok" #: panels/applications/cc-snap-row.c:59 msgid "Detect network devices using mDNS/DNS-SD (Bonjour/zeroconf)" -msgstr "" +msgstr "Zaznaj omrežnih naprav z uporabo mDNS/DNS-SD (Bonjour/zeroconf)" #: panels/applications/cc-snap-row.c:61 msgid "Access bluetooth hardware directly" -msgstr "" +msgstr "Neposreden dostop do bluetooth" #: panels/applications/cc-snap-row.c:63 msgid "Use bluetooth devices" @@ -360,7 +358,7 @@ #: panels/applications/cc-snap-row.c:65 msgid "Use your camera" -msgstr "" +msgstr "Uporabi kamero" #: panels/applications/cc-snap-row.c:67 msgid "Print documents" @@ -368,7 +366,7 @@ #: panels/applications/cc-snap-row.c:69 msgid "Use any connected joystick" -msgstr "" +msgstr "Uporabi priklopljeno igralno palico" #: panels/applications/cc-snap-row.c:71 msgid "Allow connecting to the Docker service" @@ -380,113 +378,101 @@ #: panels/applications/cc-snap-row.c:77 msgid "Setup and use privileged FUSE filesystems" -msgstr "" +msgstr "Nastavitev in uporaba datotečnega sistema FUSE" #: panels/applications/cc-snap-row.c:79 -#, fuzzy -#| msgid "Calibrate the device" msgid "Update firmware on this device" -msgstr "Umeri napravo" +msgstr "Posodobi strojno programsko opremo na tej napravi" #: panels/applications/cc-snap-row.c:81 -#, fuzzy -#| msgid "Account Information" msgid "Access hardware information" -msgstr "Podrobnosti računa" +msgstr "Dostop do podrobnosti strojne opreme" #: panels/applications/cc-snap-row.c:83 msgid "Provide entropy to hardware random number generator" -msgstr "" +msgstr "Omogoča entropijo za strojni ustvarjalnik naključnih števil" #: panels/applications/cc-snap-row.c:85 msgid "Use hardware-generated random numbers" -msgstr "" +msgstr "Uporabi strojno ustvarjena naključna števila" #: panels/applications/cc-snap-row.c:87 msgid "Access files in your home folder" -msgstr "" +msgstr "Dostop do datotek v osebni mapi" #: panels/applications/cc-snap-row.c:89 msgid "Access libvirt service" -msgstr "" +msgstr "Dostop do storitev libvirt" #: panels/applications/cc-snap-row.c:91 -#, fuzzy -#| msgid "Change system time and date settings" msgid "Change system language and region settings" -msgstr "Spremenite sistemski čas in datum" +msgstr "Spremenite sistemski jezik in območne nastavitve" #: panels/applications/cc-snap-row.c:93 msgid "Change location settings and providers" -msgstr "" +msgstr "Spreminjanje geolokacijskih nastavitev in ponudnikov" #: panels/applications/cc-snap-row.c:95 -#, fuzzy -#| msgid "Access Options" msgid "Access your location" -msgstr "Možnosti dostopa" +msgstr "Dostop do geolokacijskega mesta" #: panels/applications/cc-snap-row.c:97 msgid "Read system and application logs" -msgstr "" +msgstr "Branje sistemskih in programskih dnevnikov" #: panels/applications/cc-snap-row.c:99 msgid "Access LXD service" -msgstr "" +msgstr "Dostop do storitev LXD" #: panels/applications/cc-snap-row.c:101 msgid "access the media-hub service" -msgstr "" +msgstr "dostop do storitev media-hub" #: panels/applications/cc-snap-row.c:103 msgid "Use and configure modems" -msgstr "" +msgstr "Uporaba in nastavitev modema" #: panels/applications/cc-snap-row.c:105 msgid "Read system mount information and disk quotas" -msgstr "" +msgstr "Branje podrobnosti priklopov sistema in prostorske omejitve diska" #: panels/applications/cc-snap-row.c:107 msgid "Control music and video players" -msgstr "" +msgstr "Nadziraj predvajalnike predstavnih vsebin" #: panels/applications/cc-snap-row.c:111 -#, fuzzy -#| msgid "Change keyboard settings" msgid "Change low-level network settings" -msgstr "Spremeni nastavitve tipkovnice" +msgstr "Spreminjanje osnovnih omrežnih nastavitev" #: panels/applications/cc-snap-row.c:113 msgid "Access the NetworkManager service to read and change network settings" msgstr "" +"Dostop do storitve NetworkManager za branje in spreminjanje nastavitev " +"omrežja" #: panels/applications/cc-snap-row.c:115 -#, fuzzy -#| msgid "Network settings" msgid "Read access to network settings" -msgstr "Omrežne nastavitve" +msgstr "Bralni dostop do omrežnih nastavitev" #: panels/applications/cc-snap-row.c:117 -#, fuzzy -#| msgid "Change keyboard settings" msgid "Change network settings" -msgstr "Spremeni nastavitve tipkovnice" +msgstr "Spremeni omrežne nastavitve" #: panels/applications/cc-snap-row.c:119 -#, fuzzy -#| msgid "Network settings" msgid "Read network settings" -msgstr "Omrežne nastavitve" +msgstr "Preberi omrežne nastavitve" #: panels/applications/cc-snap-row.c:121 msgid "" "Access the ofono service to read and change network settings for mobile " "telephony" msgstr "" +"Dostop do storitve ofono za branje in spreminjanje nastavitev omrežja za " +"mobilno telefonijo" #: panels/applications/cc-snap-row.c:123 msgid "Control Open vSwitch hardware" -msgstr "" +msgstr "Nadzor nad strojno opremo Open vSwitch" #: panels/applications/cc-snap-row.c:125 msgid "Read from CD/DVD" @@ -494,67 +480,63 @@ #: panels/applications/cc-snap-row.c:127 msgid "Read, add, change, or remove saved passwords" -msgstr "" +msgstr "Branje, dodajanje, spreminjanje in odstranjevanje shranjenih gesel" #: panels/applications/cc-snap-row.c:129 msgid "" "Access pppd and ppp devices for configuring Point-to-Point Protocol " "connections" msgstr "" +"Dostop do naprav pppd in ppp za nastavljanje povezav prek protokola P2P (od " +"točke do točke)" #: panels/applications/cc-snap-row.c:131 msgid "Pause or end any process on the system" -msgstr "" +msgstr "Upravljanje kateregakoli sistemskega procesa" #: panels/applications/cc-snap-row.c:135 msgid "Access USB hardware directly" -msgstr "" +msgstr "Neposreden dostop do strojne opreme USB" #: panels/applications/cc-snap-row.c:137 msgid "Read/write files on removable storage devices" -msgstr "" +msgstr "Branje/Pisanje datotek na oddaljene naprave shrambe" #: panels/applications/cc-snap-row.c:139 msgid "Prevent screen sleep/lock" -msgstr "" +msgstr "Prepreči zaklepanje zaslona in prehod v pripravljenost" #: panels/applications/cc-snap-row.c:141 msgid "Access serial port hardware" -msgstr "" +msgstr "Dostop do strojne opreme serijskih vrat" #: panels/applications/cc-snap-row.c:143 msgid "Restart or power off the device" -msgstr "" +msgstr "Ponovni zagon in izklapljanje naprave" #: panels/applications/cc-snap-row.c:145 msgid "Install, remove and configure software" -msgstr "" +msgstr "Namesti, odstrani in prilagajaj programsko opremo" #: panels/applications/cc-snap-row.c:147 msgid "Access Storage Framework service" -msgstr "" +msgstr "Dostop do storitev okolja shrambe" #: panels/applications/cc-snap-row.c:149 -#, fuzzy -#| msgid "System Information" msgid "Read process and system information" -msgstr "Sistemski podatki" +msgstr "Opravila branja in sistemske podrobnosti" #: panels/applications/cc-snap-row.c:151 msgid "Monitor and control any running program" -msgstr "" +msgstr "Nadzor in upravljanje z zagnanimi programi" #: panels/applications/cc-snap-row.c:153 -#, fuzzy -#| msgid "Change the date and time, including time zone" msgid "Change the date and time" -msgstr "Spreminjanje sistemskega časa, datuma in časovnega območja" +msgstr "Spreminjanje sistemskega časa in datuma" #: panels/applications/cc-snap-row.c:155 -#, fuzzy -#| msgid "Change keyboard settings" msgid "Change time server settings" -msgstr "Spremeni nastavitve tipkovnice" +msgstr "Spremeni nastavitve časovnega strežnika" #: panels/applications/cc-snap-row.c:157 msgid "Change the time zone" @@ -563,22 +545,23 @@ #: panels/applications/cc-snap-row.c:159 msgid "Access the UDisks2 service for configuring disks and removable media" msgstr "" +"Dostop do storitev UDisks2 za nastavljanje diskovja in odstranljivih nosilcev" #: panels/applications/cc-snap-row.c:161 msgid "Read/change shared calendar events in Ubuntu Unity 8" -msgstr "" +msgstr "Branje/Spreminjanje dogodko v koledarju Ubuntu Unity 8" #: panels/applications/cc-snap-row.c:163 msgid "Read/change shared contacts in Ubuntu Unity 8" -msgstr "" +msgstr "Branje/Spreminjanje stikov v souporabi v Ubuntu Unity 8" #: panels/applications/cc-snap-row.c:165 msgid "Access energy usage data" -msgstr "" +msgstr "Dostop do podatkov o porabi energije" #: panels/applications/cc-snap-row.c:167 msgid "Read/write access to U2F devices exposed" -msgstr "" +msgstr "Branje/Spreminjanje dostopa do naprav U2F" #: panels/applications/gnome-applications-panel.desktop.in.in:4 msgid "Control various application permissions and settings" @@ -590,16 +573,16 @@ msgid "application;flatpak;permission;setting;" msgstr "program;flatpak;dovoljenja;nastavitve;" -#: panels/background/cc-background-chooser.c:340 +#: panels/background/cc-background-chooser.c:346 msgid "Select a picture" msgstr "Izbor slike" -#: panels/background/cc-background-chooser.c:343 +#: panels/background/cc-background-chooser.c:349 #: panels/color/cc-color-calibrate.ui:25 panels/color/cc-color-panel.c:240 #: panels/color/cc-color-panel.c:893 panels/color/cc-color-panel.ui:657 #: panels/common/cc-language-chooser.ui:24 #: panels/display/cc-display-panel.c:947 -#: panels/info-overview/cc-info-overview-panel.ui:235 +#: panels/info-overview/cc-info-overview-panel.ui:236 #: panels/network/cc-wifi-hotspot-dialog.ui:122 #: panels/network/connection-editor/connection-editor.ui:17 #: panels/network/connection-editor/vpn-helpers.c:176 @@ -614,14 +597,14 @@ #: panels/user-accounts/cc-avatar-chooser.c:107 #: panels/user-accounts/cc-avatar-chooser.c:235 #: panels/user-accounts/cc-password-dialog.ui:20 -#: panels/user-accounts/cc-user-panel.c:636 -#: panels/user-accounts/cc-user-panel.c:654 +#: panels/user-accounts/cc-user-panel.c:638 +#: panels/user-accounts/cc-user-panel.c:656 #: panels/user-accounts/data/join-dialog.ui:20 -#: panels/user-accounts/um-fingerprint-dialog.c:260 +#: panels/user-accounts/um-fingerprint-dialog.c:335 msgid "_Cancel" msgstr "_Prekliči" -#: panels/background/cc-background-chooser.c:344 +#: panels/background/cc-background-chooser.c:350 #: panels/network/connection-editor/vpn-helpers.c:177 #: panels/printers/pp-details-dialog.c:253 #: panels/sharing/cc-sharing-panel.c:411 @@ -722,13 +705,11 @@ #: panels/camera/cc-camera-panel.ui:34 msgid "Camera is turned off" -msgstr "" +msgstr "Kamera je izklopljena." #: panels/camera/cc-camera-panel.ui:43 -#, fuzzy -#| msgid "No application is currently playing or recording audio." msgid "No applications can capture photos or video." -msgstr "Trenutno ni dejavnega predvajanja ali snemanja zvoka." +msgstr "Ni določenih programov za zajem slik in videoposnetkov." #: panels/camera/cc-camera-panel.ui:77 msgid "" @@ -740,17 +721,15 @@ #: panels/camera/cc-camera-panel.ui:87 msgid "Allow the applications below to use your camera." -msgstr "" +msgstr "Dovoli navedenim programom uporabo kamere." #: panels/camera/cc-camera-panel.ui:107 msgid "No Applications Have Asked for Camera Access" -msgstr "" +msgstr "Ni programov, ki bi zahtevali dostop do kamere" #: panels/camera/gnome-camera-panel.desktop.in.in:4 -#, fuzzy -#| msgid "Browse for more pictures" msgid "Protect your pictures" -msgstr "Brskanje med več slikami" +msgstr "Zaščita slik in fotografij" #. FIXME #. Translators: Search terms to find the Privacy panel. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! @@ -1152,7 +1131,7 @@ "\">Microsoft Windows uporabna." #: panels/color/cc-color-panel.ui:607 -#: panels/user-accounts/um-fingerprint-dialog.c:719 +#: panels/user-accounts/um-fingerprint-dialog.c:818 msgid "Summary" msgstr "Povzetek" @@ -1432,17 +1411,17 @@ #: panels/common/cc-permission-infobar.ui:20 msgid "Unlock…" -msgstr "Odkleni ..." +msgstr "Odkleni …" #: panels/common/cc-permission-infobar.ui:45 -#, fuzzy -#| msgid "Can change settings" msgid "Unlock to Change Settings" -msgstr "Dovoljeno spreminjati nastavitve" +msgstr "Odklenite za spreminjanje nastavitev" #: panels/common/cc-permission-infobar.ui:55 msgid "Some settings must be unlocked before they can be changed." msgstr "" +"Nekatere nastavitve je treba najprej odkleniti, preden jih je mogoče " +"spreminjati." #: panels/common/cc-util.c:127 #: panels/network/connection-editor/ce-page-details.c:152 @@ -1754,16 +1733,13 @@ #. translators: The first '%s' is the distributor's name, such as 'Fedora', the second '%s' is a link to the privacy policy #: panels/diagnostics/cc-diagnostics-panel.c:145 -#, fuzzy, c-format -#| msgid "" -#| "Sending reports of technical problems helps us improve %s. Reports are " -#| "sent anonymously and are scrubbed of personal data." +#, c-format msgid "" "Sending reports of technical problems helps us improve %s. Reports are sent " "anonymously and are scrubbed of personal data. %s" msgstr "" "Pošiljanje poročil o tehničnih napakah omogoča izboljšave distribucije %s. " -"Poročila so poslana brezimno in brez kakršnihkoli osebnih podatkov." +"Poročila so poslana brezimno in brez kakršnihkoli osebnih podatkov. %s" #: panels/diagnostics/cc-diagnostics-panel.ui:30 msgid "Problem Reporting" @@ -1775,11 +1751,11 @@ #: panels/diagnostics/gnome-diagnostics-panel.desktop.in.in:3 msgid "Diagnostics" -msgstr "" +msgstr "Diagnostika napak" #: panels/diagnostics/gnome-diagnostics-panel.desktop.in.in:4 msgid "Report your problems" -msgstr "" +msgstr "Pošiljajte poročila o težavah" #. FIXME #: panels/display/cc-display-panel.c:958 @@ -1818,7 +1794,7 @@ #: panels/display/cc-display-panel.ui:222 msgid "Contains top bar and Activities" -msgstr "" +msgstr "Vključuje vrhnjo vrstico in pojavno okno dejavnosti" #: panels/display/cc-display-panel.ui:223 msgid "Primary Display" @@ -1837,10 +1813,8 @@ msgstr "Postavitev zaslonov" #: panels/display/cc-display-panel.ui:387 -#, fuzzy -#| msgid "Single Display" msgid "Active Display" -msgstr "En zaslon" +msgstr "Dejaven zaslon" #: panels/display/cc-display-panel.ui:434 msgid "Display Configuration" @@ -1990,11 +1964,11 @@ "pult;panel;projektor;xrandr;zaslon;ločljivost;osveževanje;monitor;noč;" "svetloba;svetlost;modra;rdeči zamik;zora;mrak;barve;" -#: panels/info-overview/cc-info-overview-panel.c:406 -#: panels/info-overview/cc-info-overview-panel.c:421 -#: panels/info-overview/cc-info-overview-panel.c:433 -#: panels/info-overview/cc-info-overview-panel.c:479 -#: panels/info-overview/cc-info-overview-panel.c:509 +#: panels/info-overview/cc-info-overview-panel.c:416 +#: panels/info-overview/cc-info-overview-panel.c:431 +#: panels/info-overview/cc-info-overview-panel.c:443 +#: panels/info-overview/cc-info-overview-panel.c:489 +#: panels/info-overview/cc-info-overview-panel.c:519 msgid "Unknown" msgstr "Neznano" @@ -2002,34 +1976,32 @@ #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: panels/info-overview/cc-info-overview-panel.c:441 +#: panels/info-overview/cc-info-overview-panel.c:451 #, c-format msgid "%s; Build ID: %s" msgstr "%s, ID izgradnje: %s" #. translators: This is the type of architecture for the OS -#: panels/info-overview/cc-info-overview-panel.c:456 +#: panels/info-overview/cc-info-overview-panel.c:466 #, c-format msgid "64-bit" msgstr "64-bitni sistem" #. translators: This is the type of architecture for the OS -#: panels/info-overview/cc-info-overview-panel.c:459 +#: panels/info-overview/cc-info-overview-panel.c:469 #, c-format msgid "32-bit" msgstr "32-bitni sistem" -#: panels/info-overview/cc-info-overview-panel.c:665 +#: panels/info-overview/cc-info-overview-panel.c:675 msgid "X11" msgstr "X11" -#: panels/info-overview/cc-info-overview-panel.c:669 +#: panels/info-overview/cc-info-overview-panel.c:679 msgid "Wayland" msgstr "Wayland" -#: panels/info-overview/cc-info-overview-panel.c:671 -#, fuzzy -#| msgid "Unknown" +#: panels/info-overview/cc-info-overview-panel.c:681 msgctxt "Windowing system (Wayland, X11, or Unknown)" msgid "Unknown" msgstr "Neznano" @@ -2092,8 +2064,10 @@ "The device name is used to identify this device when it is viewed over the " "network, or when pairing Bluetooth devices." msgstr "" +"Ime naprave se uporablja za določitev naprave, kadar je ta prikazana prek " +"omrežja oziroma ob povezovanju naprav Bluetooth." -#: panels/info-overview/cc-info-overview-panel.ui:226 +#: panels/info-overview/cc-info-overview-panel.ui:227 msgid "_Rename" msgstr "_Preimenuj" @@ -2111,17 +2085,13 @@ #. "Preferred Applications" is the old name for the preference, so make #. sure that you use the same "translation" for those keywords #: panels/info-overview/gnome-info-overview-panel.desktop.in.in:23 -#, fuzzy -#| msgid "" -#| "device;system;information;memory;processor;version;default;application;" -#| "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;" msgid "" "device;system;information;hostname;memory;processor;version;default;" "application;preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;" msgstr "" "naprava;sistem;podrobnosti;pomnilnik;procesor;različica;privzeto;program;" "povrnjeno:prednostno;cd;dvd;usb;zvok;slika;video;disk;odstrani;predstavnost;" -"samodejni zagon;" +"samodejni zagon;nastavitve;" #: panels/keyboard/00-multimedia.xml.in:2 msgid "Sound and Media" @@ -2296,8 +2266,6 @@ #: panels/keyboard/cc-alt-chars-key-dialog.ui:8 #: panels/keyboard/cc-keyboard-panel.ui:72 -#, fuzzy -#| msgid "Alternative Characters Key" msgid "Alternate Characters Key" msgstr "Drugotna tipka" @@ -2306,6 +2274,8 @@ "The alternate characters key can be used to enter additional characters. " "These are sometimes printed as a third-option on your keyboard." msgstr "" +"Tipka za izmenjavo omogoča uporabo dodatnih znakov. Ti so pogosto natisnjeni " +"na tipkovnici kot tretja možnost." #: panels/keyboard/cc-alt-chars-key-dialog.ui:45 msgid "Left Alt" @@ -2316,22 +2286,16 @@ msgstr "Desna izmenjalka (Alt)" #: panels/keyboard/cc-alt-chars-key-dialog.ui:77 -#, fuzzy -#| msgid "Left Ctrl" msgid "Left Super" -msgstr "Leva krmilka (Ctrl)" +msgstr "Leva tipka pop" #: panels/keyboard/cc-alt-chars-key-dialog.ui:93 -#, fuzzy -#| msgid "Right Ctrl" msgid "Right Super" -msgstr "Desna krmilka (Ctrl)" +msgstr "Desna tipka pop" #: panels/keyboard/cc-alt-chars-key-dialog.ui:109 -#, fuzzy -#| msgid "Security key" msgid "Menu key" -msgstr "Varnostni ključ" +msgstr "Tipka Meni" #: panels/keyboard/cc-alt-chars-key-dialog.ui:125 msgid "Right Ctrl" @@ -2364,43 +2328,31 @@ msgstr "Preklopi na naslednji vir le s spremenilniki" #: panels/keyboard/cc-keyboard-panel.c:94 -#, fuzzy -#| msgid "Right Ctrl" msgctxt "keyboard key" msgid "Right Ctrl" msgstr "Desna krmilka (Ctrl)" #: panels/keyboard/cc-keyboard-panel.c:95 -#, fuzzy -#| msgid "_Mouse Keys" msgctxt "keyboard key" msgid "Menu Key" -msgstr "_Miškine tipke" +msgstr "Tipka Meni" #: panels/keyboard/cc-keyboard-panel.c:96 -#, fuzzy -#| msgid "Left Ctrl" msgctxt "keyboard key" msgid "Left Super" -msgstr "Leva krmilka (Ctrl)" +msgstr "Leva tipka pop" #: panels/keyboard/cc-keyboard-panel.c:97 -#, fuzzy -#| msgid "Right Ctrl" msgctxt "keyboard key" msgid "Right Super" -msgstr "Desna krmilka (Ctrl)" +msgstr "Desna tipka pop" #: panels/keyboard/cc-keyboard-panel.c:98 -#, fuzzy -#| msgid "Left Alt" msgctxt "keyboard key" msgid "Left Alt" msgstr "Leva izmenjalka (Alt)" #: panels/keyboard/cc-keyboard-panel.c:99 -#, fuzzy -#| msgid "Right Alt" msgctxt "keyboard key" msgid "Right Alt" msgstr "Desna izmenjalka (Alt)" @@ -2433,10 +2385,8 @@ msgstr "Ponastavi tipkovno bližnjico na privzeto vrednost" #: panels/keyboard/cc-keyboard-panel.ui:73 -#, fuzzy -#| msgid "The new password does not contain enough different characters" msgid "Hold down and type to enter different characters" -msgstr "Novo geslo ne vsebuje dovolj različnih znakov" +msgstr "Pritisnite in vpišite različne znake" #: panels/keyboard/cc-keyboard-panel.ui:147 msgid "Reset All…" @@ -2451,12 +2401,9 @@ msgstr "Ni določene tipkovne bližnjice" #: panels/keyboard/cc-keyboard-shortcut-editor.c:413 -#, fuzzy, c-format -#| msgid "" -#| "%s is already being used for %s. If you replace it, %s will be " -#| "disabled" +#, c-format msgid "%s is already being used for %s. If you replace it, %s will be disabled" -msgstr "%s je že uporabljen za %s. Če ga zamenjate, bo %s onemogočen." +msgstr "%s je že uporabljen za %s. Če ga zamenjate, bo %s onemogočen." #: panels/keyboard/cc-keyboard-shortcut-editor.c:581 msgid "Set Custom Shortcut" @@ -2468,10 +2415,9 @@ #. TRANSLATORS: %s is replaced with a description of the keyboard shortcut #: panels/keyboard/cc-keyboard-shortcut-editor.c:592 -#, fuzzy, c-format -#| msgid "Enter new shortcut to change %s." +#, c-format msgid "Enter new shortcut to change %s." -msgstr "Vpišite novo tipkovno bližnjico za zamenjavo %s." +msgstr "Vpišite novo tipkovno bližnjico za zamenjavo %s." #: panels/keyboard/cc-keyboard-shortcut-editor.c:1016 msgid "Add Custom Shortcut" @@ -2543,16 +2489,12 @@ "približanje;vir;zaklep;glasnost;jakost;" #: panels/location/cc-location-panel.ui:31 -#, fuzzy -#| msgid "Location Services" msgid "Location services turned off" -msgstr "Storitve določanja položaja" +msgstr "Storitve določanja položaja so onemogočene" #: panels/location/cc-location-panel.ui:40 -#, fuzzy -#| msgid "No application is currently playing or recording audio." msgid "No applications can obtain location information." -msgstr "Trenutno ni dejavnega predvajanja ali snemanja zvoka." +msgstr "Ni programov, ki bi zahtevali dostop do geolokacijskih podrobnosti." #: panels/location/cc-location-panel.ui:74 msgid "" @@ -2573,15 +2515,15 @@ #: panels/location/cc-location-panel.ui:95 msgid "Allow the applications below to determine your location." -msgstr "" +msgstr "Dovoli navedenim programom uporabo geolokacijskih podatkov." #: panels/location/cc-location-panel.ui:115 msgid "No Applications Have Asked for Location Access" -msgstr "" +msgstr "Ni programov, ki bi zahtevali dostop do geolokacijskih podatkov" #: panels/location/gnome-location-panel.desktop.in.in:4 msgid "Protect your location information" -msgstr "" +msgstr "Zaščitite podrobnosti o trenutnem mestu" #. FIXME #: panels/lock/cc-lock-panel.ui:29 @@ -2589,36 +2531,32 @@ "Automatically locking the screen prevents others from access the computer " "while you're away." msgstr "" +"Samodejno zaklepanje zaslona onemogoči nepovabljenim dostop do računalnika, " +"ko vas ni v bližini." #: panels/lock/cc-lock-panel.ui:46 -#, fuzzy -#| msgid "_Blank Screen" msgid "Blank Screen Delay" -msgstr "_Zatemni zaslon" +msgstr "Zamik zatemnitve zaslona" #: panels/lock/cc-lock-panel.ui:47 msgid "Period of inactivity after which the screen will go blank." -msgstr "" +msgstr "Čas nedejavnosti, po katerem se zaslon ugasne." #: panels/lock/cc-lock-panel.ui:67 msgid "Automatic Screen _Lock" msgstr "Samodejno zakleni zaslon" #: panels/lock/cc-lock-panel.ui:84 -#, fuzzy -#| msgid "Automatic Screen _Lock" msgid "Automatic _Screen Lock Delay" -msgstr "Samodejno zakleni zaslon" +msgstr "Zamik samodejnega zaklepanja zaslona" #: panels/lock/cc-lock-panel.ui:85 msgid "Period after the screen blanks when the screen is automatically locked." -msgstr "" +msgstr "Čas po katerem se po ugasnjenem zaslonu ta tudi samodejno zaklene." #: panels/lock/cc-lock-panel.ui:105 -#, fuzzy -#| msgid "Show _Notifications" msgid "Show _Notifications on Lock Screen" -msgstr "Pokaži _obvestila" +msgstr "Pokaži _obvestila na zaklenjenem" #. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog. #: panels/lock/cc-lock-panel.ui:149 @@ -2738,22 +2676,14 @@ #. FIXME #: panels/microphone/cc-microphone-panel.ui:34 -#, fuzzy -#| msgid "Microphone mute/unmute" msgid "Microphone is turned off" -msgstr "Utišanje / Priklop mikrofona" +msgstr "Mikrofon je izklopljen" #: panels/microphone/cc-microphone-panel.ui:43 -#, fuzzy -#| msgid "No applications found" msgid "No applications can record sound." -msgstr "Ni najdenih programov" +msgstr "Ni najdenih programov za zajem zvoka." #: panels/microphone/cc-microphone-panel.ui:77 -#, fuzzy -#| msgid "" -#| "Use of the microphone allows applications to capture sounds. Disabling " -#| "the microphone may cause some applications to not function properly." msgid "" "Use of the microphone allows applications to record and listen to audio. " "Disabling the microphone may cause some applications to not function " @@ -2764,11 +2694,11 @@ #: panels/microphone/cc-microphone-panel.ui:87 msgid "Allow the applications below to use your microphone." -msgstr "" +msgstr "Dovoli navedenim programom uporabo mikrofona." #: panels/microphone/cc-microphone-panel.ui:107 msgid "No Applications Have Asked for Microphone Access" -msgstr "" +msgstr "Ni programov, ki bi zahtevali dostop do mikrofona" #: panels/microphone/gnome-microphone-panel.desktop.in.in:4 msgid "Protect your conversations" @@ -2944,7 +2874,7 @@ #: panels/network/net-device-ethernet.c:318 #: panels/network/network-bluetooth.ui:76 #: panels/network/network-ethernet.ui:102 panels/network/network-mobile.ui:414 -#: panels/network/network-vpn.ui:78 +#: panels/network/network-vpn.ui:75 msgid "Options…" msgstr "Možnosti …" @@ -2955,10 +2885,12 @@ "Turning on the hotspot will disconnect from %s, and it will not be possible " "to access the internet through Wi-Fi." msgstr "" +"Ob priklopu vroče točke se onemogoči povezava z omrežjem %s, zato ne bo " +"mogoč dostop prek Wi-Fi." #: panels/network/cc-wifi-hotspot-dialog.c:248 msgid "Must have a minimum of 8 characters" -msgstr "" +msgstr "Vsebovati mora najmanj 8 znakov" #: panels/network/cc-wifi-hotspot-dialog.c:458 msgid "Turn On Wi-Fi Hotspot?" @@ -2970,6 +2902,9 @@ "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 "" +"Vroča točka Wi-Fi omogoča drugim souporabo povezave z internetom. Uporabniki " +"se lahko povežejo v ustvarjeno omrežje Wi-Fi. Za to možnost mora biti na " +"voljo povezava mimo običajne Wi-Fi povezave." #: panels/network/cc-wifi-hotspot-dialog.ui:44 #: panels/network/network-wifi.ui:105 @@ -3288,10 +3223,8 @@ msgstr "Strojni naslov" #: panels/network/connection-editor/details-page.ui:162 -#, fuzzy -#| msgid "Supported ICC profiles" msgid "Supported Frequencies" -msgstr "Podprti profili ICC" +msgstr "Podprte frekvence" #: panels/network/connection-editor/details-page.ui:180 #: panels/network/net-device-ethernet.c:155 @@ -3322,11 +3255,14 @@ #: panels/network/connection-editor/details-page.ui:428 msgid "_Metered connection: has data limits or can incur charges" msgstr "" +"_Merjena povezava: obstajajo podatkovne omejitve oziroma dodatni stroški" #: panels/network/connection-editor/details-page.ui:439 msgid "" "Software updates and other large downloads will not be started automatically." msgstr "" +"Posodobitve programske opreme in drugi večji prejemi ne bodo zagnani " +"samodejno." #: panels/network/connection-editor/ethernet-page.ui:25 #: panels/network/connection-editor/vpn-page.ui:23 @@ -3377,8 +3313,6 @@ #: panels/network/connection-editor/ip4-page.ui:97 #: panels/network/connection-editor/ip6-page.ui:111 -#, fuzzy -#| msgid "Shared with other computers" msgid "Shared to other computers" msgstr "Souporaba z ostalimi računalniki" @@ -4138,7 +4072,7 @@ #: panels/sharing/cc-sharing-panel.ui:351 #: panels/user-accounts/cc-add-user-dialog.ui:310 #: panels/user-accounts/cc-add-user-dialog.ui:547 -#: panels/user-accounts/cc-user-panel.ui:385 +#: panels/user-accounts/cc-user-panel.ui:389 msgid "_Password" msgstr "_Geslo" @@ -4261,7 +4195,7 @@ #: panels/network/wireless-security/eap-method-tls.ui:108 msgid "Private _key" -msgstr "Osebni _ključ:" +msgstr "Osebni _ključ" #: panels/network/wireless-security/eap-method-tls.ui:133 msgid "_Private key password" @@ -4454,7 +4388,7 @@ #: panels/notifications/cc-app-notifications-dialog.ui:300 msgctxt "notifications" msgid "_Lock Screen Notifications" -msgstr "_Obvestila na zaklenjenem zaslonu" +msgstr "_Pokaži obvestila na zaklenjenem zaslonu" #: panels/notifications/cc-app-notifications-dialog.ui:351 msgctxt "notifications" @@ -4473,7 +4407,7 @@ #: panels/notifications/cc-notifications-panel.ui:70 msgid "_Do Not Disturb" -msgstr "" +msgstr "_Ne moti s prikazovanjem obvestil" #: panels/notifications/cc-notifications-panel.ui:121 msgid "_Lock Screen Notifications" @@ -4508,10 +4442,9 @@ #. * or rishi). #. #: panels/online-accounts/cc-online-accounts-panel.c:991 -#, fuzzy, c-format -#| msgid "%s removed" +#, c-format msgid "%s removed" -msgstr "Uporabniško ime %s je odstranjeno." +msgstr "Račun %s je odstranjen." #: panels/online-accounts/gnome-online-accounts-panel.desktop.in.in:3 msgid "Online Accounts" @@ -4535,13 +4468,13 @@ "Računi;ownCloud;oblak;Kerberos;IMAP;SMTP;Pocket;ReadItLater;" #. Translators: This is the button which allows undoing the removal of the printer. -#: panels/online-accounts/online-accounts.ui:38 panels/printers/printers.ui:54 +#: panels/online-accounts/online-accounts.ui:38 panels/printers/printers.ui:61 msgid "Undo" msgstr "Razveljavi" #: panels/online-accounts/online-accounts.ui:96 msgid "Connect to your data in the cloud" -msgstr "Vzpostavi povezavo s podatki v oblaku" +msgstr "Povezovanje s podatki v oblaku" #: panels/online-accounts/online-accounts.ui:111 msgid "No internet connection — connect to set up new online accounts" @@ -4956,18 +4889,18 @@ msgstr "Zahtevana je overitev" #. Translators: %s is the printer name -#: panels/printers/cc-printers-panel.c:699 +#: panels/printers/cc-printers-panel.c:695 #, c-format msgid "Printer “%s” has been deleted" msgstr "Tiskalnik »%s« je bil izbrisan." #. Translators: Addition of the new printer failed. -#: panels/printers/cc-printers-panel.c:922 +#: panels/printers/cc-printers-panel.c:918 msgid "Failed to add new printer." msgstr "Dodajanje novega tiskalnika je spodletelo." #. Translators: The XML file containing user interface can not be loaded -#: panels/printers/cc-printers-panel.c:1216 +#: panels/printers/cc-printers-panel.c:1212 #, c-format msgid "Could not load ui: %s" msgstr "Ni mogoče naložiti uporabniškega vmesnika: %s" @@ -5580,26 +5513,26 @@ msgstr "Ponoven zagon" #. Translators: This button adds new printer. -#: panels/printers/printers.ui:8 +#: panels/printers/printers.ui:12 msgid "Add…" msgstr "Dodaj …" -#: panels/printers/printers.ui:179 +#: panels/printers/printers.ui:186 msgid "No printers" msgstr "Ni nastavljenih tiskalnikov" #. Translators: This button adds new printer. -#: panels/printers/printers.ui:193 +#: panels/printers/printers.ui:200 msgid "Add a Printer…" msgstr "Dodaj tiskalnik …" #. Translators: The CUPS server is not running (we can not connect to it). -#: panels/printers/printers.ui:225 +#: panels/printers/printers.ui:232 msgid "" "Sorry! The system printing service\n" "doesn’t seem to be available." msgstr "" -"Videti je, da sistemska storitev\n" +"Kaže, da sistemska storitev\n" "za tiskanje trenutno ni na voljo." #: panels/region/cc-format-chooser.c:148 @@ -5627,34 +5560,28 @@ "Choose the format for numbers, dates and currencies. Changes take effect on " "next login." msgstr "" +"Izbor zapisa števil, datumov in denarne enote. Spremembe se uveljavijo ob " +"naslednji prijavi." #: panels/region/cc-format-chooser.ui:119 -#, fuzzy -#| msgid "Search Locations" msgid "Search locales..." -msgstr "Preišči mesta" +msgstr "Preišči krajevna mesta ..." #: panels/region/cc-format-chooser.ui:160 -#, fuzzy -#| msgid "Formats" msgid "Common Formats" -msgstr "Jezikovna določila" +msgstr "Pogoste vrste" #: panels/region/cc-format-chooser.ui:191 -#, fuzzy -#| msgid "Formats" msgid "All Formats" -msgstr "Jezikovna določila" +msgstr "Vse vrste" #: panels/region/cc-format-chooser.ui:244 -#, fuzzy -#| msgid "No results found" msgid "No Search Results" msgstr "Ni najdenih zadetkov" #: panels/region/cc-format-chooser.ui:257 msgid "Searches can be for countries or languages." -msgstr "" +msgstr "Iskati je mogoče države ali jezike." #: panels/region/cc-format-chooser.ui:309 msgid "Preview" @@ -5702,7 +5629,7 @@ msgstr "_Prijavni zaslon" #: panels/region/cc-region-panel.ui:64 -#: panels/user-accounts/cc-user-panel.ui:313 +#: panels/user-accounts/cc-user-panel.ui:317 msgid "_Language" msgstr "_Jezik" @@ -5753,7 +5680,7 @@ #: panels/region/cc-region-panel.ui:430 msgid "Super+Shift+Space" -msgstr "Super+Shift+Preslednica" +msgstr "Tipka pop+Shift+Preslednica" #: panels/region/cc-region-panel.ui:445 msgid "Next source" @@ -5761,7 +5688,7 @@ #: panels/region/cc-region-panel.ui:463 msgid "Super+Space" -msgstr "Super+Preslednica" +msgstr "Tipka pop+Preslednica" #: panels/region/cc-region-panel.ui:478 msgid "Left+Right Alt" @@ -5787,7 +5714,7 @@ #: panels/removable-media/cc-removable-media-panel.c:267 msgid "Ask what to do" -msgstr "Vprašaj kaj storiti" +msgstr "Vprašaj, kaj storiti" #: panels/removable-media/cc-removable-media-panel.c:271 msgid "Do nothing" @@ -5799,7 +5726,7 @@ #: panels/removable-media/cc-removable-media-panel.c:341 msgid "Other Media" -msgstr "Drug nosilci" +msgstr "Drugi nosilci" #: panels/removable-media/cc-removable-media-panel.c:362 msgid "Select an application for audio CDs" @@ -5845,7 +5772,7 @@ #: panels/removable-media/cc-removable-media-panel.c:382 msgid "blank HD DVD disc" -msgstr "Prazen HD DVD disk" +msgstr "Prazen disk HD DVD" #: panels/removable-media/cc-removable-media-panel.c:383 msgid "Blu-ray video disc" @@ -6035,45 +5962,35 @@ #. TRANSLATORS: %s is replaced with a link to a dav:// URL #: panels/sharing/cc-sharing-panel.c:711 -#, fuzzy, c-format -#| msgid "" -#| "File Sharing allows you to share your Public folder with others on your " -#| "current network using: dav://%s" +#, c-format msgid "" "File Sharing allows you to share your Public folder with others on your " "current network using: %s" msgstr "" -"Možnost datotečne souporabe datotek omogoča izmenjavo Javne mape z drugimi " -"uporabniki na trenutnem omrežju s protokolom: dav://%s." +"Možnost souporabe datotek omogoča drugim uporabnikom na trenutnem omrežju " +"dostop do Javne mape s protokolom: %s" #. TRANSLATORS: %s is replaced with a link to a "ssh " command to run #: panels/sharing/cc-sharing-panel.c:717 -#, fuzzy, c-format -#| msgid "" -#| "When remote login is enabled, remote users can connect using the Secure " -#| "Shell command:\n" -#| "ssh %s" +#, c-format msgid "" "When remote login is enabled, remote users can connect using the Secure " "Shell command:\n" "%s" msgstr "" -"Oddaljenim uporabnikom dovoli povezavo z ukazom Secure Shell:\n" -"ssh %s" +"Oddaljenim uporabnikom dovoli povezavo z ukazom Secure Shell, če je " +"oddaljena prijava omogočena:\n" +"%s" #. TRANSLATORS: %s is replaced with a link to a vnc:// URL #: panels/sharing/cc-sharing-panel.c:723 -#, fuzzy, c-format -#| msgid "" -#| "Screen sharing allows remote users to view or control your screen by " -#| "connecting to vnc://%s" +#, c-format msgid "" "Screen sharing allows remote users to view or control your screen by " "connecting to %s" msgstr "" -"Oddaljenim uporabnikom dovoli ogled ali nadzor vašega zaslona s povezavo z: " -"vnc://%s" +"Prikaz zaslona omogoča oddaljenim uporabnikom ogled in tudi nadzor prek " +"zaslona s povezavo prek %s" #: panels/sharing/cc-sharing-panel.c:828 msgid "Copy" @@ -6124,44 +6041,44 @@ msgstr "Oddaljena prijava" #: panels/sharing/cc-sharing-panel.ui:517 -#: panels/sharing/cc-sharing-panel.ui:763 +#: panels/sharing/cc-sharing-panel.ui:739 msgid "Screen Sharing" msgstr "Souporaba zaslona" -#: panels/sharing/cc-sharing-panel.ui:575 +#: panels/sharing/cc-sharing-panel.ui:571 msgid "_Allow connections to control the screen" msgstr "_Dovoli povezave za nadzor zaslona" -#: panels/sharing/cc-sharing-panel.ui:620 +#: panels/sharing/cc-sharing-panel.ui:596 msgid "_Password:" msgstr "_Geslo:" -#: panels/sharing/cc-sharing-panel.ui:650 +#: panels/sharing/cc-sharing-panel.ui:626 msgid "_Show Password" msgstr "Pokaži _geslo" -#: panels/sharing/cc-sharing-panel.ui:681 +#: panels/sharing/cc-sharing-panel.ui:657 msgid "Access Options" msgstr "Možnosti dostopa" -#: panels/sharing/cc-sharing-panel.ui:695 +#: panels/sharing/cc-sharing-panel.ui:671 msgid "_New connections must ask for access" msgstr "_Nove povezave morajo zahtevati dovoljenje za dostop" -#: panels/sharing/cc-sharing-panel.ui:713 +#: panels/sharing/cc-sharing-panel.ui:689 msgid "_Require a password" msgstr "_Zahtevaj geslo" -#: panels/sharing/cc-sharing-panel.ui:774 -#: panels/sharing/cc-sharing-panel.ui:868 +#: panels/sharing/cc-sharing-panel.ui:750 +#: panels/sharing/cc-sharing-panel.ui:844 msgid "Media Sharing" msgstr "Souporaba predstavnih datotek" -#: panels/sharing/cc-sharing-panel.ui:807 +#: panels/sharing/cc-sharing-panel.ui:783 msgid "Share music, photos and videos over the network." msgstr "Souporaba glasbe, fotografij in videov na omrežju." -#: panels/sharing/cc-sharing-panel.ui:822 +#: panels/sharing/cc-sharing-panel.ui:798 msgid "Folders" msgstr "Mape" @@ -6190,19 +6107,19 @@ msgid "Custom" msgstr "Po meri" -#: panels/sound/cc-alert-chooser.ui:12 panels/sound/cc-alert-selector.ui:9 +#: panels/sound/cc-alert-chooser.ui:12 msgid "Bark" msgstr "Lajež" -#: panels/sound/cc-alert-chooser.ui:19 panels/sound/cc-alert-selector.ui:15 +#: panels/sound/cc-alert-chooser.ui:19 msgid "Drip" msgstr "Kapljanje vode" -#: panels/sound/cc-alert-chooser.ui:26 panels/sound/cc-alert-selector.ui:21 +#: panels/sound/cc-alert-chooser.ui:26 msgid "Glass" msgstr "Udarec po steklu" -#: panels/sound/cc-alert-chooser.ui:33 panels/sound/cc-alert-selector.ui:27 +#: panels/sound/cc-alert-chooser.ui:33 msgid "Sonar" msgstr "Zvok sonarja" @@ -6249,7 +6166,7 @@ #: panels/sound/cc-sound-panel.ui:181 msgid "Balance" -msgstr "Ravnotežje" +msgstr "Uravnoteženost" #: panels/sound/cc-sound-panel.ui:208 msgid "Fade" @@ -6635,10 +6552,8 @@ msgstr "Zvok opozorila spremlja blisk." #: panels/universal-access/cc-ua-panel.ui:1392 -#, fuzzy -#| msgid "Flash the entire _screen" msgid "Flash the entire _window" -msgstr "Zabliskaj _celoten zaslon" +msgstr "Zabliskaj _celotno okno" #: panels/universal-access/cc-ua-panel.ui:1410 msgid "Flash the entire _screen" @@ -6947,7 +6862,7 @@ #: panels/universal-access/zoom-options.ui:577 msgid "_Length:" -msgstr "_Dolžina" +msgstr "_Dolžina:" #. The color of the accessibility crosshair #: panels/universal-access/zoom-options.ui:626 @@ -7047,10 +6962,8 @@ msgstr "_Počisti začasne datoteke" #: panels/usage/cc-usage-panel.ui:31 -#, fuzzy -#| msgid "History" msgid "File History" -msgstr "Zgodovina" +msgstr "Zgodovina datoteke" #: panels/usage/cc-usage-panel.ui:43 msgid "" @@ -7058,51 +6971,44 @@ "shared between applications, and makes it easier to find files that you " "might want to use." msgstr "" +"Zgodovina datotek vključuje tudi zapise uporabe datotek. Te podrobnosti so " +"lahko na voljo različnim programom, kar omogoča enostavnejše iskanje." #: panels/usage/cc-usage-panel.ui:58 -#, fuzzy -#| msgid "History" msgid "File H_istory" -msgstr "Zgodovina" +msgstr "Zgodovina _datoteke" #: panels/usage/cc-usage-panel.ui:80 -#, fuzzy msgid "File _History Duration" -msgstr "Uveljavitev nastavitev je spodletela: %s" +msgstr "Trajanje zgodovine datoteke" #: panels/usage/cc-usage-panel.ui:121 msgid "_Clear History…" -msgstr "Počisti _zgodovino ..." +msgstr "Počisti _zgodovino …" #: panels/usage/cc-usage-panel.ui:137 -#, fuzzy -#| msgid "Purge Trash & Temporary Files" msgid "Trash & Temporary Files" -msgstr "Počisti smeti in začasne datoteke" +msgstr "Smeti in začasne datoteke" #: panels/usage/cc-usage-panel.ui:147 msgid "" "Trash and temporary files can sometimes include personal or sensitive " "information. Automatically deleting them can help to protect privacy." msgstr "" +"V smeteh in v začasnih datoteka so včasih lahko osebni oziroma občutljivi " +"podatki. Samodejno brisanje lahko zagotavlja večjo zasebnost." #: panels/usage/cc-usage-panel.ui:161 -#, fuzzy -#| msgid "Automatically empty _Trash" msgid "Automatically Delete _Trash Content" -msgstr "Samodejno sprazni _smeti" +msgstr "Samodejno sprazni vsebino _smeti" #: panels/usage/cc-usage-panel.ui:176 -#, fuzzy -#| msgid "Automatically purge Temporary _Files" msgid "Automatically Delete Temporary _Files" msgstr "Samodejno počisti _začasne datoteke" #: panels/usage/cc-usage-panel.ui:198 -#, fuzzy -#| msgid "Automatically empty _Trash" msgid "Automatically Delete _Period" -msgstr "Samodejno sprazni _smeti" +msgstr "Samodejno izbriši _obdobje" #: panels/usage/cc-usage-panel.ui:240 msgid "_Empty Trash…" @@ -7198,11 +7104,11 @@ #: panels/usage/gnome-usage-panel.desktop.in.in:3 msgid "File History & Trash" -msgstr "" +msgstr "Zgodovina datoteke in smeti" #: panels/usage/gnome-usage-panel.desktop.in.in:4 msgid "Don't leave traces" -msgstr "" +msgstr "Ne puščaj sledi" #. FIXME #: panels/user-accounts/cc-add-user-dialog.c:34 @@ -7360,7 +7266,7 @@ #. Translators: This is a time format string in the style of "22:58". #. It indicates a login time which follows a date. #: panels/user-accounts/cc-login-history-dialog.c:173 -#: panels/user-accounts/cc-user-panel.c:766 +#: panels/user-accounts/cc-user-panel.c:768 msgctxt "login date-time" msgid "%k:%M" msgstr "%k:%M" @@ -7368,7 +7274,7 @@ #. Translators: This indicates a login date-time. #. The first %s is a date, and the second %s a time. #: panels/user-accounts/cc-login-history-dialog.c:176 -#: panels/user-accounts/cc-user-panel.c:770 +#: panels/user-accounts/cc-user-panel.c:772 #, c-format msgctxt "login date-time" msgid "%s, %s" @@ -7452,30 +7358,30 @@ msgid "Couldn’t connect to the %s domain: %s" msgstr "Z domeno %s povezava ni mogoča: %s" -#: panels/user-accounts/cc-user-panel.c:209 +#: panels/user-accounts/cc-user-panel.c:211 msgid "Your account" msgstr "Račun" -#: panels/user-accounts/cc-user-panel.c:384 +#: panels/user-accounts/cc-user-panel.c:386 msgid "Failed to delete user" msgstr "Napaka med brisanjem uporabnika" -#: panels/user-accounts/cc-user-panel.c:442 -#: panels/user-accounts/cc-user-panel.c:501 -#: panels/user-accounts/cc-user-panel.c:553 +#: panels/user-accounts/cc-user-panel.c:444 +#: panels/user-accounts/cc-user-panel.c:503 +#: panels/user-accounts/cc-user-panel.c:555 msgid "Failed to revoke remotely managed user" msgstr "Preklic oddaljeno vodenega uporabnika je spodletel" -#: panels/user-accounts/cc-user-panel.c:605 +#: panels/user-accounts/cc-user-panel.c:607 msgid "You cannot delete your own account." msgstr "Ni mogoče izbrisati lastnega računa." -#: panels/user-accounts/cc-user-panel.c:614 +#: panels/user-accounts/cc-user-panel.c:616 #, c-format msgid "%s is still logged in" msgstr "%s je še vedno prijavljen" -#: panels/user-accounts/cc-user-panel.c:618 +#: panels/user-accounts/cc-user-panel.c:620 msgid "" "Deleting a user while they are logged in can leave the system in an " "inconsistent state." @@ -7483,12 +7389,12 @@ "Izbris uporabnika, ki je trenutno prijavljen, lahko vpliva na delovanje " "sistema." -#: panels/user-accounts/cc-user-panel.c:627 +#: panels/user-accounts/cc-user-panel.c:629 #, c-format msgid "Do you want to keep %s’s files?" msgstr "Ali želite obdržati datoteke uporabnika %s?" -#: panels/user-accounts/cc-user-panel.c:631 +#: panels/user-accounts/cc-user-panel.c:633 msgid "" "It is possible to keep the home directory, mail spool and temporary files " "around when deleting a user account." @@ -7496,48 +7402,48 @@ "Mogoče je ohraniti domačo mapo, vrstilno mapo pošte in začasne datoteke tudi " "med brisanjem uporabniškega računa." -#: panels/user-accounts/cc-user-panel.c:634 +#: panels/user-accounts/cc-user-panel.c:636 msgid "_Delete Files" msgstr "_Izbriši datoteke" -#: panels/user-accounts/cc-user-panel.c:635 +#: panels/user-accounts/cc-user-panel.c:637 msgid "_Keep Files" msgstr "_Ohrani datoteke" -#: panels/user-accounts/cc-user-panel.c:649 +#: panels/user-accounts/cc-user-panel.c:651 #, c-format msgid "Are you sure you want to revoke remotely managed %s’s account?" msgstr "" "Ali ste prepričani, da želite preklicati oddaljeno voden račun uporabnika %s?" -#: panels/user-accounts/cc-user-panel.c:653 +#: panels/user-accounts/cc-user-panel.c:655 msgid "_Delete" msgstr "_Izbriši" -#: panels/user-accounts/cc-user-panel.c:703 +#: panels/user-accounts/cc-user-panel.c:705 msgctxt "Password mode" msgid "Account disabled" msgstr "Račun je onemogočen" -#: panels/user-accounts/cc-user-panel.c:711 +#: panels/user-accounts/cc-user-panel.c:713 msgctxt "Password mode" msgid "To be set at next login" msgstr "Nastavljeno bo ob naslednji prijavi" -#: panels/user-accounts/cc-user-panel.c:714 +#: panels/user-accounts/cc-user-panel.c:716 msgctxt "Password mode" msgid "None" msgstr "Brez" -#: panels/user-accounts/cc-user-panel.c:759 +#: panels/user-accounts/cc-user-panel.c:761 msgid "Logged in" msgstr "Trenutno dejavna prijava" -#: panels/user-accounts/cc-user-panel.c:1137 +#: panels/user-accounts/cc-user-panel.c:1165 msgid "Failed to contact the accounts service" msgstr "Napaka med povezovanjem s storitvijo računov" -#: panels/user-accounts/cc-user-panel.c:1139 +#: panels/user-accounts/cc-user-panel.c:1167 msgid "Please make sure that the AccountService is installed and enabled." msgstr "Prepričajte se, da je paket AccoutnService nameščen in omogočen." @@ -7545,7 +7451,7 @@ #. * We split the line in 2 here to "make it look good", as there's #. * no good way to do this in GTK+ for tooltips. See: #. * https://bugzilla.gnome.org/show_bug.cgi?id=657168 -#: panels/user-accounts/cc-user-panel.c:1171 +#: panels/user-accounts/cc-user-panel.c:1199 msgid "" "To make changes,\n" "click the * icon first" @@ -7553,89 +7459,91 @@ "Za spreminjanje,\n" "kliknite na ikono *" -#: panels/user-accounts/cc-user-panel.c:1244 +#: panels/user-accounts/cc-user-panel.c:1265 msgid "Create a user account" msgstr "Ustvari uporabniški račun" -#: panels/user-accounts/cc-user-panel.c:1255 -#: panels/user-accounts/cc-user-panel.c:1383 +#: panels/user-accounts/cc-user-panel.c:1276 +#: panels/user-accounts/cc-user-panel.c:1410 msgid "" "To create a user account,\n" "click the * icon first" msgstr "" -"Za ustvarjanje uporabniškega računa,\n" -"kliknite na ikono *" +"Za ustvarjanje uporabniškega\n" +"računa, kliknite na ikono *" -#: panels/user-accounts/cc-user-panel.c:1264 +#: panels/user-accounts/cc-user-panel.c:1291 msgid "Delete the selected user account" msgstr "Izbriši izbran uporabniški račun" -#: panels/user-accounts/cc-user-panel.c:1276 -#: panels/user-accounts/cc-user-panel.c:1387 +#: panels/user-accounts/cc-user-panel.c:1303 +#: panels/user-accounts/cc-user-panel.c:1414 msgid "" "To delete the selected user account,\n" "click the * icon first" msgstr "" -"Za izbris izbranega uporabniškega računa,\n" -"kliknite na ikono *" +"Za izbris izbranega uporabniškega\n" +"računa, kliknite na ikono *" #: panels/user-accounts/cc-user-panel.ui:5 msgid "_Add User…" msgstr "_Dodaj uporabnika …" -#: panels/user-accounts/cc-user-panel.ui:52 +#: panels/user-accounts/cc-user-panel.ui:61 msgid "Your session needs to be restarted for changes to take effect" msgstr "Za uveljavitev sprememb se je treba v sejo ponovno prijaviti" -#: panels/user-accounts/cc-user-panel.ui:60 +#: panels/user-accounts/cc-user-panel.ui:69 msgid "Restart Now" msgstr "Ponoven zagon" -#: panels/user-accounts/cc-user-panel.ui:146 -#: panels/user-accounts/cc-user-panel.ui:162 +#: panels/user-accounts/cc-user-panel.ui:150 +#: panels/user-accounts/cc-user-panel.ui:166 msgid "User Icon" msgstr "Uporabniška ikona" -#: panels/user-accounts/cc-user-panel.ui:238 +#: panels/user-accounts/cc-user-panel.ui:242 msgid "Account Settings" msgstr "Nastavitve računa" -#: panels/user-accounts/cc-user-panel.ui:265 +#: panels/user-accounts/cc-user-panel.ui:269 msgid "_Administrator" msgstr "_Skrbnik" -#: panels/user-accounts/cc-user-panel.ui:285 +#: panels/user-accounts/cc-user-panel.ui:289 msgid "" "Administrators can add and remove other users, and can change settings for " "all users." msgstr "" +"Skrbniki lahko dodajo in odstranijo druge uporabnike in vsem spreminjajo " +"nastavitve." -#: panels/user-accounts/cc-user-panel.ui:359 +#: panels/user-accounts/cc-user-panel.ui:363 msgid "Authentication & Login" msgstr "Overitev in prijava" -#: panels/user-accounts/cc-user-panel.ui:428 +#: panels/user-accounts/cc-user-panel.ui:432 msgid "_Fingerprint Login" msgstr "Prijava s _prstnimi odtisi" -#: panels/user-accounts/cc-user-panel.ui:470 +#: panels/user-accounts/cc-user-panel.ui:474 msgid "A_utomatic Login" msgstr "_Samodejna prijava" -#: panels/user-accounts/cc-user-panel.ui:500 +#: panels/user-accounts/cc-user-panel.ui:504 msgid "Account Activity" msgstr "Dejavnost računa" -#: panels/user-accounts/cc-user-panel.ui:541 +#: panels/user-accounts/cc-user-panel.ui:545 msgid "Remove User…" msgstr "Odstrani uporabnika …" #. Translators: This is the empty state page label which states that there are no users to show in the panel. -#: panels/user-accounts/cc-user-panel.ui:580 +#: panels/user-accounts/cc-user-panel.ui:584 msgid "No Users Found" msgstr "Ni najdenih uporabnikov" -#: panels/user-accounts/cc-user-panel.ui:590 +#: panels/user-accounts/cc-user-panel.ui:594 msgid "Unlock to add a user account." msgstr "Odklenite za dodajanje uporabniškega računa." @@ -7672,7 +7580,7 @@ msgstr "Desni mezinec" #: panels/user-accounts/data/account-fingerprint.ui:39 -#: panels/user-accounts/um-fingerprint-dialog.c:676 +#: panels/user-accounts/um-fingerprint-dialog.c:775 msgid "Enable Fingerprint Login" msgstr "Omogoči prijavo s prstnimi odtisi" @@ -7688,7 +7596,7 @@ msgid "_Other finger:" msgstr "_Drugi prst:" -#: panels/user-accounts/data/account-fingerprint.ui:324 +#: panels/user-accounts/data/account-fingerprint.ui:222 msgid "" "Your fingerprint was successfully saved. You should now be able to log in " "using your fingerprint reader." @@ -7898,32 +7806,32 @@ msgid "Unknown error" msgstr "Neznana napaka" -#: panels/user-accounts/um-fingerprint-dialog.c:139 +#: panels/user-accounts/um-fingerprint-dialog.c:147 msgid "" "You are not allowed to access the device. Contact your system administrator." msgstr "Ni ustreznih dovoljenj za uporabo naprave. Stopite v stik s skrbnikom." -#: panels/user-accounts/um-fingerprint-dialog.c:141 +#: panels/user-accounts/um-fingerprint-dialog.c:149 msgid "The device is already in use." msgstr "Naprava je že v uporabi." -#: panels/user-accounts/um-fingerprint-dialog.c:143 +#: panels/user-accounts/um-fingerprint-dialog.c:151 msgid "An internal error occurred." msgstr "Prišlo je do notranje napake." -#: panels/user-accounts/um-fingerprint-dialog.c:214 +#: panels/user-accounts/um-fingerprint-dialog.c:216 msgid "Enabled" msgstr "Omogočeno" -#: panels/user-accounts/um-fingerprint-dialog.c:259 +#: panels/user-accounts/um-fingerprint-dialog.c:334 msgid "Delete registered fingerprints?" msgstr "Ali naj bodo izbrisani obstoječi prstni odtisi?" -#: panels/user-accounts/um-fingerprint-dialog.c:263 +#: panels/user-accounts/um-fingerprint-dialog.c:338 msgid "_Delete Fingerprints" msgstr "_Izbriši prstne odtise" -#: panels/user-accounts/um-fingerprint-dialog.c:269 +#: panels/user-accounts/um-fingerprint-dialog.c:344 msgid "" "Do you want to delete your registered fingerprints so fingerprint login is " "disabled?" @@ -7931,15 +7839,15 @@ "Ali želite izbrisati obstoječe prstne odtise in onemogočiti tak način " "prijave?" -#: panels/user-accounts/um-fingerprint-dialog.c:439 +#: panels/user-accounts/um-fingerprint-dialog.c:526 msgid "Done!" msgstr "Končano!" #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: panels/user-accounts/um-fingerprint-dialog.c:500 -#: panels/user-accounts/um-fingerprint-dialog.c:542 +#: panels/user-accounts/um-fingerprint-dialog.c:588 +#: panels/user-accounts/um-fingerprint-dialog.c:630 #, c-format msgid "Could not access “%s” device" msgstr "Dostop do naprave »%s« ni mogoč." @@ -7947,16 +7855,16 @@ #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: panels/user-accounts/um-fingerprint-dialog.c:583 +#: panels/user-accounts/um-fingerprint-dialog.c:677 #, c-format msgid "Could not start finger capture on “%s” device" msgstr "Ni mogoče začeti z branjem prstnih odtisov na napravi »%s«" -#: panels/user-accounts/um-fingerprint-dialog.c:627 +#: panels/user-accounts/um-fingerprint-dialog.c:724 msgid "Could not access any fingerprint readers" msgstr "Ni mogoč dostop do bralnikov prstnih odtisov" -#: panels/user-accounts/um-fingerprint-dialog.c:628 +#: panels/user-accounts/um-fingerprint-dialog.c:725 msgid "Please contact your system administrator for help." msgstr "Za pomoč se obrnite na skrbnika." @@ -7965,7 +7873,7 @@ #. * "To enable fingerprint login, you need to save one of your fingerprints, using the #. * 'Digital Persona U.are.U 4000/4000B' device." #. -#: panels/user-accounts/um-fingerprint-dialog.c:710 +#: panels/user-accounts/um-fingerprint-dialog.c:809 #, c-format msgid "" "To enable fingerprint login, you need to save one of your fingerprints, " @@ -7974,11 +7882,11 @@ "Za prijavo s prstnim odtisom, je treba najprej shraniti vaš prstni odtis z " "uporabo naprave »%s«." -#: panels/user-accounts/um-fingerprint-dialog.c:717 +#: panels/user-accounts/um-fingerprint-dialog.c:816 msgid "Selecting finger" msgstr "Izbor prsta" -#: panels/user-accounts/um-fingerprint-dialog.c:718 +#: panels/user-accounts/um-fingerprint-dialog.c:817 msgid "Enrolling fingerprints" msgstr "Vpisovanje prstnih odtisov" @@ -8166,10 +8074,8 @@ msgstr "Prilagodi ločljivost zaslona" #: panels/wacom/gnome-wacom-properties.ui:376 -#, fuzzy -#| msgid "_Detect Displays" msgid "Decouple Display" -msgstr "_Zaznaj zaslone" +msgstr "Loči zaslon" #: panels/wacom/gsd-wacom-key-shortcut-button.c:217 msgid "New shortcut…" @@ -8257,7 +8163,7 @@ #: shell/cc-application.c:61 msgid "List possible panel names and exit" -msgstr "Izpiši imena pultov in končaj" +msgstr "Izpiši možna imena pultov in končaj" #: shell/cc-application.c:62 msgid "Panel to display" @@ -8273,7 +8179,7 @@ #: shell/cc-panel-loader.c:288 msgid "Available panels:" -msgstr "Pulti na voljo:" +msgstr "Razpoložljivi pulti:" #: shell/cc-window.ui:140 msgid "All Settings" @@ -8314,7 +8220,7 @@ #: shell/help-overlay.ui:20 msgctxt "shortcut window" msgid "Quit" -msgstr "Končaj" +msgstr "Konča program" #: shell/help-overlay.ui:27 shell/help-overlay.ui:48 msgctxt "shortcut window" @@ -8324,29 +8230,29 @@ #: shell/help-overlay.ui:35 msgctxt "shortcut window" msgid "Panels" -msgstr "Okna" +msgstr "Pulti" #: shell/help-overlay.ui:40 msgctxt "shortcut window" msgid "Go back to previous panel" -msgstr "Pokaži predhodno okno" +msgstr "Pokaže predhodni pult" #: shell/help-overlay.ui:53 msgctxt "shortcut window" msgid "Cancel search" -msgstr "Prekliči iskanje" +msgstr "Prekliče iskanje" #: shell/org.gnome.ControlCenter.gschema.xml:5 msgid "The identifier for the last Settings panel to be opened" -msgstr "Določilnik za odpiranje zadnjega pladnja Nastavitev." +msgstr "Določilnik za odpiranje zadnjega pulta Nastavitev." #: shell/org.gnome.ControlCenter.gschema.xml:6 msgid "" "The identifier for the last Settings panel to be opened. Unrecognised values " "will be ignored and the first panel in the list selected." msgstr "" -"Določilnik za odpiranje zadnjega pladnja Nastavitev. Neprepoznane vrednosti " -"so prezrte, za prikaz pa je izbran prvi pladenj na seznamu." +"Določilnik za odpiranje zadnjega pulta Nastavitev. Neprepoznane vrednosti so " +"prezrte, za prikaz pa je izbran prvi pult seznama." #: shell/org.gnome.ControlCenter.gschema.xml:13 msgid "Show warning when running a development build of Settings" diff -Nru gnome-control-center-3.36.4/po/zh_CN.po gnome-control-center-3.36.5/po/zh_CN.po --- gnome-control-center-3.36.4/po/zh_CN.po 2020-07-03 05:10:58.037431700 +0000 +++ gnome-control-center-3.36.5/po/zh_CN.po 2020-11-20 00:57:42.796798200 +0000 @@ -32,8 +32,8 @@ "Project-Id-Version: gnome-control-center master\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-control-center/" "issues\n" -"POT-Creation-Date: 2019-09-07 14:25+0000\n" -"PO-Revision-Date: 2019-09-10 01:47+0800\n" +"POT-Creation-Date: 2020-08-26 19:20+0000\n" +"PO-Revision-Date: 2020-08-30 10:44-0400\n" "Last-Translator: Dingzhong Chen \n" "Language-Team: Chinese (China) \n" "Language: zh_CN\n" @@ -41,72 +41,73 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Gtranslator 3.32.1\n" +"X-Generator: Poedit 2.4.1\n" -#: panels/applications/cc-applications-panel.c:561 +#: panels/applications/cc-applications-panel.c:741 msgid "System Bus" msgstr "系统总线" -#: panels/applications/cc-applications-panel.c:561 -#: panels/applications/cc-applications-panel.c:563 -#: panels/applications/cc-applications-panel.c:579 -#: panels/applications/cc-applications-panel.c:584 +#: panels/applications/cc-applications-panel.c:741 +#: panels/applications/cc-applications-panel.c:743 +#: panels/applications/cc-applications-panel.c:756 +#: panels/applications/cc-applications-panel.c:761 msgid "Full access" msgstr "完全访问" -#: panels/applications/cc-applications-panel.c:563 +#: panels/applications/cc-applications-panel.c:743 msgid "Session Bus" msgstr "会话总线" -#: panels/applications/cc-applications-panel.c:568 -#: panels/power/cc-power-panel.c:2477 panels/thunderbolt/cc-bolt-panel.ui:466 -#: panels/thunderbolt/cc-bolt-panel.ui:525 shell/cc-panel-list.ui:45 -#: shell/cc-window.c:273 +#: panels/applications/cc-applications-panel.c:747 +#: panels/power/cc-power-panel.c:2472 panels/thunderbolt/cc-bolt-panel.ui:466 +#: panels/thunderbolt/cc-bolt-panel.ui:525 msgid "Devices" msgstr "设备" -#: panels/applications/cc-applications-panel.c:568 +#: panels/applications/cc-applications-panel.c:747 msgid "Full access to /dev" msgstr "对 /dev 的完全访问" -#: panels/applications/cc-applications-panel.c:573 +#: panels/applications/cc-applications-panel.c:751 #: panels/network/gnome-network-panel.desktop.in.in:3 -#: panels/network/network-mobile.ui:241 +#: panels/network/network-mobile.ui:252 msgid "Network" msgstr "网络" -#: panels/applications/cc-applications-panel.c:573 +#: panels/applications/cc-applications-panel.c:751 +#: panels/applications/cc-snap-row.c:109 msgid "Has network access" msgstr "拥有网络访问" -#: panels/applications/cc-applications-panel.c:579 -#: panels/applications/cc-applications-panel.c:581 -#: panels/search/cc-search-locations-dialog.c:292 +#: panels/applications/cc-applications-panel.c:756 +#: panels/applications/cc-applications-panel.c:758 +#: panels/search/cc-search-locations-dialog.c:361 msgid "Home" msgstr "主目录" -#: panels/applications/cc-applications-panel.c:581 -#: panels/applications/cc-applications-panel.c:586 +#: panels/applications/cc-applications-panel.c:758 +#: panels/applications/cc-applications-panel.c:763 msgid "Read-only" msgstr "只读" -#: panels/applications/cc-applications-panel.c:584 -#: panels/applications/cc-applications-panel.c:586 +#: panels/applications/cc-applications-panel.c:761 +#: panels/applications/cc-applications-panel.c:763 msgid "File System" msgstr "文件系统" -#: panels/applications/cc-applications-panel.c:591 -#: panels/keyboard/01-launchers.xml.in:6 shell/cc-window.c:277 -#: shell/cc-window.c:975 shell/cc-window.ui:132 +#: panels/applications/cc-applications-panel.c:767 +#: panels/keyboard/01-launchers.xml.in:6 shell/cc-window.c:281 +#: shell/cc-window.c:964 shell/cc-window.ui:125 #: shell/gnome-control-center.desktop.in.in:3 msgid "Settings" msgstr "设置" -#: panels/applications/cc-applications-panel.c:591 +#: panels/applications/cc-applications-panel.c:767 +#: panels/applications/cc-snap-row.c:73 msgid "Can change settings" msgstr "可以修改设置" -#: panels/applications/cc-applications-panel.c:596 +#: panels/applications/cc-applications-panel.c:769 #, c-format msgid "" "%s has the following permissions built-in. These cannot be altered. If you " @@ -115,70 +116,69 @@ "%s 拥有以下内置权限。这些无法被更改。如果您在意这些权限，请考虑移除该应用程" "序。" -#: panels/applications/cc-applications-panel.c:738 +#: panels/applications/cc-applications-panel.c:930 msgid "Web Links" msgstr "Web 链接" -#: panels/applications/cc-applications-panel.c:748 +#: panels/applications/cc-applications-panel.c:940 msgid "Git Links" msgstr "Git 链接" -#: panels/applications/cc-applications-panel.c:754 +#: panels/applications/cc-applications-panel.c:946 #, c-format msgid "%s Links" msgstr "%s 链接" -#: panels/applications/cc-applications-panel.c:762 -#: panels/applications/cc-applications-panel.c:798 +#: panels/applications/cc-applications-panel.c:954 +#: panels/applications/cc-applications-panel.c:990 msgid "Unset" -msgstr "未设置" +msgstr "移除关联" -#: panels/applications/cc-applications-panel.c:853 +#: panels/applications/cc-applications-panel.c:1045 msgid "Links" msgstr "链接" -#: panels/applications/cc-applications-panel.c:861 +#: panels/applications/cc-applications-panel.c:1053 msgid "Hypertext Files" msgstr "超文本文件" -#: panels/applications/cc-applications-panel.c:875 +#: panels/applications/cc-applications-panel.c:1067 msgid "Text Files" msgstr "文本文件" -#: panels/applications/cc-applications-panel.c:889 +#: panels/applications/cc-applications-panel.c:1081 msgid "Image Files" msgstr "图像文件" -#: panels/applications/cc-applications-panel.c:905 +#: panels/applications/cc-applications-panel.c:1097 msgid "Font Files" msgstr "字体文件" -#: panels/applications/cc-applications-panel.c:966 +#: panels/applications/cc-applications-panel.c:1158 msgid "Archive Files" msgstr "归档文件" -#: panels/applications/cc-applications-panel.c:986 +#: panels/applications/cc-applications-panel.c:1178 msgid "Package Files" msgstr "软件包文件" -#: panels/applications/cc-applications-panel.c:1009 +#: panels/applications/cc-applications-panel.c:1201 msgid "Audio Files" msgstr "音频文件" -#: panels/applications/cc-applications-panel.c:1026 +#: panels/applications/cc-applications-panel.c:1218 msgid "Video Files" msgstr "视频文件" -#: panels/applications/cc-applications-panel.c:1034 +#: panels/applications/cc-applications-panel.c:1226 msgid "Other Files" msgstr "其它文件" #. List of applications. -#: panels/applications/cc-applications-panel.c:1376 -#: panels/applications/cc-applications-panel.ui:406 +#: panels/applications/cc-applications-panel.c:1568 +#: panels/applications/cc-applications-panel.ui:418 #: panels/applications/gnome-applications-panel.desktop.in.in:3 #: panels/notifications/cc-notifications-panel.ui:167 -#: panels/privacy/cc-privacy-panel.ui:1085 msgid "Applications" msgstr "应用程序" @@ -202,7 +202,7 @@ #: panels/applications/cc-applications-panel.ui:126 #: panels/applications/cc-applications-panel.ui:132 -#: panels/privacy/cc-privacy-panel.c:908 panels/privacy/cc-privacy-panel.ui:745 +#: panels/camera/gnome-camera-panel.desktop.in.in:3 msgid "Camera" msgstr "相机" @@ -215,31 +215,30 @@ #: panels/applications/cc-applications-panel.ui:145 #: panels/applications/cc-applications-panel.ui:157 #: panels/applications/cc-applications-panel.ui:237 -#: panels/applications/cc-applications-panel.ui:255 +#: panels/applications/cc-applications-panel.ui:267 #: panels/keyboard/cc-keyboard-option.c:259 #: panels/keyboard/cc-keyboard-option.c:378 -#: panels/keyboard/keyboard-shortcuts.c:425 -#: panels/keyboard/shortcut-editor.ui:96 panels/network/network-proxy.ui:123 -#: panels/network/network-wifi.ui:781 panels/network/network-wifi.ui:1058 -#: panels/user-accounts/um-fingerprint-dialog.c:211 +#: panels/keyboard/cc-keyboard-shortcut-editor.ui:96 +#: panels/keyboard/keyboard-shortcuts.c:425 panels/network/network-proxy.ui:126 +#: panels/user-accounts/um-fingerprint-dialog.c:219 #: subprojects/gvc/gvc-mixer-control.c:1876 msgid "Disabled" msgstr "已禁用" #: panels/applications/cc-applications-panel.ui:138 #: panels/applications/cc-applications-panel.ui:144 -#: panels/privacy/cc-privacy-panel.c:941 panels/privacy/cc-privacy-panel.ui:850 +#: panels/microphone/gnome-microphone-panel.desktop.in.in:3 msgid "Microphone" msgstr "麦克风" #: panels/applications/cc-applications-panel.ui:150 #: panels/applications/cc-applications-panel.ui:156 -#: panels/privacy/cc-privacy-panel.c:850 panels/privacy/cc-privacy-panel.ui:955 +#: panels/location/gnome-location-panel.desktop.in.in:3 msgid "Location Services" msgstr "定位服务" #: panels/applications/cc-applications-panel.ui:162 -#: panels/applications/cc-applications-panel.ui:489 +#: panels/applications/cc-applications-panel.ui:501 msgid "Built-in Permissions" msgstr "内置权限" @@ -265,7 +264,7 @@ #: panels/applications/cc-applications-panel.ui:230 #: panels/applications/cc-applications-panel.ui:236 #: panels/keyboard/01-launchers.xml.in:16 -#: panels/search/gnome-search-panel.desktop.in.in:3 shell/cc-window.ui:162 +#: panels/search/gnome-search-panel.desktop.in.in:3 shell/cc-window.ui:155 msgid "Search" msgstr "搜索" @@ -275,73 +274,307 @@ msgstr "通知" #: panels/applications/cc-applications-panel.ui:248 +msgid "Run in background" +msgstr "后台运行" + #: panels/applications/cc-applications-panel.ui:254 +msgid "Set Desktop Background" +msgstr "设置桌面背景" + +#: panels/applications/cc-applications-panel.ui:260 +#: panels/applications/cc-applications-panel.ui:266 msgid "Sounds" msgstr "声音" -#: panels/applications/cc-applications-panel.ui:287 +#: panels/applications/cc-applications-panel.ui:299 msgid "Default Handlers" msgstr "默认处理程序" -#: panels/applications/cc-applications-panel.ui:299 +#: panels/applications/cc-applications-panel.ui:311 msgid "Types of files and links that this application opens." msgstr "应用程序打开的文件和链接类型。" -#: panels/applications/cc-applications-panel.ui:315 +#: panels/applications/cc-applications-panel.ui:327 msgid "Reset" msgstr "重置" -#: panels/applications/cc-applications-panel.ui:351 +#: panels/applications/cc-applications-panel.ui:363 msgid "Usage" msgstr "占用" -#: panels/applications/cc-applications-panel.ui:363 +#: panels/applications/cc-applications-panel.ui:375 msgid "How much resources this application is using." msgstr "应用程序使用了多少资源。" -#: panels/applications/cc-applications-panel.ui:378 -#: panels/applications/cc-applications-panel.ui:525 +#: panels/applications/cc-applications-panel.ui:390 +#: panels/applications/cc-applications-panel.ui:537 msgid "Storage" msgstr "存储" -#: panels/applications/cc-applications-panel.ui:413 +#: panels/applications/cc-applications-panel.ui:425 msgid "Open in Software" msgstr "在“软件”中打开" -#: panels/applications/cc-applications-panel.ui:463 shell/cc-panel-list.ui:190 +#: panels/applications/cc-applications-panel.ui:475 shell/cc-panel-list.ui:121 msgid "No results found" msgstr "未找到结果" -#: panels/applications/cc-applications-panel.ui:474 -#: panels/keyboard/cc-keyboard-panel.ui:157 shell/cc-panel-list.ui:201 +#: panels/applications/cc-applications-panel.ui:486 +#: panels/keyboard/cc-keyboard-panel.ui:188 shell/cc-panel-list.ui:132 msgid "Try a different search" msgstr "尝试不同的搜索" -#: panels/applications/cc-applications-panel.ui:542 +#: panels/applications/cc-applications-panel.ui:554 msgid "" "How much disk space this application is occupying with app data and caches." msgstr "此应用程序包括应用数据和缓存占用了多少硬盘空间。" -#: panels/applications/cc-applications-panel.ui:551 +#: panels/applications/cc-applications-panel.ui:563 msgid "Application" msgstr "应用程序" -#: panels/applications/cc-applications-panel.ui:557 +#: panels/applications/cc-applications-panel.ui:569 msgid "Data" msgstr "数据" -#: panels/applications/cc-applications-panel.ui:563 +#: panels/applications/cc-applications-panel.ui:575 msgid "Cache" msgstr "缓存" -#: panels/applications/cc-applications-panel.ui:569 +#: panels/applications/cc-applications-panel.ui:581 msgid "Total" msgstr "全部" -#: panels/applications/cc-applications-panel.ui:586 +#: panels/applications/cc-applications-panel.ui:598 msgid "Clear Cache…" msgstr "清空缓存…" +#: panels/applications/cc-snap-row.c:55 +msgid "Add user accounts and change passwords" +msgstr "添加用户及更改密码" + +#: panels/applications/cc-snap-row.c:57 panels/applications/cc-snap-row.c:133 +msgid "Play and record sound" +msgstr "播放和录制声音" + +#: panels/applications/cc-snap-row.c:59 +msgid "Detect network devices using mDNS/DNS-SD (Bonjour/zeroconf)" +msgstr "使用mDNS / DNS-SD（Bonjour / zeroconf）检测网络设备" + +#: panels/applications/cc-snap-row.c:61 +msgid "Access bluetooth hardware directly" +msgstr "直接访问蓝牙硬件" + +#: panels/applications/cc-snap-row.c:63 +msgid "Use bluetooth devices" +msgstr "使用蓝牙设备" + +#: panels/applications/cc-snap-row.c:65 +msgid "Use your camera" +msgstr "使用相机" + +#: panels/applications/cc-snap-row.c:67 +msgid "Print documents" +msgstr "打印文档" + +#: panels/applications/cc-snap-row.c:69 +msgid "Use any connected joystick" +msgstr "使用任何连接的操纵杆" + +#: panels/applications/cc-snap-row.c:71 +msgid "Allow connecting to the Docker service" +msgstr "允许连接Docker服务" + +#: panels/applications/cc-snap-row.c:75 +msgid "Configure network firewall" +msgstr "配置网络防火墙" + +#: panels/applications/cc-snap-row.c:77 +msgid "Setup and use privileged FUSE filesystems" +msgstr "设置和使用特权FUSE文件系统" + +#: panels/applications/cc-snap-row.c:79 +msgid "Update firmware on this device" +msgstr "更新此设备上的固件" + +#: panels/applications/cc-snap-row.c:81 +msgid "Access hardware information" +msgstr "访问硬件信息" + +#: panels/applications/cc-snap-row.c:83 +msgid "Provide entropy to hardware random number generator" +msgstr "向硬件随机数生成器提供熵" + +#: panels/applications/cc-snap-row.c:85 +msgid "Use hardware-generated random numbers" +msgstr "使用硬件生成的随机数" + +#: panels/applications/cc-snap-row.c:87 +msgid "Access files in your home folder" +msgstr "访问主文件夹中的文件" + +#: panels/applications/cc-snap-row.c:89 +msgid "Access libvirt service" +msgstr "访问libvirt服务" + +#: panels/applications/cc-snap-row.c:91 +msgid "Change system language and region settings" +msgstr "更改系统语言与区域设置" + +#: panels/applications/cc-snap-row.c:93 +msgid "Change location settings and providers" +msgstr "更改位置设置和提供者" + +#: panels/applications/cc-snap-row.c:95 +msgid "Access your location" +msgstr "读取位置" + +#: panels/applications/cc-snap-row.c:97 +msgid "Read system and application logs" +msgstr "读取系统和应用程序日志" + +#: panels/applications/cc-snap-row.c:99 +msgid "Access LXD service" +msgstr "访问LXD服务" + +#: panels/applications/cc-snap-row.c:101 +msgid "access the media-hub service" +msgstr "访问媒体中心服务" + +#: panels/applications/cc-snap-row.c:103 +msgid "Use and configure modems" +msgstr "使用和配置调制解调器" + +#: panels/applications/cc-snap-row.c:105 +msgid "Read system mount information and disk quotas" +msgstr "阅读系统挂载信息和磁盘配额" + +#: panels/applications/cc-snap-row.c:107 +msgid "Control music and video players" +msgstr "控制音视频播放器" + +#: panels/applications/cc-snap-row.c:111 +msgid "Change low-level network settings" +msgstr "更改底层网络设置" + +#: panels/applications/cc-snap-row.c:113 +msgid "Access the NetworkManager service to read and change network settings" +msgstr "访问NetworkManager服务以读取和更改网络设置" + +#: panels/applications/cc-snap-row.c:115 +msgid "Read access to network settings" +msgstr "对网络设置的读取权限" + +#: panels/applications/cc-snap-row.c:117 +msgid "Change network settings" +msgstr "更改网络设置" + +#: panels/applications/cc-snap-row.c:119 +msgid "Read network settings" +msgstr "读取网络设置" + +#: panels/applications/cc-snap-row.c:121 +msgid "" +"Access the ofono service to read and change network settings for mobile " +"telephony" +msgstr "" + +#: panels/applications/cc-snap-row.c:123 +msgid "Control Open vSwitch hardware" +msgstr "" + +#: panels/applications/cc-snap-row.c:125 +msgid "Read from CD/DVD" +msgstr "" + +#: panels/applications/cc-snap-row.c:127 +msgid "Read, add, change, or remove saved passwords" +msgstr "" + +#: panels/applications/cc-snap-row.c:129 +msgid "" +"Access pppd and ppp devices for configuring Point-to-Point Protocol " +"connections" +msgstr "" + +#: panels/applications/cc-snap-row.c:131 +msgid "Pause or end any process on the system" +msgstr "" + +#: panels/applications/cc-snap-row.c:135 +msgid "Access USB hardware directly" +msgstr "" + +#: panels/applications/cc-snap-row.c:137 +msgid "Read/write files on removable storage devices" +msgstr "" + +#: panels/applications/cc-snap-row.c:139 +msgid "Prevent screen sleep/lock" +msgstr "" + +#: panels/applications/cc-snap-row.c:141 +msgid "Access serial port hardware" +msgstr "" + +#: panels/applications/cc-snap-row.c:143 +msgid "Restart or power off the device" +msgstr "" + +#: panels/applications/cc-snap-row.c:145 +msgid "Install, remove and configure software" +msgstr "" + +#: panels/applications/cc-snap-row.c:147 +msgid "Access Storage Framework service" +msgstr "" + +#: panels/applications/cc-snap-row.c:149 +msgid "Read process and system information" +msgstr "" + +#: panels/applications/cc-snap-row.c:151 +msgid "Monitor and control any running program" +msgstr "" + +#: panels/applications/cc-snap-row.c:153 +#, fuzzy +#| msgid "Change the date and time, including time zone" +msgid "Change the date and time" +msgstr "改变日期、时间和时区" + +#: panels/applications/cc-snap-row.c:155 +#, fuzzy +#| msgid "Change system time and date settings" +msgid "Change time server settings" +msgstr "更改系统时间和日期设置" + +#: panels/applications/cc-snap-row.c:157 +#, fuzzy +#| msgid "Change the date and time, including time zone" +msgid "Change the time zone" +msgstr "改变日期、时间和时区" + +#: panels/applications/cc-snap-row.c:159 +msgid "Access the UDisks2 service for configuring disks and removable media" +msgstr "" + +#: panels/applications/cc-snap-row.c:161 +msgid "Read/change shared calendar events in Ubuntu Unity 8" +msgstr "" + +#: panels/applications/cc-snap-row.c:163 +msgid "Read/change shared contacts in Ubuntu Unity 8" +msgstr "" + +#: panels/applications/cc-snap-row.c:165 +msgid "Access energy usage data" +msgstr "" + +#: panels/applications/cc-snap-row.c:167 +msgid "Read/write access to U2F devices exposed" +msgstr "" + #: panels/applications/gnome-applications-panel.desktop.in.in:4 msgid "Control various application permissions and settings" msgstr "控制不同应用程序权限和设置" @@ -352,61 +585,45 @@ msgid "application;flatpak;permission;setting;" msgstr "application;flatpak;permission;setting;应用程序;权限;设置;" -#: panels/background/cc-background-chooser.c:348 +#: panels/background/cc-background-chooser.c:346 msgid "Select a picture" msgstr "选择图片" -#: panels/background/cc-background-chooser.c:351 -#: panels/color/cc-color-panel.c:241 panels/color/cc-color-panel.c:894 -#: panels/color/cc-color-panel.ui:657 panels/color/color-calibrate.ui:25 +#: panels/background/cc-background-chooser.c:349 +#: panels/color/cc-color-calibrate.ui:25 panels/color/cc-color-panel.c:240 +#: panels/color/cc-color-panel.c:893 panels/color/cc-color-panel.ui:657 #: panels/common/cc-language-chooser.ui:24 -#: panels/display/cc-display-panel.c:950 +#: panels/display/cc-display-panel.c:947 +#: panels/info-overview/cc-info-overview-panel.ui:236 +#: panels/network/cc-wifi-hotspot-dialog.ui:122 #: panels/network/connection-editor/connection-editor.ui:17 -#: panels/network/connection-editor/vpn-helpers.c:181 -#: panels/network/connection-editor/vpn-helpers.c:310 -#: panels/network/net-device-wifi.c:1260 panels/network/net-device-wifi.c:1340 -#: panels/network/net-device-wifi.c:1561 panels/network/network-wifi.ui:24 +#: panels/network/connection-editor/vpn-helpers.c:176 +#: panels/network/connection-editor/vpn-helpers.c:299 +#: panels/network/net-device-wifi.c:800 panels/network/net-device-wifi.c:908 #: panels/printers/new-printer-dialog.ui:45 -#: panels/printers/pp-details-dialog.c:313 -#: panels/privacy/cc-privacy-panel.c:1137 panels/region/cc-format-chooser.ui:24 -#: panels/region/cc-input-chooser.ui:11 -#: panels/search/cc-search-locations-dialog.c:613 -#: panels/sharing/cc-sharing-panel.c:428 +#: panels/printers/pp-details-dialog.c:252 +#: panels/region/cc-format-chooser.ui:28 panels/region/cc-input-chooser.ui:11 +#: panels/search/cc-search-locations-dialog.c:638 +#: panels/sharing/cc-sharing-panel.c:410 panels/usage/cc-usage-panel.c:134 #: panels/user-accounts/cc-add-user-dialog.ui:28 #: panels/user-accounts/cc-avatar-chooser.c:107 #: panels/user-accounts/cc-avatar-chooser.c:235 #: panels/user-accounts/cc-password-dialog.ui:20 -#: panels/user-accounts/cc-user-panel.c:641 -#: panels/user-accounts/cc-user-panel.c:659 +#: panels/user-accounts/cc-user-panel.c:638 +#: panels/user-accounts/cc-user-panel.c:656 #: panels/user-accounts/data/join-dialog.ui:20 -#: panels/user-accounts/um-fingerprint-dialog.c:261 +#: panels/user-accounts/um-fingerprint-dialog.c:335 msgid "_Cancel" msgstr "取消(_C)" -#: panels/background/cc-background-chooser.c:352 -#: panels/network/connection-editor/vpn-helpers.c:182 -#: panels/printers/pp-details-dialog.c:314 -#: panels/sharing/cc-sharing-panel.c:429 +#: panels/background/cc-background-chooser.c:350 +#: panels/network/connection-editor/vpn-helpers.c:177 +#: panels/printers/pp-details-dialog.c:253 +#: panels/sharing/cc-sharing-panel.c:411 #: panels/user-accounts/cc-avatar-chooser.c:236 msgid "_Open" msgstr "打开(_O)" -#: panels/background/cc-background-chooser.ui:104 -msgid "Set Background and Lock Screen" -msgstr "设定背景和锁屏" - -#: panels/background/cc-background-chooser.ui:114 -msgid "Set Background" -msgstr "设定背景" - -#: panels/background/cc-background-chooser.ui:121 -msgid "Set Lock Screen" -msgstr "设定锁屏" - -#: panels/background/cc-background-chooser.ui:143 -msgid "Remove Background" -msgstr "移除背景" - #: panels/background/cc-background-item.c:140 msgid "multiple sizes" msgstr "多个尺寸" @@ -418,15 +635,15 @@ msgid "%d × %d" msgstr "%d × %d" -#: panels/background/cc-background-item.c:278 +#: panels/background/cc-background-item.c:282 msgid "No Desktop Background" msgstr "无桌面背景" -#: panels/background/cc-background-panel.c:145 +#: panels/background/cc-background-panel.c:115 msgid "Current background" msgstr "当前背景" -#: panels/background/cc-background-panel.ui:63 +#: panels/background/cc-background-panel.ui:55 msgid "Add Picture…" msgstr "添加图片…" @@ -447,45 +664,45 @@ msgid "Wallpaper;Screen;Desktop;" msgstr "Wallpaper;Screen;Desktop;壁纸;墙纸;屏幕;桌面;背景;" -#: panels/bluetooth/cc-bluetooth-panel.c:309 +#: panels/bluetooth/cc-bluetooth-panel.ui:31 msgid "No Bluetooth Found" msgstr "未找到蓝牙" -#: panels/bluetooth/cc-bluetooth-panel.c:310 +#: panels/bluetooth/cc-bluetooth-panel.ui:42 msgid "Plug in a dongle to use Bluetooth." msgstr "插入蓝牙适配器以使用蓝牙。" -#: panels/bluetooth/cc-bluetooth-panel.c:313 +#: panels/bluetooth/cc-bluetooth-panel.ui:69 msgid "Bluetooth Turned Off" msgstr "蓝牙已关闭" -#: panels/bluetooth/cc-bluetooth-panel.c:314 +#: panels/bluetooth/cc-bluetooth-panel.ui:80 msgid "Turn on to connect devices and receive file transfers." msgstr "打开以连接设备和接收文件传送。" -#: panels/bluetooth/cc-bluetooth-panel.c:317 +#: panels/bluetooth/cc-bluetooth-panel.ui:107 msgid "Airplane Mode is on" msgstr "飞行模式已打开" -#: panels/bluetooth/cc-bluetooth-panel.c:318 +#: panels/bluetooth/cc-bluetooth-panel.ui:118 msgid "Bluetooth is disabled when airplane mode is on." msgstr "蓝牙已禁用当开启飞行模式时。" -#: panels/bluetooth/cc-bluetooth-panel.c:321 +#: panels/bluetooth/cc-bluetooth-panel.ui:124 +msgid "Turn Off Airplane Mode" +msgstr "关闭飞行模式" + +#: panels/bluetooth/cc-bluetooth-panel.ui:154 msgid "Hardware Airplane Mode is on" msgstr "硬件飞行模式已打开" -#: panels/bluetooth/cc-bluetooth-panel.c:322 +#: panels/bluetooth/cc-bluetooth-panel.ui:165 msgid "Turn off the Airplane mode switch to enable Bluetooth." msgstr "关闭飞行模式开关以开启蓝牙。" -#: panels/bluetooth/cc-bluetooth-panel.c:324 -msgid "Turn Off Airplane Mode" -msgstr "关闭飞行模式" - #. Translators: The found device is a printer connected via Bluetooth #: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:3 -#: panels/printers/pp-new-printer-dialog.c:1697 +#: panels/printers/pp-new-printer-dialog.c:1714 msgid "Bluetooth" msgstr "蓝牙" @@ -498,6 +715,50 @@ msgid "share;sharing;bluetooth;obex;" msgstr "share;sharing;bluetooth;obex;分享;共享;蓝牙;" +#: panels/camera/cc-camera-panel.ui:34 +msgid "Camera is turned off" +msgstr "相机已关闭" + +#: panels/camera/cc-camera-panel.ui:43 +msgid "No applications can capture photos or video." +msgstr "没有应用程序可以捕获照片或视频。" + +#: panels/camera/cc-camera-panel.ui:77 +msgid "" +"Use of the camera allows applications to capture photos and video. Disabling " +"the camera may cause some applications to not function properly." +msgstr "" +"使用相机允许应用程序拍摄照片和视频。禁用相机可能会导致一些应用程序功能无法正" +"常使用。" + +#: panels/camera/cc-camera-panel.ui:87 +msgid "Allow the applications below to use your camera." +msgstr "允许以下应用程序使用您的相机。" + +#: panels/camera/cc-camera-panel.ui:107 +msgid "No Applications Have Asked for Camera Access" +msgstr "没有应用程序要求访问摄像头" + +#: panels/camera/gnome-camera-panel.desktop.in.in:4 +msgid "Protect your pictures" +msgstr "保护您的图片" + +#. FIXME +#. Translators: Search terms to find the Privacy panel. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! +#: panels/camera/gnome-camera-panel.desktop.in.in:20 +#: panels/diagnostics/gnome-diagnostics-panel.desktop.in.in:20 +#: panels/location/gnome-location-panel.desktop.in.in:20 +#: panels/lock/gnome-lock-panel.desktop.in.in:20 +#: panels/microphone/gnome-microphone-panel.desktop.in.in:20 +#: panels/usage/gnome-usage-panel.desktop.in.in:20 +msgid "" +"screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;" +"network;identity;" +msgstr "" +"screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;" +"network;identity;屏幕;锁;诊断;崩溃;私;最近;临时;索引;名称;网络;认证;标志;身" +"份;" + #. TRANSLATORS: The user has to attach the sensor to the screen #: panels/color/cc-color-calibrate.c:348 msgid "Place your calibration device over the square and press “Start”" @@ -573,6 +834,25 @@ msgid "Do not disturb the calibration device while in progress" msgstr "校准过程中不要干扰校准设备" +#: panels/color/cc-color-calibrate.ui:7 +msgid "Display Calibration" +msgstr "显示校准" + +#. This starts the calibration process +#: panels/color/cc-color-calibrate.ui:40 +msgid "_Start" +msgstr "开始(_S)" + +#. This resumes the calibration process +#: panels/color/cc-color-calibrate.ui:54 +msgid "_Resume" +msgstr "恢复(_R)" + +#. This button returns the user back to the color control panel +#: panels/color/cc-color-calibrate.ui:67 panels/region/cc-format-chooser.ui:64 +msgid "_Done" +msgstr "完成(_D)" + #. TRANSLATORS: This refers to the TFT display on a laptop #: panels/color/cc-color-common.c:41 msgid "Laptop Screen" @@ -631,48 +911,48 @@ #. TRANSLATORS: this is a profile prefix to signify the #. * profile has been auto-generated for this hardware -#: panels/color/cc-color-panel.c:170 +#: panels/color/cc-color-panel.c:169 msgid "Default: " msgstr "默认：" #. TRANSLATORS: this is a profile prefix to signify the #. * profile his a standard space like AdobeRGB -#: panels/color/cc-color-panel.c:178 +#: panels/color/cc-color-panel.c:177 msgid "Colorspace: " msgstr "色彩空间：" #. TRANSLATORS: this is a profile prefix to signify the #. * profile is a test profile -#: panels/color/cc-color-panel.c:185 +#: panels/color/cc-color-panel.c:184 msgid "Test profile: " msgstr "测试配置：" #. TRANSLATORS: an ICC profile is a file containing colorspace data -#: panels/color/cc-color-panel.c:239 +#: panels/color/cc-color-panel.c:238 msgid "Select ICC Profile File" msgstr "选择 ICC 配置文件" -#: panels/color/cc-color-panel.c:242 +#: panels/color/cc-color-panel.c:241 msgid "_Import" msgstr "导入(_I)" #. TRANSLATORS: filter name on the file->open dialog -#: panels/color/cc-color-panel.c:253 +#: panels/color/cc-color-panel.c:252 msgid "Supported ICC profiles" msgstr "支持的 ICC 配置" #. TRANSLATORS: filter name on the file->open dialog -#: panels/color/cc-color-panel.c:260 -#: panels/network/wireless-security/eap-method-fast.c:417 +#: panels/color/cc-color-panel.c:259 +#: panels/network/wireless-security/eap-method-fast.c:356 msgid "All files" msgstr "所有文件" -#: panels/color/cc-color-panel.c:555 +#: panels/color/cc-color-panel.c:554 msgid "Screen" msgstr "屏幕" #. TRANSLATORS: this is when the upload of the profile failed -#: panels/color/cc-color-panel.c:847 +#: panels/color/cc-color-panel.c:846 #, c-format msgid "Failed to upload file: %s" msgstr "上传文件失败：%s" @@ -680,51 +960,51 @@ #. TRANSLATORS: these are instructions on how to recover #. * the ICC profile on the native operating system and are #. * only shown when the user uses a LiveCD to calibrate -#: panels/color/cc-color-panel.c:859 +#: panels/color/cc-color-panel.c:858 msgid "The profile has been uploaded to:" msgstr "配置已上传到：" -#: panels/color/cc-color-panel.c:861 +#: panels/color/cc-color-panel.c:860 msgid "Write down this URL." msgstr "请记下此 URL。" -#: panels/color/cc-color-panel.c:862 +#: panels/color/cc-color-panel.c:861 msgid "Restart this computer and boot your normal operating system." msgstr "重启计算机并引导您日常使用的操作系统。" -#: panels/color/cc-color-panel.c:863 +#: panels/color/cc-color-panel.c:862 msgid "Type the URL into your browser to download and install the profile." msgstr "在浏览器中输入该 URL 以下载和安装该配置。" #. TRANSLATORS: this is the dialog to save the ICC profile -#: panels/color/cc-color-panel.c:891 +#: panels/color/cc-color-panel.c:890 msgid "Save Profile" msgstr "保存配置" -#: panels/color/cc-color-panel.c:895 -#: panels/network/connection-editor/vpn-helpers.c:311 +#: panels/color/cc-color-panel.c:894 +#: panels/network/connection-editor/vpn-helpers.c:300 msgid "_Save" msgstr "保存(_S)" #. TRANSLATORS: this is when the button is sensitive -#: panels/color/cc-color-panel.c:1209 +#: panels/color/cc-color-panel.c:1208 msgid "Create a color profile for the selected device" msgstr "为选中的设备创建一份色彩配置" #. TRANSLATORS: this is when the button is insensitive -#: panels/color/cc-color-panel.c:1224 panels/color/cc-color-panel.c:1248 +#: panels/color/cc-color-panel.c:1223 panels/color/cc-color-panel.c:1247 msgid "" "The measuring instrument is not detected. Please check it is turned on and " "correctly connected." msgstr "未检测到测量仪器，请检查仪器是否已打开并已正确连接。" #. TRANSLATORS: this is when the button is insensitive -#: panels/color/cc-color-panel.c:1258 +#: panels/color/cc-color-panel.c:1257 msgid "The measuring instrument does not support printer profiling." msgstr "测量仪器不支持打印机校正。" #. TRANSLATORS: this is when the button is insensitive -#: panels/color/cc-color-panel.c:1269 +#: panels/color/cc-color-panel.c:1268 msgid "The device type is not currently supported." msgstr "目前不支持此设备类型。" @@ -846,7 +1126,7 @@ "有所帮助。" #: panels/color/cc-color-panel.ui:607 -#: panels/user-accounts/um-fingerprint-dialog.c:720 +#: panels/user-accounts/um-fingerprint-dialog.c:818 msgid "Summary" msgstr "摘要" @@ -859,7 +1139,7 @@ msgstr "导入文件(_I)…" #: panels/color/cc-color-panel.ui:672 -#: panels/network/connection-editor/net-connection-editor.c:497 +#: panels/network/connection-editor/net-connection-editor.c:513 #: panels/printers/new-printer-dialog.ui:80 #: panels/region/cc-input-chooser.ui:20 #: panels/user-accounts/cc-add-user-dialog.ui:47 @@ -876,7 +1156,9 @@ msgid "Each device needs an up to date color profile to be color managed." msgstr "每个设备都需要一份最新色彩配置以进行色彩管理。" +#. translators: Text used in link to privacy policy #: panels/color/cc-color-panel.ui:812 +#: panels/diagnostics/cc-diagnostics-panel.c:143 msgid "Learn more" msgstr "了解更多" @@ -1084,25 +1366,6 @@ msgid "This profile may no longer be accurate" msgstr "此配置可能已不准确" -#: panels/color/color-calibrate.ui:7 -msgid "Display Calibration" -msgstr "显示校准" - -#. This starts the calibration process -#: panels/color/color-calibrate.ui:40 -msgid "_Start" -msgstr "开始(_S)" - -#. This resumes the calibration process -#: panels/color/color-calibrate.ui:54 -msgid "_Resume" -msgstr "恢复(_R)" - -#. This button returns the user back to the color control panel -#: panels/color/color-calibrate.ui:67 panels/region/cc-format-chooser.ui:13 -msgid "_Done" -msgstr "完成(_D)" - #: panels/color/gnome-color-panel.desktop.in.in:3 msgid "Color" msgstr "色彩" @@ -1122,12 +1385,11 @@ msgid "Other…" msgstr "其他…" -#: panels/common/cc-language-chooser.c:125 -#: panels/region/cc-format-chooser.c:296 panels/region/cc-input-chooser.c:178 +#: panels/common/cc-language-chooser.c:127 panels/region/cc-input-chooser.c:178 msgid "More…" msgstr "更多…" -#: panels/common/cc-language-chooser.c:142 +#: panels/common/cc-language-chooser.c:144 msgid "No languages found" msgstr "未找到语言" @@ -1139,13 +1401,25 @@ msgid "_Select" msgstr "选择(_S)" +#: panels/common/cc-permission-infobar.ui:20 +msgid "Unlock…" +msgstr "解锁…" + +#: panels/common/cc-permission-infobar.ui:45 +msgid "Unlock to Change Settings" +msgstr "解锁以更改设置" + +#: panels/common/cc-permission-infobar.ui:55 +msgid "Some settings must be unlocked before they can be changed." +msgstr "某些设置必须先解锁才能更改。" + #: panels/common/cc-util.c:127 -#: panels/network/connection-editor/ce-page-details.c:106 +#: panels/network/connection-editor/ce-page-details.c:152 msgid "Today" msgstr "今天" #: panels/common/cc-util.c:131 -#: panels/network/connection-editor/ce-page-details.c:108 +#: panels/network/connection-editor/ce-page-details.c:154 msgid "Yesterday" msgstr "昨天" @@ -1159,6 +1433,43 @@ msgid "%b %e, %Y" msgstr "%Y年%-m月%-d日" +#: panels/common/cc-util.c:165 +#, c-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%d 小时" + +#: panels/common/cc-util.c:166 +#, c-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d 分钟" + +#: panels/common/cc-util.c:167 +#, c-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "%d 秒" + +#. 5 hours 2 minutes 12 seconds +#: panels/common/cc-util.c:172 +#, c-format +msgctxt "time" +msgid "%s %s %s" +msgstr "%s %s %s" + +#. 2 minutes 12 seconds +#: panels/common/cc-util.c:177 +#, c-format +msgctxt "time" +msgid "%s %s" +msgstr "%s %s" + +#. 0 seconds +#: panels/common/cc-util.c:187 +msgid "0 seconds" +msgstr "0 秒" + #. translators: This is the default hotspot name, need to be less than 32-bytes #: panels/common/hostname-helper.c:177 msgctxt "hotspot" @@ -1360,21 +1671,83 @@ msgid "To change time or date settings, you need to authenticate." msgstr "修改时间或日期设置需要认证。" -#: panels/display/cc-display-panel.c:961 +#: panels/default-apps/cc-default-apps-panel.ui:31 +msgid "_Web" +msgstr "_Web" + +#: panels/default-apps/cc-default-apps-panel.ui:43 +msgid "_Mail" +msgstr "邮件(_M)" + +#: panels/default-apps/cc-default-apps-panel.ui:59 +msgid "_Calendar" +msgstr "日历(_C)" + +#: panels/default-apps/cc-default-apps-panel.ui:75 +msgid "M_usic" +msgstr "音乐(_U)" + +#: panels/default-apps/cc-default-apps-panel.ui:91 +msgid "_Video" +msgstr "视频(_V)" + +#: panels/default-apps/cc-default-apps-panel.ui:162 +#: panels/removable-media/cc-removable-media-panel.ui:162 +msgid "_Photos" +msgstr "照片(_P)" + +#: panels/default-apps/gnome-default-apps-panel.desktop.in.in:3 +msgid "Default Applications" +msgstr "默认应用程序" + +#: panels/default-apps/gnome-default-apps-panel.desktop.in.in:4 +msgid "Configure Default Applications" +msgstr "配置默认应用程序" + +#. Translators: Search terms to find the Default Applications panel. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! +#: panels/default-apps/gnome-default-apps-panel.desktop.in.in:19 +msgid "default;application;preferred;media;" +msgstr "default;application;preferred;media;默认;应用程序;首选;偏好;媒体;介质;" + +#. translators: The first '%s' is the distributor's name, such as 'Fedora', the second '%s' is a link to the privacy policy +#: panels/diagnostics/cc-diagnostics-panel.c:145 +#, c-format +msgid "" +"Sending reports of technical problems helps us improve %s. Reports are sent " +"anonymously and are scrubbed of personal data. %s" +msgstr "发送匿名的技术问题报告能帮助我们改进 %s，这些报告中不含个人数据。%s" + +#: panels/diagnostics/cc-diagnostics-panel.ui:30 +msgid "Problem Reporting" +msgstr "报告问题" + +#: panels/diagnostics/cc-diagnostics-panel.ui:67 +msgid "_Automatic Problem Reporting" +msgstr "自动报告问题(_A)" + +#: panels/diagnostics/gnome-diagnostics-panel.desktop.in.in:3 +msgid "Diagnostics" +msgstr "诊断" + +#: panels/diagnostics/gnome-diagnostics-panel.desktop.in.in:4 +msgid "Report your problems" +msgstr "报告问题" + +#. FIXME +#: panels/display/cc-display-panel.c:958 #: panels/network/connection-editor/connection-editor.ui:27 -#: panels/network/network-wifi.ui:38 msgid "_Apply" msgstr "应用(_A)" -#: panels/display/cc-display-panel.c:982 +#: panels/display/cc-display-panel.c:979 msgid "Apply Changes?" msgstr "应用更改？" -#: panels/display/cc-display-panel.c:987 +#: panels/display/cc-display-panel.c:984 msgid "Changes Cannot be Applied" msgstr "无法应用更改" -#: panels/display/cc-display-panel.c:988 +#: panels/display/cc-display-panel.c:985 msgid "This could be due to hardware limitations." msgstr "这可能是硬件限制造成的。" @@ -1395,6 +1768,14 @@ msgid "Display Mode" msgstr "显示模式" +#: panels/display/cc-display-panel.ui:222 +msgid "Contains top bar and Activities" +msgstr "包含顶栏和“活动”" + +#: panels/display/cc-display-panel.ui:223 +msgid "Primary Display" +msgstr "主显示器" + #: panels/display/cc-display-panel.ui:245 msgid "" "Drag displays to match your physical display setup. Select a display to " @@ -1405,6 +1786,10 @@ msgid "Display Arrangement" msgstr "显示器布局" +#: panels/display/cc-display-panel.ui:387 +msgid "Active Display" +msgstr "使用中的显示器" + #: panels/display/cc-display-panel.ui:434 msgid "Display Configuration" msgstr "显示配置" @@ -1505,7 +1890,7 @@ msgstr "手动计划" #: panels/display/cc-night-light-page.ui:148 -#: panels/region/cc-format-chooser.ui:154 +#: panels/region/cc-format-chooser.ui:346 msgid "Times" msgstr "时间" @@ -1552,37 +1937,11 @@ "redshift;color;sunset;sunrise;面板;投影仪;屏幕;分辨率;刷新;夜晚;晚上;光;蓝;红" "移;颜色;日落;日出;" -#: panels/info/cc-info-default-apps-panel.ui:31 -msgid "_Web" -msgstr "_Web" - -#: panels/info/cc-info-default-apps-panel.ui:43 -msgid "_Mail" -msgstr "邮件(_M)" - -#: panels/info/cc-info-default-apps-panel.ui:59 -msgid "_Calendar" -msgstr "日历(_C)" - -#: panels/info/cc-info-default-apps-panel.ui:75 -msgid "M_usic" -msgstr "音乐(_U)" - -#: panels/info/cc-info-default-apps-panel.ui:91 -msgid "_Video" -msgstr "视频(_V)" - -#: panels/info/cc-info-default-apps-panel.ui:162 -#: panels/info/cc-info-removable-media-panel.ui:162 -msgid "_Photos" -msgstr "照片(_P)" - -#. TRANSLATORS: AP type -#: panels/info/cc-info-overview-panel.c:369 -#: panels/info/cc-info-overview-panel.c:440 -#: panels/info/cc-info-overview-panel.c:452 -#: panels/info/cc-info-overview-panel.c:497 -#: panels/info/cc-info-overview-panel.c:527 panels/network/panel-common.c:123 +#: panels/info-overview/cc-info-overview-panel.c:416 +#: panels/info-overview/cc-info-overview-panel.c:431 +#: panels/info-overview/cc-info-overview-panel.c:443 +#: panels/info-overview/cc-info-overview-panel.c:489 +#: panels/info-overview/cc-info-overview-panel.c:519 msgid "Unknown" msgstr "未知" @@ -1590,218 +1949,104 @@ #. * example: #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or #. * "Ubuntu 16.04 LTS; Build ID: jki" -#: panels/info/cc-info-overview-panel.c:460 +#: panels/info-overview/cc-info-overview-panel.c:451 #, c-format msgid "%s; Build ID: %s" msgstr "%s；构建 ID：%s" #. translators: This is the type of architecture for the OS -#: panels/info/cc-info-overview-panel.c:477 +#: panels/info-overview/cc-info-overview-panel.c:466 #, c-format msgid "64-bit" msgstr "64 位" #. translators: This is the type of architecture for the OS -#: panels/info/cc-info-overview-panel.c:480 +#: panels/info-overview/cc-info-overview-panel.c:469 #, c-format msgid "32-bit" msgstr "32 位" -#: panels/info/cc-info-overview-panel.c:710 -#, c-format -msgid "Version %s" -msgstr "版本 %s" +#: panels/info-overview/cc-info-overview-panel.c:675 +msgid "X11" +msgstr "X11" + +#: panels/info-overview/cc-info-overview-panel.c:679 +msgid "Wayland" +msgstr "Wayland" + +#: panels/info-overview/cc-info-overview-panel.c:681 +msgctxt "Windowing system (Wayland, X11, or Unknown)" +msgid "Unknown" +msgstr "未知" -#: panels/info/cc-info-overview-panel.ui:70 -msgid "Device name" +#: panels/info-overview/cc-info-overview-panel.ui:54 +msgid "Device Name" msgstr "设备名称" -#: panels/info/cc-info-overview-panel.ui:86 +#: panels/info-overview/cc-info-overview-panel.ui:76 msgid "Memory" msgstr "内存" -#: panels/info/cc-info-overview-panel.ui:102 +#: panels/info-overview/cc-info-overview-panel.ui:85 msgid "Processor" msgstr "处理器" -#: panels/info/cc-info-overview-panel.ui:118 +#: panels/info-overview/cc-info-overview-panel.ui:94 msgid "Graphics" msgstr "图形" -#. To translators: this field contains the distro name and version -#: panels/info/cc-info-overview-panel.ui:133 -msgid "OS name" +#: panels/info-overview/cc-info-overview-panel.ui:103 +msgid "Disk Capacity" +msgstr "磁盘容量" + +#: panels/info-overview/cc-info-overview-panel.ui:104 +msgid "Calculating…" +msgstr "正在计算…" + +#. translators: this field contains the distro name and version +#: panels/info-overview/cc-info-overview-panel.ui:126 +msgid "OS Name" msgstr "系统名称" -#. To translators: this field contains the distro type -#: panels/info/cc-info-overview-panel.ui:149 -msgid "OS type" -msgstr "系统类型" +#: panels/info-overview/cc-info-overview-panel.ui:135 +msgid "OS Type" +msgstr "操作系统类型" + +#: panels/info-overview/cc-info-overview-panel.ui:144 +msgid "GNOME Version" +msgstr "GNOME 版本" + +#: panels/info-overview/cc-info-overview-panel.ui:154 +msgid "Windowing System" +msgstr "窗口系统" -#: panels/info/cc-info-overview-panel.ui:165 +#: panels/info-overview/cc-info-overview-panel.ui:162 msgid "Virtualization" msgstr "虚拟化" -#: panels/info/cc-info-overview-panel.ui:181 -msgid "Disk" -msgstr "磁盘" +#: panels/info-overview/cc-info-overview-panel.ui:171 +msgid "Software Updates" +msgstr "软件更新" -#: panels/info/cc-info-overview-panel.ui:293 -msgid "Calculating…" -msgstr "正在计算…" +#: panels/info-overview/cc-info-overview-panel.ui:192 +msgid "Rename Device" +msgstr "重命名设备" -#: panels/info/cc-info-overview-panel.ui:333 -msgid "Check for updates" -msgstr "检查更新" +#: panels/info-overview/cc-info-overview-panel.ui:209 +msgid "" +"The device name is used to identify this device when it is viewed over the " +"network, or when pairing Bluetooth devices." +msgstr "通过网络查看该设备或配对蓝牙设备时，设备名称用于标识该设备。" -#: panels/info/cc-info-removable-media-panel.c:307 -msgid "Ask what to do" -msgstr "询问如何处理" - -#: panels/info/cc-info-removable-media-panel.c:311 -msgid "Do nothing" -msgstr "无动作" - -#: panels/info/cc-info-removable-media-panel.c:315 -msgid "Open folder" -msgstr "打开文件夹" - -#: panels/info/cc-info-removable-media-panel.c:401 -msgid "Other Media" -msgstr "其他介质" - -#: panels/info/cc-info-removable-media-panel.c:434 -msgid "Select an application for audio CDs" -msgstr "选择播放音频 CD 的应用程序" - -#: panels/info/cc-info-removable-media-panel.c:435 -msgid "Select an application for video DVDs" -msgstr "选择播放视频 DVD 的应用程序" - -#: panels/info/cc-info-removable-media-panel.c:436 -msgid "Select an application to run when a music player is connected" -msgstr "选择连接音乐播放器后运行的应用程序" - -#: panels/info/cc-info-removable-media-panel.c:437 -msgid "Select an application to run when a camera is connected" -msgstr "选择连接相机后运行的应用程序" - -#: panels/info/cc-info-removable-media-panel.c:438 -msgid "Select an application for software CDs" -msgstr "选择插入软件 CD 时运行的应用程序" - -#. translators: these strings are duplicates of shared-mime-info -#. * strings, just here to fix capitalization of the English originals. -#. * If the shared-mime-info translation works for your language, -#. * simply leave these untranslated. -#. -#: panels/info/cc-info-removable-media-panel.c:450 -msgid "audio DVD" -msgstr "音频 DVD" - -#: panels/info/cc-info-removable-media-panel.c:451 -msgid "blank Blu-ray disc" -msgstr "空白蓝光光盘" - -#: panels/info/cc-info-removable-media-panel.c:452 -msgid "blank CD disc" -msgstr "空白 CD 光盘" - -#: panels/info/cc-info-removable-media-panel.c:453 -msgid "blank DVD disc" -msgstr "空白 DVD 光盘" - -# 空白 HD DVD 光盘 -#: panels/info/cc-info-removable-media-panel.c:454 -msgid "blank HD DVD disc" -msgstr "空白 HD DVD 光盘" - -#: panels/info/cc-info-removable-media-panel.c:455 -msgid "Blu-ray video disc" -msgstr "蓝光视频光盘" - -#: panels/info/cc-info-removable-media-panel.c:456 -msgid "e-book reader" -msgstr "电子书阅读器" - -#: panels/info/cc-info-removable-media-panel.c:457 -msgid "HD DVD video disc" -msgstr "HD DVD 视频光盘" - -#: panels/info/cc-info-removable-media-panel.c:458 -msgid "Picture CD" -msgstr "图片 CD" - -#: panels/info/cc-info-removable-media-panel.c:459 -msgid "Super Video CD" -msgstr "超级 VCD" - -#: panels/info/cc-info-removable-media-panel.c:460 -msgid "Video CD" -msgstr "视频 CD" - -#: panels/info/cc-info-removable-media-panel.c:461 -msgid "Windows software" -msgstr "Windows 软件" - -#: panels/info/cc-info-removable-media-panel.ui:44 -msgid "Select how media should be handled" -msgstr "选择如何处理介质" - -#: panels/info/cc-info-removable-media-panel.ui:75 -msgid "CD _audio" -msgstr "CD 音频(_A)" - -#: panels/info/cc-info-removable-media-panel.ui:92 -msgid "_DVD video" -msgstr "_DVD 视频" - -#: panels/info/cc-info-removable-media-panel.ui:133 -msgid "_Music player" -msgstr "音乐播放器(_M)" - -#: panels/info/cc-info-removable-media-panel.ui:191 -msgid "_Software" -msgstr "软件(_S)" - -#: panels/info/cc-info-removable-media-panel.ui:229 -msgid "_Other Media…" -msgstr "其他介质(_O)…" - -#: panels/info/cc-info-removable-media-panel.ui:287 -msgid "_Never prompt or start programs on media insertion" -msgstr "介质插入时从不提示或启动程序(_N)" - -#: panels/info/cc-info-removable-media-panel.ui:339 -msgid "Select how other media should be handled" -msgstr "选择如何处理其他介质" - -#: panels/info/cc-info-removable-media-panel.ui:378 -msgid "_Action:" -msgstr "动作(_A)：" - -#: panels/info/cc-info-removable-media-panel.ui:401 -msgid "_Type:" -msgstr "类型(_T)：" - -#: panels/info/gnome-default-apps-panel.desktop.in.in:3 -msgid "Default Applications" -msgstr "默认应用程序" - -#: panels/info/gnome-default-apps-panel.desktop.in.in:4 -msgid "Configure Default Applications" -msgstr "配置默认应用程序" +#: panels/info-overview/cc-info-overview-panel.ui:227 +msgid "_Rename" +msgstr "重命名(_R)" -#. Translators: Search terms to find the Default Applications panel. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! -#: panels/info/gnome-default-apps-panel.desktop.in.in:19 -msgid "default;application;preferred;media;" -msgstr "default;application;preferred;media;默认;应用程序;首选;偏好;媒体;介质;" - -#: panels/info/gnome-info-overview-panel.desktop.in.in:3 +#: panels/info-overview/gnome-info-overview-panel.desktop.in.in:3 msgid "About" msgstr "关于" -#: panels/info/gnome-info-overview-panel.desktop.in.in:4 +#: panels/info-overview/gnome-info-overview-panel.desktop.in.in:4 msgid "View information about your system" msgstr "查看系统信息" @@ -1810,33 +2055,15 @@ #. The list MUST also end with a semicolon! #. "Preferred Applications" is the old name for the preference, so make #. sure that you use the same "translation" for those keywords -#: panels/info/gnome-info-overview-panel.desktop.in.in:23 -msgid "" -"device;system;information;memory;processor;version;default;application;" -"preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;" -msgstr "" -"device;system;information;memory;processor;version;default;application;" -"preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;设备;系统;信息;" -"内存;处理器;CPU;版本;默认;应用程序;首选;音频;视频;光盘;光碟;盘片;可擦写;可移" -"除;可移动;媒体;介质;自动运行;" - -#: panels/info/gnome-removable-media-panel.desktop.in.in:3 -msgid "Removable Media" -msgstr "可移动介质" - -#: panels/info/gnome-removable-media-panel.desktop.in.in:4 -msgid "Configure Removable Media settings" -msgstr "配置可移动介质设置" - -#. Translators: Search terms to find the Removable Media panel. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! -#: panels/info/gnome-removable-media-panel.desktop.in.in:19 +#: panels/info-overview/gnome-info-overview-panel.desktop.in.in:23 msgid "" -"device;system;default;application;preferred;cd;dvd;usb;audio;video;disc;" -"removable;media;autorun;" +"device;system;information;hostname;memory;processor;version;default;" +"application;preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;" msgstr "" -"device;system;default;application;preferred;cd;dvd;usb;audio;video;disc;" -"removable;media;autorun;设备;系统;默认;应用程序;首选;音频;视频;光盘;光碟;盘" -"片;可擦写;可移除;可移动;媒体;介质;自动运行;" +"device;system;information;hostname;memory;processor;version;default;" +"application;preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;设" +"备;系统;信息;主机名;内存;处理器;CPU;版本;默认;应用程序;首选;音频;视频;光盘;光" +"碟;盘片;可擦写;可移除;可移动;媒体;介质;自动运行;" #: panels/keyboard/00-multimedia.xml.in:2 msgid "Sound and Media" @@ -2010,6 +2237,53 @@ msgid "High contrast on or off" msgstr "高对比度开关" +#: panels/keyboard/cc-alt-chars-key-dialog.ui:8 +#: panels/keyboard/cc-keyboard-panel.ui:72 +msgid "Alternate Characters Key" +msgstr "备用字符键" + +#: panels/keyboard/cc-alt-chars-key-dialog.ui:28 +msgid "" +"The alternate characters key can be used to enter additional characters. " +"These are sometimes printed as a third-option on your keyboard." +msgstr "备用字符键可用于输入其他字符。这些有时会作为第三选项打印在键盘上。" + +#: panels/keyboard/cc-alt-chars-key-dialog.ui:45 +#, fuzzy +#| msgid "Left+Right Alt" +msgid "Left Alt" +msgstr "左+右 Alt" + +#: panels/keyboard/cc-alt-chars-key-dialog.ui:61 +#, fuzzy +#| msgid "Left+Right Alt" +msgid "Right Alt" +msgstr "左+右 Alt" + +#: panels/keyboard/cc-alt-chars-key-dialog.ui:77 +#, fuzzy +#| msgid "Left thumb" +msgid "Left Super" +msgstr "左手拇指" + +#: panels/keyboard/cc-alt-chars-key-dialog.ui:93 +#, fuzzy +#| msgid "Right thumb" +msgid "Right Super" +msgstr "右手拇指" + +#: panels/keyboard/cc-alt-chars-key-dialog.ui:109 +#, fuzzy +#| msgid "Security key" +msgid "Menu key" +msgstr "安全密钥" + +#: panels/keyboard/cc-alt-chars-key-dialog.ui:125 +#, fuzzy +#| msgid "Right Half" +msgid "Right Ctrl" +msgstr "右半部分" + #: panels/keyboard/cc-keyboard-manager.c:501 #: panels/keyboard/cc-keyboard-manager.c:509 #: panels/keyboard/cc-keyboard-manager.c:809 @@ -2036,48 +2310,97 @@ msgid "Modifiers-only switch to next source" msgstr "切换至下一输入源的修饰键" -#: panels/keyboard/cc-keyboard-panel.c:180 +#: panels/keyboard/cc-keyboard-panel.c:94 +#, fuzzy +#| msgid "Right Half" +msgctxt "keyboard key" +msgid "Right Ctrl" +msgstr "右半部分" + +#: panels/keyboard/cc-keyboard-panel.c:95 +#, fuzzy +#| msgid "_Mouse Keys" +msgctxt "keyboard key" +msgid "Menu Key" +msgstr "鼠标键(_M)" + +#: panels/keyboard/cc-keyboard-panel.c:96 +#, fuzzy +#| msgid "Left thumb" +msgctxt "keyboard key" +msgid "Left Super" +msgstr "左手拇指" + +#: panels/keyboard/cc-keyboard-panel.c:97 +#, fuzzy +#| msgid "Right thumb" +msgctxt "keyboard key" +msgid "Right Super" +msgstr "右手拇指" + +#: panels/keyboard/cc-keyboard-panel.c:98 +#, fuzzy +#| msgid "Left+Right Alt" +msgctxt "keyboard key" +msgid "Left Alt" +msgstr "左+右 Alt" + +#: panels/keyboard/cc-keyboard-panel.c:99 +#, fuzzy +#| msgid "Left+Right Alt" +msgctxt "keyboard key" +msgid "Right Alt" +msgstr "左+右 Alt" + +#: panels/keyboard/cc-keyboard-panel.c:201 msgid "Reset All Shortcuts?" msgstr "重置所有快捷键？" -#: panels/keyboard/cc-keyboard-panel.c:183 +#: panels/keyboard/cc-keyboard-panel.c:204 msgid "" "Resetting the shortcuts may affect your custom shortcuts. This cannot be " "undone." msgstr "重新设置快捷键可能影响您的自定义快捷键。此操作无法撤销。" -#: panels/keyboard/cc-keyboard-panel.c:187 -#: panels/keyboard/shortcut-editor.ui:346 +#: panels/keyboard/cc-keyboard-panel.c:208 +#: panels/keyboard/cc-keyboard-shortcut-editor.ui:346 #: panels/printers/authentication-dialog.ui:29 #: panels/printers/ppd-selection-dialog.ui:27 msgid "Cancel" msgstr "取消" -#: panels/keyboard/cc-keyboard-panel.c:188 +#: panels/keyboard/cc-keyboard-panel.c:209 msgid "Reset All" msgstr "全部重置" -#: panels/keyboard/cc-keyboard-panel.c:284 +#: panels/keyboard/cc-keyboard-panel.c:305 msgid "Reset the shortcut to its default value" msgstr "重置快捷键为它的默认值" -#: panels/keyboard/cc-keyboard-panel.ui:116 +#: panels/keyboard/cc-keyboard-panel.ui:73 +#, fuzzy +#| msgid "The new password does not contain enough different characters" +msgid "Hold down and type to enter different characters" +msgstr "新密码必须一定量不同的字符" + +#: panels/keyboard/cc-keyboard-panel.ui:147 msgid "Reset All…" msgstr "全部重置…" -#: panels/keyboard/cc-keyboard-panel.ui:117 +#: panels/keyboard/cc-keyboard-panel.ui:148 msgid "Reset all shortcuts to their default keybindings" msgstr "重置所有快捷键为它们的默认键绑定" -#: panels/keyboard/cc-keyboard-panel.ui:146 +#: panels/keyboard/cc-keyboard-panel.ui:177 msgid "No keyboard shortcut found" msgstr "未找到键盘快捷键" -#: panels/keyboard/cc-keyboard-shortcut-editor.c:411 -#, c-format -msgid "" -"%s is already being used for %s. If you replace it, %s will be " -"disabled" +#: panels/keyboard/cc-keyboard-shortcut-editor.c:413 +#, fuzzy, c-format +#| msgid "" +#| "%s is already being used for %s. If you replace it, %s will be " +#| "disabled" +msgid "%s is already being used for %s. If you replace it, %s will be disabled" msgstr "%s 已被用于 %s。如果您替换了它，%s 将被禁用" #: panels/keyboard/cc-keyboard-shortcut-editor.c:581 @@ -2088,250 +2411,538 @@ msgid "Set Shortcut" msgstr "设置快捷键" -#. Setup the top label -#: panels/keyboard/cc-keyboard-shortcut-editor.c:590 +#. TRANSLATORS: %s is replaced with a description of the keyboard shortcut +#: panels/keyboard/cc-keyboard-shortcut-editor.c:592 #, c-format -msgid "Enter new shortcut to change %s." -msgstr "输入新的快捷键以更改%s。" +msgid "Enter new shortcut to change %s." +msgstr "输入新的快捷键以更改 %s。" -#: panels/keyboard/cc-keyboard-shortcut-editor.c:1017 +#: panels/keyboard/cc-keyboard-shortcut-editor.c:1016 msgid "Add Custom Shortcut" msgstr "添加自定义快捷键" -#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:3 -#: panels/region/cc-region-panel.ui:394 shell/cc-window.ui:340 -msgid "Keyboard Shortcuts" -msgstr "键盘快捷键" - -#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:4 -msgid "View and change keyboard shortcuts and set your typing preferences" -msgstr "查看和更改快捷并设置打字偏好" - -#. Translators: Search terms to find the Keyboard panel. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! -#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:19 -msgid "" -"Shortcut;Workspace;Window;Resize;Zoom;Contrast;Input;Source;Lock;Volume;" -msgstr "" -"Shortcut;Workspace;Window;Resize;Zoom;Contrast;Input;Source;Lock;Volume;快捷" -"键;工作空间;窗口;更改大小;缩放;对比度;输入;源;锁定;音量;" - -#: panels/keyboard/shortcut-editor.ui:68 panels/keyboard/shortcut-editor.ui:318 +#: panels/keyboard/cc-keyboard-shortcut-editor.ui:68 +#: panels/keyboard/cc-keyboard-shortcut-editor.ui:318 msgid "Press Esc to cancel or Backspace to disable the keyboard shortcut." msgstr "按 Esc 以取消或 Backspace 以停用此键盘快捷键。" -#: panels/keyboard/shortcut-editor.ui:156 panels/printers/details-dialog.ui:38 +#: panels/keyboard/cc-keyboard-shortcut-editor.ui:156 +#: panels/printers/pp-details-dialog.ui:40 msgid "Name" msgstr "名称" -#: panels/keyboard/shortcut-editor.ui:168 +#: panels/keyboard/cc-keyboard-shortcut-editor.ui:168 msgid "Command" msgstr "命令" -#: panels/keyboard/shortcut-editor.ui:180 +#: panels/keyboard/cc-keyboard-shortcut-editor.ui:180 msgid "Shortcut" msgstr "快捷键" -#: panels/keyboard/shortcut-editor.ui:259 +#: panels/keyboard/cc-keyboard-shortcut-editor.ui:259 msgid "Set Shortcut…" msgstr "设置快捷键…" -#: panels/keyboard/shortcut-editor.ui:272 panels/network/network-wifi.ui:593 +#: panels/keyboard/cc-keyboard-shortcut-editor.ui:272 msgid "None" msgstr "无" -#: panels/keyboard/shortcut-editor.ui:303 +#: panels/keyboard/cc-keyboard-shortcut-editor.ui:303 msgid "Enter the new shortcut" msgstr "输入新的快捷键" -#: panels/keyboard/shortcut-editor.ui:357 +#: panels/keyboard/cc-keyboard-shortcut-editor.ui:357 msgid "Remove" msgstr "移除" -#: panels/keyboard/shortcut-editor.ui:367 +#: panels/keyboard/cc-keyboard-shortcut-editor.ui:367 msgid "Add" msgstr "添加" -#: panels/keyboard/shortcut-editor.ui:382 +#: panels/keyboard/cc-keyboard-shortcut-editor.ui:382 msgid "Replace" msgstr "替换" -#: panels/keyboard/shortcut-editor.ui:395 +#: panels/keyboard/cc-keyboard-shortcut-editor.ui:395 msgid "Set" msgstr "设置" -#: panels/mouse/cc-mouse-panel.c:80 panels/wacom/cc-wacom-panel.c:463 -msgid "Test Your _Settings" -msgstr "测试您的设置(_S)" +#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:3 +#: panels/region/cc-region-panel.ui:394 shell/cc-window.ui:327 +msgid "Keyboard Shortcuts" +msgstr "键盘快捷键" -#: panels/mouse/gnome-mouse-panel.desktop.in.in:3 -msgid "Mouse & Touchpad" -msgstr "鼠标和触摸板" +#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:4 +msgid "View and change keyboard shortcuts and set your typing preferences" +msgstr "查看和更改快捷并设置打字偏好" -#: panels/mouse/gnome-mouse-panel.desktop.in.in:4 +#. Translators: Search terms to find the Keyboard panel. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! +#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:19 msgid "" -"Change your mouse or touchpad sensitivity and select right or left-handed" -msgstr "改变鼠标和触摸板灵敏度，并选择右手或左手习惯" - -#. Translators: Search terms to find the Mouse and Touchpad panel. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! -#: panels/mouse/gnome-mouse-panel.desktop.in.in:19 -msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;" +"Shortcut;Workspace;Window;Resize;Zoom;Contrast;Input;Source;Lock;Volume;" msgstr "" -"Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;触摸板;指针;触摸;单" -"击;双击;按钮;轨迹球;滚动;" +"Shortcut;Workspace;Window;Resize;Zoom;Contrast;Input;Source;Lock;Volume;快捷" +"键;工作空间;窗口;更改大小;缩放;对比度;输入;源;锁定;音量;" -#: panels/mouse/gnome-mouse-properties.ui:50 -msgid "General" -msgstr "常规" +#: panels/location/cc-location-panel.ui:31 +#, fuzzy +#| msgid "Location Services" +msgid "Location services turned off" +msgstr "定位服务" -#: panels/mouse/gnome-mouse-properties.ui:88 -msgid "Primary Button" -msgstr "主按钮" +#: panels/location/cc-location-panel.ui:40 +#, fuzzy +#| msgid "No application is currently playing or recording audio." +msgid "No applications can obtain location information." +msgstr "没有正在播放或录制音频的程序。" -#: panels/mouse/gnome-mouse-properties.ui:107 -msgid "Sets the order of physical buttons on mice and touchpads." -msgstr "设置鼠标和触控板上的物理按钮的排列。" +#: panels/location/cc-location-panel.ui:74 +msgid "" +"Location services allow applications to know your location. Using Wi-Fi and " +"mobile broadband increases accuracy." +msgstr "" +"定位服务允许应用得知您的地理定位。使用 Wi-Fi 和移动宽带可以提高精确度。" -#: panels/mouse/gnome-mouse-properties.ui:136 -#: panels/sound/cc-balance-slider.ui:13 -msgid "Left" -msgstr "左" +#: panels/location/cc-location-panel.ui:83 +msgid "" +"Uses Mozilla Location Service: Privacy Policy" +msgstr "" +"使用 Mozilla 定位服务：隐私策略" -#: panels/mouse/gnome-mouse-properties.ui:146 -#: panels/sound/cc-balance-slider.ui:15 -msgid "Right" -msgstr "右" +#: panels/location/cc-location-panel.ui:95 +msgid "Allow the applications below to determine your location." +msgstr "" -#: panels/mouse/gnome-mouse-properties.ui:182 -msgid "Mouse" -msgstr "鼠标" +#: panels/location/cc-location-panel.ui:115 +msgid "No Applications Have Asked for Location Access" +msgstr "" -#: panels/mouse/gnome-mouse-properties.ui:221 -msgid "Mouse Speed" -msgstr "鼠标速度" +#: panels/location/gnome-location-panel.desktop.in.in:4 +msgid "Protect your location information" +msgstr "" -#: panels/mouse/gnome-mouse-properties.ui:243 -#: panels/mouse/gnome-mouse-properties.ui:535 -msgid "Double-click timeout" -msgstr "双击超时" +#. FIXME +#: panels/lock/cc-lock-panel.ui:29 +msgid "" +"Automatically locking the screen prevents others from access the computer " +"while you're away." +msgstr "" -#. Translators: This switch reverses the scrolling direction for mices. The term used comes from OS X so use the same translation if possible. -#. Translators: This switch reverses the scrolling direction for touchpads. The term used comes from OS X so use the same translation if possible. -#: panels/mouse/gnome-mouse-properties.ui:280 -#: panels/mouse/gnome-mouse-properties.ui:443 -msgid "Natural Scrolling" -msgstr "自然滚动" +#: panels/lock/cc-lock-panel.ui:46 +#, fuzzy +#| msgid "_Blank Screen" +msgid "Blank Screen Delay" +msgstr "息屏(_B)" -#: panels/mouse/gnome-mouse-properties.ui:296 -#: panels/mouse/gnome-mouse-properties.ui:459 -msgid "Scrolling moves the content, not the view." -msgstr "滚动移动内容而非视图。" +#: panels/lock/cc-lock-panel.ui:47 +msgid "Period of inactivity after which the screen will go blank." +msgstr "" -#: panels/mouse/gnome-mouse-properties.ui:346 -#: panels/mouse/gnome-mouse-properties.ui:391 -msgid "Touchpad" -msgstr "触摸板" +#: panels/lock/cc-lock-panel.ui:67 +msgid "Automatic Screen _Lock" +msgstr "自动锁屏(_L)" -#: panels/mouse/gnome-mouse-properties.ui:514 -msgid "Touchpad Speed" -msgstr "触摸板速度" +#: panels/lock/cc-lock-panel.ui:84 +#, fuzzy +#| msgid "Automatic Screen _Lock" +msgid "Automatic _Screen Lock Delay" +msgstr "自动锁屏(_L)" -#: panels/mouse/gnome-mouse-properties.ui:573 -msgid "Tap to Click" -msgstr "轻拍以点击" +#: panels/lock/cc-lock-panel.ui:85 +msgid "Period after the screen blanks when the screen is automatically locked." +msgstr "" -#: panels/mouse/gnome-mouse-properties.ui:625 -msgid "Two-finger Scrolling" -msgstr "双指滚动" +#: panels/lock/cc-lock-panel.ui:105 +#, fuzzy +#| msgid "Show _Notifications" +msgid "Show _Notifications on Lock Screen" +msgstr "显示通知(_N)" -#: panels/mouse/gnome-mouse-properties.ui:678 -msgid "Edge Scrolling" -msgstr "边缘滚动" +#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog. +#: panels/lock/cc-lock-panel.ui:149 +msgctxt "lock_screen" +msgid "Screen Turns Off" +msgstr "屏幕关闭" -#: panels/mouse/gnome-mouse-test.c:132 panels/mouse/gnome-mouse-test.ui:25 -msgid "Try clicking, double clicking, scrolling" -msgstr "尝试单击、双击、滚动" +#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog. +#: panels/lock/cc-lock-panel.ui:153 +msgctxt "lock_screen" +msgid "30 seconds" +msgstr "30 秒" -#: panels/mouse/gnome-mouse-test.c:137 +#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog. +#: panels/lock/cc-lock-panel.ui:157 +msgctxt "lock_screen" +msgid "1 minute" +msgstr "1 分钟" + +#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog. +#: panels/lock/cc-lock-panel.ui:161 +msgctxt "lock_screen" +msgid "2 minutes" +msgstr "2 分钟" + +#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog. +#: panels/lock/cc-lock-panel.ui:165 +msgctxt "lock_screen" +msgid "3 minutes" +msgstr "3 分钟" + +#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog. +#: panels/lock/cc-lock-panel.ui:169 +msgctxt "lock_screen" +msgid "5 minutes" +msgstr "5 分钟" + +#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog. +#: panels/lock/cc-lock-panel.ui:173 +msgctxt "lock_screen" +msgid "30 minutes" +msgstr "30 分钟" + +#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog. +#: panels/lock/cc-lock-panel.ui:177 +msgctxt "lock_screen" +msgid "1 hour" +msgstr "1 小时" + +#. Translators: Option for "Blank screen" in "Power" panel. +#: panels/lock/cc-lock-panel.ui:192 panels/power/cc-power-panel.ui:63 +msgctxt "blank_screen" +msgid "1 minute" +msgstr "1 分钟" + +#. Translators: Option for "Blank screen" in "Power" panel. +#: panels/lock/cc-lock-panel.ui:196 panels/power/cc-power-panel.ui:67 +msgctxt "blank_screen" +msgid "2 minutes" +msgstr "2 分钟" + +#. Translators: Option for "Blank screen" in "Power" panel. +#: panels/lock/cc-lock-panel.ui:200 panels/power/cc-power-panel.ui:71 +msgctxt "blank_screen" +msgid "3 minutes" +msgstr "3 分钟" + +#. Translators: Option for "Blank screen" in "Power" panel. +#: panels/lock/cc-lock-panel.ui:204 panels/power/cc-power-panel.ui:75 +msgctxt "blank_screen" +msgid "4 minutes" +msgstr "4 分钟" + +#. Translators: Option for "Blank screen" in "Power" panel. +#: panels/lock/cc-lock-panel.ui:208 panels/power/cc-power-panel.ui:79 +msgctxt "blank_screen" +msgid "5 minutes" +msgstr "5 分钟" + +#. Translators: Option for "Blank screen" in "Power" panel. +#: panels/lock/cc-lock-panel.ui:212 panels/power/cc-power-panel.ui:83 +msgctxt "blank_screen" +msgid "8 minutes" +msgstr "8 分钟" + +#. Translators: Option for "Blank screen" in "Power" panel. +#: panels/lock/cc-lock-panel.ui:216 panels/power/cc-power-panel.ui:87 +msgctxt "blank_screen" +msgid "10 minutes" +msgstr "10 分钟" + +#. Translators: Option for "Blank screen" in "Power" panel. +#: panels/lock/cc-lock-panel.ui:220 panels/power/cc-power-panel.ui:91 +msgctxt "blank_screen" +msgid "12 minutes" +msgstr "12 分钟" + +#. Translators: Option for "Blank screen" in "Power" panel. +#: panels/lock/cc-lock-panel.ui:224 panels/power/cc-power-panel.ui:95 +msgctxt "blank_screen" +msgid "15 minutes" +msgstr "15 分钟" + +#. Translators: Option for "Blank screen" in "Power" panel. +#: panels/lock/cc-lock-panel.ui:228 panels/power/cc-power-panel.ui:99 +msgctxt "blank_screen" +msgid "Never" +msgstr "从不" + +#: panels/lock/gnome-lock-panel.desktop.in.in:3 +msgid "Screen Lock" +msgstr "锁屏" + +#: panels/lock/gnome-lock-panel.desktop.in.in:4 +#, fuzzy +#| msgid "Lock screen" +msgid "Lock your screen" +msgstr "锁定屏幕" + +#. FIXME +#: panels/microphone/cc-microphone-panel.ui:34 +#, fuzzy +#| msgid "Microphone mute/unmute" +msgid "Microphone is turned off" +msgstr "麦克风静音/取消静音" + +#: panels/microphone/cc-microphone-panel.ui:43 +#, fuzzy +#| msgid "No applications found" +msgid "No applications can record sound." +msgstr "未找到应用" + +#: panels/microphone/cc-microphone-panel.ui:77 +#, fuzzy +#| msgid "" +#| "Use of the microphone allows applications to capture sounds. Disabling " +#| "the microphone may cause some applications to not function properly." +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 "" +"使用麦克风允许应用程序录制声音。禁用麦克风可能会导致一些应用程序功能无法正常" +"使用。" + +#: panels/microphone/cc-microphone-panel.ui:87 +msgid "Allow the applications below to use your microphone." +msgstr "" + +#: panels/microphone/cc-microphone-panel.ui:107 +msgid "No Applications Have Asked for Microphone Access" +msgstr "" + +#: panels/microphone/gnome-microphone-panel.desktop.in.in:4 +msgid "Protect your conversations" +msgstr "" + +#. FIXME +#: panels/mouse/cc-mouse-panel.ui:37 +msgid "General" +msgstr "常规" + +#: panels/mouse/cc-mouse-panel.ui:75 +msgid "Primary Button" +msgstr "主按钮" + +#: panels/mouse/cc-mouse-panel.ui:94 +msgid "Sets the order of physical buttons on mice and touchpads." +msgstr "设置鼠标和触控板上的物理按钮的排列。" + +#: panels/mouse/cc-mouse-panel.ui:123 panels/sound/cc-balance-slider.ui:13 +msgid "Left" +msgstr "左" + +#: panels/mouse/cc-mouse-panel.ui:133 panels/sound/cc-balance-slider.ui:15 +msgid "Right" +msgstr "右" + +#: panels/mouse/cc-mouse-panel.ui:169 +msgid "Mouse" +msgstr "鼠标" + +#: panels/mouse/cc-mouse-panel.ui:208 +msgid "Mouse Speed" +msgstr "鼠标速度" + +#: panels/mouse/cc-mouse-panel.ui:230 panels/mouse/cc-mouse-panel.ui:522 +msgid "Double-click timeout" +msgstr "双击超时" + +#. Translators: This switch reverses the scrolling direction for mices. The term used comes from OS X so use the same translation if possible. +#. Translators: This switch reverses the scrolling direction for touchpads. The term used comes from OS X so use the same translation if possible. +#: panels/mouse/cc-mouse-panel.ui:267 panels/mouse/cc-mouse-panel.ui:430 +msgid "Natural Scrolling" +msgstr "自然滚动" + +#: panels/mouse/cc-mouse-panel.ui:283 panels/mouse/cc-mouse-panel.ui:446 +msgid "Scrolling moves the content, not the view." +msgstr "滚动移动内容而非视图。" + +#: panels/mouse/cc-mouse-panel.ui:333 panels/mouse/cc-mouse-panel.ui:378 +msgid "Touchpad" +msgstr "触摸板" + +#: panels/mouse/cc-mouse-panel.ui:501 +msgid "Touchpad Speed" +msgstr "触摸板速度" + +#: panels/mouse/cc-mouse-panel.ui:560 +msgid "Tap to Click" +msgstr "轻拍以点击" + +#: panels/mouse/cc-mouse-panel.ui:612 +msgid "Two-finger Scrolling" +msgstr "双指滚动" + +#: panels/mouse/cc-mouse-panel.ui:665 +msgid "Edge Scrolling" +msgstr "边缘滚动" + +#: panels/mouse/cc-mouse-panel.ui:719 panels/wacom/cc-wacom-panel.c:436 +msgid "Test Your _Settings" +msgstr "测试您的设置(_S)" + +#: panels/mouse/cc-mouse-test.c:132 panels/mouse/cc-mouse-test.ui:25 +msgid "Try clicking, double clicking, scrolling" +msgstr "尝试单击、双击、滚动" + +#: panels/mouse/cc-mouse-test.c:137 msgid "Five clicks, GEGL time!" msgstr "点击五次，开始 GEGL！" -#: panels/mouse/gnome-mouse-test.c:142 +#: panels/mouse/cc-mouse-test.c:142 msgid "Double click, primary button" msgstr "主键双击" -#: panels/mouse/gnome-mouse-test.c:142 +#: panels/mouse/cc-mouse-test.c:142 msgid "Single click, primary button" msgstr "主键单击" -#: panels/mouse/gnome-mouse-test.c:145 +#: panels/mouse/cc-mouse-test.c:145 msgid "Double click, middle button" msgstr "中键双击" -#: panels/mouse/gnome-mouse-test.c:145 +#: panels/mouse/cc-mouse-test.c:145 msgid "Single click, middle button" msgstr "中键单击" -#: panels/mouse/gnome-mouse-test.c:148 +#: panels/mouse/cc-mouse-test.c:148 msgid "Double click, secondary button" msgstr "副键双击" -#: panels/mouse/gnome-mouse-test.c:148 +#: panels/mouse/cc-mouse-test.c:148 msgid "Single click, secondary button" msgstr "副键单击" -#. add proxy to device list -#: panels/network/cc-network-panel.c:590 -msgid "Network proxy" -msgstr "网络代理" +#: panels/mouse/gnome-mouse-panel.desktop.in.in:3 +msgid "Mouse & Touchpad" +msgstr "鼠标和触摸板" -#. Translators: this is the title of the connection details -#. * window for vpn connections, it is also used to display -#. * vpn connections in the device list. -#. -#: panels/network/cc-network-panel.c:725 panels/network/net-vpn.c:167 -#: panels/network/net-vpn.c:295 -#, c-format -msgid "%s VPN" -msgstr "%s VPN" +#: panels/mouse/gnome-mouse-panel.desktop.in.in:4 +msgid "" +"Change your mouse or touchpad sensitivity and select right or left-handed" +msgstr "改变鼠标和触摸板灵敏度，并选择右手或左手习惯" + +#. Translators: Search terms to find the Mouse and Touchpad panel. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! +#: panels/mouse/gnome-mouse-panel.desktop.in.in:19 +msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;" +msgstr "" +"Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;触摸板;指针;触摸;单" +"击;双击;按钮;轨迹球;滚动;" -#: panels/network/cc-network-panel.c:789 panels/network/cc-wifi-panel.ui:306 +#: panels/network/cc-network-panel.c:648 panels/network/cc-wifi-panel.ui:306 msgid "Oops, something has gone wrong. Please contact your software vendor." msgstr "抱歉，发生错误。请联系软件提供商。" -#: panels/network/cc-network-panel.c:795 +#: panels/network/cc-network-panel.c:654 msgid "NetworkManager needs to be running." msgstr "需要运行 NetworkManager。" -#: panels/network/cc-network-panel.ui:102 +#: panels/network/cc-network-panel.ui:68 msgid "Other Devices" msgstr "其他设备" -#: panels/network/cc-network-panel.ui:143 -#: panels/network/connection-editor/net-connection-editor.c:581 +#: panels/network/cc-network-panel.ui:109 +#: panels/network/connection-editor/net-connection-editor.c:596 msgid "VPN" msgstr "VPN" -#: panels/network/cc-network-panel.ui:195 +#: panels/network/cc-network-panel.ui:153 msgid "Not set up" msgstr "未设置" #. TRANSLATORS: This happens when the connection name does not contain the SSID. -#: panels/network/cc-wifi-connection-row.c:189 +#: panels/network/cc-wifi-connection-row.c:198 #, c-format msgctxt "Wi-Fi Connection" msgid "%s (SSID: %s)" msgstr "%s (SSID: %s)" +#: panels/network/cc-wifi-connection-row.c:258 +msgid "Insecure network (WEP)" +msgstr "" + +#: panels/network/cc-wifi-connection-row.c:263 +msgid "Secure network (WPA)" +msgstr "" + +#: panels/network/cc-wifi-connection-row.c:268 +msgid "Secure network (WPA2)" +msgstr "" + +#: panels/network/cc-wifi-connection-row.c:273 +msgid "Secure network (WPA3)" +msgstr "" + +#: panels/network/cc-wifi-connection-row.c:278 +msgid "Secure network" +msgstr "" + #: panels/network/cc-wifi-connection-row.ui:102 -#: panels/network/net-device-ethernet.c:359 -#: panels/network/network-ethernet.ui:120 panels/network/network-mobile.ui:394 -#: panels/network/network-simple.ui:75 panels/network/network-vpn.ui:79 +#: panels/network/net-device-ethernet.c:318 +#: panels/network/network-bluetooth.ui:76 +#: panels/network/network-ethernet.ui:102 panels/network/network-mobile.ui:414 +#: panels/network/network-vpn.ui:75 msgid "Options…" msgstr "选项…" -#: panels/network/cc-wifi-panel.c:284 +#. TRANSLATORS: ‘%s’ is a Wi-Fi Network(SSID) name +#: panels/network/cc-wifi-hotspot-dialog.c:132 +#, c-format +msgid "" +"Turning on the hotspot will disconnect from %s, and it will not be possible " +"to access the internet through Wi-Fi." +msgstr "" + +#: panels/network/cc-wifi-hotspot-dialog.c:248 +msgid "Must have a minimum of 8 characters" +msgstr "" + +#: panels/network/cc-wifi-hotspot-dialog.c:458 +msgid "Turn On Wi-Fi Hotspot?" +msgstr "要打开 Wi-Fi 热点吗？" + +#: panels/network/cc-wifi-hotspot-dialog.ui:19 +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 "" + +#: panels/network/cc-wifi-hotspot-dialog.ui:44 +#: panels/network/network-wifi.ui:105 +msgid "Network Name" +msgstr "网络名称" + +#. Translators: This is a password needed for printing. +#: panels/network/cc-wifi-hotspot-dialog.ui:69 +#: panels/printers/authentication-dialog.ui:96 +#: panels/printers/new-printer-dialog.ui:383 +#: panels/printers/pp-jobs-dialog.ui:70 +#: panels/user-accounts/cc-add-user-dialog.ui:249 +msgid "Password" +msgstr "密码" + +#: panels/network/cc-wifi-hotspot-dialog.ui:83 +#, fuzzy +#| msgid "Group Password" +msgid "Generate Random Password" +msgstr "组密码" + +#: panels/network/cc-wifi-hotspot-dialog.ui:84 +#, fuzzy +#| msgid "Current _Password" +msgid "Autogenerate Password" +msgstr "当前密码(_P)" + +#: panels/network/cc-wifi-hotspot-dialog.ui:130 +msgid "_Turn On" +msgstr "打开(_T)" + +#: panels/network/cc-wifi-panel.c:276 #: panels/network/gnome-wifi-panel.desktop.in.in:3 -#: panels/network/network-wifi.ui:1738 +#: panels/network/network-wifi.ui:233 msgid "Wi-Fi" msgstr "Wi-Fi" @@ -2367,57 +2978,33 @@ msgid "NetworkManager needs to be running" msgstr "需要运行 NetworkManager" -#: panels/network/connection-editor/8021x-security-page.ui:26 +#: panels/network/connection-editor/8021x-security-page.ui:20 msgid "802.1x _Security" msgstr "802.1X 安全性(_S)" -#: panels/network/connection-editor/8021x-security-page.ui:73 -#: panels/network/connection-editor/security-page.ui:72 -msgid "page 1" -msgstr "第 1 页" - -#: panels/network/connection-editor/8021x-security-page.ui:224 -#: panels/network/connection-editor/security-page.ui:223 -#: panels/network/wireless-security/eap-method-fast.ui:50 -#: panels/network/wireless-security/eap-method-peap.ui:48 -#: panels/network/wireless-security/eap-method-ttls.ui:31 -msgid "Anony_mous identity" -msgstr "匿名身份(_M)" - -#: panels/network/connection-editor/8021x-security-page.ui:238 -#: panels/network/connection-editor/security-page.ui:237 -msgid "Inner _authentication" -msgstr "内部认证(_A)" - -#: panels/network/connection-editor/8021x-security-page.ui:281 -#: panels/network/connection-editor/security-page.ui:280 -msgid "page 2" -msgstr "第 2 页" - -#: panels/network/connection-editor/ce-page-8021x-security.c:101 -#: panels/network/connection-editor/ce-page-security.c:445 -#: panels/network/connection-editor/details-page.ui:86 -#: panels/network/network-wifi.ui:239 +#: panels/network/connection-editor/ce-page-8021x-security.c:112 +#: panels/network/connection-editor/ce-page-security.c:404 +#: panels/network/connection-editor/details-page.ui:90 msgid "Security" msgstr "安全" -#: panels/network/connection-editor/ce-page.c:396 +#: panels/network/connection-editor/ce-page.c:234 msgid "Preserve" msgstr "预留" -#: panels/network/connection-editor/ce-page.c:397 +#: panels/network/connection-editor/ce-page.c:235 msgid "Permanent" msgstr "永久" -#: panels/network/connection-editor/ce-page.c:398 +#: panels/network/connection-editor/ce-page.c:236 msgid "Random" msgstr "随机" -#: panels/network/connection-editor/ce-page.c:399 +#: panels/network/connection-editor/ce-page.c:237 msgid "Stable" msgstr "固定" -#: panels/network/connection-editor/ce-page.c:403 +#: panels/network/connection-editor/ce-page.c:241 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 " @@ -2426,300 +3013,283 @@ "此处输入的 MAC 地址将用作此连接激活所在的网络设备的硬件地址。该特性被称为 " "MAC 克隆或欺骗。例如：00:11:22:33:44:55" -#: panels/network/connection-editor/ce-page.c:538 -msgid "automatic" -msgstr "自动" - -#: panels/network/connection-editor/ce-page.c:578 +#: panels/network/connection-editor/ce-page.c:399 #, c-format msgid "Profile %d" msgstr "配置 %d" #. TRANSLATORS: this WEP WiFi security -#: panels/network/connection-editor/ce-page-details.c:56 -#: panels/network/net-device-wifi.c:134 panels/network/net-device-wifi.c:314 +#: panels/network/connection-editor/ce-page-details.c:93 +#: panels/network/net-device-wifi.c:235 msgid "WEP" msgstr "WEP" #. TRANSLATORS: this WPA WiFi security -#: panels/network/connection-editor/ce-page-details.c:60 -#: panels/network/net-device-wifi.c:138 panels/network/net-device-wifi.c:319 -#: panels/network/network-wifi.ui:592 +#: panels/network/connection-editor/ce-page-details.c:97 +#: panels/network/net-device-wifi.c:240 msgid "WPA" msgstr "WPA" +#. TRANSLATORS: this WPA3 WiFi security +#: panels/network/connection-editor/ce-page-details.c:103 +msgid "WPA3" +msgstr "" + #. TRANSLATORS: this WPA WiFi security -#: panels/network/connection-editor/ce-page-details.c:64 -#: panels/network/net-device-wifi.c:142 +#: panels/network/connection-editor/ce-page-details.c:109 msgid "WPA2" msgstr "WPA2" #. TRANSLATORS: this Enterprise WiFi security -#: panels/network/connection-editor/ce-page-details.c:69 -#: panels/network/net-device-wifi.c:147 +#: panels/network/connection-editor/ce-page-details.c:115 msgid "Enterprise" msgstr "企业" -#: panels/network/connection-editor/ce-page-details.c:74 -#: panels/network/net-device-wifi.c:152 panels/network/net-device-wifi.c:304 +#: panels/network/connection-editor/ce-page-details.c:120 +#: panels/network/net-device-wifi.c:225 msgctxt "Wifi security" msgid "None" msgstr "无" -#: panels/network/connection-editor/ce-page-details.c:95 +#: panels/network/connection-editor/ce-page-details.c:141 msgid "Never" msgstr "从不" -#: panels/network/connection-editor/ce-page-details.c:110 -#: panels/network/net-device-ethernet.c:137 -#: panels/network/net-device-wifi.c:413 +#: panels/network/connection-editor/ce-page-details.c:156 +#: panels/network/net-device-ethernet.c:108 #, c-format msgid "%i day ago" msgid_plural "%i days ago" msgstr[0] "%i 天前" +#: panels/network/connection-editor/ce-page-details.c:281 +#, c-format +msgid "%d Mb/s (%1.1f GHz)" +msgstr "" + #. Translators: network device speed -#: panels/network/connection-editor/ce-page-details.c:228 -#: panels/network/net-device-ethernet.c:66 panels/network/net-device-wifi.c:536 +#: panels/network/connection-editor/ce-page-details.c:283 +#: panels/network/net-device-ethernet.c:202 #, c-format msgid "%d Mb/s" msgstr "%d Mb/秒" -#: panels/network/connection-editor/ce-page-details.c:249 -#: panels/network/net-device-wifi.c:565 +#: panels/network/connection-editor/ce-page-details.c:300 +msgid "2.4 GHz / 5 GHz" +msgstr "" + +#: panels/network/connection-editor/ce-page-details.c:302 +msgid "2.4 GHz" +msgstr "" + +#: panels/network/connection-editor/ce-page-details.c:304 +msgid "5 GHz" +msgstr "" + +#: panels/network/connection-editor/ce-page-details.c:324 msgctxt "Signal strength" msgid "None" msgstr "无" -#: panels/network/connection-editor/ce-page-details.c:251 -#: panels/network/net-device-wifi.c:567 +#: panels/network/connection-editor/ce-page-details.c:326 msgctxt "Signal strength" msgid "Weak" msgstr "较弱" -#: panels/network/connection-editor/ce-page-details.c:253 -#: panels/network/net-device-wifi.c:569 +#: panels/network/connection-editor/ce-page-details.c:328 msgctxt "Signal strength" msgid "Ok" msgstr "一般" -#: panels/network/connection-editor/ce-page-details.c:255 -#: panels/network/net-device-wifi.c:571 +#: panels/network/connection-editor/ce-page-details.c:330 msgctxt "Signal strength" msgid "Good" msgstr "良好" -#: panels/network/connection-editor/ce-page-details.c:257 -#: panels/network/net-device-wifi.c:573 +#: panels/network/connection-editor/ce-page-details.c:332 msgctxt "Signal strength" msgid "Excellent" msgstr "非常好" -#: panels/network/connection-editor/ce-page-details.c:300 +#: panels/network/connection-editor/ce-page-details.c:390 +#: panels/network/connection-editor/details-page.ui:108 +#: panels/network/net-device-ethernet.c:143 +#: panels/network/net-device-mobile.c:431 +msgid "IPv4 Address" +msgstr "IPv4 地址" + +#: panels/network/connection-editor/ce-page-details.c:391 +#: panels/network/connection-editor/details-page.ui:126 +#: panels/network/net-device-ethernet.c:144 +#: panels/network/net-device-ethernet.c:148 +#: panels/network/net-device-mobile.c:432 panels/network/network-mobile.ui:200 +msgid "IPv6 Address" +msgstr "IPv6 地址" + +#: panels/network/connection-editor/ce-page-details.c:394 +#: panels/network/connection-editor/ce-page-details.c:395 +#: panels/network/net-device-ethernet.c:146 +#: panels/network/net-device-mobile.c:435 +#: panels/network/net-device-mobile.c:436 panels/network/network-mobile.ui:183 +msgid "IP Address" +msgstr "IP 地址" + +#: panels/network/connection-editor/ce-page-details.c:429 msgid "Forget Connection" msgstr "忘记连接" -#: panels/network/connection-editor/ce-page-details.c:302 +#: panels/network/connection-editor/ce-page-details.c:431 msgid "Remove Connection Profile" msgstr "移除连接配置" -#: panels/network/connection-editor/ce-page-details.c:304 +#: panels/network/connection-editor/ce-page-details.c:433 msgid "Remove VPN" msgstr "移除 VPN" -#: panels/network/connection-editor/ce-page-details.c:332 -#: panels/network/network-wifi.ui:1433 shell/cc-panel-list.ui:103 -#: shell/cc-window.c:269 +#: panels/network/connection-editor/ce-page-details.c:451 msgid "Details" msgstr "详细信息" -#: panels/network/connection-editor/ce-page-ethernet.c:177 -#: panels/network/connection-editor/ce-page-vpn.c:188 -#: panels/network/connection-editor/ce-page-wifi.c:196 -#: panels/network/network-wifi.ui:1437 +#: panels/network/connection-editor/ce-page-ethernet.c:71 +msgid "automatic" +msgstr "自动" + +#: panels/network/connection-editor/ce-page-ethernet.c:144 +#: panels/network/connection-editor/ce-page-vpn.c:150 +#: panels/network/connection-editor/ce-page-wifi.c:129 msgid "Identity" msgstr "身份" -#: panels/network/connection-editor/ce-page-ip4.c:251 -#: panels/network/connection-editor/ce-page-ip6.c:230 +#: panels/network/connection-editor/ce-page-ip4.c:268 +#: panels/network/connection-editor/ce-page-ip6.c:249 msgid "Delete Address" msgstr "删除地址" -#: panels/network/connection-editor/ce-page-ip4.c:422 -#: panels/network/connection-editor/ce-page-ip6.c:390 +#: panels/network/connection-editor/ce-page-ip4.c:428 +#: panels/network/connection-editor/ce-page-ip6.c:398 msgid "Delete Route" msgstr "删除路由" -#: panels/network/connection-editor/ce-page-ip4.c:896 -#: panels/network/network-wifi.ui:1441 +#: panels/network/connection-editor/ce-page-ip4.c:852 msgid "IPv4" msgstr "IPv4" -#: panels/network/connection-editor/ce-page-ip6.c:828 -#: panels/network/network-wifi.ui:1445 +#: panels/network/connection-editor/ce-page-ip6.c:783 msgid "IPv6" msgstr "IPv6" -#: panels/network/connection-editor/ce-page-security.c:245 +#: panels/network/connection-editor/ce-page-security.c:260 msgctxt "Wi-Fi/Ethernet security" msgid "None" msgstr "无" -#: panels/network/connection-editor/ce-page-security.c:268 +#: panels/network/connection-editor/ce-page-security.c:283 msgid "WEP 40/128-bit Key (Hex or ASCII)" msgstr "WEP 40/128 位密钥（Hex 或 ASCII）" -#: panels/network/connection-editor/ce-page-security.c:278 +#: panels/network/connection-editor/ce-page-security.c:293 msgid "WEP 128-bit Passphrase" msgstr "WEP 128 位密码" -#: panels/network/connection-editor/ce-page-security.c:291 -#: panels/network/wireless-security/wireless-security.c:465 +#: panels/network/connection-editor/ce-page-security.c:306 +#: panels/network/wireless-security/ws-dynamic-wep.ui:20 +#: panels/network/wireless-security/ws-wpa-eap.ui:25 msgid "LEAP" msgstr "LEAP" -#: panels/network/connection-editor/ce-page-security.c:304 +#: panels/network/connection-editor/ce-page-security.c:319 msgid "Dynamic WEP (802.1x)" msgstr "动态 WEP (802.1X)" -#: panels/network/connection-editor/ce-page-security.c:318 +#: panels/network/connection-editor/ce-page-security.c:333 msgid "WPA & WPA2 Personal" msgstr "WPA 和 WPA2 个人" -#: panels/network/connection-editor/ce-page-security.c:332 +#: panels/network/connection-editor/ce-page-security.c:347 msgid "WPA & WPA2 Enterprise" msgstr "WPA 和 WPA2 企业" +#: panels/network/connection-editor/ce-page-security.c:361 +#, fuzzy +#| msgctxt "category" +#| msgid "Personal" +msgid "WPA3 Personal" +msgstr "个人" + #: panels/network/connection-editor/details-page.ui:18 -#: panels/network/network-wifi.ui:174 msgid "Signal Strength" msgstr "信号强度" -#: panels/network/connection-editor/details-page.ui:52 -#: panels/network/network-wifi.ui:207 +#: panels/network/connection-editor/details-page.ui:54 msgid "Link speed" msgstr "链路速度" -#: panels/network/connection-editor/details-page.ui:104 -#: panels/network/net-device-ethernet.c:170 panels/network/network-wifi.ui:256 -#: panels/network/panel-common.c:644 -msgid "IPv4 Address" -msgstr "IPv4 地址" +#: panels/network/connection-editor/details-page.ui:144 +#: panels/network/net-device-ethernet.c:151 +msgid "Hardware Address" +msgstr "硬件地址" -#: panels/network/connection-editor/details-page.ui:122 -#: panels/network/net-device-ethernet.c:171 -#: panels/network/net-device-ethernet.c:175 -#: panels/network/network-mobile.ui:189 panels/network/network-wifi.ui:273 -#: panels/network/panel-common.c:645 -msgid "IPv6 Address" -msgstr "IPv6 地址" - -#: panels/network/connection-editor/details-page.ui:140 -#: panels/network/net-device-ethernet.c:178 panels/network/network-wifi.ui:290 -msgid "Hardware Address" -msgstr "硬件地址" +#: panels/network/connection-editor/details-page.ui:162 +#, fuzzy +#| msgid "Supported ICC profiles" +msgid "Supported Frequencies" +msgstr "支持的 ICC 配置" -#: panels/network/connection-editor/details-page.ui:158 -#: panels/network/net-device-ethernet.c:182 -#: panels/network/network-mobile.ui:206 panels/network/network-wifi.ui:307 +#: panels/network/connection-editor/details-page.ui:180 +#: panels/network/net-device-ethernet.c:155 +#: panels/network/network-mobile.ui:217 msgid "Default Route" msgstr "默认路由" -#: panels/network/connection-editor/details-page.ui:177 -#: panels/network/connection-editor/ip4-page.ui:197 -#: panels/network/connection-editor/ip6-page.ui:211 -#: panels/network/net-device-ethernet.c:184 -#: panels/network/network-mobile.ui:224 panels/network/network-wifi.ui:325 -#: panels/network/network-wifi.ui:831 panels/network/network-wifi.ui:1108 +#: panels/network/connection-editor/details-page.ui:199 +#: panels/network/connection-editor/ip4-page.ui:211 +#: panels/network/connection-editor/ip6-page.ui:225 +#: panels/network/net-device-ethernet.c:157 +#: panels/network/network-mobile.ui:235 msgid "DNS" msgstr "DNS" -#: panels/network/connection-editor/details-page.ui:195 +#: panels/network/connection-editor/details-page.ui:217 msgid "Last Used" msgstr "上次使用" -#: panels/network/connection-editor/details-page.ui:324 +#: panels/network/connection-editor/details-page.ui:376 msgid "Connect _automatically" msgstr "自动连接(_A)" -#: panels/network/connection-editor/details-page.ui:343 +#: panels/network/connection-editor/details-page.ui:395 msgid "Make available to _other users" msgstr "对其他用户可用(_O)" -#: panels/network/connection-editor/details-page.ui:376 -msgid "Restrict background data usage" -msgstr "限制后台数据的使用" - -#: panels/network/connection-editor/details-page.ui:386 -msgid "Appropriate for connections that have data charges or limits." -msgstr "适用于有数据费用或限制的连接。" - -#: panels/network/connection-editor/ethernet-page.ui:16 -#: panels/network/connection-editor/ethernet-page.ui:39 -#: panels/network/connection-editor/ip4-page.ui:209 -#: panels/network/connection-editor/ip4-page.ui:277 -#: panels/network/connection-editor/ip6-page.ui:42 -#: panels/network/connection-editor/ip6-page.ui:223 -#: panels/network/connection-editor/ip6-page.ui:291 -#: panels/network/net-proxy.c:58 panels/network/network-proxy.ui:103 -#: panels/network/wireless-security/eap-method-peap.ui:22 -#: panels/privacy/cc-privacy-panel.c:239 -msgid "Automatic" -msgstr "自动" +#: panels/network/connection-editor/details-page.ui:428 +msgid "_Metered connection: has data limits or can incur charges" +msgstr "" -#: panels/network/connection-editor/ethernet-page.ui:19 -msgid "Twisted Pair (TP)" -msgstr "双绞线 (TP)" - -#: panels/network/connection-editor/ethernet-page.ui:22 -msgid "Attachment Unit Interface (AUI)" -msgstr "连接单元接口 (AUI)" +#: panels/network/connection-editor/details-page.ui:439 +msgid "" +"Software updates and other large downloads will not be started automatically." +msgstr "" #: panels/network/connection-editor/ethernet-page.ui:25 -msgid "BNC" -msgstr "BNC" - -#: panels/network/connection-editor/ethernet-page.ui:28 -msgid "Media Independent Interface (MII)" -msgstr "媒体独立接口 (MII)" - -#: panels/network/connection-editor/ethernet-page.ui:42 -msgid "10 Mb/s" -msgstr "10 Mb/s" - -#: panels/network/connection-editor/ethernet-page.ui:45 -msgid "100 Mb/s" -msgstr "100 Mb/s" - -#: panels/network/connection-editor/ethernet-page.ui:48 -msgid "1 Gb/s" -msgstr "1 Gb/s" - -#: panels/network/connection-editor/ethernet-page.ui:51 -msgid "10 Gb/s" -msgstr "10 Gb/s" - -#: panels/network/connection-editor/ethernet-page.ui:71 #: panels/network/connection-editor/vpn-page.ui:23 msgid "_Name" msgstr "名称(_N)" -#: panels/network/connection-editor/ethernet-page.ui:100 +#: panels/network/connection-editor/ethernet-page.ui:54 #: panels/network/connection-editor/wifi-page.ui:67 -#: panels/network/network-wifi.ui:1260 msgid "_MAC Address" msgstr "_MAC 地址" -#: panels/network/connection-editor/ethernet-page.ui:151 +#: panels/network/connection-editor/ethernet-page.ui:105 msgid "M_TU" msgstr "M_TU" -#: panels/network/connection-editor/ethernet-page.ui:168 +#: panels/network/connection-editor/ethernet-page.ui:122 #: panels/network/connection-editor/wifi-page.ui:102 msgid "_Cloned Address" msgstr "克隆的地址(_C)" -#: panels/network/connection-editor/ethernet-page.ui:183 +#: panels/network/connection-editor/ethernet-page.ui:137 msgid "bytes" msgstr "字节" @@ -2728,7 +3298,6 @@ msgstr "IPv_4 方式" #: panels/network/connection-editor/ip4-page.ui:42 -#: panels/network/network-wifi.ui:777 panels/network/network-wifi.ui:1054 msgid "Automatic (DHCP)" msgstr "自动 (DHCP)" @@ -2739,9 +3308,7 @@ #: panels/network/connection-editor/ip4-page.ui:69 #: panels/network/connection-editor/ip6-page.ui:83 -#: panels/network/net-proxy.c:56 panels/network/network-proxy.ui:113 -#: panels/network/network-wifi.ui:776 panels/network/network-wifi.ui:1053 -#: panels/privacy/cc-privacy-panel.c:239 +#: panels/network/net-proxy.c:72 panels/network/network-proxy.ui:116 msgid "Manual" msgstr "手动" @@ -2750,61 +3317,76 @@ msgid "Disable" msgstr "禁用" -#: panels/network/connection-editor/ip4-page.ui:111 -#: panels/network/connection-editor/ip6-page.ui:125 +#: panels/network/connection-editor/ip4-page.ui:97 +#: panels/network/connection-editor/ip6-page.ui:111 +#, fuzzy +#| msgid "Shared with other computers" +msgid "Shared to other computers" +msgstr "与其他计算机共享" + +#: panels/network/connection-editor/ip4-page.ui:125 +#: panels/network/connection-editor/ip6-page.ui:139 msgid "Addresses" msgstr "地址" -#: panels/network/connection-editor/ip4-page.ui:129 -#: panels/network/connection-editor/ip4-page.ui:313 -#: panels/network/connection-editor/ip6-page.ui:143 -#: panels/network/connection-editor/ip6-page.ui:327 -#: panels/printers/details-dialog.ui:89 +#: panels/network/connection-editor/ip4-page.ui:143 +#: panels/network/connection-editor/ip4-page.ui:327 +#: panels/network/connection-editor/ip6-page.ui:157 +#: panels/network/connection-editor/ip6-page.ui:341 +#: panels/printers/pp-details-dialog.ui:95 msgid "Address" msgstr "地址" -#: panels/network/connection-editor/ip4-page.ui:143 -#: panels/network/connection-editor/ip4-page.ui:327 +#: panels/network/connection-editor/ip4-page.ui:157 +#: panels/network/connection-editor/ip4-page.ui:341 msgid "Netmask" msgstr "子网掩码" -#: panels/network/connection-editor/ip4-page.ui:157 -#: panels/network/connection-editor/ip4-page.ui:341 -#: panels/network/connection-editor/ip6-page.ui:171 -#: panels/network/connection-editor/ip6-page.ui:355 +#: panels/network/connection-editor/ip4-page.ui:171 +#: panels/network/connection-editor/ip4-page.ui:355 +#: panels/network/connection-editor/ip6-page.ui:185 +#: panels/network/connection-editor/ip6-page.ui:369 msgid "Gateway" msgstr "网关" -#: panels/network/connection-editor/ip4-page.ui:220 -#: panels/network/connection-editor/ip6-page.ui:234 +#: panels/network/connection-editor/ip4-page.ui:223 +#: panels/network/connection-editor/ip4-page.ui:291 +#: panels/network/connection-editor/ip6-page.ui:42 +#: panels/network/connection-editor/ip6-page.ui:237 +#: panels/network/connection-editor/ip6-page.ui:305 +#: panels/network/net-proxy.c:74 panels/network/network-proxy.ui:106 +#: panels/network/wireless-security/eap-method-peap.ui:33 +msgid "Automatic" +msgstr "自动" + +#: panels/network/connection-editor/ip4-page.ui:234 +#: panels/network/connection-editor/ip6-page.ui:248 msgid "Automatic DNS" msgstr "自动 DNS" -#: panels/network/connection-editor/ip4-page.ui:244 -#: panels/network/connection-editor/ip6-page.ui:258 +#: panels/network/connection-editor/ip4-page.ui:258 +#: panels/network/connection-editor/ip6-page.ui:272 msgid "Separate IP addresses with commas" msgstr "使用逗号分隔 IP 地址" -#: panels/network/connection-editor/ip4-page.ui:265 -#: panels/network/connection-editor/ip6-page.ui:279 -#: panels/network/network-wifi.ui:876 panels/network/network-wifi.ui:1153 +#: panels/network/connection-editor/ip4-page.ui:279 +#: panels/network/connection-editor/ip6-page.ui:293 msgid "Routes" msgstr "路由" -#: panels/network/connection-editor/ip4-page.ui:288 -#: panels/network/connection-editor/ip6-page.ui:302 +#: panels/network/connection-editor/ip4-page.ui:302 +#: panels/network/connection-editor/ip6-page.ui:316 msgid "Automatic Routes" msgstr "自动路由" #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking) -#: panels/network/connection-editor/ip4-page.ui:354 -#: panels/network/connection-editor/ip6-page.ui:368 +#: panels/network/connection-editor/ip4-page.ui:368 +#: panels/network/connection-editor/ip6-page.ui:382 msgid "Metric" msgstr "跃点" -#: panels/network/connection-editor/ip4-page.ui:384 -#: panels/network/connection-editor/ip6-page.ui:398 -#: panels/network/network-wifi.ui:932 panels/network/network-wifi.ui:1209 +#: panels/network/connection-editor/ip4-page.ui:398 +#: panels/network/connection-editor/ip6-page.ui:412 msgid "Use this connection _only for resources on its network" msgstr "仅对该网络上的资源使用此连接(_O)" @@ -2816,37 +3398,36 @@ msgid "Automatic, DHCP only" msgstr "自动，仅 DHCP" -#: panels/network/connection-editor/ip6-page.ui:157 -#: panels/network/connection-editor/ip6-page.ui:341 +#: panels/network/connection-editor/ip6-page.ui:171 +#: panels/network/connection-editor/ip6-page.ui:355 msgid "Prefix" msgstr "前缀" -#: panels/network/connection-editor/net-connection-editor.c:261 +#: panels/network/connection-editor/net-connection-editor.c:291 msgid "Unable to open connection editor" msgstr "无法打开连接编辑器" -#: panels/network/connection-editor/net-connection-editor.c:279 +#: panels/network/connection-editor/net-connection-editor.c:307 msgid "New Profile" msgstr "新配置" -#: panels/network/connection-editor/net-connection-editor.c:727 +#: panels/network/connection-editor/net-connection-editor.c:740 msgid "Import from file…" msgstr "从文件导入…" -#: panels/network/connection-editor/net-connection-editor.c:759 +#: panels/network/connection-editor/net-connection-editor.c:772 msgid "Add VPN" msgstr "添加 VPN" -#: panels/network/connection-editor/security-page.ui:26 -#: panels/network/network-wifi.ui:529 +#: panels/network/connection-editor/security-page.ui:20 msgid "S_ecurity" msgstr "安全(_E)" -#: panels/network/connection-editor/vpn-helpers.c:141 +#: panels/network/connection-editor/vpn-helpers.c:139 msgid "Cannot import VPN connection" msgstr "无法导入 VPN 连接" -#: panels/network/connection-editor/vpn-helpers.c:143 +#: panels/network/connection-editor/vpn-helpers.c:141 #, c-format msgid "" "The file “%s” could not be read or does not contain recognized VPN " @@ -2858,29 +3439,29 @@ "\n" "错误：%s。" -#: panels/network/connection-editor/vpn-helpers.c:178 +#: panels/network/connection-editor/vpn-helpers.c:173 msgid "Select file to import" msgstr "选择要导入的文件" -#: panels/network/connection-editor/vpn-helpers.c:230 +#: panels/network/connection-editor/vpn-helpers.c:225 #, c-format msgid "A file named “%s” already exists." msgstr "名为“%s”的文件已存在。" -#: panels/network/connection-editor/vpn-helpers.c:232 +#: panels/network/connection-editor/vpn-helpers.c:227 msgid "_Replace" msgstr "替换(_R)" -#: panels/network/connection-editor/vpn-helpers.c:234 +#: panels/network/connection-editor/vpn-helpers.c:229 #, c-format msgid "Do you want to replace %s with the VPN connection you are saving?" msgstr "您希望用将要保存的 VPN 连接替换 %s 么？" -#: panels/network/connection-editor/vpn-helpers.c:270 +#: panels/network/connection-editor/vpn-helpers.c:264 msgid "Cannot export VPN connection" msgstr "无法导入 VPN 连接" -#: panels/network/connection-editor/vpn-helpers.c:272 +#: panels/network/connection-editor/vpn-helpers.c:266 #, c-format msgid "" "The VPN connection “%s” could not be exported to %s.\n" @@ -2891,7 +3472,7 @@ "\n" "错误：%s。" -#: panels/network/connection-editor/vpn-helpers.c:307 +#: panels/network/connection-editor/vpn-helpers.c:296 msgid "Export VPN connection" msgstr "导出 VPN 连接" @@ -2900,12 +3481,10 @@ msgstr "（错误：无法载入 VPN 连接编辑器）" #: panels/network/connection-editor/wifi-page.ui:20 -#: panels/network/network-wifi.ui:497 msgid "_SSID" msgstr "_SSID" #: panels/network/connection-editor/wifi-page.ui:36 -#: panels/network/network-wifi.ui:513 msgid "_BSSID" msgstr "_BSSID" @@ -2931,28 +3510,19 @@ "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Broadband;DNS;Hotspot;网络;无线;无线保真;" "互联网协议;局域网;宽带;域名系统;热点;" -#: panels/network/net-device-ethernet.c:123 -#: panels/network/net-device-wifi.c:399 +#: panels/network/net-device-ethernet.c:96 msgid "never" msgstr "从不" -#: panels/network/net-device-ethernet.c:133 -#: panels/network/net-device-wifi.c:409 +#: panels/network/net-device-ethernet.c:104 msgid "today" msgstr "今天" -#: panels/network/net-device-ethernet.c:135 -#: panels/network/net-device-wifi.c:411 +#: panels/network/net-device-ethernet.c:106 msgid "yesterday" msgstr "昨天" -#: panels/network/net-device-ethernet.c:173 -#: panels/network/network-mobile.ui:172 panels/network/panel-common.c:647 -#: panels/network/panel-common.c:649 -msgid "IP Address" -msgstr "IP 地址" - -#: panels/network/net-device-ethernet.c:189 panels/network/network-wifi.ui:342 +#: panels/network/net-device-ethernet.c:162 msgid "Last used" msgstr "上次使用" @@ -2961,85 +3531,59 @@ #. * profile. It is also used to display ethernet in the #. * device list. #. -#: panels/network/net-device-ethernet.c:291 -#: panels/network/network-ethernet.ui:19 panels/network/network-simple.ui:39 +#: panels/network/net-device-ethernet.c:252 +#: panels/network/network-bluetooth.ui:38 panels/network/network-ethernet.ui:18 msgid "Wired" msgstr "有线" -#: panels/network/net-device-mobile.c:236 +#: panels/network/net-device-mobile.c:208 msgid "Add new connection" msgstr "添加新连接" -#: panels/network/net-device-wifi.c:1217 -#, c-format -msgid "Switching on the wireless hotspot will disconnect you from %s." -msgstr "打开无线网热点将使您从 %s 断开。" - -#: panels/network/net-device-wifi.c:1221 -msgid "" -"It is not possible to access the Internet through your wireless while the " -"hotspot is active." -msgstr "启用热点模式时无法通过无线网络访问互联网。" - -#: panels/network/net-device-wifi.c:1228 -msgid "Turn On Wi-Fi Hotspot?" -msgstr "要打开 Wi-Fi 热点吗？" - -#: panels/network/net-device-wifi.c:1250 -msgid "" -"Wi-Fi hotspots are usually used to share an additional Internet connection " -"over Wi-Fi." -msgstr "Wi-Fi 热点常用于在 Wi-Fi 上共享其互联网连接。" - -#: panels/network/net-device-wifi.c:1261 -msgid "_Turn On" -msgstr "打开(_T)" - -#: panels/network/net-device-wifi.c:1338 +#: panels/network/net-device-wifi.c:798 msgid "Stop hotspot and disconnect any users?" msgstr "停止热点并断开所有用户？" -#: panels/network/net-device-wifi.c:1341 +#: panels/network/net-device-wifi.c:801 msgid "_Stop Hotspot" msgstr "停止热点(_S)" -#: panels/network/net-device-wifi.c:1397 -msgid "System policy prohibits use as a Hotspot" -msgstr "系统策略禁止作为热点使用" - -#: panels/network/net-device-wifi.c:1400 -msgid "Wireless device does not support Hotspot mode" -msgstr "无线设备不支持热点模式" - -#: panels/network/net-device-wifi.c:1558 +#: panels/network/net-device-wifi.c:905 msgid "" "Network details for the selected networks, including passwords and any " "custom configuration will be lost." msgstr "所选网络的细节，包括密码和全部自定义设置都将丢失。" -#: panels/network/net-device-wifi.c:1562 panels/network/network-wifi.ui:1350 +#: panels/network/net-device-wifi.c:909 msgid "_Forget" msgstr "忘记(_F)" -#: panels/network/net-device-wifi.c:1725 panels/network/net-device-wifi.c:1732 +#: panels/network/net-device-wifi.c:1065 panels/network/net-device-wifi.c:1072 msgid "Known Wi-Fi Networks" msgstr "已知的 Wi-Fi 网络" #. translators: This is the label for the "Forget wireless network" functionality -#: panels/network/net-device-wifi.c:1769 +#: panels/network/net-device-wifi.c:1107 msgctxt "Wi-Fi Network" msgid "_Forget" msgstr "忘记(_F)" -#: panels/network/net-proxy.c:54 -#: panels/notifications/cc-notifications-panel.c:270 -#: panels/power/cc-power-panel.c:2074 panels/power/cc-power-panel.c:2085 -#: panels/privacy/cc-privacy-panel.c:212 panels/privacy/cc-privacy-panel.c:289 -#: panels/universal-access/cc-ua-panel.c:477 -#: panels/universal-access/cc-ua-panel.c:840 -#: panels/universal-access/cc-ua-panel.c:853 -#: panels/universal-access/cc-ua-panel.c:865 -#: panels/universal-access/cc-ua-panel.c:1030 +#: panels/network/net-device-wifi.c:1268 +msgid "System policy prohibits use as a Hotspot" +msgstr "系统策略禁止作为热点使用" + +#: panels/network/net-device-wifi.c:1271 +msgid "Wireless device does not support Hotspot mode" +msgstr "无线设备不支持热点模式" + +#: panels/network/net-proxy.c:70 +#: panels/notifications/cc-notifications-panel.c:267 +#: panels/power/cc-power-panel.c:2068 panels/power/cc-power-panel.c:2079 +#: panels/universal-access/cc-ua-panel.c:480 +#: panels/universal-access/cc-ua-panel.c:843 +#: panels/universal-access/cc-ua-panel.c:856 +#: panels/universal-access/cc-ua-panel.c:868 +#: panels/universal-access/cc-ua-panel.c:1033 #: panels/universal-access/cc-ua-panel.ui:323 #: panels/universal-access/cc-ua-panel.ui:369 #: panels/universal-access/cc-ua-panel.ui:415 @@ -3047,12 +3591,12 @@ #: panels/universal-access/cc-ua-panel.ui:674 #: panels/universal-access/cc-ua-panel.ui:720 #: panels/universal-access/cc-ua-panel.ui:766 -#: panels/universal-access/cc-ua-panel.ui:918 +#: panels/universal-access/cc-ua-panel.ui:950 msgid "Off" msgstr "关" #. TRANSLATORS: this is when the use leaves the PAC textbox blank -#: panels/network/net-proxy.c:102 +#: panels/network/net-proxy.c:113 msgid "" "Web Proxy Autodiscovery is used when a Configuration URL is not provided." msgstr "若未提供配置 URL，将使用网络代理自动发现。" @@ -3061,664 +3605,565 @@ #. * network, then anyone else on that network can tell your #. * machine that it should proxy all of your web traffic #. * through them. -#: panels/network/net-proxy.c:110 +#: panels/network/net-proxy.c:121 msgid "This is not recommended for untrusted public networks." msgstr "对于不可信的公共网络，不建议这样做。" -#: panels/network/network-mobile.ui:30 +#. update title +#. Translators: this is the title of the connection details +#. * window for vpn connections, it is also used to display +#. * vpn connections in the device list. +#. +#: panels/network/net-vpn.c:66 panels/network/net-vpn.c:163 +#, c-format +msgid "%s VPN" +msgstr "%s VPN" + +#: panels/network/network-bluetooth.ui:50 +msgid "Turn device off" +msgstr "关闭设备" + +#: panels/network/network-mobile.ui:29 msgid "IMEI" msgstr "IMEI" -#: panels/network/network-mobile.ui:48 +#: panels/network/network-mobile.ui:47 msgid "Provider" msgstr "提供者" -#: panels/network/network-proxy.ui:47 panels/network/network-proxy.ui:92 +#: panels/network/network-proxy.ui:47 panels/network/network-proxy.ui:95 msgid "Network Proxy" msgstr "网络代理" -#: panels/network/network-proxy.ui:173 +#: panels/network/network-proxy.ui:176 msgid "_HTTP Proxy" msgstr "_HTTP 代理" -#: panels/network/network-proxy.ui:192 +#: panels/network/network-proxy.ui:195 msgid "H_TTPS Proxy" msgstr "H_TTPS 代理" -#: panels/network/network-proxy.ui:211 +#: panels/network/network-proxy.ui:214 msgid "_FTP Proxy" msgstr "_FTP 代理" -#: panels/network/network-proxy.ui:230 +#: panels/network/network-proxy.ui:233 msgid "_Socks Host" msgstr "_Socks 主机" -#: panels/network/network-proxy.ui:249 +#: panels/network/network-proxy.ui:252 msgid "_Ignore Hosts" msgstr "忽略主机(_I)" -#: panels/network/network-proxy.ui:287 +#: panels/network/network-proxy.ui:290 msgid "HTTP proxy port" msgstr "HTTP 代理端口" -#: panels/network/network-proxy.ui:364 +#: panels/network/network-proxy.ui:367 msgid "HTTPS proxy port" msgstr "HTTPS 代理端口" -#: panels/network/network-proxy.ui:385 +#: panels/network/network-proxy.ui:388 msgid "FTP proxy port" msgstr "FTP 代理端口" -#: panels/network/network-proxy.ui:406 +#: panels/network/network-proxy.ui:409 msgid "Socks proxy port" msgstr "SOCKS 代理端口" -#: panels/network/network-proxy.ui:435 +#: panels/network/network-proxy.ui:438 msgid "_Configuration URL" msgstr "配置 URL(_C)" -#: panels/network/network-simple.ui:50 -msgid "Turn device off" -msgstr "关闭设备" - -#: panels/network/network-vpn.ui:56 +#: panels/network/network-vpn.ui:55 msgid "Turn VPN connection off" msgstr "关闭 VPN 连接" -#: panels/network/network-wifi.ui:127 -msgid "Automatic _Connect" -msgstr "自动连接(_C)" - -#: panels/network/network-wifi.ui:474 -msgid "details" -msgstr "详细信息" - -#: panels/network/network-wifi.ui:545 -#: panels/network/wireless-security/eap-method-leap.ui:40 -#: panels/network/wireless-security/eap-method-simple.ui:40 -#: panels/network/wireless-security/ws-leap.ui:40 -#: panels/network/wireless-security/ws-wpa-psk.ui:22 -#: panels/sharing/cc-sharing-panel.ui:351 -#: panels/user-accounts/cc-add-user-dialog.ui:310 -#: panels/user-accounts/cc-add-user-dialog.ui:547 -#: panels/user-accounts/cc-user-panel.ui:216 -msgid "_Password" -msgstr "密码(_P)" - -#: panels/network/network-wifi.ui:621 -msgid "Show P_assword" -msgstr "显示密码(_A)" - -#: panels/network/network-wifi.ui:651 -msgid "Make available to other users" -msgstr "对其他用户可用" - -#: panels/network/network-wifi.ui:679 -msgid "identity" -msgstr "身份" - -#: panels/network/network-wifi.ui:713 -msgid "IPv_4" -msgstr "IPv_4" - -#: panels/network/network-wifi.ui:754 panels/network/network-wifi.ui:1031 -msgid "_Addresses" -msgstr "地址(_A)" - -#: panels/network/network-wifi.ui:778 panels/network/network-wifi.ui:1055 -msgid "Automatic (DHCP) addresses only" -msgstr "仅自动分配地址 (DHCP)" - -#: panels/network/network-wifi.ui:779 panels/network/network-wifi.ui:1056 -msgid "Link-local only" -msgstr "仅本地链路" - -#: panels/network/network-wifi.ui:780 panels/network/network-wifi.ui:1057 -msgid "Shared with other computers" -msgstr "与其他计算机共享" - -#: panels/network/network-wifi.ui:916 panels/network/network-wifi.ui:1193 -msgid "_Ignore automatically obtained routes" -msgstr "忽略自动获取的路由(_I)" - -#: panels/network/network-wifi.ui:959 -msgid "ipv4" -msgstr "ipv4" - -#: panels/network/network-wifi.ui:990 -msgid "IPv_6" -msgstr "IPv_6" - -#: panels/network/network-wifi.ui:1236 -msgid "ipv6" -msgstr "ipv6" - -#: panels/network/network-wifi.ui:1276 -msgid "_Cloned MAC Address" -msgstr "克隆的 MAC 地址(_C)" - -#: panels/network/network-wifi.ui:1334 -msgid "_Reset" -msgstr "重置(_R)" - -#: panels/network/network-wifi.ui:1370 -msgid "" -"Reset the settings for this connection to their defaults, but remember as a " -"preferred connection." -msgstr "将这个连接的设置重置为默认值，但仍作为首选连接。" - -#: panels/network/network-wifi.ui:1387 -msgid "" -"Remove all details relating to this network and do not try to automatically " -"connect to it." -msgstr "删除关于这个网络的所有细节，不再尝试自动连接。" - -#: panels/network/network-wifi.ui:1449 -msgid "Hardware" -msgstr "硬件" - -#: panels/network/network-wifi.ui:1453 -msgctxt "tab" -msgid "Reset" -msgstr "重置" - -#: panels/network/network-wifi.ui:1505 +#: panels/network/network-wifi.ui:37 msgid "Wi-Fi Hotspot" msgstr "Wi-Fi 热点" -#: panels/network/network-wifi.ui:1523 +#: panels/network/network-wifi.ui:55 msgid "Switch off to connect to a Wi-Fi network" msgstr "关闭以连接到无线网络" -#: panels/network/network-wifi.ui:1572 -msgid "Network Name" -msgstr "网络名称" - -#: panels/network/network-wifi.ui:1590 -msgid "Connected Devices" -msgstr "已连接的设备" - -#: panels/network/network-wifi.ui:1608 +#: panels/network/network-wifi.ui:123 msgid "Security type" msgstr "安全类型" -#: panels/network/network-wifi.ui:1671 +#: panels/network/network-wifi.ui:175 msgctxt "Wi-Fi passkey" msgid "Password" msgstr "密码" -#: panels/network/network-wifi.ui:1768 +#: panels/network/network-wifi.ui:264 msgid "Turn Wi-Fi off" msgstr "关闭 Wi-Fi" -#: panels/network/network-wifi.ui:1800 +#: panels/network/network-wifi.ui:296 msgid "_Connect to Hidden Network…" msgstr "连接到隐藏网络(_C)…" -#: panels/network/network-wifi.ui:1810 +#: panels/network/network-wifi.ui:307 msgid "_Turn On Wi-Fi Hotspot…" msgstr "打开 Wi-Fi 热点(_T)…" -#: panels/network/network-wifi.ui:1820 +#: panels/network/network-wifi.ui:318 msgid "_Known Wi-Fi Networks" msgstr "已知的 Wi-Fi 网络(_K)" -#. TRANSLATORS: AP type -#: panels/network/panel-common.c:127 -msgid "Ad-hoc" -msgstr "Ad-hoc" - -#. TRANSLATORS: AP type -#: panels/network/panel-common.c:131 -msgid "Infrastructure" -msgstr "架构" - #. TRANSLATORS: device status -#. TRANSLATORS: VPN status -#: panels/network/panel-common.c:147 panels/network/panel-common.c:201 +#: panels/network/panel-common.c:37 msgid "Status unknown" msgstr "未知状态" #. TRANSLATORS: device status -#: panels/network/panel-common.c:151 +#: panels/network/panel-common.c:41 msgid "Unmanaged" msgstr "未托管" #. TRANSLATORS: device status -#: panels/network/panel-common.c:155 +#: panels/network/panel-common.c:45 msgid "Unavailable" msgstr "不可用" #. TRANSLATORS: device status -#. TRANSLATORS: VPN status -#: panels/network/panel-common.c:165 panels/network/panel-common.c:207 +#: panels/network/panel-common.c:55 msgid "Connecting" msgstr "正在连接" #. TRANSLATORS: device status -#. TRANSLATORS: VPN status -#: panels/network/panel-common.c:169 panels/network/panel-common.c:211 +#: panels/network/panel-common.c:59 msgid "Authentication required" msgstr "需要认证" #. TRANSLATORS: device status -#. TRANSLATORS: VPN status -#: panels/network/panel-common.c:173 panels/network/panel-common.c:215 +#: panels/network/panel-common.c:63 msgid "Connected" msgstr "已连接" #. TRANSLATORS: device status -#: panels/network/panel-common.c:177 +#: panels/network/panel-common.c:67 msgid "Disconnecting" msgstr "正在断开" #. TRANSLATORS: device status -#. TRANSLATORS: VPN status -#: panels/network/panel-common.c:181 panels/network/panel-common.c:219 +#: panels/network/panel-common.c:71 msgid "Connection failed" msgstr "连接失败" #. TRANSLATORS: device status -#. TRANSLATORS: VPN status -#: panels/network/panel-common.c:185 panels/network/panel-common.c:227 +#: panels/network/panel-common.c:75 msgid "Status unknown (missing)" msgstr "未知状态（丢失）" -#. TRANSLATORS: VPN status -#: panels/network/panel-common.c:223 -msgid "Not connected" -msgstr "未连接" - #. TRANSLATORS: device status reason -#: panels/network/panel-common.c:248 +#: panels/network/panel-common.c:96 msgid "Configuration failed" msgstr "配置失败" #. TRANSLATORS: device status reason -#: panels/network/panel-common.c:252 +#: panels/network/panel-common.c:100 msgid "IP configuration failed" msgstr "IP 配置失败" #. TRANSLATORS: device status reason -#: panels/network/panel-common.c:256 +#: panels/network/panel-common.c:104 msgid "IP configuration expired" msgstr "IP 配置已过期" #. TRANSLATORS: device status reason -#: panels/network/panel-common.c:260 +#: panels/network/panel-common.c:108 msgid "Secrets were required, but not provided" msgstr "需要认证凭据，但没有提供" #. TRANSLATORS: device status reason -#: panels/network/panel-common.c:264 +#: panels/network/panel-common.c:112 msgid "802.1x supplicant disconnected" msgstr "802.1X 客户端已断开" #. TRANSLATORS: device status reason -#: panels/network/panel-common.c:268 +#: panels/network/panel-common.c:116 msgid "802.1x supplicant configuration failed" msgstr "802.1X 客户端配置失败" #. TRANSLATORS: device status reason -#: panels/network/panel-common.c:272 +#: panels/network/panel-common.c:120 msgid "802.1x supplicant failed" msgstr "802.1X 客户端失败" #. TRANSLATORS: device status reason -#: panels/network/panel-common.c:276 +#: panels/network/panel-common.c:124 msgid "802.1x supplicant took too long to authenticate" msgstr "802.1X 客户端认证耗时过长" #. TRANSLATORS: device status reason -#: panels/network/panel-common.c:280 +#: panels/network/panel-common.c:128 msgid "PPP service failed to start" msgstr "PPP 服务启动失败" #. TRANSLATORS: device status reason -#: panels/network/panel-common.c:284 +#: panels/network/panel-common.c:132 msgid "PPP service disconnected" msgstr "PPP 服务已断开" #. TRANSLATORS: device status reason -#: panels/network/panel-common.c:288 +#: panels/network/panel-common.c:136 msgid "PPP failed" msgstr "PPP 失败" #. TRANSLATORS: device status reason -#: panels/network/panel-common.c:292 +#: panels/network/panel-common.c:140 msgid "DHCP client failed to start" msgstr "DHCP 客户端启动失败" #. TRANSLATORS: device status reason -#: panels/network/panel-common.c:296 +#: panels/network/panel-common.c:144 msgid "DHCP client error" msgstr "DHCP 客户端错误" #. TRANSLATORS: device status reason -#: panels/network/panel-common.c:300 +#: panels/network/panel-common.c:148 msgid "DHCP client failed" msgstr "DHCP 客户端失败" #. TRANSLATORS: device status reason -#: panels/network/panel-common.c:304 +#: panels/network/panel-common.c:152 msgid "Shared connection service failed to start" msgstr "共享连接服务启动失败" #. TRANSLATORS: device status reason -#: panels/network/panel-common.c:308 +#: panels/network/panel-common.c:156 msgid "Shared connection service failed" msgstr "共享连接服务失败" #. TRANSLATORS: device status reason -#: panels/network/panel-common.c:312 +#: panels/network/panel-common.c:160 msgid "AutoIP service failed to start" msgstr "AutoIP 服务启动失败" #. TRANSLATORS: device status reason -#: panels/network/panel-common.c:316 +#: panels/network/panel-common.c:164 msgid "AutoIP service error" msgstr "AutoIP 服务出错" #. TRANSLATORS: device status reason -#: panels/network/panel-common.c:320 +#: panels/network/panel-common.c:168 msgid "AutoIP service failed" msgstr "AutoIP 服务失败" #. TRANSLATORS: device status reason -#: panels/network/panel-common.c:324 +#: panels/network/panel-common.c:172 msgid "Line busy" msgstr "线路忙" #. TRANSLATORS: device status reason -#: panels/network/panel-common.c:328 +#: panels/network/panel-common.c:176 msgid "No dial tone" msgstr "无拨号音" #. TRANSLATORS: device status reason -#: panels/network/panel-common.c:332 +#: panels/network/panel-common.c:180 msgid "No carrier could be established" msgstr "无法建立载波" #. TRANSLATORS: device status reason -#: panels/network/panel-common.c:336 +#: panels/network/panel-common.c:184 msgid "Dialing request timed out" msgstr "拨号请求超时" #. TRANSLATORS: device status reason -#: panels/network/panel-common.c:340 +#: panels/network/panel-common.c:188 msgid "Dialing attempt failed" msgstr "拨号尝试失败" #. TRANSLATORS: device status reason -#: panels/network/panel-common.c:344 +#: panels/network/panel-common.c:192 msgid "Modem initialization failed" msgstr "调制解调器初始化失败" #. TRANSLATORS: device status reason -#: panels/network/panel-common.c:348 +#: panels/network/panel-common.c:196 msgid "Failed to select the specified APN" msgstr "无法选择指定的 APN" #. TRANSLATORS: device status reason -#: panels/network/panel-common.c:352 +#: panels/network/panel-common.c:200 msgid "Not searching for networks" msgstr "未在搜索网络" #. TRANSLATORS: device status reason -#: panels/network/panel-common.c:356 +#: panels/network/panel-common.c:204 msgid "Network registration denied" msgstr "网络注册被拒绝" #. TRANSLATORS: device status reason -#: panels/network/panel-common.c:360 +#: panels/network/panel-common.c:208 msgid "Network registration timed out" msgstr "网络注册超时" #. TRANSLATORS: device status reason -#: panels/network/panel-common.c:364 +#: panels/network/panel-common.c:212 msgid "Failed to register with the requested network" msgstr "无法在请求的网络上注册" #. TRANSLATORS: device status reason -#: panels/network/panel-common.c:368 +#: panels/network/panel-common.c:216 msgid "PIN check failed" msgstr "PIN 检查失败" #. TRANSLATORS: device status reason -#: panels/network/panel-common.c:372 +#: panels/network/panel-common.c:220 msgid "Firmware for the device may be missing" msgstr "设备可能缺少固件" #. TRANSLATORS: device status reason -#: panels/network/panel-common.c:376 +#: panels/network/panel-common.c:224 msgid "Connection disappeared" msgstr "连接丢失" #. TRANSLATORS: device status reason -#: panels/network/panel-common.c:380 +#: panels/network/panel-common.c:228 msgid "Existing connection was assumed" msgstr "已假定为现有连接" #. TRANSLATORS: device status reason -#: panels/network/panel-common.c:384 +#: panels/network/panel-common.c:232 msgid "Modem not found" msgstr "未找到调制解调器" #. TRANSLATORS: device status reason -#: panels/network/panel-common.c:388 +#: panels/network/panel-common.c:236 msgid "Bluetooth connection failed" msgstr "蓝牙连接失败" #. TRANSLATORS: device status reason -#: panels/network/panel-common.c:392 +#: panels/network/panel-common.c:240 msgid "SIM Card not inserted" msgstr "未插入 SIM 卡" #. TRANSLATORS: device status reason -#: panels/network/panel-common.c:396 +#: panels/network/panel-common.c:244 msgid "SIM Pin required" msgstr "需要 SIM PIN 码" #. TRANSLATORS: device status reason -#: panels/network/panel-common.c:400 +#: panels/network/panel-common.c:248 msgid "SIM Puk required" msgstr "需要 SIM PUK 码" #. TRANSLATORS: device status reason -#: panels/network/panel-common.c:404 +#: panels/network/panel-common.c:252 msgid "SIM wrong" msgstr "SIM 错误" #. TRANSLATORS: device status reason -#: panels/network/panel-common.c:408 +#: panels/network/panel-common.c:256 msgid "Connection dependency failed" msgstr "连接依赖失败" #. TRANSLATORS: device status -#: panels/network/panel-common.c:433 +#: panels/network/panel-common.c:351 msgid "Firmware missing" msgstr "固件缺失" #. TRANSLATORS: device status -#: panels/network/panel-common.c:437 +#: panels/network/panel-common.c:355 msgid "Cable unplugged" msgstr "线缆已拔出" -#: panels/network/wireless-security/eap-method.c:69 +#: panels/network/wireless-security/eap-method.c:92 msgid "undefined error in 802.1X security (wpa-eap)" msgstr "802.1X 安全性里未定义的错误 (wpa-eap)" -#: panels/network/wireless-security/eap-method.c:245 +#: panels/network/wireless-security/eap-method.c:195 msgid "no file selected" msgstr "未选择文件" -#: panels/network/wireless-security/eap-method.c:276 +#: panels/network/wireless-security/eap-method.c:222 msgid "unspecified error validating eap-method file" msgstr "验证 eap-method 文件时发生未知错误" -#: panels/network/wireless-security/eap-method.c:451 +#: panels/network/wireless-security/eap-method.c:397 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)" msgstr "DER、PEM 或 PKCS#12 私钥 (*.der, *.pem, *.p12, *.key)" -#: panels/network/wireless-security/eap-method.c:454 +#: panels/network/wireless-security/eap-method.c:400 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)" msgstr "DER 或 PEM 证书 (*.der, *.pem, *.crt, *.cer)" -#: panels/network/wireless-security/eap-method-fast.c:72 +#: panels/network/wireless-security/eap-method-fast.c:87 msgid "missing EAP-FAST PAC file" msgstr "缺失 EAP-FAST PAC 文件" -#: panels/network/wireless-security/eap-method-fast.c:268 -#: panels/network/wireless-security/eap-method-peap.c:302 -#: panels/network/wireless-security/eap-method-ttls.c:361 -msgid "GTC" -msgstr "GTC" - -#: panels/network/wireless-security/eap-method-fast.c:283 -#: panels/network/wireless-security/eap-method-peap.c:272 -#: panels/network/wireless-security/eap-method-ttls.c:299 -msgid "MSCHAPv2" -msgstr "MSCHAPv2" - -#: panels/network/wireless-security/eap-method-fast.c:406 +#: panels/network/wireless-security/eap-method-fast.c:347 msgid "Choose a PAC file" msgstr "选择 PAC 文件" -#: panels/network/wireless-security/eap-method-fast.c:413 +#: panels/network/wireless-security/eap-method-fast.c:352 msgid "PAC files (*.pac)" msgstr "PAC 文件(*.pac)" -#: panels/network/wireless-security/eap-method-fast.ui:22 +#: panels/network/wireless-security/eap-method-fast.ui:13 +#: panels/network/wireless-security/eap-method-peap.ui:21 +#: panels/network/wireless-security/eap-method-ttls.ui:37 +msgid "GTC" +msgstr "GTC" + +#: panels/network/wireless-security/eap-method-fast.ui:17 +#: panels/network/wireless-security/eap-method-peap.ui:13 +#: panels/network/wireless-security/eap-method-ttls.ui:21 +msgid "MSCHAPv2" +msgstr "MSCHAPv2" + +#: panels/network/wireless-security/eap-method-fast.ui:29 msgid "Anonymous" msgstr "匿名" -#: panels/network/wireless-security/eap-method-fast.ui:25 +#: panels/network/wireless-security/eap-method-fast.ui:32 msgid "Authenticated" msgstr "已认证" -#: panels/network/wireless-security/eap-method-fast.ui:28 +#: panels/network/wireless-security/eap-method-fast.ui:35 msgid "Both" msgstr "两者" -#: panels/network/wireless-security/eap-method-fast.ui:76 +#: panels/network/wireless-security/eap-method-fast.ui:49 +#: panels/network/wireless-security/eap-method-peap.ui:52 +#: panels/network/wireless-security/eap-method-ttls.ui:51 +msgid "Anony_mous identity" +msgstr "匿名身份(_M)" + +#: panels/network/wireless-security/eap-method-fast.ui:75 msgid "PAC _file" msgstr "PAC 文件(_F)" -#: panels/network/wireless-security/eap-method-fast.ui:122 -#: panels/network/wireless-security/eap-method-peap.ui:146 -#: panels/network/wireless-security/eap-method-ttls.ui:123 +#: panels/network/wireless-security/eap-method-fast.ui:115 +#: panels/network/wireless-security/eap-method-peap.ui:150 +#: panels/network/wireless-security/eap-method-ttls.ui:143 msgid "_Inner authentication" msgstr "内部认证(_I)" -#: panels/network/wireless-security/eap-method-fast.ui:156 +#: panels/network/wireless-security/eap-method-fast.ui:144 msgid "Allow automatic PAC pro_visioning" msgstr "允许自动 PAC 配置(_V)" -#: panels/network/wireless-security/eap-method-leap.c:65 +#: panels/network/wireless-security/eap-method-leap.c:64 msgid "missing EAP-LEAP username" msgstr "缺失 EAP-LEAP 用户名" -#: panels/network/wireless-security/eap-method-leap.c:74 +#: panels/network/wireless-security/eap-method-leap.c:73 msgid "missing EAP-LEAP password" msgstr "缺失 EAP-LEAP 密码" -#: panels/network/wireless-security/eap-method-leap.ui:26 -#: panels/network/wireless-security/eap-method-simple.ui:26 -#: panels/network/wireless-security/ws-leap.ui:26 +#: panels/network/wireless-security/eap-method-leap.ui:17 +#: panels/network/wireless-security/eap-method-simple.ui:17 +#: panels/network/wireless-security/ws-leap.ui:18 #: panels/user-accounts/cc-add-user-dialog.ui:146 #: panels/user-accounts/cc-add-user-dialog.ui:527 msgid "_Username" msgstr "用户名(_U)" -#: panels/network/wireless-security/eap-method-leap.ui:68 -#: panels/network/wireless-security/eap-method-simple.ui:85 -#: panels/network/wireless-security/eap-method-tls.ui:164 -#: panels/network/wireless-security/ws-leap.ui:68 -#: panels/network/wireless-security/ws-wpa-psk.ui:76 +#: panels/network/wireless-security/eap-method-leap.ui:31 +#: panels/network/wireless-security/eap-method-simple.ui:31 +#: panels/network/wireless-security/ws-leap.ui:32 +#: panels/network/wireless-security/ws-wpa-psk.ui:14 +#: panels/sharing/cc-sharing-panel.ui:351 +#: panels/user-accounts/cc-add-user-dialog.ui:310 +#: panels/user-accounts/cc-add-user-dialog.ui:547 +#: panels/user-accounts/cc-user-panel.ui:389 +msgid "_Password" +msgstr "密码(_P)" + +#: panels/network/wireless-security/eap-method-leap.ui:55 +#: panels/network/wireless-security/eap-method-simple.ui:73 +#: panels/network/wireless-security/eap-method-tls.ui:157 +#: panels/network/wireless-security/ws-leap.ui:56 +#: panels/network/wireless-security/ws-wpa-psk.ui:64 msgid "Sho_w password" msgstr "显示密码(_W)" -#: panels/network/wireless-security/eap-method-peap.c:63 +#: panels/network/wireless-security/eap-method-peap.c:87 #, c-format msgid "invalid EAP-PEAP CA certificate: %s" msgstr "无效的 EAP-PEAP CA 证书：%s" -#: panels/network/wireless-security/eap-method-peap.c:68 +#: panels/network/wireless-security/eap-method-peap.c:96 msgid "invalid EAP-PEAP CA certificate: no certificate specified" msgstr "无效的 EAP-PEAP CA 证书：未指定证书" -#: panels/network/wireless-security/eap-method-peap.c:287 -#: panels/network/wireless-security/eap-method-ttls.c:346 -#: panels/network/wireless-security/wireless-security.c:441 -msgid "MD5" -msgstr "MD5" - -#: panels/network/wireless-security/eap-method-peap.c:381 -#: panels/network/wireless-security/eap-method-tls.c:492 -#: panels/network/wireless-security/eap-method-ttls.c:440 +#: panels/network/wireless-security/eap-method-peap.c:328 +#: panels/network/wireless-security/eap-method-tls.c:507 +#: panels/network/wireless-security/eap-method-ttls.c:336 msgid "Choose a Certificate Authority certificate" msgstr "选择 CA 证书" -#: panels/network/wireless-security/eap-method-peap.ui:25 +#: panels/network/wireless-security/eap-method-peap.ui:17 +#: panels/network/wireless-security/eap-method-ttls.ui:33 +#: panels/network/wireless-security/ws-wpa-eap.ui:15 +msgid "MD5" +msgstr "MD5" + +#: panels/network/wireless-security/eap-method-peap.ui:36 msgid "Version 0" msgstr "版本 0" -#: panels/network/wireless-security/eap-method-peap.ui:28 +#: panels/network/wireless-security/eap-method-peap.ui:39 msgid "Version 1" msgstr "版本 1" -#: panels/network/wireless-security/eap-method-peap.ui:74 -#: panels/network/wireless-security/eap-method-tls.ui:75 -#: panels/network/wireless-security/eap-method-ttls.ui:82 +#: panels/network/wireless-security/eap-method-peap.ui:78 +#: panels/network/wireless-security/eap-method-tls.ui:68 +#: panels/network/wireless-security/eap-method-ttls.ui:102 msgid "C_A certificate" msgstr "C_A 证书" -#: panels/network/wireless-security/eap-method-peap.ui:96 -#: panels/network/wireless-security/eap-method-tls.ui:97 -#: panels/network/wireless-security/eap-method-ttls.ui:105 +#: panels/network/wireless-security/eap-method-peap.ui:100 +#: panels/network/wireless-security/eap-method-tls.ui:90 +#: panels/network/wireless-security/eap-method-ttls.ui:125 msgid "No CA certificate is _required" msgstr "不需要 CA 证书(_R)" -#: panels/network/wireless-security/eap-method-peap.ui:114 +#: panels/network/wireless-security/eap-method-peap.ui:118 msgid "PEAP _version" msgstr "PEAP 版本(_V)" -#: panels/network/wireless-security/eap-method-simple.c:74 +#: panels/network/wireless-security/eap-method-simple.c:78 msgid "missing EAP username" msgstr "缺失 EAP 用户名" -#: panels/network/wireless-security/eap-method-simple.c:87 +#: panels/network/wireless-security/eap-method-simple.c:91 msgid "missing EAP password" msgstr "缺失 EAP 密码" -#: panels/network/wireless-security/eap-method-tls.c:68 +#: panels/network/wireless-security/eap-method-tls.c:91 msgid "missing EAP-TLS identity" msgstr "缺失 EAP-TLS 身份" -#: panels/network/wireless-security/eap-method-tls.c:77 +#: panels/network/wireless-security/eap-method-tls.c:101 #, c-format msgid "invalid EAP-TLS CA certificate: %s" msgstr "无效的 EAP-TLS CA 证书：%s" -#: panels/network/wireless-security/eap-method-tls.c:84 +#: panels/network/wireless-security/eap-method-tls.c:111 msgid "invalid EAP-TLS CA certificate: no certificate specified" msgstr "无效的 EAP-TLS CA 证书：未指定证书" -#: panels/network/wireless-security/eap-method-tls.c:100 +#: panels/network/wireless-security/eap-method-tls.c:125 #, c-format msgid "invalid EAP-TLS private-key: %s" msgstr "无效的 EAP-TLS CA 私钥：%s" -#: panels/network/wireless-security/eap-method-tls.c:110 +#: panels/network/wireless-security/eap-method-tls.c:135 #, c-format msgid "invalid EAP-TLS user-certificate: %s" msgstr "无效的 EAP-TLS 用户证书：%s" -#: panels/network/wireless-security/eap-method-tls.c:307 +#: panels/network/wireless-security/eap-method-tls.c:266 msgid "Unencrypted private keys are insecure" msgstr "未加密的私钥不安全" -#: panels/network/wireless-security/eap-method-tls.c:310 +#: panels/network/wireless-security/eap-method-tls.c:269 msgid "" "The selected private key does not appear to be protected by a password. This " "could allow your security credentials to be compromised. Please select a " @@ -3731,92 +4176,97 @@ "\n" "（您可以使用 openssl 来对私钥进行密码保护）" -#: panels/network/wireless-security/eap-method-tls.c:486 +#: panels/network/wireless-security/eap-method-tls.c:500 msgid "Choose your personal certificate" msgstr "选择您的个人证书" -#: panels/network/wireless-security/eap-method-tls.c:498 +#: panels/network/wireless-security/eap-method-tls.c:514 msgid "Choose your private key" msgstr "选择您的私钥" -#: panels/network/wireless-security/eap-method-tls.ui:24 +#: panels/network/wireless-security/eap-method-tls.ui:17 msgid "I_dentity" msgstr "身份(_D)" -#: panels/network/wireless-security/eap-method-tls.ui:50 +#: panels/network/wireless-security/eap-method-tls.ui:43 msgid "_User certificate" msgstr "用户证书(_U)" -#: panels/network/wireless-security/eap-method-tls.ui:115 +#: panels/network/wireless-security/eap-method-tls.ui:108 msgid "Private _key" msgstr "私钥(_K)" -#: panels/network/wireless-security/eap-method-tls.ui:140 +#: panels/network/wireless-security/eap-method-tls.ui:133 msgid "_Private key password" msgstr "私钥密码(_P)" -#: panels/network/wireless-security/eap-method-ttls.c:63 +#: panels/network/wireless-security/eap-method-ttls.c:98 #, c-format msgid "invalid EAP-TTLS CA certificate: %s" msgstr "无效的 EAP-TTLS CA 证书：%s" -#: panels/network/wireless-security/eap-method-ttls.c:68 +#: panels/network/wireless-security/eap-method-ttls.c:106 msgid "invalid EAP-TTLS CA certificate: no certificate specified" msgstr "无效的 EAP-TTLS CA 证书：未指定证书" -#: panels/network/wireless-security/eap-method-ttls.c:269 +#: panels/network/wireless-security/eap-method-ttls.ui:13 msgid "PAP" msgstr "PAP" -#: panels/network/wireless-security/eap-method-ttls.c:284 +#: panels/network/wireless-security/eap-method-ttls.ui:17 msgid "MSCHAP" msgstr "MSCHAP" -#: panels/network/wireless-security/eap-method-ttls.c:315 +#: panels/network/wireless-security/eap-method-ttls.ui:25 msgid "MSCHAPv2 (no EAP)" msgstr "MSCHAPv2（无 EAP）" -#: panels/network/wireless-security/eap-method-ttls.c:331 +#: panels/network/wireless-security/eap-method-ttls.ui:29 msgid "CHAP" msgstr "CHAP" -#: panels/network/wireless-security/eap-method-ttls.ui:56 +#: panels/network/wireless-security/eap-method-ttls.ui:76 #: panels/user-accounts/cc-add-user-dialog.ui:507 #: panels/user-accounts/data/join-dialog.ui:116 msgid "_Domain" msgstr "域(_D)" -#: panels/network/wireless-security/wireless-security.c:87 +#: panels/network/wireless-security/wireless-security.c:71 msgid "Unknown error validating 802.1X security" msgstr "验证 802.1X 安全性时发生未知错误" -#: panels/network/wireless-security/wireless-security.c:453 +#: panels/network/wireless-security/ws-dynamic-wep.ui:15 +#: panels/network/wireless-security/ws-wpa-eap.ui:20 msgid "TLS" msgstr "TLS" -#: panels/network/wireless-security/wireless-security.c:477 +#: panels/network/wireless-security/ws-dynamic-wep.ui:25 +#: panels/network/wireless-security/ws-wpa-eap.ui:30 msgid "PWD" msgstr "PWD" -#: panels/network/wireless-security/wireless-security.c:488 +#: panels/network/wireless-security/ws-dynamic-wep.ui:30 +#: panels/network/wireless-security/ws-wpa-eap.ui:35 msgid "FAST" msgstr "FAST" -#: panels/network/wireless-security/wireless-security.c:499 +#: panels/network/wireless-security/ws-dynamic-wep.ui:35 +#: panels/network/wireless-security/ws-wpa-eap.ui:40 msgid "Tunneled TLS" msgstr "隧道 TLS" -#: panels/network/wireless-security/wireless-security.c:510 +#: panels/network/wireless-security/ws-dynamic-wep.ui:40 +#: panels/network/wireless-security/ws-wpa-eap.ui:45 msgid "Protected EAP (PEAP)" msgstr "受保护的 EAP (PEAP)" -#: panels/network/wireless-security/ws-dynamic-wep.ui:39 -#: panels/network/wireless-security/ws-wep-key.ui:115 -#: panels/network/wireless-security/ws-wpa-eap.ui:33 +#: panels/network/wireless-security/ws-dynamic-wep.ui:56 +#: panels/network/wireless-security/ws-wep-key.ui:102 +#: panels/network/wireless-security/ws-wpa-eap.ui:61 msgid "Au_thentication" msgstr "认证(_T)" -#: panels/network/wireless-security/ws-leap.c:63 +#: panels/network/wireless-security/ws-leap.c:65 msgid "missing leap-username" msgstr "缺失 leap-username" @@ -3868,15 +4318,15 @@ msgid "Shared Key" msgstr "共享密钥" -#: panels/network/wireless-security/ws-wep-key.ui:56 +#: panels/network/wireless-security/ws-wep-key.ui:48 msgid "_Key" msgstr "密钥(_K)" -#: panels/network/wireless-security/ws-wep-key.ui:94 +#: panels/network/wireless-security/ws-wep-key.ui:84 msgid "Sho_w key" msgstr "显示密钥(_W)" -#: panels/network/wireless-security/ws-wep-key.ui:152 +#: panels/network/wireless-security/ws-wep-key.ui:134 msgid "WEP inde_x" msgstr "WEP 索引(_X)" @@ -3892,7 +4342,7 @@ msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex" msgstr "无效的 wep-psk：无法将 64 字节作为十六进制来解析密钥" -#: panels/network/wireless-security/ws-wpa-psk.ui:50 +#: panels/network/wireless-security/ws-wpa-psk.ui:42 msgid "_Type" msgstr "类型(_T)" @@ -3935,20 +4385,19 @@ msgid "Show Message C_ontent on Lock Screen" msgstr "锁屏时显示显示消息内容(_O)" -#: panels/notifications/cc-notifications-panel.c:270 -#: panels/power/cc-power-panel.c:2080 panels/power/cc-power-panel.c:2087 -#: panels/privacy/cc-privacy-panel.c:212 panels/privacy/cc-privacy-panel.c:289 -#: panels/universal-access/cc-ua-panel.c:477 -#: panels/universal-access/cc-ua-panel.c:840 -#: panels/universal-access/cc-ua-panel.c:853 -#: panels/universal-access/cc-ua-panel.c:865 -#: panels/universal-access/cc-ua-panel.c:1030 +#: panels/notifications/cc-notifications-panel.c:267 +#: panels/power/cc-power-panel.c:2074 panels/power/cc-power-panel.c:2081 +#: panels/universal-access/cc-ua-panel.c:480 +#: panels/universal-access/cc-ua-panel.c:843 +#: panels/universal-access/cc-ua-panel.c:856 +#: panels/universal-access/cc-ua-panel.c:868 +#: panels/universal-access/cc-ua-panel.c:1033 msgid "On" msgstr "开" #: panels/notifications/cc-notifications-panel.ui:70 -msgid "Notification _Popups" -msgstr "通知弹窗(_P)" +msgid "_Do Not Disturb" +msgstr "" #: panels/notifications/cc-notifications-panel.ui:121 msgid "_Lock Screen Notifications" @@ -3971,21 +4420,22 @@ #. translators: This is the title of the "Show Account" dialog. The #. * %s is the name of the provider. e.g., 'Google'. -#: panels/online-accounts/cc-online-accounts-panel.c:626 +#: panels/online-accounts/cc-online-accounts-panel.c:627 #, c-format msgid "%s Account" msgstr "%s 帐号" -#: panels/online-accounts/cc-online-accounts-panel.c:923 +#: panels/online-accounts/cc-online-accounts-panel.c:924 msgid "Error removing account" msgstr "移除帐号出错" #. Translators: The %s is the username (eg., debarshi.ray@gmail.com #. * or rishi). #. -#: panels/online-accounts/cc-online-accounts-panel.c:988 -#, c-format -msgid "%s removed" +#: panels/online-accounts/cc-online-accounts-panel.c:991 +#, fuzzy, c-format +#| msgid "%s removed" +msgid "%s removed" msgstr "%s 已移除" #: panels/online-accounts/gnome-online-accounts-panel.desktop.in.in:3 @@ -4010,7 +4460,7 @@ "线;聊天;日历;邮件;联系人;云存储;稍后阅读;" #. Translators: This is the button which allows undoing the removal of the printer. -#: panels/online-accounts/online-accounts.ui:38 panels/printers/printers.ui:71 +#: panels/online-accounts/online-accounts.ui:38 panels/printers/printers.ui:61 msgid "Undo" msgstr "撤消" @@ -4030,17 +4480,17 @@ msgid "Remove Account" msgstr "移除帐号" -#: panels/power/cc-power-panel.c:327 +#: panels/power/cc-power-panel.c:331 msgid "Unknown time" msgstr "未知时间" -#: panels/power/cc-power-panel.c:333 +#: panels/power/cc-power-panel.c:337 #, c-format msgid "%i minute" msgid_plural "%i minutes" msgstr[0] "%i 分钟" -#: panels/power/cc-power-panel.c:345 +#: panels/power/cc-power-panel.c:349 #, c-format msgid "%i hour" msgid_plural "%i hours" @@ -4048,292 +4498,255 @@ #. TRANSLATOR: "%i %s %i %s" are "%i hours %i minutes" #. * Swap order with "%2$s %2$i %1$s %1$i if needed -#: panels/power/cc-power-panel.c:353 +#: panels/power/cc-power-panel.c:357 #, c-format msgid "%i %s %i %s" msgstr "%i %s %i %s" -#: panels/power/cc-power-panel.c:354 +#: panels/power/cc-power-panel.c:358 msgid "hour" msgid_plural "hours" msgstr[0] "时" -#: panels/power/cc-power-panel.c:355 +#: panels/power/cc-power-panel.c:359 msgid "minute" msgid_plural "minutes" msgstr[0] "分" #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes" -#: panels/power/cc-power-panel.c:373 +#: panels/power/cc-power-panel.c:377 #, c-format msgid "%s until fully charged" msgstr "%s 后充满" #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes" -#: panels/power/cc-power-panel.c:380 +#: panels/power/cc-power-panel.c:384 #, c-format msgid "Caution: %s remaining" msgstr "注意：剩余 %s 的电量" #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes" -#: panels/power/cc-power-panel.c:385 +#: panels/power/cc-power-panel.c:389 #, c-format msgid "%s remaining" msgstr "剩余 %s" #. TRANSLATORS: primary battery -#: panels/power/cc-power-panel.c:390 panels/power/cc-power-panel.c:420 +#: panels/power/cc-power-panel.c:394 panels/power/cc-power-panel.c:424 msgid "Fully charged" msgstr "已充满" #. TRANSLATORS: primary battery -#: panels/power/cc-power-panel.c:394 panels/power/cc-power-panel.c:424 +#: panels/power/cc-power-panel.c:398 panels/power/cc-power-panel.c:428 msgid "Not charging" msgstr "未充电" #. TRANSLATORS: primary battery -#: panels/power/cc-power-panel.c:398 panels/power/cc-power-panel.c:428 +#: panels/power/cc-power-panel.c:402 panels/power/cc-power-panel.c:432 msgid "Empty" msgstr "已耗尽" #. TRANSLATORS: primary battery -#: panels/power/cc-power-panel.c:411 +#: panels/power/cc-power-panel.c:415 msgid "Charging" msgstr "正在充电" #. TRANSLATORS: primary battery -#: panels/power/cc-power-panel.c:416 +#: panels/power/cc-power-panel.c:420 msgid "Discharging" msgstr "正在放电" -#: panels/power/cc-power-panel.c:549 +#: panels/power/cc-power-panel.c:553 msgctxt "Battery name" msgid "Main" msgstr "主电池" -#: panels/power/cc-power-panel.c:551 +#: panels/power/cc-power-panel.c:555 msgctxt "Battery name" msgid "Extra" msgstr "附加电池" #. TRANSLATORS: secondary battery -#: panels/power/cc-power-panel.c:626 +#: panels/power/cc-power-panel.c:630 msgid "Wireless mouse" msgstr "无线鼠标" #. TRANSLATORS: secondary battery -#: panels/power/cc-power-panel.c:629 +#: panels/power/cc-power-panel.c:633 msgid "Wireless keyboard" msgstr "无线键盘" #. TRANSLATORS: secondary battery -#: panels/power/cc-power-panel.c:632 +#: panels/power/cc-power-panel.c:636 msgid "Uninterruptible power supply" msgstr "不间断电源（UPS）" #. TRANSLATORS: secondary battery -#: panels/power/cc-power-panel.c:635 +#: panels/power/cc-power-panel.c:639 msgid "Personal digital assistant" msgstr "个人数字助理（PDA）" #. TRANSLATORS: secondary battery -#: panels/power/cc-power-panel.c:638 +#: panels/power/cc-power-panel.c:642 msgid "Cellphone" msgstr "手机" #. TRANSLATORS: secondary battery -#: panels/power/cc-power-panel.c:641 +#: panels/power/cc-power-panel.c:645 msgid "Media player" msgstr "媒体播放器" #. TRANSLATORS: secondary battery -#: panels/power/cc-power-panel.c:644 panels/wacom/cc-wacom-panel.c:848 +#: panels/power/cc-power-panel.c:648 panels/wacom/cc-wacom-panel.c:809 msgid "Tablet" msgstr "手写板" #. TRANSLATORS: secondary battery -#: panels/power/cc-power-panel.c:647 +#: panels/power/cc-power-panel.c:651 msgid "Computer" msgstr "计算机" #. TRANSLATORS: secondary battery -#: panels/power/cc-power-panel.c:650 +#: panels/power/cc-power-panel.c:654 msgid "Gaming input device" msgstr "游戏输入设备" #. TRANSLATORS: secondary battery, misc -#: panels/power/cc-power-panel.c:653 panels/power/cc-power-panel.c:911 -#: panels/power/cc-power-panel.c:2430 +#: panels/power/cc-power-panel.c:657 panels/power/cc-power-panel.c:939 +#: panels/power/cc-power-panel.c:2425 msgid "Battery" msgstr "电池" #. TRANSLATORS: secondary battery -#: panels/power/cc-power-panel.c:714 +#: panels/power/cc-power-panel.c:718 msgctxt "Battery power" msgid "Charging" msgstr "正在充电" #. TRANSLATORS: secondary battery -#: panels/power/cc-power-panel.c:721 +#: panels/power/cc-power-panel.c:725 msgctxt "Battery power" msgid "Caution" msgstr "警告" #. TRANSLATORS: secondary battery -#: panels/power/cc-power-panel.c:726 +#: panels/power/cc-power-panel.c:730 msgctxt "Battery power" msgid "Low" msgstr "低" #. TRANSLATORS: secondary battery -#: panels/power/cc-power-panel.c:731 +#: panels/power/cc-power-panel.c:735 msgctxt "Battery power" msgid "Good" msgstr "充足" #. TRANSLATORS: primary battery -#: panels/power/cc-power-panel.c:736 +#: panels/power/cc-power-panel.c:740 msgctxt "Battery power" msgid "Fully charged" msgstr "已充满" #. TRANSLATORS: primary battery -#: panels/power/cc-power-panel.c:740 +#: panels/power/cc-power-panel.c:744 msgctxt "Battery power" msgid "Empty" msgstr "电池已耗尽" -#: panels/power/cc-power-panel.c:909 +#: panels/power/cc-power-panel.c:937 msgid "Batteries" msgstr "电池" -#: panels/power/cc-power-panel.c:1274 -#, c-format -msgid "%d hour" -msgid_plural "%d hours" -msgstr[0] "%d 小时" - -#: panels/power/cc-power-panel.c:1276 -#, c-format -msgid "%d minute" -msgid_plural "%d minutes" -msgstr[0] "%d 分钟" - -#: panels/power/cc-power-panel.c:1279 -#, c-format -msgid "%d second" -msgid_plural "%d seconds" -msgstr[0] "%d 秒" - -#. 5 hours 2 minutes 12 seconds -#: panels/power/cc-power-panel.c:1284 -#, c-format -msgctxt "time" -msgid "%s %s %s" -msgstr "%s %s %s" - -#. 2 minutes 12 seconds -#: panels/power/cc-power-panel.c:1287 -#, c-format -msgctxt "time" -msgid "%s %s" -msgstr "%s %s" - -#. 0 seconds -#: panels/power/cc-power-panel.c:1293 -msgid "0 seconds" -msgstr "0 秒" - -#: panels/power/cc-power-panel.c:1390 +#: panels/power/cc-power-panel.c:1378 msgid "When _idle" msgstr "空闲时(_I)" -#: panels/power/cc-power-panel.c:1835 +#: panels/power/cc-power-panel.c:1829 msgid "Power Saving" msgstr "节电" -#: panels/power/cc-power-panel.c:1869 +#: panels/power/cc-power-panel.c:1863 msgid "_Screen Brightness" msgstr "屏幕亮度(_S)" -#: panels/power/cc-power-panel.c:1890 +#: panels/power/cc-power-panel.c:1884 msgid "Automatic Brightness" msgstr "自动亮度" -#: panels/power/cc-power-panel.c:1903 +#: panels/power/cc-power-panel.c:1897 msgid "_Keyboard Brightness" msgstr "键盘亮度(_K)" -#: panels/power/cc-power-panel.c:1914 +#: panels/power/cc-power-panel.c:1908 msgid "_Dim Screen When Inactive" msgstr "无操作时使屏幕变暗(_D)" -#: panels/power/cc-power-panel.c:1932 +#: panels/power/cc-power-panel.c:1926 msgid "_Blank Screen" msgstr "息屏(_B)" -#: panels/power/cc-power-panel.c:1955 +#: panels/power/cc-power-panel.c:1949 msgid "_Wi-Fi" msgstr "_Wi-Fi" -#: panels/power/cc-power-panel.c:1956 +#: panels/power/cc-power-panel.c:1950 msgid "Wi-Fi can be turned off to save power." msgstr "可以关闭 Wi-Fi 以节省电源。" -#: panels/power/cc-power-panel.c:1972 +#: panels/power/cc-power-panel.c:1966 msgid "_Mobile Broadband" msgstr "移动宽带(_M)" -#: panels/power/cc-power-panel.c:1973 +#: panels/power/cc-power-panel.c:1967 msgid "Mobile broadband (LTE, 4G, 3G, etc.) can be turned off to save power." msgstr "可以关闭移动宽带（LTE、4G、3G 等）以节省电源。" -#: panels/power/cc-power-panel.c:2023 +#: panels/power/cc-power-panel.c:2017 msgid "_Bluetooth" msgstr "蓝牙(_B)" -#: panels/power/cc-power-panel.c:2024 +#: panels/power/cc-power-panel.c:2018 msgid "Bluetooth can be turned off to save power." msgstr "可以关闭蓝牙以节省电源。" -#: panels/power/cc-power-panel.c:2076 +#: panels/power/cc-power-panel.c:2070 msgid "When on battery power" msgstr "电池供电时" -#: panels/power/cc-power-panel.c:2078 +#: panels/power/cc-power-panel.c:2072 msgid "When plugged in" msgstr "插入电源时" -#: panels/power/cc-power-panel.c:2172 +#: panels/power/cc-power-panel.c:2166 msgid "Suspend" msgstr "挂起" -#: panels/power/cc-power-panel.c:2173 +#: panels/power/cc-power-panel.c:2167 msgid "Power Off" msgstr "电源关闭" -#: panels/power/cc-power-panel.c:2174 +#: panels/power/cc-power-panel.c:2168 msgid "Hibernate" msgstr "休眠" -#: panels/power/cc-power-panel.c:2175 +#: panels/power/cc-power-panel.c:2169 msgid "Nothing" msgstr "不处理" #. Frame header -#: panels/power/cc-power-panel.c:2275 +#: panels/power/cc-power-panel.c:2269 msgid "Suspend & Power Button" msgstr "挂起和关机按钮" -#: panels/power/cc-power-panel.c:2316 +#: panels/power/cc-power-panel.c:2310 msgid "_Automatic Suspend" msgstr "自动挂起(_A)" -#: panels/power/cc-power-panel.c:2317 +#: panels/power/cc-power-panel.c:2311 msgid "Automatic suspend" msgstr "自动挂起" -#: panels/power/cc-power-panel.c:2374 +#: panels/power/cc-power-panel.c:2369 msgid "Po_wer Button Action" msgstr "电源按钮操作(_W)" @@ -4397,66 +4810,6 @@ msgid "2 hours" msgstr "2 小时" -#. Translators: Option for "Blank screen" in "Power" panel. -#: panels/power/cc-power-panel.ui:63 -msgctxt "blank_screen" -msgid "1 minute" -msgstr "1 分钟" - -#. Translators: Option for "Blank screen" in "Power" panel. -#: panels/power/cc-power-panel.ui:67 -msgctxt "blank_screen" -msgid "2 minutes" -msgstr "2 分钟" - -#. Translators: Option for "Blank screen" in "Power" panel. -#: panels/power/cc-power-panel.ui:71 -msgctxt "blank_screen" -msgid "3 minutes" -msgstr "3 分钟" - -#. Translators: Option for "Blank screen" in "Power" panel. -#: panels/power/cc-power-panel.ui:75 -msgctxt "blank_screen" -msgid "4 minutes" -msgstr "4 分钟" - -#. Translators: Option for "Blank screen" in "Power" panel. -#: panels/power/cc-power-panel.ui:79 -msgctxt "blank_screen" -msgid "5 minutes" -msgstr "5 分钟" - -#. Translators: Option for "Blank screen" in "Power" panel. -#: panels/power/cc-power-panel.ui:83 -msgctxt "blank_screen" -msgid "8 minutes" -msgstr "8 分钟" - -#. Translators: Option for "Blank screen" in "Power" panel. -#: panels/power/cc-power-panel.ui:87 -msgctxt "blank_screen" -msgid "10 minutes" -msgstr "10 分钟" - -#. Translators: Option for "Blank screen" in "Power" panel. -#: panels/power/cc-power-panel.ui:91 -msgctxt "blank_screen" -msgid "12 minutes" -msgstr "12 分钟" - -#. Translators: Option for "Blank screen" in "Power" panel. -#: panels/power/cc-power-panel.ui:95 -msgctxt "blank_screen" -msgid "15 minutes" -msgstr "15 分钟" - -#. Translators: Option for "Blank screen" in "Power" panel. -#: panels/power/cc-power-panel.ui:99 -msgctxt "blank_screen" -msgid "Never" -msgstr "从不" - #: panels/power/cc-power-panel.ui:147 msgid "Automatic Suspend" msgstr "自动挂起" @@ -4470,7 +4823,7 @@ msgstr "使用电池时(_B)" #: panels/power/cc-power-panel.ui:233 panels/power/cc-power-panel.ui:293 -#: panels/universal-access/cc-ua-panel.ui:1495 +#: panels/universal-access/cc-ua-panel.ui:1527 msgid "Delay" msgstr "延迟" @@ -4500,68 +4853,36 @@ #. Translators: This is a username on a print server. #: panels/printers/authentication-dialog.ui:80 -#: panels/printers/jobs-dialog.ui:57 panels/printers/new-printer-dialog.ui:362 +#: panels/printers/new-printer-dialog.ui:362 +#: panels/printers/pp-jobs-dialog.ui:57 msgid "Username" msgstr "用户名" -#. Translators: This is a password needed for printing. -#: panels/printers/authentication-dialog.ui:96 -#: panels/printers/jobs-dialog.ui:70 panels/printers/new-printer-dialog.ui:383 -#: panels/user-accounts/cc-add-user-dialog.ui:249 -msgid "Password" -msgstr "密码" - #: panels/printers/authentication-dialog.ui:139 #: panels/printers/new-printer-dialog.ui:337 msgid "Authentication Required" msgstr "需要认证" #. Translators: %s is the printer name -#: panels/printers/cc-printers-panel.c:715 +#: panels/printers/cc-printers-panel.c:695 #, c-format msgid "Printer “%s” has been deleted" msgstr "已删除打印机“%s”" #. Translators: Addition of the new printer failed. -#: panels/printers/cc-printers-panel.c:938 +#: panels/printers/cc-printers-panel.c:918 msgid "Failed to add new printer." msgstr "添加新打印机失败。" #. Translators: The XML file containing user interface can not be loaded -#: panels/printers/cc-printers-panel.c:1242 +#: panels/printers/cc-printers-panel.c:1212 #, c-format msgid "Could not load ui: %s" msgstr "无法载入界面：%s" -#: panels/printers/details-dialog.ui:64 panels/printers/printer-entry.ui:223 -msgid "Location" -msgstr "位置" - -#. Translators: Name of column showing printer drivers -#: panels/printers/details-dialog.ui:114 -#: panels/printers/pp-ppd-selection-dialog.c:250 -msgid "Driver" -msgstr "驱动" - -#: panels/printers/details-dialog.ui:152 -msgid "Searching for preferred drivers…" -msgstr "正在搜索首选驱动…" - -#: panels/printers/details-dialog.ui:174 -msgid "Search for Drivers" -msgstr "搜索驱动" - -#: panels/printers/details-dialog.ui:182 -msgid "Select from Database…" -msgstr "从数据库选择…" - -#: panels/printers/details-dialog.ui:190 -msgid "Install PPD File…" -msgstr "安装 PPD 文件…" - -#: panels/printers/gnome-printers-panel.desktop.in.in:3 -msgid "Printers" -msgstr "打印机" +#: panels/printers/gnome-printers-panel.desktop.in.in:3 +msgid "Printers" +msgstr "打印机" #: panels/printers/gnome-printers-panel.desktop.in.in:4 msgid "Add printers, view printer jobs and decide how you want to print" @@ -4574,31 +4895,6 @@ "Printer;Queue;Print;Paper;Ink;Toner;打印机;队列;打印;纸张;墨水;墨粉;硒鼓;墨" "盒;" -#. Translators: This is a windows domain used with SMB protocol. -#: panels/printers/jobs-dialog.ui:44 -msgid "Domain" -msgstr "域" - -#. Translators: This button authenticates all print jobs and send them for printing. -#: panels/printers/jobs-dialog.ui:123 -msgid "A_uthenticate" -msgstr "认证(_U)" - -#. Translators: this action removes (purges) all the listed jobs from the list. -#: panels/printers/jobs-dialog.ui:163 -msgid "Clear All" -msgstr "全部清除" - -#. Translators: This button pop up authentication dialog for print jobs which need credentials. -#: panels/printers/jobs-dialog.ui:225 -msgid "_Authenticate" -msgstr "认证(_A)" - -#. Translators: this label describes the dialog empty state, with no jobs listed. -#: panels/printers/jobs-dialog.ui:354 -msgid "No Active Printer Jobs" -msgstr "没有活动的打印机任务" - #. Translators: This is the title presented at top of the dialog. #: panels/printers/new-printer-dialog.ui:29 #: panels/printers/pp-new-printer-dialog.c:363 @@ -4627,33 +4923,53 @@ msgid "Enter username and password to view printers on Print Server." msgstr "输入用户名和密码以查看打印服务器上的打印机。" -#. Translators: This button triggers the printing of a test page. -#. Translators: Name of job which makes printer to print test page -#: panels/printers/options-dialog.ui:22 panels/printers/pp-options-dialog.c:907 -msgid "Test Page" -msgstr "测试页" - #. Translators: This is the title of the dialog. %s is the printer name. -#: panels/printers/pp-details-dialog.c:133 -#: panels/printers/pp-details-dialog.c:417 +#: panels/printers/pp-details-dialog.c:75 +#: panels/printers/pp-details-dialog.c:370 #, c-format msgid "%s Details" msgstr "%s 详细信息" -#: panels/printers/pp-details-dialog.c:180 +#: panels/printers/pp-details-dialog.c:122 msgid "No suitable driver found" msgstr "未找到合适的驱动" -#: panels/printers/pp-details-dialog.c:310 +#: panels/printers/pp-details-dialog.c:249 msgid "Select PPD File" msgstr "选择 PPD 文件" -#: panels/printers/pp-details-dialog.c:319 +#: panels/printers/pp-details-dialog.c:258 msgid "" "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *." "PPD.GZ)" msgstr "PostScript 打印机描述文件 (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD.GZ)" +#: panels/printers/pp-details-dialog.ui:68 panels/printers/printer-entry.ui:223 +msgid "Location" +msgstr "位置" + +#. Translators: Name of column showing printer drivers +#: panels/printers/pp-details-dialog.ui:122 +#: panels/printers/pp-ppd-selection-dialog.c:250 +msgid "Driver" +msgstr "驱动" + +#: panels/printers/pp-details-dialog.ui:162 +msgid "Searching for preferred drivers…" +msgstr "正在搜索首选驱动…" + +#: panels/printers/pp-details-dialog.ui:183 +msgid "Search for Drivers" +msgstr "搜索驱动" + +#: panels/printers/pp-details-dialog.ui:192 +msgid "Select from Database…" +msgstr "从数据库选择…" + +#: panels/printers/pp-details-dialog.ui:201 +msgid "Install PPD File…" +msgstr "安装 PPD 文件…" + #: panels/printers/ppd-selection-dialog.ui:10 msgid "Select Printer Driver" msgstr "选择打印机驱动" @@ -4668,12 +4984,12 @@ msgstr "正在载入驱动数据库…" #. Translators: The found device is a JetDirect printer -#: panels/printers/pp-host.c:472 +#: panels/printers/pp-host.c:479 msgid "JetDirect Printer" msgstr "JetDirect 打印机" #. Translators: The found device is a Line Printer Daemon printer -#: panels/printers/pp-host.c:707 +#: panels/printers/pp-host.c:714 msgid "LPD Printer" msgstr "LPD 打印机" @@ -4716,73 +5032,98 @@ msgstr "纵向倒转" #. Translators: Job's state (job is waiting to be printed) -#: panels/printers/pp-jobs-dialog.c:234 +#: panels/printers/pp-jobs-dialog.c:222 msgctxt "print job" msgid "Pending" msgstr "等待中" #. Translators: Job's state (job is held for printing) -#: panels/printers/pp-jobs-dialog.c:240 +#: panels/printers/pp-jobs-dialog.c:228 msgctxt "print job" msgid "Paused" msgstr "暂停" #. Translators: Job's state (job needs authentication to proceed further) -#: panels/printers/pp-jobs-dialog.c:245 +#: panels/printers/pp-jobs-dialog.c:233 msgctxt "print job" msgid "Authentication required" msgstr "需要认证" #. Translators: Job's state (job is currently printing) -#: panels/printers/pp-jobs-dialog.c:250 +#: panels/printers/pp-jobs-dialog.c:238 msgctxt "print job" msgid "Processing" msgstr "正在处理" #. Translators: Job's state (job has been stopped) -#: panels/printers/pp-jobs-dialog.c:254 +#: panels/printers/pp-jobs-dialog.c:242 msgctxt "print job" msgid "Stopped" msgstr "已停止" #. Translators: Job's state (job has been canceled) -#: panels/printers/pp-jobs-dialog.c:258 +#: panels/printers/pp-jobs-dialog.c:246 msgctxt "print job" msgid "Canceled" msgstr "已取消" #. Translators: Job's state (job has aborted due to error) -#: panels/printers/pp-jobs-dialog.c:262 +#: panels/printers/pp-jobs-dialog.c:250 msgctxt "print job" msgid "Aborted" msgstr "已中止" #. Translators: Job's state (job has completed successfully) -#: panels/printers/pp-jobs-dialog.c:266 +#: panels/printers/pp-jobs-dialog.c:254 msgctxt "print job" msgid "Completed" msgstr "已完成" #. Translators: This label shows how many jobs of this printer needs to be authenticated to be printed. -#: panels/printers/pp-jobs-dialog.c:390 +#: panels/printers/pp-jobs-dialog.c:363 #, c-format msgid "%u Job Requires Authentication" msgid_plural "%u Jobs Require Authentication" msgstr[0] "%u 项任务需要认证" #. Translators: This is the printer name for which we are showing the active jobs -#: panels/printers/pp-jobs-dialog.c:613 +#: panels/printers/pp-jobs-dialog.c:520 #, c-format msgctxt "Printer jobs dialog title" msgid "%s — Active Jobs" msgstr "%s — 活动任务" #. Translators: The printer needs authentication info to print. -#: panels/printers/pp-jobs-dialog.c:617 +#: panels/printers/pp-jobs-dialog.c:524 #, c-format msgid "Enter credentials to print from %s." msgstr "从 %s 输入凭据以打印。" +#. Translators: This is a windows domain used with SMB protocol. +#: panels/printers/pp-jobs-dialog.ui:44 +msgid "Domain" +msgstr "域" + +#. Translators: This button authenticates all print jobs and send them for printing. +#: panels/printers/pp-jobs-dialog.ui:129 +msgid "A_uthenticate" +msgstr "认证(_U)" + +#. Translators: this action removes (purges) all the listed jobs from the list. +#: panels/printers/pp-jobs-dialog.ui:169 +msgid "Clear All" +msgstr "全部清除" + +#. Translators: This button pop up authentication dialog for print jobs which need credentials. +#: panels/printers/pp-jobs-dialog.ui:232 +msgid "_Authenticate" +msgstr "认证(_A)" + +#. Translators: this label describes the dialog empty state, with no jobs listed. +#: panels/printers/pp-jobs-dialog.ui:358 +msgid "No Active Printer Jobs" +msgstr "没有活动的打印机任务" + #: panels/printers/pp-new-printer-dialog.c:380 msgid "Unlock Print Server" msgstr "解锁打印服务器" @@ -4804,127 +5145,134 @@ msgstr "正在搜索打印机" #. Translators: The found device is a printer connected via USB -#: panels/printers/pp-new-printer-dialog.c:1680 +#: panels/printers/pp-new-printer-dialog.c:1697 msgid "USB" msgstr "USB" #. Translators: The found device is a printer connected via serial port -#: panels/printers/pp-new-printer-dialog.c:1685 +#: panels/printers/pp-new-printer-dialog.c:1702 msgid "Serial Port" msgstr "串口" #. Translators: The found device is a printer connected via parallel port -#: panels/printers/pp-new-printer-dialog.c:1692 +#: panels/printers/pp-new-printer-dialog.c:1709 msgid "Parallel Port" msgstr "并口" #. Translators: Location of found network printer (e.g. Kitchen, Reception) -#: panels/printers/pp-new-printer-dialog.c:1734 +#: panels/printers/pp-new-printer-dialog.c:1751 #, c-format msgid "Location: %s" msgstr "位置：%s" #. Translators: Network address of found printer -#: panels/printers/pp-new-printer-dialog.c:1739 +#: panels/printers/pp-new-printer-dialog.c:1756 #, c-format msgid "Address: %s" msgstr "地址：%s" #. Translators: This item is a server which needs authentication to show its printers -#: panels/printers/pp-new-printer-dialog.c:1766 +#: panels/printers/pp-new-printer-dialog.c:1783 msgid "Server requires authentication" msgstr "服务器要求认证" -#: panels/printers/pp-options-dialog.c:90 +#: panels/printers/pp-options-dialog.c:91 msgid "Two Sided" msgstr "双面" -#: panels/printers/pp-options-dialog.c:91 +#: panels/printers/pp-options-dialog.c:92 msgid "Paper Type" msgstr "纸张类型" -#: panels/printers/pp-options-dialog.c:92 +#: panels/printers/pp-options-dialog.c:93 msgid "Paper Source" msgstr "纸张来源" -#: panels/printers/pp-options-dialog.c:93 +#: panels/printers/pp-options-dialog.c:94 msgid "Output Tray" msgstr "出纸托盘" -#: panels/printers/pp-options-dialog.c:94 +#: panels/printers/pp-options-dialog.c:95 msgctxt "printing option" msgid "Resolution" msgstr "分辨率" -#: panels/printers/pp-options-dialog.c:95 +#: panels/printers/pp-options-dialog.c:96 msgid "GhostScript pre-filtering" msgstr "GhostScript 预过滤" #. Translators: This option sets number of pages printed on one sheet -#: panels/printers/pp-options-dialog.c:548 +#: panels/printers/pp-options-dialog.c:534 msgid "Pages per side" msgstr "每面页数" #. Translators: This option sets whether to print on both sides of paper -#: panels/printers/pp-options-dialog.c:560 +#: panels/printers/pp-options-dialog.c:546 msgid "Two-sided" msgstr "双面" #. Translators: This option sets orientation of print (portrait, landscape...) -#: panels/printers/pp-options-dialog.c:572 +#: panels/printers/pp-options-dialog.c:558 msgid "Orientation" msgstr "方向" #. Translators: "General" tab contains general printer options -#: panels/printers/pp-options-dialog.c:669 +#: panels/printers/pp-options-dialog.c:655 msgctxt "Printer Option Group" msgid "General" msgstr "常规" #. Translators: "Page Setup" tab contains settings related to pages (page size, paper source, etc.) -#: panels/printers/pp-options-dialog.c:672 +#: panels/printers/pp-options-dialog.c:658 msgctxt "Printer Option Group" msgid "Page Setup" msgstr "页面设置" #. Translators: "Installable Options" tab contains settings of presence of installed options (amount of RAM, duplex unit, etc.) -#: panels/printers/pp-options-dialog.c:675 +#: panels/printers/pp-options-dialog.c:661 msgctxt "Printer Option Group" msgid "Installable Options" msgstr "可安装选项" #. Translators: "Job" tab contains settings for jobs -#: panels/printers/pp-options-dialog.c:678 +#: panels/printers/pp-options-dialog.c:664 msgctxt "Printer Option Group" msgid "Job" msgstr "任务" #. Translators: "Image Quality" tab contains settings for quality of output print (e.g. resolution) -#: panels/printers/pp-options-dialog.c:681 +#: panels/printers/pp-options-dialog.c:667 msgctxt "Printer Option Group" msgid "Image Quality" msgstr "图像质量" #. Translators: "Color" tab contains color settings (e.g. color printing) -#: panels/printers/pp-options-dialog.c:684 +#: panels/printers/pp-options-dialog.c:670 msgctxt "Printer Option Group" msgid "Color" msgstr "色彩" #. Translators: "Finishing" tab contains finishing settings (e.g. booklet printing) -#: panels/printers/pp-options-dialog.c:687 +#: panels/printers/pp-options-dialog.c:673 msgctxt "Printer Option Group" msgid "Finishing" msgstr "正在完成" #. Translators: "Advanced" tab contains all others settings -#: panels/printers/pp-options-dialog.c:690 +#: panels/printers/pp-options-dialog.c:676 msgctxt "Printer Option Group" msgid "Advanced" msgstr "高级" #. Translators: Name of job which makes printer to print test page -#: panels/printers/pp-options-dialog.c:920 +#. Translators: This button triggers the printing of a test page. +#: panels/printers/pp-options-dialog.c:869 +#: panels/printers/pp-options-dialog.ui:18 +msgid "Test Page" +msgstr "测试页" + +#. Translators: Name of job which makes printer to print test page +#: panels/printers/pp-options-dialog.c:882 msgid "Test page" msgstr "测试页" @@ -4970,123 +5318,123 @@ msgstr "厂商" #. Translators: This is the label of the button that opens the Jobs Dialog. -#: panels/printers/pp-printer-entry.c:606 panels/printers/printer-entry.ui:166 +#: panels/printers/pp-printer-entry.c:594 panels/printers/printer-entry.ui:166 msgid "No Active Jobs" msgstr "无活动任务" #. Translators: This is the label of the button that opens the Jobs Dialog. -#: panels/printers/pp-printer-entry.c:611 +#: panels/printers/pp-printer-entry.c:599 #, c-format msgid "%u Job" msgid_plural "%u Jobs" msgstr[0] "%u 项任务" #. Translators: The printer is low on toner -#: panels/printers/pp-printer-entry.c:766 +#: panels/printers/pp-printer-entry.c:745 msgid "Low on toner" msgstr "墨粉不足" #. Translators: The printer has no toner left -#: panels/printers/pp-printer-entry.c:768 +#: panels/printers/pp-printer-entry.c:747 msgid "Out of toner" msgstr "墨粉用尽" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: panels/printers/pp-printer-entry.c:771 +#: panels/printers/pp-printer-entry.c:750 msgid "Low on developer" msgstr "显影剂不足" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: panels/printers/pp-printer-entry.c:774 +#: panels/printers/pp-printer-entry.c:753 msgid "Out of developer" msgstr "显影剂用尽" #. Translators: "marker" is one color bin of the printer -#: panels/printers/pp-printer-entry.c:776 +#: panels/printers/pp-printer-entry.c:755 msgid "Low on a marker supply" msgstr "标记墨水不足" #. Translators: "marker" is one color bin of the printer -#: panels/printers/pp-printer-entry.c:778 +#: panels/printers/pp-printer-entry.c:757 msgid "Out of a marker supply" msgstr "标记墨水用尽" #. Translators: One or more covers on the printer are open -#: panels/printers/pp-printer-entry.c:780 +#: panels/printers/pp-printer-entry.c:759 msgid "Open cover" msgstr "打开上盖" #. Translators: One or more doors on the printer are open -#: panels/printers/pp-printer-entry.c:782 +#: panels/printers/pp-printer-entry.c:761 msgid "Open door" msgstr "打开后盖" #. Translators: At least one input tray is low on media -#: panels/printers/pp-printer-entry.c:784 +#: panels/printers/pp-printer-entry.c:763 msgid "Low on paper" msgstr "纸张不足" #. Translators: At least one input tray is empty -#: panels/printers/pp-printer-entry.c:786 +#: panels/printers/pp-printer-entry.c:765 msgid "Out of paper" msgstr "纸张用尽" #. Translators: The printer is offline -#: panels/printers/pp-printer-entry.c:788 +#: panels/printers/pp-printer-entry.c:767 msgctxt "printer state" msgid "Offline" msgstr "离线" #. Translators: Someone has stopped the Printer #. Translators: Printer's state (no jobs can be processed) -#: panels/printers/pp-printer-entry.c:790 -#: panels/printers/pp-printer-entry.c:918 +#: panels/printers/pp-printer-entry.c:769 +#: panels/printers/pp-printer-entry.c:897 msgctxt "printer state" msgid "Stopped" msgstr "已停止" #. Translators: The printer marker supply waste receptacle is almost full -#: panels/printers/pp-printer-entry.c:792 +#: panels/printers/pp-printer-entry.c:771 msgid "Waste receptacle almost full" msgstr "废粉仓将满" #. Translators: The printer marker supply waste receptacle is full -#: panels/printers/pp-printer-entry.c:794 +#: panels/printers/pp-printer-entry.c:773 msgid "Waste receptacle full" msgstr "废粉仓已满" #. Translators: Optical photo conductors are used in laser printers -#: panels/printers/pp-printer-entry.c:796 +#: panels/printers/pp-printer-entry.c:775 msgid "The optical photo conductor is near end of life" msgstr "感光鼓使用寿命已快耗尽" #. Translators: Optical photo conductors are used in laser printers -#: panels/printers/pp-printer-entry.c:798 +#: panels/printers/pp-printer-entry.c:777 msgid "The optical photo conductor is no longer functioning" msgstr "感光鼓故障" #. Translators: Printer's state (can start new job without waiting) -#: panels/printers/pp-printer-entry.c:904 +#: panels/printers/pp-printer-entry.c:883 msgctxt "printer state" msgid "Ready" msgstr "就绪" #. Translators: Printer's state (printer is ready but doesn't accept new jobs) -#: panels/printers/pp-printer-entry.c:909 +#: panels/printers/pp-printer-entry.c:888 msgctxt "printer state" msgid "Does not accept jobs" msgstr "不接收任务" #. Translators: Printer's state (jobs are processing) -#: panels/printers/pp-printer-entry.c:914 +#: panels/printers/pp-printer-entry.c:893 msgctxt "printer state" msgid "Processing" msgstr "正在处理" #. Translators: Name of job which makes printer to clean its heads -#: panels/printers/pp-printer-entry.c:938 +#: panels/printers/pp-printer-entry.c:917 msgid "Clean print heads" msgstr "清理喷墨头" @@ -5131,7 +5479,7 @@ msgstr "重启" #. Translators: This button adds new printer. -#: panels/printers/printers.ui:20 +#: panels/printers/printers.ui:12 msgid "Add…" msgstr "添加…" @@ -5151,531 +5499,362 @@ "doesn’t seem to be available." msgstr "抱歉，系统打印服务似乎不可用。" -#: panels/privacy/cc-privacy-panel.c:423 panels/privacy/cc-privacy-panel.ui:280 -msgid "Screen Lock" -msgstr "锁屏" - -#: panels/privacy/cc-privacy-panel.c:467 -msgid "In use" -msgstr "已占用" - -#: panels/privacy/cc-privacy-panel.c:472 -msgctxt "Location services status" -msgid "On" -msgstr "开启" - -#: panels/privacy/cc-privacy-panel.c:473 -msgctxt "Location services status" -msgid "Off" -msgstr "关闭" - -#: panels/privacy/cc-privacy-panel.c:895 -msgctxt "Camera status" -msgid "Off" -msgstr "关闭" - -#: panels/privacy/cc-privacy-panel.c:897 -msgctxt "Camera status" -msgid "On" -msgstr "开启" - -#: panels/privacy/cc-privacy-panel.c:928 -msgctxt "Microphone status" -msgid "Off" -msgstr "关闭" - -#: panels/privacy/cc-privacy-panel.c:930 -msgctxt "Microphone status" -msgid "On" -msgstr "开启" - -#: panels/privacy/cc-privacy-panel.c:1036 -#: panels/privacy/cc-privacy-panel.ui:127 -msgid "Usage & History" -msgstr "用量及历史" - -#: panels/privacy/cc-privacy-panel.c:1157 -msgid "Empty all items from Trash?" -msgstr "清空回收站中的所有项目吗？" - -#: panels/privacy/cc-privacy-panel.c:1158 -msgid "All items in the Trash will be permanently deleted." -msgstr "回收站内的所有项目将会永久删除。" - -#: panels/privacy/cc-privacy-panel.c:1159 -msgid "_Empty Trash" -msgstr "清空回收站(_E)" - -#: panels/privacy/cc-privacy-panel.c:1180 -msgid "Delete all the temporary files?" -msgstr "删除所有临时文件吗？" - -#: panels/privacy/cc-privacy-panel.c:1181 -msgid "All the temporary files will be permanently deleted." -msgstr "所有临时文件将会永久删除。" +#: panels/region/cc-format-chooser.c:148 +msgctxt "measurement format" +msgid "Imperial" +msgstr "英制" -#: panels/privacy/cc-privacy-panel.c:1182 -msgid "_Purge Temporary Files" -msgstr "清理临时文件(_P)" +#: panels/region/cc-format-chooser.c:150 +msgctxt "measurement format" +msgid "Metric" +msgstr "公制" -#: panels/privacy/cc-privacy-panel.c:1204 -#: panels/privacy/cc-privacy-panel.ui:432 -msgid "Purge Trash & Temporary Files" -msgstr "清理回收站及临时文件" - -#: panels/privacy/cc-privacy-panel.c:1237 -#: panels/privacy/cc-privacy-panel.ui:637 -msgid "Software Usage" -msgstr "软件使用统计" +#: panels/region/cc-format-chooser.c:255 panels/region/cc-format-chooser.c:296 +#: panels/region/cc-format-chooser.ui:6 +msgid "Formats" +msgstr "格式" -#: panels/privacy/cc-privacy-panel.c:1276 -#: panels/privacy/cc-privacy-panel.ui:1169 -msgid "Problem Reporting" -msgstr "报告问题" +#: panels/region/cc-format-chooser.ui:48 panels/wacom/wacom-stylus-page.ui:37 +#: shell/cc-window.ui:232 +msgid "Back" +msgstr "后退" -#. translators: '%s' is the distributor's name, such as 'Fedora' -#: panels/privacy/cc-privacy-panel.c:1288 -#, c-format +#: panels/region/cc-format-chooser.ui:103 msgid "" -"Sending reports of technical problems helps us improve %s. Reports are sent " -"anonymously and are scrubbed of personal data." -msgstr "发送匿名的技术问题报告能帮助我们改进 %s，这些报告中不含个人数据。" +"Choose the format for numbers, dates and currencies. Changes take effect on " +"next login." +msgstr "选择数字，日期和货币的格式。 更改将在下次登录时生效。" -#: panels/privacy/cc-privacy-panel.c:1300 -#: panels/privacy/cc-privacy-panel.ui:719 -msgid "Privacy Policy" -msgstr "隐私政策" +#: panels/region/cc-format-chooser.ui:119 +msgid "Search locales..." +msgstr "搜索地区..." -#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog. -#: panels/privacy/cc-privacy-panel.ui:14 -msgctxt "lock_screen" -msgid "Screen Turns Off" -msgstr "屏幕关闭" +#: panels/region/cc-format-chooser.ui:160 +msgid "Common Formats" +msgstr "常见格式" -#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog. -#: panels/privacy/cc-privacy-panel.ui:18 -msgctxt "lock_screen" -msgid "30 seconds" -msgstr "30 秒" +#: panels/region/cc-format-chooser.ui:191 +msgid "All Formats" +msgstr "所有格式" -#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog. -#: panels/privacy/cc-privacy-panel.ui:22 -msgctxt "lock_screen" -msgid "1 minute" -msgstr "1 分钟" - -#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog. -#: panels/privacy/cc-privacy-panel.ui:26 -msgctxt "lock_screen" -msgid "2 minutes" -msgstr "2 分钟" +#: panels/region/cc-format-chooser.ui:244 +msgid "No Search Results" +msgstr "无结果" -#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog. -#: panels/privacy/cc-privacy-panel.ui:30 -msgctxt "lock_screen" -msgid "3 minutes" -msgstr "3 分钟" +#: panels/region/cc-format-chooser.ui:257 +msgid "Searches can be for countries or languages." +msgstr "搜索可以是国家或语言。" -#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog. -#: panels/privacy/cc-privacy-panel.ui:34 -msgctxt "lock_screen" -msgid "5 minutes" -msgstr "5 分钟" - -#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog. -#: panels/privacy/cc-privacy-panel.ui:38 -msgctxt "lock_screen" -msgid "30 minutes" -msgstr "30 分钟" - -#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog. -#: panels/privacy/cc-privacy-panel.ui:42 -msgctxt "lock_screen" -msgid "1 hour" -msgstr "1 小时" - -#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog. -#: panels/privacy/cc-privacy-panel.ui:56 -msgctxt "purge_files" -msgid "1 hour" -msgstr "1 小时" - -#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog. -#: panels/privacy/cc-privacy-panel.ui:60 -msgctxt "purge_files" -msgid "1 day" -msgstr "1 天" - -#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog. -#: panels/privacy/cc-privacy-panel.ui:64 -msgctxt "purge_files" -msgid "2 days" -msgstr "2 天" - -#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog. -#: panels/privacy/cc-privacy-panel.ui:68 -msgctxt "purge_files" -msgid "3 days" -msgstr "3 天" +#: panels/region/cc-format-chooser.ui:309 +msgid "Preview" +msgstr "预览" -#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog. -#: panels/privacy/cc-privacy-panel.ui:72 -msgctxt "purge_files" -msgid "4 days" -msgstr "4 天" +#: panels/region/cc-format-chooser.ui:324 +msgid "Dates" +msgstr "日期" -#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog. -#: panels/privacy/cc-privacy-panel.ui:76 -msgctxt "purge_files" -msgid "5 days" -msgstr "5 天" +#: panels/region/cc-format-chooser.ui:368 +msgid "Dates & Times" +msgstr "日期与时间" -#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog. -#: panels/privacy/cc-privacy-panel.ui:80 -msgctxt "purge_files" -msgid "6 days" -msgstr "6 天" +#: panels/region/cc-format-chooser.ui:390 +msgid "Numbers" +msgstr "数字" -#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog. -#: panels/privacy/cc-privacy-panel.ui:84 -msgctxt "purge_files" -msgid "7 days" -msgstr "7 天" +#: panels/region/cc-format-chooser.ui:412 +msgid "Measurement" +msgstr "度量" -#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog. -#: panels/privacy/cc-privacy-panel.ui:88 -msgctxt "purge_files" -msgid "14 days" -msgstr "14 天" +#: panels/region/cc-format-chooser.ui:434 +msgid "Paper" +msgstr "纸张" -#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog. -#: panels/privacy/cc-privacy-panel.ui:92 -msgctxt "purge_files" -msgid "30 days" -msgstr "30 天" +#: panels/region/cc-input-chooser.c:193 +msgid "No input sources found" +msgstr "无输入源" -#. Translators: Option for "Retain History" in "Usage & History" dialog. -#: panels/privacy/cc-privacy-panel.ui:106 -msgctxt "retain_history" -msgid "1 day" -msgstr "1 天" +#: panels/region/cc-input-chooser.c:948 +msgctxt "Input Source" +msgid "Other" +msgstr "其他" -#. Translators: Option for "Retain History" in "Usage & History" dialog. -#: panels/privacy/cc-privacy-panel.ui:110 -msgctxt "retain_history" -msgid "7 days" -msgstr "7 天" +#: panels/region/cc-input-chooser.ui:5 +msgid "Add an Input Source" +msgstr "添加输入源" -#. Translators: Option for "Retain History" in "Usage & History" dialog. -#: panels/privacy/cc-privacy-panel.ui:114 -msgctxt "retain_history" -msgid "30 days" -msgstr "30 天" +#: panels/region/cc-input-chooser.ui:77 +msgid "Input methods can’t be used on the login screen" +msgstr "无法在登录屏幕上使用输入法" -#. Translators: Option for "Retain History" in "Usage & History" dialog. -#: panels/privacy/cc-privacy-panel.ui:118 -msgctxt "retain_history" -msgid "Forever" -msgstr "永久" +#: panels/region/cc-region-panel.c:1507 +msgid "Login _Screen" +msgstr "登录屏幕(_S)" -#: panels/privacy/cc-privacy-panel.ui:148 -msgid "" -"Remembering your history makes things easier to find again. These items are " -"never shared over the network." -msgstr "记住历史能够在下次使用时方便查找。这些条目永远不会通过网络共享。" +#: panels/region/cc-region-panel.ui:64 +#: panels/user-accounts/cc-user-panel.ui:317 +msgid "_Language" +msgstr "语言(_L)" -#: panels/privacy/cc-privacy-panel.ui:176 -msgid "_Recently Used" -msgstr "最近使用(_R)" +#: panels/region/cc-region-panel.ui:99 +msgid "Restart the session for changes to take effect" +msgstr "重启会话以让更改生效" -#: panels/privacy/cc-privacy-panel.ui:207 -msgid "Retain _History" -msgstr "保留历史(_H)" +#: panels/region/cc-region-panel.ui:114 +msgid "Restart…" +msgstr "重启…" -#: panels/privacy/cc-privacy-panel.ui:247 -msgid "Cl_ear Recent History" -msgstr "清理最近历史(_E)" +#: panels/region/cc-region-panel.ui:147 +msgid "_Formats" +msgstr "格式(_F)" -#: panels/privacy/cc-privacy-panel.ui:301 -msgid "The Screen Lock protects your privacy when you are away." -msgstr "离开时锁定屏幕可以保护隐私。" +#: panels/region/cc-region-panel.ui:195 +msgid "Input Sources" +msgstr "输入源" -#: panels/privacy/cc-privacy-panel.ui:328 -msgid "Automatic Screen _Lock" -msgstr "自动锁屏(_L)" +#: panels/region/cc-region-panel.ui:209 +msgid "Choose keyboard layouts or input methods." +msgstr "选择键盘布局或输入法。" -#: panels/privacy/cc-privacy-panel.ui:362 -msgid "Lock screen _after blank for" -msgstr "黑屏至锁屏的等待时间(_A)" - -#: panels/privacy/cc-privacy-panel.ui:394 -msgid "Lock Screen _Notifications" -msgstr "锁屏通知(_N)" - -#: panels/privacy/cc-privacy-panel.ui:454 -msgid "" -"Automatically purge the Trash and temporary files to help keep your computer " -"free of unnecessary sensitive information." -msgstr "自动清理回收站和临时文件，避免计算机保存不必要的敏感信息。" +#: panels/region/cc-region-panel.ui:266 +msgid "No input source selected" +msgstr "未选择输入源" -#: panels/privacy/cc-privacy-panel.ui:483 -msgid "Automatically empty _Trash" -msgstr "自动清空回收站(_T)" +#: panels/region/cc-region-panel.ui:300 +msgid "Login settings are used by all users when logging into the system" +msgstr "登录设置将对所有于本机登录的用户共享" -#: panels/privacy/cc-privacy-panel.ui:515 -msgid "Automatically purge Temporary _Files" -msgstr "自动清理临时文件(_F)" +#: panels/region/cc-region-panel.ui:337 +msgid "Input Source Options" +msgstr "输入源选项" -#: panels/privacy/cc-privacy-panel.ui:546 -msgid "Purge _After" -msgstr "清理延时(_A)" +#: panels/region/cc-region-panel.ui:352 +msgid "Use the _same source for all windows" +msgstr "所有窗口使用相同的输入源(_S)" -#: panels/privacy/cc-privacy-panel.ui:590 -msgid "_Empty Trash…" -msgstr "清空回收站(_E)…" +#: panels/region/cc-region-panel.ui:370 +msgid "Allow _different sources for each window" +msgstr "每个窗口使用不同的输入源(_D)" -#: panels/privacy/cc-privacy-panel.ui:606 -msgid "_Purge Temporary Files…" -msgstr "清除临时文件(_P)…" - -#: panels/privacy/cc-privacy-panel.ui:654 -msgid "" -"Sending us information about which software you use helps us provide you " -"with more accurate recommendations. It also helps us to improve our " -"software.\n" -"\n" -"All the information we collect is made anonymous, and we will never share " -"your data with third parties." -msgstr "" -"发送软件的使用情况有助于我们向提供更准确的推荐，帮助改进软件。\n" -"\n" -"信息均为匿名收集，不会与他人分享。" +#: panels/region/cc-region-panel.ui:412 +msgid "Previous source" +msgstr "上个源" -#: panels/privacy/cc-privacy-panel.ui:681 -msgid "_Send software usage statistics" -msgstr "发送软件使用统计信息(_S)" +#: panels/region/cc-region-panel.ui:430 +msgid "Super+Shift+Space" +msgstr "Super+Shift+Space" -#: panels/privacy/cc-privacy-panel.ui:764 -msgid "" -"Use of the camera allows applications to capture photos and video. Disabling " -"the camera may cause some applications to not function properly." -msgstr "" -"使用相机允许应用程序拍摄照片和视频。禁用相机可能会导致一些应用程序功能无法正" -"常使用。" +#: panels/region/cc-region-panel.ui:445 +msgid "Next source" +msgstr "下个源" -#: panels/privacy/cc-privacy-panel.ui:812 -msgid "_Camera" -msgstr "相机(_C)" +#: panels/region/cc-region-panel.ui:463 +msgid "Super+Space" +msgstr "Super+Space" -#: panels/privacy/cc-privacy-panel.ui:869 -msgid "" -"Use of the microphone allows applications to capture sounds. Disabling the " -"microphone may cause some applications to not function properly." -msgstr "" -"使用麦克风允许应用程序录制声音。禁用麦克风可能会导致一些应用程序功能无法正常" -"使用。" +#: panels/region/cc-region-panel.ui:478 +msgid "Left+Right Alt" +msgstr "左+右 Alt" -#: panels/privacy/cc-privacy-panel.ui:917 -msgid "_Microphone" -msgstr "麦克风(_M)" +#: panels/region/cc-region-panel.ui:494 +msgid "These keyboard shortcuts can be changed in the keyboard settings" +msgstr "可以在键盘设置中修改这些键盘快捷键" -#: panels/privacy/cc-privacy-panel.ui:974 -msgid "" -"Location services allow applications to know your location. Using Wi-Fi and " -"mobile broadband increases accuracy." -msgstr "" -"定位服务允许应用得知您的地理定位。使用 Wi-Fi 和移动宽带可以提高精确度。" +#: panels/region/gnome-region-panel.desktop.in.in:3 +msgid "Region & Language" +msgstr "区域与语言" -#: panels/privacy/cc-privacy-panel.ui:988 +#: panels/region/gnome-region-panel.desktop.in.in:4 msgid "" -"Uses Mozilla Location Service: Privacy Policy" -msgstr "" -"使用 Mozilla 定位服务：隐私策略" - -#: panels/privacy/cc-privacy-panel.ui:1038 -msgid "_Location Services" -msgstr "定位服务(_L)" - -#: panels/privacy/cc-privacy-panel.ui:1236 -msgid "_Automatic Problem Reporting" -msgstr "自动报告问题(_A)" - -#: panels/privacy/gnome-privacy-panel.desktop.in.in:3 -msgid "Privacy" -msgstr "隐私" - -#: panels/privacy/gnome-privacy-panel.desktop.in.in:4 -msgid "Protect your personal information and control what others might see" -msgstr "保护个人信息并控制他人可见的信息" +"Select your display language, formats, keyboard layouts and input sources" +msgstr "选择您的显示语言、格式、键盘布局和输入源" -#. FIXME -#. Translators: Search terms to find the Privacy panel. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! -#: panels/privacy/gnome-privacy-panel.desktop.in.in:20 -msgid "" -"screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;" -"network;identity;" -msgstr "" -"screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;" -"network;identity;屏幕;锁;诊断;崩溃;私;最近;临时;索引;名称;网络;认证;标志;身" -"份;" +#. Translators: Search terms to find the Region and Language panel. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! +#: panels/region/gnome-region-panel.desktop.in.in:19 +msgid "Language;Layout;Keyboard;Input;" +msgstr "Language;Layout;Keyboard;Input;语言;布局;键盘;输入;" -#: panels/region/cc-format-chooser.c:133 -msgctxt "measurement format" -msgid "Imperial" -msgstr "英制" +#: panels/removable-media/cc-removable-media-panel.c:267 +msgid "Ask what to do" +msgstr "询问如何处理" -#: panels/region/cc-format-chooser.c:135 -msgctxt "measurement format" -msgid "Metric" -msgstr "公制" +#: panels/removable-media/cc-removable-media-panel.c:271 +msgid "Do nothing" +msgstr "无动作" -#: panels/region/cc-format-chooser.c:314 -msgid "No regions found" -msgstr "无可用区域" +#: panels/removable-media/cc-removable-media-panel.c:275 +msgid "Open folder" +msgstr "打开文件夹" -#: panels/region/cc-format-chooser.ui:7 -msgid "Formats" -msgstr "格式" +#: panels/removable-media/cc-removable-media-panel.c:341 +msgid "Other Media" +msgstr "其他介质" -#: panels/region/cc-format-chooser.ui:106 -msgid "Preview" -msgstr "预览" +#: panels/removable-media/cc-removable-media-panel.c:362 +msgid "Select an application for audio CDs" +msgstr "选择播放音频 CD 的应用程序" -#: panels/region/cc-format-chooser.ui:123 -msgid "Dates" -msgstr "日期" +#: panels/removable-media/cc-removable-media-panel.c:363 +msgid "Select an application for video DVDs" +msgstr "选择播放视频 DVD 的应用程序" -#: panels/region/cc-format-chooser.ui:185 -msgid "Dates & Times" -msgstr "日期与时间" +#: panels/removable-media/cc-removable-media-panel.c:364 +msgid "Select an application to run when a music player is connected" +msgstr "选择连接音乐播放器后运行的应用程序" -#: panels/region/cc-format-chooser.ui:216 -msgid "Numbers" -msgstr "数字" +#: panels/removable-media/cc-removable-media-panel.c:365 +msgid "Select an application to run when a camera is connected" +msgstr "选择连接相机后运行的应用程序" -#: panels/region/cc-format-chooser.ui:233 -msgid "Measurement" -msgstr "度量" +#: panels/removable-media/cc-removable-media-panel.c:366 +msgid "Select an application for software CDs" +msgstr "选择插入软件 CD 时运行的应用程序" -#: panels/region/cc-format-chooser.ui:250 -msgid "Paper" -msgstr "纸张" +#. translators: these strings are duplicates of shared-mime-info +#. * strings, just here to fix capitalization of the English originals. +#. * If the shared-mime-info translation works for your language, +#. * simply leave these untranslated. +#. +#: panels/removable-media/cc-removable-media-panel.c:378 +msgid "audio DVD" +msgstr "音频 DVD" -#: panels/region/cc-input-chooser.c:193 -msgid "No input sources found" -msgstr "无输入源" +#: panels/removable-media/cc-removable-media-panel.c:379 +msgid "blank Blu-ray disc" +msgstr "空白蓝光光盘" -#: panels/region/cc-input-chooser.c:948 -msgctxt "Input Source" -msgid "Other" -msgstr "其他" +#: panels/removable-media/cc-removable-media-panel.c:380 +msgid "blank CD disc" +msgstr "空白 CD 光盘" -#: panels/region/cc-input-chooser.ui:5 -msgid "Add an Input Source" -msgstr "添加输入源" +#: panels/removable-media/cc-removable-media-panel.c:381 +msgid "blank DVD disc" +msgstr "空白 DVD 光盘" -#: panels/region/cc-input-chooser.ui:77 -msgid "Input methods can’t be used on the login screen" -msgstr "无法在登录屏幕上使用输入法" +# 空白 HD DVD 光盘 +#: panels/removable-media/cc-removable-media-panel.c:382 +msgid "blank HD DVD disc" +msgstr "空白 HD DVD 光盘" -#: panels/region/cc-region-panel.c:1511 -msgid "Login _Screen" -msgstr "登录屏幕(_S)" +#: panels/removable-media/cc-removable-media-panel.c:383 +msgid "Blu-ray video disc" +msgstr "蓝光视频光盘" -#: panels/region/cc-region-panel.ui:64 -#: panels/user-accounts/cc-user-panel.ui:364 -msgid "_Language" -msgstr "语言(_L)" +#: panels/removable-media/cc-removable-media-panel.c:384 +msgid "e-book reader" +msgstr "电子书阅读器" -#: panels/region/cc-region-panel.ui:99 -msgid "Restart the session for changes to take effect" -msgstr "重启会话以让更改生效" +#: panels/removable-media/cc-removable-media-panel.c:385 +msgid "HD DVD video disc" +msgstr "HD DVD 视频光盘" -#: panels/region/cc-region-panel.ui:114 -msgid "Restart…" -msgstr "重启…" +#: panels/removable-media/cc-removable-media-panel.c:386 +msgid "Picture CD" +msgstr "图片 CD" -#: panels/region/cc-region-panel.ui:147 -msgid "_Formats" -msgstr "格式(_F)" +#: panels/removable-media/cc-removable-media-panel.c:387 +msgid "Super Video CD" +msgstr "超级 VCD" -#: panels/region/cc-region-panel.ui:195 -msgid "Input Sources" -msgstr "输入源" +#: panels/removable-media/cc-removable-media-panel.c:388 +msgid "Video CD" +msgstr "视频 CD" -#: panels/region/cc-region-panel.ui:209 -msgid "Choose keyboard layouts or input methods." -msgstr "选择键盘布局或输入法。" +#: panels/removable-media/cc-removable-media-panel.c:389 +msgid "Windows software" +msgstr "Windows 软件" -#: panels/region/cc-region-panel.ui:266 -msgid "No input source selected" -msgstr "未选择输入源" +#: panels/removable-media/cc-removable-media-panel.ui:44 +msgid "Select how media should be handled" +msgstr "选择如何处理介质" -#: panels/region/cc-region-panel.ui:300 -msgid "Login settings are used by all users when logging into the system" -msgstr "登录设置将对所有于本机登录的用户共享" +#: panels/removable-media/cc-removable-media-panel.ui:75 +msgid "CD _audio" +msgstr "CD 音频(_A)" -#: panels/region/cc-region-panel.ui:337 -msgid "Input Source Options" -msgstr "输入源选项" +#: panels/removable-media/cc-removable-media-panel.ui:92 +msgid "_DVD video" +msgstr "_DVD 视频" -#: panels/region/cc-region-panel.ui:352 -msgid "Use the _same source for all windows" -msgstr "所有窗口使用相同的输入源(_S)" +#: panels/removable-media/cc-removable-media-panel.ui:133 +msgid "_Music player" +msgstr "音乐播放器(_M)" -#: panels/region/cc-region-panel.ui:370 -msgid "Allow _different sources for each window" -msgstr "每个窗口使用不同的输入源(_D)" +#: panels/removable-media/cc-removable-media-panel.ui:191 +msgid "_Software" +msgstr "软件(_S)" -#: panels/region/cc-region-panel.ui:412 -msgid "Previous source" -msgstr "上个源" +#: panels/removable-media/cc-removable-media-panel.ui:229 +msgid "_Other Media…" +msgstr "其他介质(_O)…" -#: panels/region/cc-region-panel.ui:430 -msgid "Super+Shift+Space" -msgstr "Super+Shift+Space" +#: panels/removable-media/cc-removable-media-panel.ui:288 +msgid "_Never prompt or start programs on media insertion" +msgstr "介质插入时从不提示或启动程序(_N)" -#: panels/region/cc-region-panel.ui:445 -msgid "Next source" -msgstr "下个源" +#: panels/removable-media/cc-removable-media-panel.ui:342 +msgid "Select how other media should be handled" +msgstr "选择如何处理其他介质" -#: panels/region/cc-region-panel.ui:463 -msgid "Super+Space" -msgstr "Super+Space" +#: panels/removable-media/cc-removable-media-panel.ui:389 +msgid "_Action:" +msgstr "动作(_A)：" -#: panels/region/cc-region-panel.ui:478 -msgid "Left+Right Alt" -msgstr "左+右 Alt" +#: panels/removable-media/cc-removable-media-panel.ui:412 +msgid "_Type:" +msgstr "类型(_T)：" -#: panels/region/cc-region-panel.ui:494 -msgid "These keyboard shortcuts can be changed in the keyboard settings" -msgstr "可以在键盘设置中修改这些键盘快捷键" +#: panels/removable-media/gnome-removable-media-panel.desktop.in.in:3 +msgid "Removable Media" +msgstr "可移动介质" -#: panels/region/gnome-region-panel.desktop.in.in:3 -msgid "Region & Language" -msgstr "区域与语言" +#: panels/removable-media/gnome-removable-media-panel.desktop.in.in:4 +msgid "Configure Removable Media settings" +msgstr "配置可移动介质设置" -#: panels/region/gnome-region-panel.desktop.in.in:4 +#. Translators: Search terms to find the Removable Media panel. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! +#: panels/removable-media/gnome-removable-media-panel.desktop.in.in:19 msgid "" -"Select your display language, formats, keyboard layouts and input sources" -msgstr "选择您的显示语言、格式、键盘布局和输入源" - -#. Translators: Search terms to find the Region and Language panel. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! -#: panels/region/gnome-region-panel.desktop.in.in:19 -msgid "Language;Layout;Keyboard;Input;" -msgstr "Language;Layout;Keyboard;Input;语言;布局;键盘;输入;" +"device;system;default;application;preferred;cd;dvd;usb;audio;video;disc;" +"removable;media;autorun;" +msgstr "" +"device;system;default;application;preferred;cd;dvd;usb;audio;video;disc;" +"removable;media;autorun;设备;系统;默认;应用程序;首选;音频;视频;光盘;光碟;盘" +"片;可擦写;可移除;可移动;媒体;介质;自动运行;" -#: panels/search/cc-search-locations-dialog.c:610 +#: panels/search/cc-search-locations-dialog.c:635 msgid "Select Location" msgstr "选择位置" -#: panels/search/cc-search-locations-dialog.c:614 +#: panels/search/cc-search-locations-dialog.c:639 msgid "_OK" msgstr "确定(_O)" -#: panels/search/cc-search-panel.c:153 +#: panels/search/cc-search-locations-dialog.ui:9 +#: panels/search/cc-search-panel.ui:61 +msgid "Search Locations" +msgstr "搜索位置" + +#: panels/search/cc-search-locations-dialog.ui:32 +#: panels/search/cc-search-locations-dialog.ui:69 +#: panels/search/cc-search-locations-dialog.ui:107 +msgid "" +"Folders which are searched by system applications, such as Files, Photos and " +"Videos." +msgstr "系统应用程序所搜索的文件夹，比如文件、照片和视频。" + +#: panels/search/cc-search-locations-dialog.ui:52 +msgid "Places" +msgstr "位置" + +#: panels/search/cc-search-locations-dialog.ui:91 +msgid "Bookmarks" +msgstr "书签" + +#: panels/search/cc-search-locations-dialog.ui:156 +msgid "Other" +msgstr "其他" + +#: panels/search/cc-search-panel.c:152 msgid "No applications found" msgstr "未找到应用" @@ -5687,7 +5866,7 @@ msgid "Move Down" msgstr "下移" -#: panels/search/cc-search-panel.ui:32 +#: panels/search/cc-search-panel.ui:33 msgid "" "Control which search results are shown in the Activities Overview. The order " "of search results can also be changed by moving rows in the list." @@ -5695,11 +5874,6 @@ "控制活动概览中显示哪些搜索结果。搜索结果顺序也可以通过移动列表中的行排序进行" "更改。" -#: panels/search/cc-search-panel.ui:60 -#: panels/search/search-locations-dialog.ui:9 -msgid "Search Locations" -msgstr "搜索位置" - #: panels/search/gnome-search-panel.desktop.in.in:4 msgid "" "Control which applications show search results in the Activities Overview" @@ -5711,88 +5885,85 @@ msgstr "" "Search;Find;Index;Hide;Privacy;Results;搜索;查找;寻找;索引;隐藏;隐私;结果;" -#: panels/search/search-locations-dialog.ui:32 -#: panels/search/search-locations-dialog.ui:69 -#: panels/search/search-locations-dialog.ui:107 -msgid "" -"Folders which are searched by system applications, such as Files, Photos and " -"Videos." -msgstr "系统应用程序所搜索的文件夹，比如文件、照片和视频。" - -#: panels/search/search-locations-dialog.ui:52 -msgid "Places" -msgstr "位置" - -#: panels/search/search-locations-dialog.ui:91 -msgid "Bookmarks" -msgstr "书签" - -#: panels/search/search-locations-dialog.ui:156 -msgid "Other" -msgstr "其他" - #. Label #: panels/sharing/cc-sharing-networks.c:307 msgid "No networks selected for sharing" msgstr "未选择要共享的网络" -#: panels/sharing/cc-sharing-panel.c:320 +#: panels/sharing/cc-sharing-networks.ui:19 +msgid "Networks" +msgstr "网络" + +#: panels/sharing/cc-sharing-panel.c:302 msgctxt "service is enabled" msgid "On" msgstr "已开启" -#: panels/sharing/cc-sharing-panel.c:322 panels/sharing/cc-sharing-panel.c:349 +#: panels/sharing/cc-sharing-panel.c:304 panels/sharing/cc-sharing-panel.c:331 msgctxt "service is disabled" msgid "Off" msgstr "已关闭" -#: panels/sharing/cc-sharing-panel.c:352 +#: panels/sharing/cc-sharing-panel.c:334 msgctxt "service is enabled" msgid "Enabled" msgstr "已启用" -#: panels/sharing/cc-sharing-panel.c:355 +#: panels/sharing/cc-sharing-panel.c:337 msgctxt "service is active" msgid "Active" msgstr "活动" -#: panels/sharing/cc-sharing-panel.c:425 +#: panels/sharing/cc-sharing-panel.c:407 msgid "Choose a Folder" msgstr "选择文件夹" -#: panels/sharing/cc-sharing-panel.c:725 -#, c-format +#. TRANSLATORS: %s is replaced with a link to a dav:// URL +#: panels/sharing/cc-sharing-panel.c:711 +#, fuzzy, c-format +#| msgid "" +#| "File Sharing allows you to share your Public folder with others on your " +#| "current network using: dav://%s" msgid "" "File Sharing allows you to share your Public folder with others on your " -"current network using: dav://%s" +"current network using: %s" msgstr "" "文件共享允许您与当前网络中的其他人共享自己的公共文件夹，使用地址：dav://%s" -#: panels/sharing/cc-sharing-panel.c:727 -#, c-format +#. TRANSLATORS: %s is replaced with a link to a "ssh " command to run +#: panels/sharing/cc-sharing-panel.c:717 +#, fuzzy, c-format +#| msgid "" +#| "When remote login is enabled, remote users can connect using the Secure " +#| "Shell command:\n" +#| "ssh %s" msgid "" "When remote login is enabled, remote users can connect using the Secure " "Shell command:\n" -"ssh %s" +"%s" msgstr "" "当启用远程登录是，远程用户可以使用 SSH 命令来连接：\n" "ssh %s" -#: panels/sharing/cc-sharing-panel.c:729 -#, c-format +#. TRANSLATORS: %s is replaced with a link to a vnc:// URL +#: panels/sharing/cc-sharing-panel.c:723 +#, fuzzy, c-format +#| msgid "" +#| "Screen sharing allows remote users to view or control your screen by " +#| "connecting to vnc://%s" msgid "" "Screen sharing allows remote users to view or control your screen by " -"connecting to vnc://%s" +"connecting to %s" msgstr "" "屏幕共享允许远程用户查看或控制您的屏幕通过连接到：vnc://" "%s" -#: panels/sharing/cc-sharing-panel.c:833 +#: panels/sharing/cc-sharing-panel.c:828 msgid "Copy" msgstr "复制" -#: panels/sharing/cc-sharing-panel.c:1286 +#: panels/sharing/cc-sharing-panel.c:1279 #: panels/sharing/gnome-sharing-panel.desktop.in.in:3 msgid "Sharing" msgstr "共享" @@ -5836,44 +6007,44 @@ msgstr "远程登录" #: panels/sharing/cc-sharing-panel.ui:517 -#: panels/sharing/cc-sharing-panel.ui:763 +#: panels/sharing/cc-sharing-panel.ui:739 msgid "Screen Sharing" msgstr "屏幕共享" -#: panels/sharing/cc-sharing-panel.ui:575 +#: panels/sharing/cc-sharing-panel.ui:571 msgid "_Allow connections to control the screen" msgstr "允许连接控制屏幕(_A)" -#: panels/sharing/cc-sharing-panel.ui:620 +#: panels/sharing/cc-sharing-panel.ui:596 msgid "_Password:" msgstr "密码(_P)：" -#: panels/sharing/cc-sharing-panel.ui:650 +#: panels/sharing/cc-sharing-panel.ui:626 msgid "_Show Password" msgstr "显示密码(_S)" -#: panels/sharing/cc-sharing-panel.ui:681 +#: panels/sharing/cc-sharing-panel.ui:657 msgid "Access Options" msgstr "访问选项" -#: panels/sharing/cc-sharing-panel.ui:695 +#: panels/sharing/cc-sharing-panel.ui:671 msgid "_New connections must ask for access" msgstr "建立新连接前必须询问访问权限(_N)" -#: panels/sharing/cc-sharing-panel.ui:713 +#: panels/sharing/cc-sharing-panel.ui:689 msgid "_Require a password" msgstr "需要密码(_R)" -#: panels/sharing/cc-sharing-panel.ui:774 -#: panels/sharing/cc-sharing-panel.ui:868 +#: panels/sharing/cc-sharing-panel.ui:750 +#: panels/sharing/cc-sharing-panel.ui:844 msgid "Media Sharing" msgstr "媒体共享" -#: panels/sharing/cc-sharing-panel.ui:807 +#: panels/sharing/cc-sharing-panel.ui:783 msgid "Share music, photos and videos over the network." msgstr "通过网络共享音乐、照片和视频。" -#: panels/sharing/cc-sharing-panel.ui:822 +#: panels/sharing/cc-sharing-panel.ui:798 msgid "Folders" msgstr "文件夹" @@ -5891,10 +6062,6 @@ "movies;server;renderer;共享;主机;名称;远程;桌面;介质;媒体;音频;视频;图片;照" "片;电影;服务器;渲染;" -#: panels/sharing/networks.ui:19 -msgid "Networks" -msgstr "网络" - #: panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in:11 msgid "Enable or disable remote login" msgstr "启用或禁用远程登录" @@ -5907,19 +6074,19 @@ msgid "Custom" msgstr "自定义" -#: panels/sound/cc-alert-chooser.ui:12 panels/sound/cc-alert-selector.ui:9 +#: panels/sound/cc-alert-chooser.ui:12 msgid "Bark" msgstr "犬吠" -#: panels/sound/cc-alert-chooser.ui:19 panels/sound/cc-alert-selector.ui:15 +#: panels/sound/cc-alert-chooser.ui:19 msgid "Drip" msgstr "雨滴" -#: panels/sound/cc-alert-chooser.ui:26 panels/sound/cc-alert-selector.ui:21 +#: panels/sound/cc-alert-chooser.ui:26 msgid "Glass" msgstr "玻璃" -#: panels/sound/cc-alert-chooser.ui:33 panels/sound/cc-alert-selector.ui:27 +#: panels/sound/cc-alert-chooser.ui:33 msgid "Sonar" msgstr "声纳" @@ -5993,7 +6160,7 @@ msgid "Alert Sound" msgstr "警报声" -#: panels/sound/cc-volume-slider.c:63 +#: panels/sound/cc-volume-slider.c:115 msgctxt "volume" msgid "100%" msgstr "100%" @@ -6120,12 +6287,12 @@ msgid "Authorized" msgstr "已认证" -#: panels/thunderbolt/cc-bolt-panel.c:176 +#: panels/thunderbolt/cc-bolt-panel.c:175 msgid "" "The Thunderbolt subsystem (boltd) is not installed or not set up properly." msgstr "Thunderbolt 子系统 (boltd) 未安装或配置不正确。" -#: panels/thunderbolt/cc-bolt-panel.c:469 +#: panels/thunderbolt/cc-bolt-panel.c:468 msgid "" "Thunderbolt could not be detected.\n" "Either the system lacks Thunderbolt support, it has been disabled in the " @@ -6135,15 +6302,15 @@ "可能是该系统无 Thunderbolt 支持，或在 BIOS 中被禁用，抑或是设置成了不被支持的" "安全级别。" -#: panels/thunderbolt/cc-bolt-panel.c:513 +#: panels/thunderbolt/cc-bolt-panel.c:512 msgid "Thunderbolt support has been disabled in the BIOS." msgstr "Thunderbolt 支持在 BIOS 中被禁用。" -#: panels/thunderbolt/cc-bolt-panel.c:517 +#: panels/thunderbolt/cc-bolt-panel.c:516 msgid "Thunderbolt security level could not be determined." msgstr "无法确定 Thunderbolt 安全级别。" -#: panels/thunderbolt/cc-bolt-panel.c:622 +#: panels/thunderbolt/cc-bolt-panel.c:621 #, c-format msgid "Error switching direct mode: %s" msgstr "无法切换为直接模式：%s" @@ -6187,32 +6354,32 @@ #. translators: the labels will read: #. * Cursor Size: Default -#: panels/universal-access/cc-ua-panel.c:497 +#: panels/universal-access/cc-ua-panel.c:500 msgctxt "cursor size" msgid "Default" msgstr "默认" -#: panels/universal-access/cc-ua-panel.c:500 +#: panels/universal-access/cc-ua-panel.c:503 msgctxt "cursor size" msgid "Medium" msgstr "中" -#: panels/universal-access/cc-ua-panel.c:503 +#: panels/universal-access/cc-ua-panel.c:506 msgctxt "cursor size" msgid "Large" msgstr "大" -#: panels/universal-access/cc-ua-panel.c:506 +#: panels/universal-access/cc-ua-panel.c:509 msgctxt "cursor size" msgid "Larger" msgstr "更大" -#: panels/universal-access/cc-ua-panel.c:509 +#: panels/universal-access/cc-ua-panel.c:512 msgctxt "cursor size" msgid "Largest" msgstr "最大" -#: panels/universal-access/cc-ua-panel.c:513 +#: panels/universal-access/cc-ua-panel.c:516 #, c-format msgid "%d pixel" msgid_plural "%d pixels" @@ -6248,7 +6415,7 @@ msgstr "屏幕朗读(_R)" #: panels/universal-access/cc-ua-panel.ui:397 -#: panels/universal-access/cc-ua-panel.ui:1231 +#: panels/universal-access/cc-ua-panel.ui:1263 msgid "_Sound Keys" msgstr "发声键(_S)" @@ -6257,7 +6424,7 @@ msgstr "听觉" #: panels/universal-access/cc-ua-panel.ui:503 -#: panels/universal-access/cc-ua-panel.ui:1334 +#: panels/universal-access/cc-ua-panel.ui:1366 msgid "_Visual Alerts" msgstr "视觉警报(_V)" @@ -6286,248 +6453,252 @@ msgstr "鼠标键(_M)" #: panels/universal-access/cc-ua-panel.ui:900 +msgid "_Locate Pointer" +msgstr "闪烁整个窗口(_S)" + +#: panels/universal-access/cc-ua-panel.ui:932 msgid "_Click Assist" msgstr "点击助手(_C)" -#: panels/universal-access/cc-ua-panel.ui:946 +#: panels/universal-access/cc-ua-panel.ui:978 msgid "_Double-Click Delay" msgstr "双击延时(_D)" -#: panels/universal-access/cc-ua-panel.ui:966 +#: panels/universal-access/cc-ua-panel.ui:998 msgid "Double-Click Delay" msgstr "双击延时" -#: panels/universal-access/cc-ua-panel.ui:1036 +#: panels/universal-access/cc-ua-panel.ui:1068 msgid "Cursor Size" msgstr "光标大小" -#: panels/universal-access/cc-ua-panel.ui:1063 +#: panels/universal-access/cc-ua-panel.ui:1095 msgid "" "Cursor size can be combined with zoom to make it easier to see the cursor." msgstr "可通过缩放光标大小来更清晰地看见光标。" -#: panels/universal-access/cc-ua-panel.ui:1099 +#: panels/universal-access/cc-ua-panel.ui:1131 msgid "Screen Reader" msgstr "屏幕朗读" -#: panels/universal-access/cc-ua-panel.ui:1116 +#: panels/universal-access/cc-ua-panel.ui:1148 msgid "The screen reader reads displayed text as you move the focus." msgstr "移动焦点时朗读显示的文本。" -#: panels/universal-access/cc-ua-panel.ui:1149 +#: panels/universal-access/cc-ua-panel.ui:1181 msgid "_Screen Reader" msgstr "屏幕朗读(_S)" -#: panels/universal-access/cc-ua-panel.ui:1188 +#: panels/universal-access/cc-ua-panel.ui:1220 msgid "Sound Keys" msgstr "发声键" -#: panels/universal-access/cc-ua-panel.ui:1206 +#: panels/universal-access/cc-ua-panel.ui:1238 msgid "Beep when Num Lock or Caps Lock are turned on or off." msgstr "数字键盘锁定或大小写锁定开启或关闭时发出蜂鸣声。" -#: panels/universal-access/cc-ua-panel.ui:1276 +#: panels/universal-access/cc-ua-panel.ui:1308 msgid "Visual Alerts" msgstr "视觉警报" -#: panels/universal-access/cc-ua-panel.ui:1280 +#: panels/universal-access/cc-ua-panel.ui:1312 msgid "_Test flash" msgstr "测试闪烁(_T)" -#: panels/universal-access/cc-ua-panel.ui:1309 +#: panels/universal-access/cc-ua-panel.ui:1341 msgid "Use a visual indication when an alert sound occurs." msgstr "发出警报声时使用视觉提示。" -#: panels/universal-access/cc-ua-panel.ui:1360 -msgid "Flash the _window title" -msgstr "闪烁窗口标题栏(_W)" +#: panels/universal-access/cc-ua-panel.ui:1392 +msgid "Flash the entire _window" +msgstr "闪烁整个窗口(_W)" -#: panels/universal-access/cc-ua-panel.ui:1378 +#: panels/universal-access/cc-ua-panel.ui:1410 msgid "Flash the entire _screen" msgstr "闪烁整个屏幕(_S)" -#: panels/universal-access/cc-ua-panel.ui:1423 +#: panels/universal-access/cc-ua-panel.ui:1455 msgid "Repeat Keys" msgstr "重复" -#: panels/universal-access/cc-ua-panel.ui:1453 +#: panels/universal-access/cc-ua-panel.ui:1485 msgid "Key presses repeat when key is held down." msgstr "按住某一键时重复该键。" -#: panels/universal-access/cc-ua-panel.ui:1533 +#: panels/universal-access/cc-ua-panel.ui:1565 msgid "Repeat keys delay" msgstr "重复键延时" -#: panels/universal-access/cc-ua-panel.ui:1581 -#: panels/universal-access/cc-ua-panel.ui:1716 +#: panels/universal-access/cc-ua-panel.ui:1613 +#: panels/universal-access/cc-ua-panel.ui:1748 msgid "Speed" msgstr "速度" -#: panels/universal-access/cc-ua-panel.ui:1620 +#: panels/universal-access/cc-ua-panel.ui:1652 msgid "Repeat keys speed" msgstr "重复键速度" -#: panels/universal-access/cc-ua-panel.ui:1644 +#: panels/universal-access/cc-ua-panel.ui:1676 msgid "Cursor Blinking" msgstr "光标闪烁" -#: panels/universal-access/cc-ua-panel.ui:1674 +#: panels/universal-access/cc-ua-panel.ui:1706 msgid "Cursor blinks in text fields." msgstr "文本字段中光标闪烁。" -#: panels/universal-access/cc-ua-panel.ui:1753 +#: panels/universal-access/cc-ua-panel.ui:1785 msgid "Cursor blinking speed" msgstr "光标闪烁速度" -#: panels/universal-access/cc-ua-panel.ui:1789 +#: panels/universal-access/cc-ua-panel.ui:1821 msgid "Typing Assist" msgstr "打字助手" -#: panels/universal-access/cc-ua-panel.ui:1828 +#: panels/universal-access/cc-ua-panel.ui:1860 msgid "_Sticky Keys" msgstr "粘滞键(_S)" -#: panels/universal-access/cc-ua-panel.ui:1845 +#: panels/universal-access/cc-ua-panel.ui:1877 msgid "Treats a sequence of modifier keys as a key combination" msgstr "将一系列按键当作组合键" -#: panels/universal-access/cc-ua-panel.ui:1869 +#: panels/universal-access/cc-ua-panel.ui:1901 msgid "_Disable if two keys are pressed together" msgstr "同时按下两个键时禁用输入(_D)" -#: panels/universal-access/cc-ua-panel.ui:1887 +#: panels/universal-access/cc-ua-panel.ui:1919 msgid "Beep when a _modifier key is pressed" msgstr "按修饰键时蜂鸣(_M)" -#: panels/universal-access/cc-ua-panel.ui:1935 +#: panels/universal-access/cc-ua-panel.ui:1967 msgid "S_low Keys" msgstr "慢速键(_L)" -#: panels/universal-access/cc-ua-panel.ui:1952 +#: panels/universal-access/cc-ua-panel.ui:1984 msgid "Puts a delay between when a key is pressed and when it is accepted" msgstr "在按下按键和接受按键之间添加延迟" -#: panels/universal-access/cc-ua-panel.ui:1985 -#: panels/universal-access/cc-ua-panel.ui:2198 -#: panels/universal-access/cc-ua-panel.ui:2535 +#: panels/universal-access/cc-ua-panel.ui:2017 +#: panels/universal-access/cc-ua-panel.ui:2230 +#: panels/universal-access/cc-ua-panel.ui:2567 msgid "A_cceptance delay:" msgstr "按键接受延迟(_C)：" -#: panels/universal-access/cc-ua-panel.ui:2007 +#: panels/universal-access/cc-ua-panel.ui:2039 msgctxt "slow keys delay" msgid "Short" msgstr "短" -#: panels/universal-access/cc-ua-panel.ui:2026 +#: panels/universal-access/cc-ua-panel.ui:2058 msgid "Slow keys typing delay" msgstr "慢速键输入延迟" -#: panels/universal-access/cc-ua-panel.ui:2041 +#: panels/universal-access/cc-ua-panel.ui:2073 msgctxt "slow keys delay" msgid "Long" msgstr "长" -#: panels/universal-access/cc-ua-panel.ui:2068 +#: panels/universal-access/cc-ua-panel.ui:2100 msgid "Beep when a key is pr_essed" msgstr "按键时蜂鸣(_E)" -#: panels/universal-access/cc-ua-panel.ui:2085 +#: panels/universal-access/cc-ua-panel.ui:2117 msgid "Beep when a key is _accepted" msgstr "按键被接受时蜂鸣(_A)" -#: panels/universal-access/cc-ua-panel.ui:2102 -#: panels/universal-access/cc-ua-panel.ui:2281 +#: panels/universal-access/cc-ua-panel.ui:2134 +#: panels/universal-access/cc-ua-panel.ui:2313 msgid "Beep when a key is _rejected" msgstr "按键被拒绝时蜂鸣(_R)" -#: panels/universal-access/cc-ua-panel.ui:2148 +#: panels/universal-access/cc-ua-panel.ui:2180 msgid "_Bounce Keys" msgstr "重复键(_B)" -#: panels/universal-access/cc-ua-panel.ui:2165 +#: panels/universal-access/cc-ua-panel.ui:2197 msgid "Ignores fast duplicate keypresses" msgstr "忽略快速重复按键" -#: panels/universal-access/cc-ua-panel.ui:2220 +#: panels/universal-access/cc-ua-panel.ui:2252 msgctxt "bounce keys delay" msgid "Short" msgstr "短" -#: panels/universal-access/cc-ua-panel.ui:2239 +#: panels/universal-access/cc-ua-panel.ui:2271 msgid "Bounce keys typing delay" msgstr "重复键输入延迟" -#: panels/universal-access/cc-ua-panel.ui:2254 +#: panels/universal-access/cc-ua-panel.ui:2286 msgctxt "bounce keys delay" msgid "Long" msgstr "长" -#: panels/universal-access/cc-ua-panel.ui:2367 +#: panels/universal-access/cc-ua-panel.ui:2399 msgid "_Enable by Keyboard" msgstr "通过键盘启用(_E)" -#: panels/universal-access/cc-ua-panel.ui:2384 +#: panels/universal-access/cc-ua-panel.ui:2416 msgid "Turn accessibility features on and off using the keyboard" msgstr "通过键盘开关辅助功能特性" -#: panels/universal-access/cc-ua-panel.ui:2448 +#: panels/universal-access/cc-ua-panel.ui:2480 msgid "Click Assist" msgstr "点击助手" -#: panels/universal-access/cc-ua-panel.ui:2484 +#: panels/universal-access/cc-ua-panel.ui:2516 msgid "_Simulated Secondary Click" msgstr "模拟副键点击(_S)" -#: panels/universal-access/cc-ua-panel.ui:2502 +#: panels/universal-access/cc-ua-panel.ui:2534 msgid "Trigger a secondary click by holding down the primary button" msgstr "按住鼠标主键不放时触发副键点击" -#: panels/universal-access/cc-ua-panel.ui:2556 +#: panels/universal-access/cc-ua-panel.ui:2588 msgctxt "secondary click" msgid "Short" msgstr "短" -#: panels/universal-access/cc-ua-panel.ui:2575 +#: panels/universal-access/cc-ua-panel.ui:2607 msgid "Secondary click delay" msgstr "副键点击延迟" -#: panels/universal-access/cc-ua-panel.ui:2590 +#: panels/universal-access/cc-ua-panel.ui:2622 msgctxt "secondary click delay" msgid "Long" msgstr "长" -#: panels/universal-access/cc-ua-panel.ui:2647 +#: panels/universal-access/cc-ua-panel.ui:2679 msgid "_Hover Click" msgstr "悬停点击(_H)" -#: panels/universal-access/cc-ua-panel.ui:2665 +#: panels/universal-access/cc-ua-panel.ui:2697 msgid "Trigger a click when the pointer hovers" msgstr "指针悬停时触发点击" -#: panels/universal-access/cc-ua-panel.ui:2698 +#: panels/universal-access/cc-ua-panel.ui:2730 msgid "D_elay:" msgstr "延迟(_E)：" -#: panels/universal-access/cc-ua-panel.ui:2720 +#: panels/universal-access/cc-ua-panel.ui:2752 msgctxt "dwell click delay" msgid "Short" msgstr "短" -#: panels/universal-access/cc-ua-panel.ui:2751 +#: panels/universal-access/cc-ua-panel.ui:2783 msgctxt "dwell click delay" msgid "Long" msgstr "长" -#: panels/universal-access/cc-ua-panel.ui:2787 +#: panels/universal-access/cc-ua-panel.ui:2819 msgid "Motion _threshold:" msgstr "运动阈值(_T)：" -#: panels/universal-access/cc-ua-panel.ui:2809 +#: panels/universal-access/cc-ua-panel.ui:2841 msgctxt "dwell click threshold" msgid "Small" msgstr "小" -#: panels/universal-access/cc-ua-panel.ui:2840 +#: panels/universal-access/cc-ua-panel.ui:2872 msgctxt "dwell click threshold" msgid "Large" msgstr "大" @@ -6666,66 +6837,240 @@ msgid "_Overlaps mouse cursor" msgstr "光标与鼠标指针重叠（——O）" -#: panels/universal-access/zoom-options.ui:776 -msgid "Crosshairs" -msgstr "十字光标" +#: panels/universal-access/zoom-options.ui:776 +msgid "Crosshairs" +msgstr "十字光标" + +#: panels/universal-access/zoom-options.ui:825 +msgid "_White on black:" +msgstr "白底黑字(_W)：" + +#: panels/universal-access/zoom-options.ui:845 +msgid "_Brightness:" +msgstr "亮度(_B)：" + +#: panels/universal-access/zoom-options.ui:866 +msgid "_Contrast:" +msgstr "对比度(_C)：" + +#. The contrast scale goes from Color to None (grayscale) +#: panels/universal-access/zoom-options.ui:886 +msgctxt "universal access, contrast" +msgid "Co_lor" +msgstr "色彩(_L)" + +#: panels/universal-access/zoom-options.ui:911 +msgctxt "universal access, color" +msgid "None" +msgstr "无" + +#: panels/universal-access/zoom-options.ui:943 +msgctxt "universal access, color" +msgid "Full" +msgstr "完全" + +#: panels/universal-access/zoom-options.ui:1006 +msgctxt "universal access, brightness" +msgid "Low" +msgstr "低" + +#: panels/universal-access/zoom-options.ui:1039 +msgctxt "universal access, brightness" +msgid "High" +msgstr "高" + +#: panels/universal-access/zoom-options.ui:1070 +msgctxt "universal access, contrast" +msgid "Low" +msgstr "低" + +#: panels/universal-access/zoom-options.ui:1103 +msgctxt "universal access, contrast" +msgid "High" +msgstr "高" + +#: panels/universal-access/zoom-options.ui:1139 +msgid "Color Effects:" +msgstr "色彩效果：" + +#: panels/universal-access/zoom-options.ui:1164 +msgid "Color Effects" +msgstr "色彩效果" + +#: panels/usage/cc-usage-panel.c:155 +msgid "Empty all items from Trash?" +msgstr "清空回收站中的所有项目吗？" + +#: panels/usage/cc-usage-panel.c:156 +msgid "All items in the Trash will be permanently deleted." +msgstr "回收站内的所有项目将会永久删除。" + +#: panels/usage/cc-usage-panel.c:157 +msgid "_Empty Trash" +msgstr "清空回收站(_E)" + +#: panels/usage/cc-usage-panel.c:178 +msgid "Delete all the temporary files?" +msgstr "删除所有临时文件吗？" + +#: panels/usage/cc-usage-panel.c:179 +msgid "All the temporary files will be permanently deleted." +msgstr "所有临时文件将会永久删除。" + +#: panels/usage/cc-usage-panel.c:180 +msgid "_Purge Temporary Files" +msgstr "清理临时文件(_P)" + +#: panels/usage/cc-usage-panel.ui:31 +msgid "File History" +msgstr "文件历史" + +#: panels/usage/cc-usage-panel.ui:43 +msgid "" +"File history keeps a record of files that you have used. This information is " +"shared between applications, and makes it easier to find files that you " +"might want to use." +msgstr "" +"文件历史记录会记录您已使用的文件。此信息在应用程序之间共享，使查找您可能想要" +"使用的文件更加容易。" + +#: panels/usage/cc-usage-panel.ui:58 +msgid "File H_istory" +msgstr "文件历史(_I)" + +#: panels/usage/cc-usage-panel.ui:80 +msgid "File _History Duration" +msgstr "文件历史持续时间(_H)" + +#: panels/usage/cc-usage-panel.ui:121 +msgid "_Clear History…" +msgstr "清理历史(_C)…" + +#: panels/usage/cc-usage-panel.ui:137 +msgid "Trash & Temporary Files" +msgstr "回收站及临时文件" + +#: panels/usage/cc-usage-panel.ui:147 +msgid "" +"Trash and temporary files can sometimes include personal or sensitive " +"information. Automatically deleting them can help to protect privacy." +msgstr "" +"回收站和临时文件有时可能包含个人信息或敏感信息。自动删除它们可以帮助保护隐" +"私。" + +#: panels/usage/cc-usage-panel.ui:161 +msgid "Automatically Delete _Trash Content" +msgstr "自动清空回收站(_T)" + +#: panels/usage/cc-usage-panel.ui:176 +msgid "Automatically Delete Temporary _Files" +msgstr "自动清理临时文件(_F)" + +#: panels/usage/cc-usage-panel.ui:198 +msgid "Automatically Delete _Period" +msgstr "自动清空周期(_P)" + +#: panels/usage/cc-usage-panel.ui:240 +msgid "_Empty Trash…" +msgstr "清空回收站(_E)…" + +#: panels/usage/cc-usage-panel.ui:252 +msgid "_Delete Temporary Files…" +msgstr "清除临时文件(_D)…" + +#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog. +#: panels/usage/cc-usage-panel.ui:280 +msgctxt "purge_files" +msgid "1 hour" +msgstr "1 小时" + +#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog. +#: panels/usage/cc-usage-panel.ui:284 +msgctxt "purge_files" +msgid "1 day" +msgstr "1 天" + +#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog. +#: panels/usage/cc-usage-panel.ui:288 +msgctxt "purge_files" +msgid "2 days" +msgstr "2 天" -#: panels/universal-access/zoom-options.ui:825 -msgid "_White on black:" -msgstr "白底黑字(_W)：" +#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog. +#: panels/usage/cc-usage-panel.ui:292 +msgctxt "purge_files" +msgid "3 days" +msgstr "3 天" -#: panels/universal-access/zoom-options.ui:845 -msgid "_Brightness:" -msgstr "亮度(_B)：" +#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog. +#: panels/usage/cc-usage-panel.ui:296 +msgctxt "purge_files" +msgid "4 days" +msgstr "4 天" -#: panels/universal-access/zoom-options.ui:866 -msgid "_Contrast:" -msgstr "对比度(_C)：" +#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog. +#: panels/usage/cc-usage-panel.ui:300 +msgctxt "purge_files" +msgid "5 days" +msgstr "5 天" -#. The contrast scale goes from Color to None (grayscale) -#: panels/universal-access/zoom-options.ui:886 -msgctxt "universal access, contrast" -msgid "Co_lor" -msgstr "色彩(_L)" +#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog. +#: panels/usage/cc-usage-panel.ui:304 +msgctxt "purge_files" +msgid "6 days" +msgstr "6 天" -#: panels/universal-access/zoom-options.ui:911 -msgctxt "universal access, color" -msgid "None" -msgstr "无" +#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog. +#: panels/usage/cc-usage-panel.ui:308 +msgctxt "purge_files" +msgid "7 days" +msgstr "7 天" -#: panels/universal-access/zoom-options.ui:943 -msgctxt "universal access, color" -msgid "Full" -msgstr "完全" +#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog. +#: panels/usage/cc-usage-panel.ui:312 +msgctxt "purge_files" +msgid "14 days" +msgstr "14 天" -#: panels/universal-access/zoom-options.ui:1006 -msgctxt "universal access, brightness" -msgid "Low" -msgstr "低" +#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog. +#: panels/usage/cc-usage-panel.ui:316 +msgctxt "purge_files" +msgid "30 days" +msgstr "30 天" -#: panels/universal-access/zoom-options.ui:1039 -msgctxt "universal access, brightness" -msgid "High" -msgstr "高" +#. Translators: Option for "Retain History" in "Usage & History" dialog. +#: panels/usage/cc-usage-panel.ui:331 +msgctxt "retain_history" +msgid "1 day" +msgstr "1 天" -#: panels/universal-access/zoom-options.ui:1070 -msgctxt "universal access, contrast" -msgid "Low" -msgstr "低" +#. Translators: Option for "Retain History" in "Usage & History" dialog. +#: panels/usage/cc-usage-panel.ui:335 +msgctxt "retain_history" +msgid "7 days" +msgstr "7 天" -#: panels/universal-access/zoom-options.ui:1103 -msgctxt "universal access, contrast" -msgid "High" -msgstr "高" +#. Translators: Option for "Retain History" in "Usage & History" dialog. +#: panels/usage/cc-usage-panel.ui:339 +msgctxt "retain_history" +msgid "30 days" +msgstr "30 天" -#: panels/universal-access/zoom-options.ui:1139 -msgid "Color Effects:" -msgstr "色彩效果：" +#. Translators: Option for "Retain History" in "Usage & History" dialog. +#: panels/usage/cc-usage-panel.ui:343 +msgctxt "retain_history" +msgid "Forever" +msgstr "永久" -#: panels/universal-access/zoom-options.ui:1164 -msgid "Color Effects" -msgstr "色彩效果" +#: panels/usage/gnome-usage-panel.desktop.in.in:3 +msgid "File History & Trash" +msgstr "文件历史与回收站" + +#: panels/usage/gnome-usage-panel.desktop.in.in:4 +msgid "Don't leave traces" +msgstr "不留痕迹" +#. FIXME #: panels/user-accounts/cc-add-user-dialog.c:34 msgid "Should match the web address of your login provider." msgstr "应与您登录提供商的网络地址相同。" @@ -6787,17 +7132,14 @@ msgstr "全名(_F)" #: panels/user-accounts/cc-add-user-dialog.ui:206 -#: panels/user-accounts/cc-user-panel.ui:153 msgid "Standard" msgstr "标准" #: panels/user-accounts/cc-add-user-dialog.ui:216 -#: panels/user-accounts/cc-user-panel.ui:163 msgid "Administrator" msgstr "管理员" #: panels/user-accounts/cc-add-user-dialog.ui:232 -#: panels/user-accounts/cc-user-panel.ui:181 msgid "Account _Type" msgstr "帐号类型(_T)" @@ -6883,7 +7225,7 @@ #. Translators: This is a time format string in the style of "22:58". #. It indicates a login time which follows a date. #: panels/user-accounts/cc-login-history-dialog.c:173 -#: panels/user-accounts/cc-user-panel.c:771 +#: panels/user-accounts/cc-user-panel.c:768 msgctxt "login date-time" msgid "%k:%M" msgstr "%k:%M" @@ -6891,7 +7233,7 @@ #. Translators: This indicates a login date-time. #. The first %s is a date, and the second %s a time. #: panels/user-accounts/cc-login-history-dialog.c:176 -#: panels/user-accounts/cc-user-panel.c:775 +#: panels/user-accounts/cc-user-panel.c:772 #, c-format msgctxt "login date-time" msgid "%s, %s" @@ -6975,87 +7317,87 @@ msgid "Couldn’t connect to the %s domain: %s" msgstr "无法连接到 %s 域：%s" -#: panels/user-accounts/cc-user-panel.c:214 +#: panels/user-accounts/cc-user-panel.c:211 msgid "Your account" msgstr "您的帐号" -#: panels/user-accounts/cc-user-panel.c:389 +#: panels/user-accounts/cc-user-panel.c:386 msgid "Failed to delete user" msgstr "删除用户失败" -#: panels/user-accounts/cc-user-panel.c:447 -#: panels/user-accounts/cc-user-panel.c:506 -#: panels/user-accounts/cc-user-panel.c:558 +#: panels/user-accounts/cc-user-panel.c:444 +#: panels/user-accounts/cc-user-panel.c:503 +#: panels/user-accounts/cc-user-panel.c:555 msgid "Failed to revoke remotely managed user" msgstr "吊销远程管理的用户失败" -#: panels/user-accounts/cc-user-panel.c:610 +#: panels/user-accounts/cc-user-panel.c:607 msgid "You cannot delete your own account." msgstr "不能删除自己的帐号。" -#: panels/user-accounts/cc-user-panel.c:619 +#: panels/user-accounts/cc-user-panel.c:616 #, c-format msgid "%s is still logged in" msgstr "%s 已经登录" -#: panels/user-accounts/cc-user-panel.c:623 +#: panels/user-accounts/cc-user-panel.c:620 msgid "" "Deleting a user while they are logged in can leave the system in an " "inconsistent state." msgstr "删除已登录帐号可能导致系统不一致。" -#: panels/user-accounts/cc-user-panel.c:632 +#: panels/user-accounts/cc-user-panel.c:629 #, c-format msgid "Do you want to keep %s’s files?" msgstr "要保留 %s 的文件吗？" -#: panels/user-accounts/cc-user-panel.c:636 +#: panels/user-accounts/cc-user-panel.c:633 msgid "" "It is possible to keep the home directory, mail spool and temporary files " "around when deleting a user account." msgstr "删除用户时可以保留其主目录、电子邮件目录和临时文件。" -#: panels/user-accounts/cc-user-panel.c:639 +#: panels/user-accounts/cc-user-panel.c:636 msgid "_Delete Files" msgstr "删除文件(_D)" -#: panels/user-accounts/cc-user-panel.c:640 +#: panels/user-accounts/cc-user-panel.c:637 msgid "_Keep Files" msgstr "保留文件(_K)" -#: panels/user-accounts/cc-user-panel.c:654 +#: panels/user-accounts/cc-user-panel.c:651 #, c-format msgid "Are you sure you want to revoke remotely managed %s’s account?" msgstr "您确定要吊销远程管理的帐号 %s 吗？" -#: panels/user-accounts/cc-user-panel.c:658 +#: panels/user-accounts/cc-user-panel.c:655 msgid "_Delete" msgstr "删除(_D)" -#: panels/user-accounts/cc-user-panel.c:708 +#: panels/user-accounts/cc-user-panel.c:705 msgctxt "Password mode" msgid "Account disabled" msgstr "帐号已禁用" -#: panels/user-accounts/cc-user-panel.c:716 +#: panels/user-accounts/cc-user-panel.c:713 msgctxt "Password mode" msgid "To be set at next login" msgstr "下次登录时设置" -#: panels/user-accounts/cc-user-panel.c:719 +#: panels/user-accounts/cc-user-panel.c:716 msgctxt "Password mode" msgid "None" msgstr "无" -#: panels/user-accounts/cc-user-panel.c:764 +#: panels/user-accounts/cc-user-panel.c:761 msgid "Logged in" msgstr "已登录" -#: panels/user-accounts/cc-user-panel.c:1098 +#: panels/user-accounts/cc-user-panel.c:1165 msgid "Failed to contact the accounts service" msgstr "联系帐号服务失败" -#: panels/user-accounts/cc-user-panel.c:1100 +#: panels/user-accounts/cc-user-panel.c:1167 msgid "Please make sure that the AccountService is installed and enabled." msgstr "请确定帐号服务已正确安装并启用。" @@ -7063,7 +7405,7 @@ #. * We split the line in 2 here to "make it look good", as there's #. * no good way to do this in GTK+ for tooltips. See: #. * https://bugzilla.gnome.org/show_bug.cgi?id=657168 -#: panels/user-accounts/cc-user-panel.c:1132 +#: panels/user-accounts/cc-user-panel.c:1199 msgid "" "To make changes,\n" "click the * icon first" @@ -7071,12 +7413,12 @@ "要进行更改，\n" "请先点击 * 图标" -#: panels/user-accounts/cc-user-panel.c:1205 +#: panels/user-accounts/cc-user-panel.c:1265 msgid "Create a user account" msgstr "创建用户帐号" -#: panels/user-accounts/cc-user-panel.c:1216 -#: panels/user-accounts/cc-user-panel.c:1344 +#: panels/user-accounts/cc-user-panel.c:1276 +#: panels/user-accounts/cc-user-panel.c:1410 msgid "" "To create a user account,\n" "click the * icon first" @@ -7084,12 +7426,12 @@ "要创建用户帐号，\n" "请先点击 * 图标" -#: panels/user-accounts/cc-user-panel.c:1225 +#: panels/user-accounts/cc-user-panel.c:1291 msgid "Delete the selected user account" msgstr "删除选中的用户帐号" -#: panels/user-accounts/cc-user-panel.c:1237 -#: panels/user-accounts/cc-user-panel.c:1348 +#: panels/user-accounts/cc-user-panel.c:1303 +#: panels/user-accounts/cc-user-panel.c:1414 msgid "" "To delete the selected user account,\n" "click the * icon first" @@ -7097,45 +7439,63 @@ "要删除选中的用户帐号，\n" "请先点击 * 图标" -#: panels/user-accounts/cc-user-panel.ui:18 +#: panels/user-accounts/cc-user-panel.ui:5 msgid "_Add User…" msgstr "添加用户(_A)…" -#: panels/user-accounts/cc-user-panel.ui:70 +#: panels/user-accounts/cc-user-panel.ui:61 msgid "Your session needs to be restarted for changes to take effect" msgstr "修改需要重启会话才能生效" -#: panels/user-accounts/cc-user-panel.ui:78 +#: panels/user-accounts/cc-user-panel.ui:69 msgid "Restart Now" msgstr "现在重启" -#: panels/user-accounts/cc-user-panel.ui:256 -msgid "A_utomatic Login" -msgstr "自动登录(_U)" +#: panels/user-accounts/cc-user-panel.ui:150 +#: panels/user-accounts/cc-user-panel.ui:166 +msgid "User Icon" +msgstr "用户图标" + +#: panels/user-accounts/cc-user-panel.ui:242 +msgid "Account Settings" +msgstr "帐号设置" + +#: panels/user-accounts/cc-user-panel.ui:269 +msgid "_Administrator" +msgstr "管理员" + +#: panels/user-accounts/cc-user-panel.ui:289 +msgid "" +"Administrators can add and remove other users, and can change settings for " +"all users." +msgstr "管理员可以增删用户，也能为所有用户更改设置。" + +#: panels/user-accounts/cc-user-panel.ui:363 +msgid "Authentication & Login" +msgstr "认证与登录" -#: panels/user-accounts/cc-user-panel.ui:298 +#: panels/user-accounts/cc-user-panel.ui:432 msgid "_Fingerprint Login" msgstr "指纹登录(_F)" -#: panels/user-accounts/cc-user-panel.ui:324 -#: panels/user-accounts/cc-user-panel.ui:340 -msgid "User Icon" -msgstr "用户图标" +#: panels/user-accounts/cc-user-panel.ui:474 +msgid "A_utomatic Login" +msgstr "自动登录(_U)" -#: panels/user-accounts/cc-user-panel.ui:404 -msgid "Last Login" -msgstr "最近登录" +#: panels/user-accounts/cc-user-panel.ui:504 +msgid "Account Activity" +msgstr "帐号活动" -#: panels/user-accounts/cc-user-panel.ui:453 +#: panels/user-accounts/cc-user-panel.ui:545 msgid "Remove User…" msgstr "移除用户…" #. Translators: This is the empty state page label which states that there are no users to show in the panel. -#: panels/user-accounts/cc-user-panel.ui:486 +#: panels/user-accounts/cc-user-panel.ui:584 msgid "No Users Found" msgstr "未找到用户" -#: panels/user-accounts/cc-user-panel.ui:496 +#: panels/user-accounts/cc-user-panel.ui:594 msgid "Unlock to add a user account." msgstr "解锁以添加用户帐号。" @@ -7172,7 +7532,7 @@ msgstr "右手小指" #: panels/user-accounts/data/account-fingerprint.ui:39 -#: panels/user-accounts/um-fingerprint-dialog.c:677 +#: panels/user-accounts/um-fingerprint-dialog.c:775 msgid "Enable Fingerprint Login" msgstr "启用指纹登录" @@ -7188,7 +7548,7 @@ msgid "_Other finger:" msgstr "其他手指(_O)：" -#: panels/user-accounts/data/account-fingerprint.ui:324 +#: panels/user-accounts/data/account-fingerprint.ui:222 msgid "" "Your fingerprint was successfully saved. You should now be able to log in " "using your fingerprint reader." @@ -7343,113 +7703,95 @@ "Adding more letters, numbers and punctuation will make the password stronger." msgstr "增加更多字母、数字和标点可进一步提高密码强度。" -#: panels/user-accounts/run-passwd.c:422 +#: panels/user-accounts/run-passwd.c:424 msgid "Authentication failed" msgstr "认证失败" -#: panels/user-accounts/run-passwd.c:502 +#: panels/user-accounts/run-passwd.c:504 #, c-format msgid "The new password is too short" msgstr "新密码太短" -#: panels/user-accounts/run-passwd.c:508 +#: panels/user-accounts/run-passwd.c:510 #, c-format msgid "The new password is too simple" msgstr "新密码太简单" -#: panels/user-accounts/run-passwd.c:514 +#: panels/user-accounts/run-passwd.c:516 #, c-format msgid "The old and new passwords are too similar" msgstr "新密码和旧密码太相似" -#: panels/user-accounts/run-passwd.c:517 +#: panels/user-accounts/run-passwd.c:519 #, c-format msgid "The new password has already been used recently." msgstr "新的密码最近已使用过。" -#: panels/user-accounts/run-passwd.c:520 +#: panels/user-accounts/run-passwd.c:522 #, c-format msgid "The new password must contain numeric or special characters" msgstr "新密码必须包含数字或特殊字符" -#: panels/user-accounts/run-passwd.c:524 +#: panels/user-accounts/run-passwd.c:526 #, c-format msgid "The old and new passwords are the same" msgstr "新旧密码相同" -#: panels/user-accounts/run-passwd.c:528 +#: panels/user-accounts/run-passwd.c:530 #, c-format msgid "Your password has been changed since you initially authenticated!" msgstr "密码在您首次认证后已经更改！" -#: panels/user-accounts/run-passwd.c:532 +#: panels/user-accounts/run-passwd.c:534 #, c-format msgid "The new password does not contain enough different characters" msgstr "新密码必须一定量不同的字符" -#: panels/user-accounts/run-passwd.c:536 +#: panels/user-accounts/run-passwd.c:538 #, c-format msgid "Unknown error" msgstr "未知错误" -#: panels/user-accounts/user-utils.c:427 -msgid "" -"The username should usually only consist of lower case letters from a-z, " -"digits and the following characters: - _" -msgstr "用户名只能包含小写英文字母（a 至 z）、数字和“.”“-”“_”符号" - -#: panels/user-accounts/user-utils.c:431 -msgid "Sorry, that user name isn’t available. Please try another." -msgstr "抱歉，该用户名不可用。请试下别的。" - -#: panels/user-accounts/user-utils.c:476 -msgid "The username is too long." -msgstr "用户名太长。" - -#: panels/user-accounts/user-utils.c:526 -msgid "This will be used to name your home folder and can’t be changed." -msgstr "将作为您主文件夹的名称且不可再次更改。" - -#: panels/user-accounts/um-fingerprint-dialog.c:139 +#: panels/user-accounts/um-fingerprint-dialog.c:147 msgid "" "You are not allowed to access the device. Contact your system administrator." msgstr "您未被允许访问该设备。请联系系统管理员。" -#: panels/user-accounts/um-fingerprint-dialog.c:141 +#: panels/user-accounts/um-fingerprint-dialog.c:149 msgid "The device is already in use." msgstr "设备正被占用。" -#: panels/user-accounts/um-fingerprint-dialog.c:143 +#: panels/user-accounts/um-fingerprint-dialog.c:151 msgid "An internal error occurred." msgstr "发生了一个内部错误。" -#: panels/user-accounts/um-fingerprint-dialog.c:214 +#: panels/user-accounts/um-fingerprint-dialog.c:216 msgid "Enabled" msgstr "已启用" -#: panels/user-accounts/um-fingerprint-dialog.c:260 +#: panels/user-accounts/um-fingerprint-dialog.c:334 msgid "Delete registered fingerprints?" msgstr "要删除已登记的指纹吗？" -#: panels/user-accounts/um-fingerprint-dialog.c:264 +#: panels/user-accounts/um-fingerprint-dialog.c:338 msgid "_Delete Fingerprints" msgstr "删除指纹(_D)" -#: panels/user-accounts/um-fingerprint-dialog.c:270 +#: panels/user-accounts/um-fingerprint-dialog.c:344 msgid "" "Do you want to delete your registered fingerprints so fingerprint login is " "disabled?" msgstr "确定要删除已登记的指纹吗？这将禁用指纹登录。" -#: panels/user-accounts/um-fingerprint-dialog.c:440 +#: panels/user-accounts/um-fingerprint-dialog.c:526 msgid "Done!" msgstr "完成！" #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: panels/user-accounts/um-fingerprint-dialog.c:501 -#: panels/user-accounts/um-fingerprint-dialog.c:543 +#: panels/user-accounts/um-fingerprint-dialog.c:588 +#: panels/user-accounts/um-fingerprint-dialog.c:630 #, c-format msgid "Could not access “%s” device" msgstr "无法访问设备“%s”" @@ -7457,16 +7799,16 @@ #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: panels/user-accounts/um-fingerprint-dialog.c:584 +#: panels/user-accounts/um-fingerprint-dialog.c:677 #, c-format msgid "Could not start finger capture on “%s” device" msgstr "无法在设备“%s”上启动指纹采集" -#: panels/user-accounts/um-fingerprint-dialog.c:628 +#: panels/user-accounts/um-fingerprint-dialog.c:724 msgid "Could not access any fingerprint readers" msgstr "无法访问指纹读取器" -#: panels/user-accounts/um-fingerprint-dialog.c:629 +#: panels/user-accounts/um-fingerprint-dialog.c:725 msgid "Please contact your system administrator for help." msgstr "请联系系统管理员以寻求帮助。" @@ -7475,26 +7817,44 @@ #. * "To enable fingerprint login, you need to save one of your fingerprints, using the #. * 'Digital Persona U.are.U 4000/4000B' device." #. -#: panels/user-accounts/um-fingerprint-dialog.c:711 +#: panels/user-accounts/um-fingerprint-dialog.c:809 #, c-format msgid "" "To enable fingerprint login, you need to save one of your fingerprints, " "using the “%s” device." msgstr "要启用指纹登录，您需要使用设备“%s”保存一个指纹。" -#: panels/user-accounts/um-fingerprint-dialog.c:718 +#: panels/user-accounts/um-fingerprint-dialog.c:816 msgid "Selecting finger" msgstr "选择手指" -#: panels/user-accounts/um-fingerprint-dialog.c:719 +#: panels/user-accounts/um-fingerprint-dialog.c:817 msgid "Enrolling fingerprints" msgstr "正在登记指纹" +#: panels/user-accounts/user-utils.c:439 +msgid "" +"The username should usually only consist of lower case letters from a-z, " +"digits and the following characters: - _" +msgstr "用户名只能包含小写英文字母（a 至 z）、数字和“.”“-”“_”符号" + +#: panels/user-accounts/user-utils.c:443 +msgid "Sorry, that user name isn’t available. Please try another." +msgstr "抱歉，该用户名不可用。请试下别的。" + +#: panels/user-accounts/user-utils.c:488 +msgid "The username is too long." +msgstr "用户名太长。" + +#: panels/user-accounts/user-utils.c:550 +msgid "This will be used to name your home folder and can’t be changed." +msgstr "将作为您主文件夹的名称且不可再次更改。" + #: panels/wacom/button-mapping.ui:9 msgid "Map Buttons" msgstr "映射按键" -#: panels/wacom/button-mapping.ui:37 panels/wacom/cc-wacom-page.c:533 +#: panels/wacom/button-mapping.ui:37 panels/wacom/cc-wacom-page.c:519 #: panels/wacom/gnome-wacom-properties.ui:60 msgid "_Close" msgstr "关闭(_C)" @@ -7521,7 +7881,7 @@ msgid "Mis-click detected, restarting…" msgstr "检测到误点击，重新开始校准…" -#: panels/wacom/cc-wacom-button-row.c:253 +#: panels/wacom/cc-wacom-button-row.c:249 #, c-format msgid "Button %d" msgstr "按键 %d" @@ -7546,17 +7906,17 @@ msgid "Show On-Screen Help" msgstr "显示屏幕帮助" -#: panels/wacom/cc-wacom-mapping-panel.c:256 +#: panels/wacom/cc-wacom-mapping-panel.c:249 msgid "Output:" msgstr "输出：" #. Keep ratio switch -#: panels/wacom/cc-wacom-mapping-panel.c:268 +#: panels/wacom/cc-wacom-mapping-panel.c:261 msgid "Keep aspect ratio (letterbox):" msgstr "保持长宽比（黑边）：" #. Whole-desktop checkbox -#: panels/wacom/cc-wacom-mapping-panel.c:279 +#: panels/wacom/cc-wacom-mapping-panel.c:272 msgid "Map to single monitor" msgstr "映射到单个显示器" @@ -7565,15 +7925,15 @@ msgid "%d of %d" msgstr "%d/%d" -#: panels/wacom/cc-wacom-page.c:530 +#: panels/wacom/cc-wacom-page.c:516 msgid "Display Mapping" msgstr "显示映射" -#: panels/wacom/cc-wacom-panel.c:845 panels/wacom/wacom-stylus-page.ui:119 +#: panels/wacom/cc-wacom-panel.c:806 panels/wacom/wacom-stylus-page.ui:119 msgid "Stylus" msgstr "手写笔" -#: panels/wacom/cc-wacom-stylus-page.c:355 +#: panels/wacom/cc-wacom-stylus-page.c:360 msgid "Button" msgstr "按键" @@ -7629,6 +7989,7 @@ msgstr "惯用左手" #: panels/wacom/gnome-wacom-properties.ui:296 +#: panels/wacom/gnome-wacom-properties.ui:401 msgid "Map to Monitor…" msgstr "映射到显示器…" @@ -7648,6 +8009,10 @@ msgid "Adjust display resolution" msgstr "调整显示分辨率" +#: panels/wacom/gnome-wacom-properties.ui:376 +msgid "Decouple Display" +msgstr "显示器解耦" + #: panels/wacom/gsd-wacom-key-shortcut-button.c:217 msgid "New shortcut…" msgstr "新建快捷键…" @@ -7664,10 +8029,6 @@ msgid "Right Mouse Button Click" msgstr "鼠标右键单击" -#: panels/wacom/wacom-stylus-page.ui:37 shell/cc-window.ui:242 -msgid "Back" -msgstr "后退" - #: panels/wacom/wacom-stylus-page.ui:41 msgid "Forward" msgstr "前进" @@ -7684,27 +8045,27 @@ msgid "Eraser Pressure Feel" msgstr "擦除压力感应" -#: panels/wacom/wacom-stylus-page.ui:180 panels/wacom/wacom-stylus-page.ui:340 +#: panels/wacom/wacom-stylus-page.ui:180 panels/wacom/wacom-stylus-page.ui:341 msgid "Soft" msgstr "软" -#: panels/wacom/wacom-stylus-page.ui:210 panels/wacom/wacom-stylus-page.ui:370 +#: panels/wacom/wacom-stylus-page.ui:211 panels/wacom/wacom-stylus-page.ui:372 msgid "Firm" msgstr "硬" -#: panels/wacom/wacom-stylus-page.ui:233 +#: panels/wacom/wacom-stylus-page.ui:234 msgid "Top Button" msgstr "顶部按钮" -#: panels/wacom/wacom-stylus-page.ui:262 +#: panels/wacom/wacom-stylus-page.ui:263 msgid "Lower Button" msgstr "下部按钮" -#: panels/wacom/wacom-stylus-page.ui:291 +#: panels/wacom/wacom-stylus-page.ui:292 msgid "Lowest Button" msgstr "底部按钮" -#: panels/wacom/wacom-stylus-page.ui:320 +#: panels/wacom/wacom-stylus-page.ui:321 msgid "Tip Pressure Feel" msgstr "指尖压力感应" @@ -7748,23 +8109,27 @@ msgid "[PANEL] [ARGUMENT…]" msgstr "[面板] [参数…]" -#: shell/cc-panel-loader.c:279 +#: shell/cc-panel-list.ui:45 shell/cc-window.c:277 +msgid "Privacy" +msgstr "隐私" + +#: shell/cc-panel-loader.c:288 msgid "Available panels:" msgstr "可用面板：" -#: shell/cc-window.ui:147 +#: shell/cc-window.ui:140 msgid "All Settings" msgstr "全部设置" -#: shell/cc-window.ui:185 +#: shell/cc-window.ui:178 msgid "Primary Menu" msgstr "主菜单" -#: shell/cc-window.ui:332 +#: shell/cc-window.ui:319 msgid "Warning: Development Version" msgstr "警告：开发版本" -#: shell/cc-window.ui:333 +#: shell/cc-window.ui:320 msgid "" "This version of Settings should only be used for development purposes. You " "may experience incorrect system behavior, data loss, and other unexpected " @@ -7773,7 +8138,7 @@ "该版本的 GNOME 设置仅适用于开发工作。您可能会遇到不正常的系统行为、数据丢失及" "其他未预期的问题。" -#: shell/cc-window.ui:344 +#: shell/cc-window.ui:331 msgid "Help" msgstr "帮助" @@ -7851,6 +8216,263 @@ msgid "System Sounds" msgstr "系统声音" +#~ msgid "Set Background and Lock Screen" +#~ msgstr "设定背景和锁屏" + +#~ msgid "Set Background" +#~ msgstr "设定背景" + +#~ msgid "Set Lock Screen" +#~ msgstr "设定锁屏" + +#~ msgid "Remove Background" +#~ msgstr "移除背景" + +#~ msgid "Version %s" +#~ msgstr "版本 %s" + +#~ msgid "OS name" +#~ msgstr "系统名称" + +#~ msgid "OS type" +#~ msgstr "系统类型" + +#~ msgid "Disk" +#~ msgstr "磁盘" + +#~ msgid "Check for updates" +#~ msgstr "检查更新" + +#~ msgid "Network proxy" +#~ msgstr "网络代理" + +#~ msgid "page 1" +#~ msgstr "第 1 页" + +#~ msgid "Inner _authentication" +#~ msgstr "内部认证(_A)" + +#~ msgid "page 2" +#~ msgstr "第 2 页" + +#~ msgid "Restrict background data usage" +#~ msgstr "限制后台数据的使用" + +#~ msgid "Appropriate for connections that have data charges or limits." +#~ msgstr "适用于有数据费用或限制的连接。" + +#~ msgid "Twisted Pair (TP)" +#~ msgstr "双绞线 (TP)" + +#~ msgid "Attachment Unit Interface (AUI)" +#~ msgstr "连接单元接口 (AUI)" + +#~ msgid "BNC" +#~ msgstr "BNC" + +#~ msgid "Media Independent Interface (MII)" +#~ msgstr "媒体独立接口 (MII)" + +#~ msgid "10 Mb/s" +#~ msgstr "10 Mb/s" + +#~ msgid "100 Mb/s" +#~ msgstr "100 Mb/s" + +#~ msgid "1 Gb/s" +#~ msgstr "1 Gb/s" + +#~ msgid "10 Gb/s" +#~ msgstr "10 Gb/s" + +#~ msgid "" +#~ "Switching on the wireless hotspot will disconnect you from %s." +#~ msgstr "打开无线网热点将使您从 %s 断开。" + +#~ msgid "" +#~ "It is not possible to access the Internet through your wireless while the " +#~ "hotspot is active." +#~ msgstr "启用热点模式时无法通过无线网络访问互联网。" + +#~ msgid "" +#~ "Wi-Fi hotspots are usually used to share an additional Internet " +#~ "connection over Wi-Fi." +#~ msgstr "Wi-Fi 热点常用于在 Wi-Fi 上共享其互联网连接。" + +#~ msgid "Automatic _Connect" +#~ msgstr "自动连接(_C)" + +#~ msgid "details" +#~ msgstr "详细信息" + +#~ msgid "Show P_assword" +#~ msgstr "显示密码(_A)" + +#~ msgid "Make available to other users" +#~ msgstr "对其他用户可用" + +#~ msgid "identity" +#~ msgstr "身份" + +#~ msgid "IPv_4" +#~ msgstr "IPv_4" + +#~ msgid "_Addresses" +#~ msgstr "地址(_A)" + +#~ msgid "Automatic (DHCP) addresses only" +#~ msgstr "仅自动分配地址 (DHCP)" + +#~ msgid "Link-local only" +#~ msgstr "仅本地链路" + +#~ msgid "_Ignore automatically obtained routes" +#~ msgstr "忽略自动获取的路由(_I)" + +#~ msgid "ipv4" +#~ msgstr "ipv4" + +#~ msgid "IPv_6" +#~ msgstr "IPv_6" + +#~ msgid "ipv6" +#~ msgstr "ipv6" + +#~ msgid "_Cloned MAC Address" +#~ msgstr "克隆的 MAC 地址(_C)" + +#~ msgid "_Reset" +#~ msgstr "重置(_R)" + +#~ msgid "" +#~ "Reset the settings for this connection to their defaults, but remember as " +#~ "a preferred connection." +#~ msgstr "将这个连接的设置重置为默认值，但仍作为首选连接。" + +#~ msgid "" +#~ "Remove all details relating to this network and do not try to " +#~ "automatically connect to it." +#~ msgstr "删除关于这个网络的所有细节，不再尝试自动连接。" + +#~ msgid "Hardware" +#~ msgstr "硬件" + +#~ msgctxt "tab" +#~ msgid "Reset" +#~ msgstr "重置" + +#~ msgid "Connected Devices" +#~ msgstr "已连接的设备" + +#~ msgid "Ad-hoc" +#~ msgstr "Ad-hoc" + +#~ msgid "Infrastructure" +#~ msgstr "架构" + +#~ msgid "Not connected" +#~ msgstr "未连接" + +#~ msgid "Notification _Popups" +#~ msgstr "通知弹窗(_P)" + +#~ msgid "In use" +#~ msgstr "已占用" + +#~ msgctxt "Location services status" +#~ msgid "On" +#~ msgstr "开启" + +#~ msgctxt "Location services status" +#~ msgid "Off" +#~ msgstr "关闭" + +#~ msgctxt "Camera status" +#~ msgid "Off" +#~ msgstr "关闭" + +#~ msgctxt "Camera status" +#~ msgid "On" +#~ msgstr "开启" + +#~ msgctxt "Microphone status" +#~ msgid "Off" +#~ msgstr "关闭" + +#~ msgctxt "Microphone status" +#~ msgid "On" +#~ msgstr "开启" + +#~ msgid "Usage & History" +#~ msgstr "用量及历史" + +#~ msgid "Privacy Policy" +#~ msgstr "隐私政策" + +#~ msgid "" +#~ "Remembering your history makes things easier to find again. These items " +#~ "are never shared over the network." +#~ msgstr "记住历史能够在下次使用时方便查找。这些条目永远不会通过网络共享。" + +#~ msgid "_Recently Used" +#~ msgstr "最近使用(_R)" + +#~ msgid "Retain _History" +#~ msgstr "保留历史(_H)" + +#~ msgid "The Screen Lock protects your privacy when you are away." +#~ msgstr "离开时锁定屏幕可以保护隐私。" + +#~ msgid "Lock screen _after blank for" +#~ msgstr "黑屏至锁屏的等待时间(_A)" + +#~ msgid "Lock Screen _Notifications" +#~ msgstr "锁屏通知(_N)" + +#~ msgid "" +#~ "Automatically purge the Trash and temporary files to help keep your " +#~ "computer free of unnecessary sensitive information." +#~ msgstr "自动清理回收站和临时文件，避免计算机保存不必要的敏感信息。" + +#~ msgid "Purge _After" +#~ msgstr "清理延时(_A)" + +#~ msgid "" +#~ "Sending us information about which software you use helps us provide you " +#~ "with more accurate recommendations. It also helps us to improve our " +#~ "software.\n" +#~ "\n" +#~ "All the information we collect is made anonymous, and we will never share " +#~ "your data with third parties." +#~ msgstr "" +#~ "发送软件的使用情况有助于我们向提供更准确的推荐，帮助改进软件。\n" +#~ "\n" +#~ "信息均为匿名收集，不会与他人分享。" + +#~ msgid "_Send software usage statistics" +#~ msgstr "发送软件使用统计信息(_S)" + +#~ msgid "_Camera" +#~ msgstr "相机(_C)" + +#~ msgid "_Microphone" +#~ msgstr "麦克风(_M)" + +#~ msgid "_Location Services" +#~ msgstr "定位服务(_L)" + +#~ msgid "Protect your personal information and control what others might see" +#~ msgstr "保护个人信息并控制他人可见的信息" + +#~ msgid "No regions found" +#~ msgstr "无可用区域" + +#~ msgid "Flash the _window title" +#~ msgstr "闪烁窗口标题栏(_W)" + +#~ msgid "Last Login" +#~ msgstr "最近登录" + #~ msgid "_Background" #~ msgstr "背景(_B)" @@ -7969,9 +8591,6 @@ #~ msgid "printer" #~ msgstr "printer" -#~ msgid "Show _Notifications" -#~ msgstr "显示通知(_N)" - #~ msgid "preferences-system-privacy" #~ msgstr "preferences-system-privacy" @@ -8058,9 +8677,6 @@ #~ msgid "Sound Effects" #~ msgstr "声音效果" -#~ msgid "No application is currently playing or recording audio." -#~ msgstr "没有正在播放或录制音频的程序。" - #~ msgid "Built-in" #~ msgstr "内置" @@ -8091,15 +8707,9 @@ #~ msgid "Move input source down" #~ msgstr "下移输入源" -#~ msgid "Configure input source" -#~ msgstr "配置输入源" - #~ msgid "Show input source keyboard layout" #~ msgstr "显示输入源键盘布局" -#~ msgid "Primary Display" -#~ msgstr "主显示器" - #~ msgid "_Night Light" #~ msgstr "夜光(_N)" @@ -8297,9 +8907,6 @@ #~ "如果有无线网络以外的方式连接互联网，您可以配置无线热点并与他人共享网络连" #~ "接。" -#~ msgid "History" -#~ msgstr "历史" - #~ msgid "Proxy" #~ msgstr "代理" @@ -8318,15 +8925,9 @@ #~ msgid "Automatic" #~ msgstr "自动" -#~ msgid "VPN Type" -#~ msgstr "VPN 类型" - #~ msgid "Group Name" #~ msgstr "组名" -#~ msgid "Group Password" -#~ msgstr "组密码" - #~ msgid "_Use as Hotspot…" #~ msgstr "用作热点(_U)…" @@ -8574,10 +9175,6 @@ #~ msgstr "向右滚动" #~ msgctxt "category" -#~ msgid "Personal" -#~ msgstr "个人" - -#~ msgctxt "category" #~ msgid "Hardware" #~ msgstr "硬件" @@ -8585,9 +9182,6 @@ #~ msgid "System" #~ msgstr "系统" -#~ msgid "Wayland" -#~ msgstr "Wayland" - #~ msgctxt "button" #~ msgid "Set Shortcut" #~ msgstr "设置快捷键" @@ -8860,9 +9454,6 @@ #~ msgid "Bluetooth is disabled" #~ msgstr "蓝牙已禁用" -#~ msgid "Security key" -#~ msgstr "安全密钥" - #~ msgid "Wireless devices require extra power" #~ msgstr "无线设备需要消耗更多电"