41.4

network: Show configuration button only for active/connecting connections
In commit c7bd442839 we started to show the configuration button for all rows, which fixes the original issue of not being able to tweak a connection during association but also introduces a regression of not having connection data to show for other connections in the list. This way, the configuration button will fail to create a net_connection_editor interface for rows that aren't associated with an active connection. Let's only show the configuration button when the NMActiveConnectionState is either NM_ACTIVE_CONNECTION_STATE_ACTIVATING or NM_ACTIVE_CONNECTION_STATE_ACTIVATED. Fixes #1494
2022-02-14 10:57:02 +13:00 · 2022-02-10 16:22:25 +01:00 · 2022-02-07 21:14:57 +00:00 · 2022-02-07 20:42:09 +00:00 · 2022-02-05 13:11:02 +00:00 · 2022-01-31 20:58:41 +00:00
48 changed files with 3080 additions and 3756 deletions
--- a/22
+++ b/22
@@ -1,3 +1,25 @@
+================
+Version 41.4
+================
+
+- Drop unused argument for i18n.merge_file() in Meson rules
+- Updated translations
+
+Applications
+- Set the Icon key in desktop file to a icon that exists
+
+Display
+- Do not invert order when constructing modes
+
+Network
+- Show configuration button only for active/connecting connections
+
+Printers
+- Fix error cancelling PPD dialog
+
+Sound
+- Clear level bar when stream is empty
+
 ================
 Version 41.2
 ================
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project(
  'gnome-control-center', 'c',
-        version : '41.2',
+        version : '41.4',
        license : 'GPL2+',
  meson_version : '>= 0.53.0'
 )
--- a/panels/applications/gnome-applications-panel.desktop.in.in
+++ b/panels/applications/gnome-applications-panel.desktop.in.in
@@ -4,7 +4,7 @@ Comment=Control various application permissions and settings
 Exec=gnome-control-center applications
 # FIXME
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-Icon=preferences-desktop-apps
+Icon=preferences-desktop-apps-symbolic
 Terminal=false
 Type=Application
 NoDisplay=true
@@ -13,4 +13,4 @@ Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-Acc
 OnlyShowIn=GNOME;Unity;
 # Translators: Search terms to find the Privacy panel. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 Keywords=application;flatpak;permission;setting;
-X-GNOME-ControlCenter-HasSidebar=true
+X-GNOME-ControlCenter-HasSidebar=true
--- a/panels/applications/meson.build
+++ b/panels/applications/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-       desktop,
         type : 'desktop',
        input : desktop_in,
       output : desktop,
--- a/panels/background/meson.build
+++ b/panels/background/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
--- a/panels/bluetooth/meson.build
+++ b/panels/bluetooth/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
--- a/panels/camera/meson.build
+++ b/panels/camera/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
--- a/panels/color/meson.build
+++ b/panels/color/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
--- a/panels/datetime/meson.build
+++ b/panels/datetime/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
@@ -20,7 +19,6 @@ i18n.merge_file(
 polkit = 'org.gnome.controlcenter.@0@.policy'.format(cappletname)

 i18n.merge_file(
-  polkit,
  input: polkit + '.in',
  output: polkit,
  po_dir: po_dir,
--- a/panels/default-apps/meson.build
+++ b/panels/default-apps/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
--- a/panels/diagnostics/meson.build
+++ b/panels/diagnostics/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
--- a/panels/display/cc-display-config-dbus.c
+++ b/panels/display/cc-display-config-dbus.c
@@ -795,6 +795,8 @@ construct_modes (CcDisplayMonitorDBus *self,
      if (mode->flags & MODE_CURRENT)
        self->current_mode = CC_DISPLAY_MODE (mode);
    }
+
+  self->modes = g_list_reverse (self->modes);
 }

 static CcDisplayMonitorDBus *
--- a/panels/display/meson.build
+++ b/panels/display/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
--- a/panels/info-overview/meson.build
+++ b/panels/info-overview/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
--- a/panels/keyboard/meson.build
+++ b/panels/keyboard/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
@@ -45,7 +44,6 @@ xml_files = [

 foreach file: xml_files
  i18n.merge_file(
-    file,
    input: file + '.in',
    output: file,
    po_dir: po_dir,
--- a/panels/location/meson.build
+++ b/panels/location/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
--- a/panels/lock/meson.build
+++ b/panels/lock/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
--- a/panels/microphone/meson.build
+++ b/panels/microphone/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
--- a/panels/mouse/meson.build
+++ b/panels/mouse/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
--- a/panels/multitasking/meson.build
+++ b/panels/multitasking/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
--- a/panels/network/cc-wifi-connection-row.c
+++ b/panels/network/cc-wifi-connection-row.c
@@ -37,6 +37,7 @@ struct _CcWifiConnectionRow
  GtkSpinner      *connecting_spinner;
  GtkImage        *encrypted_icon;
  GtkLabel        *name_label;
+  GtkButton       *options_button;
  GtkImage        *strength_icon;
 };

@@ -250,6 +251,7 @@ update_ui (CcWifiConnectionRow *self)
    }

  gtk_widget_set_visible (GTK_WIDGET (self->active_label), active);
+  gtk_widget_set_visible (GTK_WIDGET (self->options_button), active || connecting);

  if (security != NM_AP_SEC_UNKNOWN && security != NM_AP_SEC_NONE && security != NM_AP_SEC_OWE)
    {
@@ -456,6 +458,7 @@ cc_wifi_connection_row_class_init (CcWifiConnectionRowClass *klass)
  gtk_widget_class_bind_template_child (widget_class, CcWifiConnectionRow, checkbutton);
  gtk_widget_class_bind_template_child (widget_class, CcWifiConnectionRow, connecting_spinner);
  gtk_widget_class_bind_template_child (widget_class, CcWifiConnectionRow, encrypted_icon);
+  gtk_widget_class_bind_template_child (widget_class, CcWifiConnectionRow, options_button);
  gtk_widget_class_bind_template_child (widget_class, CcWifiConnectionRow, name_label);
  gtk_widget_class_bind_template_child (widget_class, CcWifiConnectionRow, strength_icon);

--- a/panels/network/cc-wifi-connection-row.ui
+++ b/panels/network/cc-wifi-connection-row.ui
@@ -81,7 +81,7 @@
          </object>
        </child>
        <child>
-          <object class="GtkButton">
+          <object class="GtkButton" id="options_button">
            <property name="name">options_button</property>
            <property name="visible">True</property>
            <property name="can_focus">True</property>
--- a/panels/network/meson.build
+++ b/panels/network/meson.build
@@ -25,7 +25,6 @@ foreach name: panel_names
  )

  i18n.merge_file(
-    desktop,
    type: 'desktop',
    input: desktop_in,
    output: desktop,
--- a/panels/notifications/meson.build
+++ b/panels/notifications/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
--- a/panels/online-accounts/meson.build
+++ b/panels/online-accounts/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
--- a/panels/power/meson.build
+++ b/panels/power/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
--- a/panels/printers/meson.build
+++ b/panels/printers/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
--- a/panels/printers/pp-new-printer-dialog.c
+++ b/panels/printers/pp-new-printer-dialog.c
@@ -1671,9 +1671,6 @@ ppd_selection_cb (GtkDialog *_dialog,
      ppd_name = pp_ppd_selection_dialog_get_ppd_name (self->ppd_selection_dialog);
      ppd_display_name = pp_ppd_selection_dialog_get_ppd_display_name (self->ppd_selection_dialog);
  }
-  else {
-      self->user_callback (GTK_DIALOG (self), GTK_RESPONSE_CANCEL, self->user_data);
-  }

  if (ppd_name)
    {
@@ -1712,7 +1709,7 @@ ppd_selection_cb (GtkDialog *_dialog,
        }
    }

-  self->user_callback (GTK_DIALOG (self), GTK_RESPONSE_OK, self->user_data);
+  self->user_callback (GTK_DIALOG (self), response_id, self->user_data);
 }

 static void
--- a/panels/region/meson.build
+++ b/panels/region/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
--- a/panels/removable-media/meson.build
+++ b/panels/removable-media/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
--- a/panels/search/meson.build
+++ b/panels/search/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
--- a/panels/sharing/meson.build
+++ b/panels/sharing/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
@@ -29,7 +28,6 @@ polkit_in = configure_file(
 )

 i18n.merge_file(
-  polkit,
  input: polkit_in,
  output: polkit,
  po_dir: po_dir,
--- a/panels/sound/cc-level-bar.c
+++ b/panels/sound/cc-level-bar.c
@@ -232,6 +232,7 @@ cc_level_bar_set_stream (CcLevelBar     *self,

  if (stream == NULL)
   {
+     self->value = 0.0;
     gtk_widget_queue_draw (GTK_WIDGET (self));
     return;
   }
--- a/panels/sound/meson.build
+++ b/panels/sound/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
--- a/panels/thunderbolt/meson.build
+++ b/panels/thunderbolt/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
--- a/panels/universal-access/meson.build
+++ b/panels/universal-access/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
--- a/panels/usage/meson.build
+++ b/panels/usage/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
--- a/panels/user-accounts/meson.build
+++ b/panels/user-accounts/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
@@ -85,7 +84,6 @@ meson.add_install_script('sh', '-c',
 polkit = 'org.gnome.controlcenter.@0@.policy'.format(cappletname)

 i18n.merge_file(
-  polkit,
  input: polkit + '.in',
  output: polkit,
  po_dir: po_dir,
--- a/panels/wacom/meson.build
+++ b/panels/wacom/meson.build
@@ -30,7 +30,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-       desktop,
         type : 'desktop',
        input : desktop_in,
       output : desktop,
--- a/panels/wwan/meson.build
+++ b/panels/wwan/meson.build
@@ -11,7 +11,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-       desktop,
         type : 'desktop',
        input : desktop_in,
       output : desktop,
--- a/po/is.po
+++ b/po/is.po
--- a/po/ja.po
+++ b/po/ja.po
--- a/po/pt.po
+++ b/po/pt.po
@@ -15,8 +15,8 @@ msgstr ""
 "Project-Id-Version: 3.8\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-control-center/"
 "issues\n"
-"POT-Creation-Date: 2021-09-08 08:29+0000\n"
-"PO-Revision-Date: 2021-09-08 15:26+0100\n"
+"POT-Creation-Date: 2021-12-03 03:00+0000\n"
+"PO-Revision-Date: 2021-12-18 13:39+0000\n"
 "Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n"
 "Language-Team: Portuguese <https://l10n.gnome.org/teams/pt/>\n"
 "Language: pt\n"
@@ -24,7 +24,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.0\n"
+"X-Generator: Poedit 3.0.1\n"
 "X-Language: pt_PT\n"
 "X-Source-Language: C\n"
 "X-Project-Style: gnome\n"
@@ -209,7 +209,7 @@ msgstr "Câmara"
 #: panels/keyboard/keyboard-shortcuts.c:367 panels/network/network-proxy.ui:129
 #: panels/user-accounts/cc-user-panel.c:848
 #: panels/user-accounts/cc-user-panel.c:938
-#: panels/wwan/cc-wwan-device-page.c:445
+#: panels/wwan/cc-wwan-device-page.c:479
 #: subprojects/gvc/gvc-mixer-control.c:1900
 msgid "Disabled"
 msgstr "Inativo"
@@ -278,7 +278,7 @@ msgstr "Sons"

 #: panels/applications/cc-applications-panel.ui:267
 msgid "Inhibit system keyboard shortcuts"
-msgstr "Inibir os atalhos de teclado do sistema"
+msgstr "Inibir as teclas de atalho do sistema"

 #: panels/applications/cc-applications-panel.ui:300
 msgid "Default Handlers"
@@ -2274,7 +2274,7 @@ msgstr "Métodos para inserir símbolos e variantes de letras usando o teclado."
 #: panels/keyboard/cc-keyboard-shortcut-dialog.c:306
 #: panels/keyboard/cc-keyboard-shortcut-dialog.c:322 shell/cc-window.ui:326
 msgid "Keyboard Shortcuts"
-msgstr "Atalhos de teclado"
+msgstr "Teclas de atalho"

 #: panels/keyboard/cc-keyboard-panel.ui:283
 msgid "View and Customize Shortcuts"
@@ -2296,14 +2296,14 @@ msgid ""
 "Resetting the shortcuts may affect your custom shortcuts. This cannot be "
 "undone."
 msgstr ""
-"Repor os atalhos pode afetar os seus atalhos personalizados. Isto não pode "
-"ser desfeito."
+"A reposição dos atalhos pode afetar os seus atalhos personalizados. Isto não "
+"pode ser anulado."

 #: panels/keyboard/cc-keyboard-shortcut-dialog.c:435
 #: panels/keyboard/cc-keyboard-shortcut-editor.ui:275
 #: panels/printers/authentication-dialog.ui:29
 #: panels/printers/ppd-selection-dialog.ui:27
-#: panels/wwan/cc-wwan-device-page.c:143
+#: panels/wwan/cc-wwan-device-page.c:190
 msgid "Cancel"
 msgstr "Cancelar"

@@ -2318,7 +2318,7 @@ msgstr "Adicionar atalhos personalizados"
 #: panels/keyboard/cc-keyboard-shortcut-dialog.ui:124
 msgid "Set up custom shortcuts for launching apps, running scripts, and more."
 msgstr ""
-"Configurar atalhos personalizados para iniciar aplicações, executar scripts, "
+"Configurar atalhos personalizados para iniciar aplicações, executar scripts "
 "e muito mais."

 #: panels/keyboard/cc-keyboard-shortcut-dialog.ui:131
@@ -2343,7 +2343,7 @@ msgstr "Repor tudo…"

 #: panels/keyboard/cc-keyboard-shortcut-dialog.ui:236
 msgid "Reset all shortcuts to their default keybindings"
-msgstr "Repor todos os atalhos para as suas posições predefinidas"
+msgstr "Repor todos os atalhos para as suas predefinições"

 #: panels/keyboard/cc-keyboard-shortcut-editor.c:391
 #, c-format
@@ -7742,7 +7742,7 @@ msgstr "Com sessão ativa"
 #. TRANSLATORS: Status of Parental Controls setup
 #: panels/user-accounts/cc-user-panel.c:846
 #: panels/user-accounts/cc-user-panel.c:935
-#: panels/wwan/cc-wwan-device-page.c:443
+#: panels/wwan/cc-wwan-device-page.c:477
 msgid "Enabled"
 msgstr "Ativo"

@@ -8458,63 +8458,63 @@ msgctxt "Network mode"
 msgid "Unknown"
 msgstr "Desconhecido"

-#: panels/wwan/cc-wwan-device-page.c:141
+#: panels/wwan/cc-wwan-device-page.c:188
 msgid "Unlock SIM card"
 msgstr "Desbloquear o cartão SIM"

-#: panels/wwan/cc-wwan-device-page.c:142 panels/wwan/cc-wwan-device-page.c:190
+#: panels/wwan/cc-wwan-device-page.c:189 panels/wwan/cc-wwan-device-page.c:237
 msgid "Unlock"
 msgstr "Desbloquear"

-#: panels/wwan/cc-wwan-device-page.c:147
+#: panels/wwan/cc-wwan-device-page.c:194
 #, c-format
 msgid "Please provide PIN code for SIM %d"
 msgstr "Forneça o código PIN do SIM %d"

-#: panels/wwan/cc-wwan-device-page.c:148
+#: panels/wwan/cc-wwan-device-page.c:195
 msgid "Enter PIN to unlock your SIM card"
 msgstr "Inserir o PIN para desbloquear o cartão SIM"

-#: panels/wwan/cc-wwan-device-page.c:152
+#: panels/wwan/cc-wwan-device-page.c:199
 #, c-format
 msgid "Please provide PUK code for SIM %d"
 msgstr "Forneça o código PUK do SIM %d"

-#: panels/wwan/cc-wwan-device-page.c:153
+#: panels/wwan/cc-wwan-device-page.c:200
 msgid "Enter PUK to unlock your SIM card"
 msgstr "Inserir o PUK para desbloquear o cartão SIM"

-#: panels/wwan/cc-wwan-device-page.c:171
+#: panels/wwan/cc-wwan-device-page.c:218
 #, c-format
 msgid "Wrong password entered. You have %1$u try left"
 msgid_plural "Wrong password entered. You have %1$u tries left"
 msgstr[0] "Palavra-passe incorreta introduzida. Ainda tem %1$u tentativa"
 msgstr[1] "Palavra-passe incorreta introduzida. Ainda tem %1$u tentativas"

-#: panels/wwan/cc-wwan-device-page.c:174
+#: panels/wwan/cc-wwan-device-page.c:221
 #, c-format
 msgid "You have %u try left"
 msgid_plural "You have %u tries left"
 msgstr[0] "Tem %u tentativa restante"
 msgstr[1] "Tem %u tentativas restantes"

-#: panels/wwan/cc-wwan-device-page.c:179
+#: panels/wwan/cc-wwan-device-page.c:226
 msgid "Wrong password entered."
 msgstr "Palavra-passe incorreta introduzida."

-#: panels/wwan/cc-wwan-device-page.c:224
+#: panels/wwan/cc-wwan-device-page.c:271
 msgid "PUK code should be an 8 digit number"
 msgstr "O código PUK deve ser um número de 8 dígitos"

-#: panels/wwan/cc-wwan-device-page.c:248
+#: panels/wwan/cc-wwan-device-page.c:295
 msgid "Enter New PIN"
 msgstr "Introduza novo PIN"

-#: panels/wwan/cc-wwan-device-page.c:252
+#: panels/wwan/cc-wwan-device-page.c:299
 msgid "PIN code should be a 4-8 digit number"
 msgstr "O código PIN deve ser um número de 4-8 dígitos"

-#: panels/wwan/cc-wwan-device-page.c:270
+#: panels/wwan/cc-wwan-device-page.c:317
 msgid "Unlocking..."
 msgstr "A desbloquear..."

--- a/po/ru.po
+++ b/po/ru.po
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -31,19 +31,19 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-control-center master\n"
+"Project-Id-Version: gnome-control-center 41.0\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-control-center/"
 "issues\n"
-"POT-Creation-Date: 2021-09-08 08:29+0000\n"
-"PO-Revision-Date: 2021-09-14 18:51+0800\n"
-"Last-Translator: lumingzh <lumingzh@qq.com>\n"
+"POT-Creation-Date: 2022-02-07 20:42+0000\n"
+"PO-Revision-Date: 2022-02-07 16:11-0500\n"
+"Last-Translator: Boyuan Yang <073plan@gmail.com>\n"
 "Language-Team: Chinese - China <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 3.0\n"
+"X-Generator: Poedit 3.0.1\n"

 #: panels/applications/cc-applications-panel.c:823
 msgid "System Bus"
@@ -223,7 +223,7 @@ msgstr "相机"
 #: panels/keyboard/keyboard-shortcuts.c:367 panels/network/network-proxy.ui:129
 #: panels/user-accounts/cc-user-panel.c:848
 #: panels/user-accounts/cc-user-panel.c:938
-#: panels/wwan/cc-wwan-device-page.c:445
+#: panels/wwan/cc-wwan-device-page.c:479
 #: subprojects/gvc/gvc-mixer-control.c:1900
 msgid "Disabled"
 msgstr "已禁用"
@@ -251,8 +251,8 @@ msgstr "无法被更改"

 #: panels/applications/cc-applications-panel.ui:175
 msgid ""
-"Individual permissions for applications can be reviewed in the <a href="
-"\"privacy\">Privacy</a> Settings."
+"Individual permissions for applications can be reviewed in the <a "
+"href=\"privacy\">Privacy</a> Settings."
 msgstr "应用程序的各个权限可以在 <a href=\"privacy\">隐私</a> 设置中查看。"

 # 左撇子有歧视色彩。
@@ -902,9 +902,9 @@ msgstr "需要互联网连接"

 #: panels/color/cc-color-panel.ui:591
 msgid ""
-"You may find these instructions on how to use the profile on <a href=\"linux"
-"\">GNU/Linux</a>, <a href=\"osx\">Apple OS X</a> and <a href=\"windows"
-"\">Microsoft Windows</a> systems useful."
+"You may find these instructions on how to use the profile on <a "
+"href=\"linux\">GNU/Linux</a>, <a href=\"osx\">Apple OS X</a> and <a "
+"href=\"windows\">Microsoft Windows</a> systems useful."
 msgstr ""
 "有关如何在 <a href=\"linux\">GNU/Linux</a>、<a href=\"osx\">Apple OS X</a> "
 "和 <a href=\"windows\">Microsoft Windows</a> 系统中使用配置的这些说明可能对您"
@@ -2160,7 +2160,7 @@ msgstr "左Super徽标键"
 #: panels/keyboard/cc-keyboard-panel.c:92
 msgctxt "keyboard key"
 msgid "Right Super"
-msgstr "左Super徽标键"
+msgstr "右Super徽标键"

 #: panels/keyboard/cc-keyboard-panel.c:75
 #: panels/keyboard/cc-keyboard-panel.c:93
@@ -2272,7 +2272,7 @@ msgstr "重新设置快捷键可能影响您的自定义快捷键。此操作无
 #: panels/keyboard/cc-keyboard-shortcut-editor.ui:275
 #: panels/printers/authentication-dialog.ui:29
 #: panels/printers/ppd-selection-dialog.ui:27
-#: panels/wwan/cc-wwan-device-page.c:143
+#: panels/wwan/cc-wwan-device-page.c:190
 msgid "Cancel"
 msgstr "取消"

@@ -2387,7 +2387,6 @@ msgid "Keyboard"
 msgstr "键盘"

 #: panels/keyboard/gnome-keyboard-panel.desktop.in.in:4
-#| msgid "View and change keyboard shortcuts and set your typing preferences"
 msgid ""
 "Change keyboard shortcuts and set your typing preferences, keyboard layouts "
 "and input sources"
@@ -3358,7 +3357,7 @@ msgstr "禁用"
 #: panels/network/connection-editor/ip4-page.ui:97
 #: panels/network/connection-editor/ip6-page.ui:111
 msgid "Shared to other computers"
-msgstr "已与其他计算机共享"
+msgstr "与其他计算机共享"

 #: panels/network/connection-editor/ip4-page.ui:125
 #: panels/network/connection-editor/ip6-page.ui:139
@@ -5691,8 +5690,6 @@ msgid "Region & Language"
 msgstr "区域与语言"

 #: panels/region/gnome-region-panel.desktop.in.in:4
-#| msgid ""
-#| "Select your display language, formats, keyboard layouts and input sources"
 msgid "Select your display language and formats"
 msgstr "选择您的显示语言和格式"

@@ -7625,7 +7622,7 @@ msgstr "已登录"
 #. TRANSLATORS: Status of Parental Controls setup
 #: panels/user-accounts/cc-user-panel.c:846
 #: panels/user-accounts/cc-user-panel.c:935
-#: panels/wwan/cc-wwan-device-page.c:443
+#: panels/wwan/cc-wwan-device-page.c:477
 msgid "Enabled"
 msgstr "已启用"

@@ -8321,61 +8318,61 @@ msgctxt "Network mode"
 msgid "Unknown"
 msgstr "未知"

-#: panels/wwan/cc-wwan-device-page.c:141
+#: panels/wwan/cc-wwan-device-page.c:188
 msgid "Unlock SIM card"
 msgstr "解锁 SIM 卡"

-#: panels/wwan/cc-wwan-device-page.c:142 panels/wwan/cc-wwan-device-page.c:190
+#: panels/wwan/cc-wwan-device-page.c:189 panels/wwan/cc-wwan-device-page.c:237
 msgid "Unlock"
 msgstr "解锁"

-#: panels/wwan/cc-wwan-device-page.c:147
+#: panels/wwan/cc-wwan-device-page.c:194
 #, c-format
 msgid "Please provide PIN code for SIM %d"
 msgstr "请提供 SIM 卡 %d 的 PIN 码"

-#: panels/wwan/cc-wwan-device-page.c:148
+#: panels/wwan/cc-wwan-device-page.c:195
 msgid "Enter PIN to unlock your SIM card"
 msgstr "输入 PIN 以解锁您的 SIM 卡"

-#: panels/wwan/cc-wwan-device-page.c:152
+#: panels/wwan/cc-wwan-device-page.c:199
 #, c-format
 msgid "Please provide PUK code for SIM %d"
 msgstr "请提供 SIM 卡 %d 的 PUK 码"

-#: panels/wwan/cc-wwan-device-page.c:153
+#: panels/wwan/cc-wwan-device-page.c:200
 msgid "Enter PUK to unlock your SIM card"
 msgstr "输入 PUK 以解锁您的 SIM 卡"

-#: panels/wwan/cc-wwan-device-page.c:171
+#: panels/wwan/cc-wwan-device-page.c:218
 #, c-format
 msgid "Wrong password entered. You have %1$u try left"
 msgid_plural "Wrong password entered. You have %1$u tries left"
 msgstr[0] "密码输入错误。您还有 %1$u 次尝试机会"

-#: panels/wwan/cc-wwan-device-page.c:174
+#: panels/wwan/cc-wwan-device-page.c:221
 #, c-format
 msgid "You have %u try left"
 msgid_plural "You have %u tries left"
 msgstr[0] "您还有 %u 次尝试机会"

-#: panels/wwan/cc-wwan-device-page.c:179
+#: panels/wwan/cc-wwan-device-page.c:226
 msgid "Wrong password entered."
 msgstr "密码输入错误。"

-#: panels/wwan/cc-wwan-device-page.c:224
+#: panels/wwan/cc-wwan-device-page.c:271
 msgid "PUK code should be an 8 digit number"
 msgstr "PUK 码应为 8 位数字"

-#: panels/wwan/cc-wwan-device-page.c:248
+#: panels/wwan/cc-wwan-device-page.c:295
 msgid "Enter New PIN"
 msgstr "输入新 PIN"

-#: panels/wwan/cc-wwan-device-page.c:252
+#: panels/wwan/cc-wwan-device-page.c:299
 msgid "PIN code should be a 4-8 digit number"
 msgstr "PIN 码应为 4 到 8 位数字"

-#: panels/wwan/cc-wwan-device-page.c:270
+#: panels/wwan/cc-wwan-device-page.c:317
 msgid "Unlocking..."
 msgstr "正在解锁…"

--- a/shell/appdata/meson.build
+++ b/shell/appdata/meson.build
@@ -1,7 +1,6 @@
 appdata = 'gnome-control-center.appdata.xml'

 i18n.merge_file(
-  appdata,
  input: appdata + '.in',
  output: appdata,
  po_dir: po_dir,
--- a/shell/meson.build
+++ b/shell/meson.build
@@ -23,7 +23,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-       desktop,
         type : 'desktop',
        input : desktop_in,
       output : desktop,
--- a/tests/interactive-panels/applications/meson.build
+++ b/tests/interactive-panels/applications/meson.build
@@ -12,7 +12,6 @@ desktop_files = [

 foreach desktop_file : desktop_files
  i18n.merge_file(
-              desktop,
                type : 'desktop',
               input : 'gtp-@0@.desktop.in'.format(desktop_file),
              output : 'gnome-@0@-panel.desktop'.format(desktop_file),
Author	SHA1	Message	Date
Robert Ancell	d08fac3f0b	41.4	2022-02-14 10:57:02 +13:00
Felipe Borges	212ab19dfd	network: Show configuration button only for active/connecting connections In commit `c7bd442839` we started to show the configuration button for all rows, which fixes the original issue of not being able to tweak a connection during association but also introduces a regression of not having connection data to show for other connections in the list. This way, the configuration button will fail to create a net_connection_editor interface for rows that aren't associated with an active connection. Let's only show the configuration button when the NMActiveConnectionState is either NM_ACTIVE_CONNECTION_STATE_ACTIVATING or NM_ACTIVE_CONNECTION_STATE_ACTIVATED. Fixes #1494	2022-02-10 16:22:25 +01:00
Boyuan Yang	0aaba85d10	Update Chinese (China) translation	2022-02-07 21:14:57 +00:00
Boyuan Yang	691c223a53	Update Chinese (China) translation	2022-02-07 20:42:09 +00:00
sicklylife	d0d4bfc728	Update Japanese translation	2022-02-05 13:11:02 +00:00
Brandon Nielsen	badd326299	Simplify callback logic in ppd_selection_cb. This ensures user_callback does not get called twice when cancelling out of the ppd selection dialog. Fixes #1599, introduced with `179bda1b` / MR: 1011.	2022-01-31 20:58:41 +00:00
Hui Wang	600b0a014e	sound: clear the value on level_bar when stream is empty We met an Input Device level_bar display issue on a machine which has no internal mic. At first there is no external mic plugged, so the Input Device list is empty and level_bar is gray color, after we plug an external mic, the level_bar has red color ripples, then we unplug the external mic, the Input Device list changes to empty and we expect the level_bar changes back to gray color, but some bars are still red color. Here clear the self->value to 0 if the stream is empty, then the level_bar will change back to gray color when Input/Output device list is empty. Signed-off-by: Hui Wang <hui.wang@canonical.com>	2022-01-31 12:23:01 +13:00
Sveinn í Felli	a930c01660	Update Icelandic translation	2022-01-30 21:00:28 +00:00
Sveinn í Felli	f41d67ed21	Update Icelandic translation	2022-01-30 15:19:34 +00:00
Sveinn í Felli	b6fac911b2	Update Icelandic translation	2022-01-30 14:49:22 +00:00
Sveinn í Felli	39dbe693da	Update Icelandic translation	2022-01-30 14:37:42 +00:00
Sveinn í Felli	22a01539dc	Update Icelandic translation	2022-01-30 13:49:08 +00:00
sicklylife	affc906cb4	Update Japanese translation	2022-01-29 14:24:11 +00:00
sicklylife	e13e38ed8e	Update Japanese translation	2022-01-29 13:21:47 +00:00
sicklylife	28600b5b22	Update Japanese translation	2022-01-29 13:17:21 +00:00
Sveinn í Felli	dce6f2262c	Update Icelandic translation	2022-01-29 12:09:56 +00:00
Sveinn í Felli	6d7332ae64	Update Icelandic translation	2022-01-29 12:05:39 +00:00
Aleksandr Melman	1d7e60b799	Update Russian translation	2022-01-24 13:02:22 +00:00
Jan Beich	4f64deb5f1	meson: drop unused argument for i18n.merge_file() Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0. panels/applications/meson.build:10:5: ERROR: Function does not take positional arguments. panels/background/meson.build:10:5: ERROR: Function does not take positional arguments. panels/camera/meson.build:10:5: ERROR: Function does not take positional arguments. [...]	2022-01-19 15:01:58 +13:00
Felipe Borges	8d318a7228	applications: Fix typo in key name in the desktop file Regression introduced by commit `9a3cb6ab4`. Reported at `9a3cb6ab44 (note_1356724)`	2022-01-17 13:25:19 +01:00
Felipe Borges	0e2562c2c5	applications: Set the Icon key in desktop file to a icon that exists While we dynamically append --symbolic to the icons while creating the sidebar model in https://gitlab.gnome.org/GNOME/gnome-control-center/-/blob/master/shell/cc-shell-model.c#L270 There are automation tools (such as rpmdiff) that parse desktop files and verify whether their Icon= matches to an existing file in the icon theme package. preferences-desktop-apps doesn't exist in adwaita-icon-theme but preferences-desktop-apps-symbolic does.	2022-01-14 13:31:36 +01:00
Aleksandr Melman	ad29e2677c	Update Russian translation	2022-01-10 17:46:08 +00:00
Robert Mader	293e191e39	display-config: Do not invert order when constructing modes Mutter sends modes in descending order of preference. By reverting the order via `g_list_prepend`, we get unintended side effects such as choosing the least preferred refresh rate by default (if the selected mode is not marked as preferred). Instead of adding complex logic in several places, make sure that the assumption of descending preference is kept by simply not inverting the order. Closes https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1562 (cherry picked from commit `6a4652bd35`)	2022-01-05 23:24:50 +01:00
Hugo Carvalho	492fac1540	Update Portuguese translation	2021-12-18 13:40:28 +00:00
Robert Ancell	5669987a76	Post-release version bump	2021-12-03 15:59:00 +13:00