[gnome-control-center/rhel/8.4.0: 32/32] Update translations




commit 1720aabaae3af0538a4aec4316d716fff9b39dad
Author: Kalev Lember <klember redhat com>
Date:   Mon Mar 1 14:26:47 2021 +0100

    Update translations
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1876291

 po/fr.po    | 1114 +++++------
 po/ja.po    | 4791 +++++++++++++++++++++++----------------------
 po/zh_CN.po | 6279 +++++++++++++++++++++++++++++++++--------------------------
 3 files changed, 6529 insertions(+), 5655 deletions(-)
---
diff --git a/po/fr.po b/po/fr.po
index 7c55fd2aa..689f54da4 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -35,9 +35,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center HEAD\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-control-center/";
-"issues\n"
-"POT-Creation-Date: 2018-03-01 16:23+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-02-12 14:19+0100\n"
 "PO-Revision-Date: 2018-03-01 20:03+0100\n"
 "Last-Translator: Alain Lojewski <allomervan gmail com>\n"
 "Language-Team: GNOME French Team <gnomefr traduc org>\n"
@@ -127,13 +126,13 @@ msgstr "Dossier personnel"
 #: panels/background/cc-background-chooser-dialog.c:555
 #, c-format
 msgid "You can add images to your %s folder and they will show up here"
-msgstr ""
-"Vous pouvez ajouter des images dans votre dossier %s où elles s’afficheront"
+msgstr "Vous pouvez ajouter des images dans votre dossier %s où elles s’afficheront"
 
 #: panels/background/cc-background-chooser-dialog.c:560
 #: panels/color/cc-color-panel.c:225 panels/color/cc-color-panel.c:963
 #: panels/color/color-calibrate.ui:25 panels/color/color.ui:657
-#: panels/common/language-chooser.ui:23 panels/display/cc-display-panel.c:2594
+#: panels/common/language-chooser.ui:23 panels/display/cc-display-panel.c:2597
+#: panels/info/cc-subscription-register-dialog.ui:18
 #: panels/network/connection-editor/connection-editor.ui:15
 #: panels/network/connection-editor/vpn-helpers.c:181
 #: panels/network/connection-editor/vpn-helpers.c:310
@@ -144,15 +143,15 @@ msgstr ""
 #: panels/privacy/cc-privacy-panel.c:1053 panels/region/format-chooser.ui:25
 #: panels/region/input-chooser.ui:13
 #: panels/search/cc-search-locations-dialog.c:642
-#: panels/sharing/cc-sharing-panel.c:384
+#: panels/sharing/cc-sharing-panel.c:392
 #: panels/user-accounts/data/account-dialog.ui:28
 #: panels/user-accounts/data/join-dialog.ui:20
 #: panels/user-accounts/data/password-dialog.ui:21
 #: panels/user-accounts/um-fingerprint-dialog.c:261
-#: panels/user-accounts/um-photo-dialog.c:102
-#: panels/user-accounts/um-photo-dialog.c:229
-#: panels/user-accounts/um-user-panel.c:635
-#: panels/user-accounts/um-user-panel.c:653
+#: panels/user-accounts/um-photo-dialog.c:103
+#: panels/user-accounts/um-photo-dialog.c:230
+#: panels/user-accounts/um-user-panel.c:634
+#: panels/user-accounts/um-user-panel.c:652
 msgid "_Cancel"
 msgstr "_Annuler"
 
@@ -215,9 +214,7 @@ msgstr "Bluetooth désactivé"
 
 #: panels/bluetooth/cc-bluetooth-panel.c:331
 msgid "Turn on to connect devices and receive file transfers."
-msgstr ""
-"Activez pour connecter des périphériques et recevoir des transfert de "
-"fichiers."
+msgstr "Activez pour connecter des périphériques et recevoir des transfert de fichiers."
 
 #: panels/bluetooth/cc-bluetooth-panel.c:332
 msgid "Airplane Mode is on"
@@ -237,14 +234,10 @@ msgstr "Désactivez le mode avion pour activer le Bluetooth."
 
 #. Translators: The found device is a printer connected via Bluetooth
 #: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:3
-#: panels/network/network.ui:101 panels/printers/pp-new-printer-dialog.c:1816
+#: panels/printers/pp-new-printer-dialog.c:1816
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: panels/network/network.ui:68
-msgid "Other Devices"
-msgstr "Autres périphériques"
-
 #: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:4
 msgid "Turn Bluetooth on and off and connect your devices"
 msgstr "Active/désactive le Bluetooth et connecte vos périphériques"
@@ -262,8 +255,7 @@ msgstr "partage;partager;bluetooth;obex;"
 #. TRANSLATORS: The user has to attach the sensor to the screen
 #: panels/color/cc-color-calibrate.c:361
 msgid "Place your calibration device over the square and press “Start”"
-msgstr ""
-"Posez votre sonde d’étalonnage sur le carré et appuyez sur « Démarrer »"
+msgstr "Posez votre sonde d’étalonnage sur le carré et appuyez sur « Démarrer »"
 
 #. TRANSLATORS: Some calibration devices need the user to move a
 #. * dial or switch manually. We also show a picture showing them
@@ -271,9 +263,7 @@ msgstr ""
 #: panels/color/cc-color-calibrate.c:367
 msgid ""
 "Move your calibration device to the calibrate position and press “Continue”"
-msgstr ""
-"Déplacez votre sonde d’étalonnage vers l’emplacement à étalonner et appuyez "
-"sur « Continuer »"
+msgstr "Déplacez votre sonde d’étalonnage vers l’emplacement à étalonner et appuyez sur « Continuer »"
 
 #. TRANSLATORS: Some calibration devices need the user to move a
 #. * dial or switch manually. We also show a picture showing them
@@ -281,9 +271,7 @@ msgstr ""
 #: panels/color/cc-color-calibrate.c:373
 msgid ""
 "Move your calibration device to the surface position and press “Continue”"
-msgstr ""
-"Déplacez votre sonde d’étalonnage à l’aplomb de l’emplacement à étalonner et "
-"appuyez sur « Continuer »"
+msgstr "Déplacez votre sonde d’étalonnage à l’aplomb de l’emplacement à étalonner et appuyez sur « Continuer 
»"
 
 #. TRANSLATORS: on some hardware e.g. Lenovo W700 the sensor
 #. * is built into the palmrest and we need to fullscreen the
@@ -456,14 +444,11 @@ msgstr "Saisissez cet URL."
 
 #: panels/color/cc-color-panel.c:925
 msgid "Restart this computer and boot your normal operating system."
-msgstr ""
-"Redémarrez cet ordinateur et lancez votre sysème d’exploitation habituel."
+msgstr "Redémarrez cet ordinateur et lancez votre sysème d’exploitation habituel."
 
 #: panels/color/cc-color-panel.c:926
 msgid "Type the URL into your browser to download and install the profile."
-msgstr ""
-"Saisissez cet URL dans votre navigateur pour télécharger et installer le "
-"profil."
+msgstr "Saisissez cet URL dans votre navigateur pour télécharger et installer le profil."
 
 #. TRANSLATORS: this is the dialog to save the ICC profile
 #: panels/color/cc-color-panel.c:960
@@ -485,15 +470,12 @@ msgstr "Créer un profil de couleur pour le périphérique sélectionné"
 msgid ""
 "The measuring instrument is not detected. Please check it is turned on and "
 "correctly connected."
-msgstr ""
-"L’instrument de mesure n’est pas détecté. Vérifiez qu’il est allumé et "
-"connecté correctement."
+msgstr "L’instrument de mesure n’est pas détecté. Vérifiez qu’il est allumé et connecté correctement."
 
 #. TRANSLATORS: this is when the button is insensitive
 #: panels/color/cc-color-panel.c:1374
 msgid "The measuring instrument does not support printer profiling."
-msgstr ""
-"L’instrument de mesure ne prend pas en charge les profils d’imprimante."
+msgstr "L’instrument de mesure ne prend pas en charge les profils d’imprimante."
 
 #. TRANSLATORS: this is when the button is insensitive
 #: panels/color/cc-color-panel.c:1385
@@ -609,10 +591,7 @@ msgid ""
 "Calibration will produce a profile that you can use to color manage your "
 "screen. The longer you spend on calibration, the better the quality of the "
 "color profile."
-msgstr ""
-"L’étalonnage va générer un profil que vous pourrez utiliser pour gérer la "
-"couleur de votre écran. Plus l’étalonnage est long, meilleure est la qualité "
-"du profil de couleur."
+msgstr "L’étalonnage va générer un profil que vous pourrez utiliser pour gérer la couleur de votre écran. 
Plus l’étalonnage est long, meilleure est la qualité du profil de couleur."
 
 #: panels/color/color.ui:38
 msgid ""
@@ -653,9 +632,7 @@ msgstr "Type d’écran"
 msgid ""
 "Select a display target white point. Most displays should be calibrated to a "
 "D65 illuminant."
-msgstr ""
-"Sélectionnez un point blanc cible pour l’écran. La plupart des écrans "
-"doivent être étalonnés à l’illuminant D65."
+msgstr "Sélectionnez un point blanc cible pour l’écran. La plupart des écrans doivent être étalonnés à 
l’illuminant D65."
 
 #: panels/color/color.ui:278
 msgid "Profile Whitepoint"
@@ -665,17 +642,13 @@ msgstr "Point blanc du profil"
 msgid ""
 "Please set the display to a brightness that is typical for you. Color "
 "management will be most accurate at this brightness level."
-msgstr ""
-"Réglez la luminosité de l’écran à une valeur qui vous est habituelle. La "
-"gestion de couleur n’en sera que plus fiable."
+msgstr "Réglez la luminosité de l’écran à une valeur qui vous est habituelle. La gestion de couleur n’en 
sera que plus fiable."
 
 #: panels/color/color.ui:307
 msgid ""
 "Alternatively, you can use the brightness level used with one of the other "
 "profiles for this device."
-msgstr ""
-"Vous pouvez aussi utiliser la luminosité déjà définie dans d’autres profils "
-"pour ce périphérique."
+msgstr "Vous pouvez aussi utiliser la luminosité déjà définie dans d’autres profils pour ce périphérique."
 
 #: panels/color/color.ui:318
 msgid "Display Brightness"
@@ -685,9 +658,7 @@ msgstr "Luminosité de l’écran"
 msgid ""
 "You can use a color profile on different computers, or even create profiles "
 "for different lighting conditions."
-msgstr ""
-"Vous pouvez utiliser le même profil de couleurs sur différents ordinateurs "
-"et aussi créer des profils adaptés à différentes conditions d’éclairage."
+msgstr "Vous pouvez utiliser le même profil de couleurs sur différents ordinateurs et aussi créer des 
profils adaptés à différentes conditions d’éclairage."
 
 #: panels/color/color.ui:348
 msgid "Profile Name:"
@@ -722,10 +693,7 @@ 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."
-msgstr ""
-"Ici, vous pouvez consulter d’utiles conseils sur l’utilisation d’un profil "
-"<a href=\"linux\">GNU/Linux</a>, <a href=\"osx\">Apple OS X</a> et <a href="
-"\"windows\">Microsoft Windows</a>."
+msgstr "Ici, vous pouvez consulter d’utiles conseils sur l’utilisation d’un profil <a 
href=\"linux\">GNU/Linux</a>, <a href=\"osx\">Apple OS X</a> et <a href=\"windows\">Microsoft Windows</a>."
 
 #: panels/color/color.ui:607 panels/user-accounts/um-fingerprint-dialog.c:720
 msgid "Summary"
@@ -750,15 +718,11 @@ msgstr "_Ajouter"
 msgid ""
 "Problems detected. The profile may not work correctly. <a href=\"\">Show "
 "details.</a>"
-msgstr ""
-"Il y a un problème. Il se peut que le profil ne fonctionne pas correctement. "
-"<a href=\"\">Afficher les détails</a>"
+msgstr "Il y a un problème. Il se peut que le profil ne fonctionne pas correctement. <a href=\"\">Afficher 
les détails</a>"
 
 #: panels/color/color.ui:807
 msgid "Each device needs an up to date color profile to be color managed."
-msgstr ""
-"Chaque périphérique a besoin d’un profil de couleur à jour pour la prise en "
-"charge des couleurs."
+msgstr "Chaque périphérique a besoin d’un profil de couleur à jour pour la prise en charge des couleurs."
 
 #: panels/color/color.ui:829
 msgid "Learn more"
@@ -900,9 +864,7 @@ msgstr "Couleur"
 #: panels/color/gnome-color-panel.desktop.in.in:4
 msgid ""
 "Calibrate the color of your devices, such as displays, cameras or printers"
-msgstr ""
-"Étalonne la couleur de vos périphériques, comme les écrans, les appareils "
-"photos ou les imprimantes"
+msgstr "Étalonne la couleur de vos périphériques, comme les écrans, les appareils photos ou les imprimantes"
 
 #. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: panels/color/gnome-color-panel.desktop.in.in:7
@@ -1143,100 +1105,98 @@ msgstr "Modifier la date et l’heure du système"
 msgid "To change time or date settings, you need to authenticate."
 msgstr "Vous devez vous authentifier pour modifier la date ou l’heure."
 
-#: panels/display/cc-display-panel.c:729
+#: panels/display/cc-display-panel.c:732
 msgctxt "Display rotation"
 msgid "Landscape"
 msgstr "Paysage"
 
-#: panels/display/cc-display-panel.c:732
+#: panels/display/cc-display-panel.c:735
 msgctxt "Display rotation"
 msgid "Portrait Right"
 msgstr "Portrait sur la droite"
 
-#: panels/display/cc-display-panel.c:735
+#: panels/display/cc-display-panel.c:738
 msgctxt "Display rotation"
 msgid "Portrait Left"
 msgstr "Portrait sur la gauche"
 
-#: panels/display/cc-display-panel.c:738
+#: panels/display/cc-display-panel.c:741
 msgctxt "Display rotation"
 msgid "Landscape (flipped)"
 msgstr "Paysage (retourné)"
 
 #. Translators: This option sets orientation of print (portrait, landscape...)
-#: panels/display/cc-display-panel.c:805
+#: panels/display/cc-display-panel.c:808
 #: panels/printers/pp-options-dialog.c:558
 msgid "Orientation"
 msgstr "Orientation"
 
-#: panels/display/cc-display-panel.c:870 panels/display/cc-display-panel.c:1673
+#: panels/display/cc-display-panel.c:873 panels/display/cc-display-panel.c:1676
 #: panels/printers/pp-options-dialog.c:87
 msgid "Resolution"
 msgstr "Résolution"
 
-#: panels/display/cc-display-panel.c:958
+#: panels/display/cc-display-panel.c:961
 msgid "Refresh Rate"
 msgstr "Taux de rafraîchissement"
 
-#: panels/display/cc-display-panel.c:1095
+#: panels/display/cc-display-panel.c:1098
 msgid "Scale"
 msgstr "Échelle"
 
-#: panels/display/cc-display-panel.c:1148
+#: panels/display/cc-display-panel.c:1151
 msgid "Adjust for TV"
 msgstr "Adapter aux téléviseurs"
 
-#: panels/display/cc-display-panel.c:1410
+#: panels/display/cc-display-panel.c:1413
 msgid "Primary Display"
 msgstr "Écran principal"
 
-#: panels/display/cc-display-panel.c:1439
+#: panels/display/cc-display-panel.c:1442
 msgid "Display Arrangement"
 msgstr "Disposition des écrans"
 
-#: panels/display/cc-display-panel.c:1440
+#: panels/display/cc-display-panel.c:1443
 msgid ""
 "Drag displays to match your setup. The top bar is placed on the primary "
 "display."
-msgstr ""
-"Faites glisser vos écrans pour apparier votre configuration. La barre "
-"supérieure se trouve sur l’écran principal."
+msgstr "Faites glisser vos écrans pour apparier votre configuration. La barre supérieure se trouve sur 
l’écran principal."
 
-#: panels/display/cc-display-panel.c:1863
+#: panels/display/cc-display-panel.c:1866
 msgid "Display Mode"
 msgstr "Mode d’affichage"
 
-#: panels/display/cc-display-panel.c:1879
+#: panels/display/cc-display-panel.c:1882
 msgid "Join Displays"
 msgstr "Joindre les écrans"
 
-#: panels/display/cc-display-panel.c:1882
+#: panels/display/cc-display-panel.c:1885
 msgid "Mirror"
 msgstr "Cloner"
 
-#: panels/display/cc-display-panel.c:1885
+#: panels/display/cc-display-panel.c:1888
 msgid "Single Display"
 msgstr "Écran unique"
 
-#: panels/display/cc-display-panel.c:2590
+#: panels/display/cc-display-panel.c:2593
 msgid "Apply Changes?"
 msgstr "Appliquer les changements ?"
 
-#: panels/display/cc-display-panel.c:2604
+#: panels/display/cc-display-panel.c:2607
 #: panels/network/connection-editor/connection-editor.ui:24
 #: panels/network/network-wifi.ui:38
 msgid "_Apply"
 msgstr "_Appliquer"
 
-#: panels/display/cc-display-panel.c:2979
+#: panels/display/cc-display-panel.c:2982
 #, c-format
 msgid "%.2lf Hz"
 msgstr "%.2lf Hz"
 
 #. TRANSLATORS: the state of the night light setting
-#: panels/display/cc-display-panel.c:3195
+#: panels/display/cc-display-panel.c:3198
 #: panels/notifications/cc-notifications-panel.c:292
-#: panels/power/cc-power-panel.c:1991 panels/power/cc-power-panel.c:1998
+#: panels/power/cc-power-panel.c:1994 panels/power/cc-power-panel.c:2001
 #: panels/privacy/cc-privacy-panel.c:190 panels/privacy/cc-privacy-panel.c:257
 #: panels/universal-access/cc-ua-panel.c:333
 #: panels/universal-access/cc-ua-panel.c:714
@@ -1246,9 +1206,9 @@ msgstr "%.2lf Hz"
 msgid "On"
 msgstr "Activé"
 
-#: panels/display/cc-display-panel.c:3195 panels/network/net-proxy.c:54
+#: panels/display/cc-display-panel.c:3198 panels/network/net-proxy.c:54
 #: panels/notifications/cc-notifications-panel.c:292
-#: panels/power/cc-power-panel.c:1985 panels/power/cc-power-panel.c:1996
+#: panels/power/cc-power-panel.c:1988 panels/power/cc-power-panel.c:1999
 #: panels/privacy/cc-privacy-panel.c:190 panels/privacy/cc-privacy-panel.c:257
 #: panels/universal-access/cc-ua-panel.c:333
 #: panels/universal-access/cc-ua-panel.c:714
@@ -1262,11 +1222,11 @@ msgstr "Activé"
 msgid "Off"
 msgstr "Désactivé"
 
-#: panels/display/cc-display-panel.c:3216
+#: panels/display/cc-display-panel.c:3219
 msgid "_Night Light"
 msgstr "Mode _nuit"
 
-#: panels/display/cc-display-panel.c:3281
+#: panels/display/cc-display-panel.c:3284
 msgid "Could not get screen information"
 msgstr "Impossible d’obtenir les informations concernant l’écran"
 
@@ -1284,9 +1244,7 @@ msgstr "Désactivé temporairement jusqu’à demain"
 msgid ""
 "Night light makes the screen color warmer. This can help to prevent eye "
 "strain and sleeplessness."
-msgstr ""
-"Le mode nuit adoucit les couleurs bleues de l’écran. Il peut réduire la "
-"fatigue des yeux et les risques d’insomnies."
+msgstr "Le mode nuit adoucit les couleurs bleues de l’écran. Il peut réduire la fatigue des yeux et les 
risques d’insomnies."
 
 #. This is the redshift functionality where we suppress blue light when the sun has gone down
 #: panels/display/display.ui:171 panels/display/display.ui:567
@@ -1350,14 +1308,13 @@ msgstr "preferences-desktop-display"
 msgid ""
 "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;Night;Light;Blue;"
 "redshift;color;sunset;sunrise;"
-msgstr ""
-"Panneau;Projecteur;xrandr;Écran;Définition;Résolution;Rafraîchissement;"
-"Moniteur;Nuit;Éclairage;Lumière;Bleue;redshift;décalage;spectral;couleur;"
-"lever;coucher;"
+msgstr 
"Panneau;Projecteur;xrandr;Écran;Définition;Résolution;Rafraîchissement;Moniteur;Nuit;Éclairage;Lumière;Bleue;redshift;décalage;spectral;couleur;lever;coucher;"
 
 #. TRANSLATORS: AP type
-#: panels/info/cc-info-overview-panel.c:374
-#: panels/info/cc-info-overview-panel.c:457 panels/network/panel-common.c:123
+#: panels/info/cc-info-overview-panel.c:385
+#: panels/info/cc-info-overview-panel.c:465
+#: panels/info/cc-subscription-details-dialog.c:109
+#: panels/network/panel-common.c:123
 msgid "Unknown"
 msgstr "Inconnu"
 
@@ -1365,24 +1322,24 @@ msgstr "Inconnu"
 #. * example:
 #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or
 #. * "Ubuntu 16.04 LTS; Build ID: jki"
-#: panels/info/cc-info-overview-panel.c:465
+#: panels/info/cc-info-overview-panel.c:473
 #, c-format
 msgid "%s; Build ID: %s"
 msgstr "%s ; (identifiant de construction : %s)"
 
 #. translators: This is the type of architecture for the OS
-#: panels/info/cc-info-overview-panel.c:482
+#: panels/info/cc-info-overview-panel.c:490
 #, c-format
 msgid "64-bit"
 msgstr "64-bit"
 
 #. translators: This is the type of architecture for the OS
-#: panels/info/cc-info-overview-panel.c:485
+#: panels/info/cc-info-overview-panel.c:493
 #, c-format
 msgid "32-bit"
 msgstr "32-bit"
 
-#: panels/info/cc-info-overview-panel.c:775
+#: panels/info/cc-info-overview-panel.c:782
 #, c-format
 msgid "Version %s"
 msgstr "Version %s"
@@ -1417,8 +1374,7 @@ msgstr "Sélectionnez une application à lancer lorsqu’un baladeur est connect
 
 #: panels/info/cc-info-removable-media-panel.c:427
 msgid "Select an application to run when a camera is connected"
-msgstr ""
-"Sélectionnez une application à lancer lorsqu’un appareil photo est connecté"
+msgstr "Sélectionnez une application à lancer lorsqu’un appareil photo est connecté"
 
 #: panels/info/cc-info-removable-media-panel.c:428
 msgid "Select an application for software CDs"
@@ -1477,6 +1433,210 @@ msgstr "CD vidéo"
 msgid "Windows software"
 msgstr "Logiciels Windows"
 
+#: panels/info/cc-subscription-details-dialog.c:125
+msgid "Subscribed"
+msgstr "Abonné"
+
+#: panels/info/cc-subscription-details-dialog.c:127
+msgid "No Specific Subscription"
+msgstr "Pas d'abonnement spécifique"
+
+#: panels/info/cc-subscription-details-dialog.c:129
+msgid "Not Subscribed"
+msgstr "Non abonné"
+
+#: panels/info/cc-subscription-details-dialog.c:138
+msgid "Product Name"
+msgstr "Nom du produit"
+
+#: panels/info/cc-subscription-details-dialog.c:139
+msgid "Product ID"
+msgstr "ID Produit"
+
+#: panels/info/cc-subscription-details-dialog.c:140
+msgid "Version"
+msgstr "Version"
+
+#: panels/info/cc-subscription-details-dialog.c:141
+msgid "Arch"
+msgstr "Arch"
+
+#: panels/info/cc-subscription-details-dialog.c:142
+msgid "Status"
+msgstr "Statut"
+
+#: panels/info/cc-subscription-details-dialog.c:146
+msgid "Starts"
+msgstr "Démarre"
+
+#: panels/info/cc-subscription-details-dialog.c:147
+msgid "Ends"
+msgstr "Termine"
+
+#: panels/info/cc-subscription-details-dialog.c:175
+#: panels/info/cc-subscription-details-dialog.ui:9
+#: panels/info/cc-subscription-register-dialog.ui:337
+#: panels/info/cc-subscription-register-dialog.ui:470
+msgid "Registration Details"
+msgstr "Informations d’inscription"
+
+#: panels/info/cc-subscription-details-dialog.c:188
+msgid "Subscribe System"
+msgstr "S’abonner au système "
+
+#: panels/info/cc-subscription-details-dialog.c:201
+msgid "Looking For Available Subscriptions…"
+msgstr "Tous les abonnements disponibles..."
+
+#: panels/info/cc-subscription-details-dialog.c:215
+msgid "Unregister System"
+msgstr "Annulation de l’enregistrement du système"
+
+#: panels/info/cc-subscription-details-dialog.c:229
+msgid "Unregistering System…"
+msgstr "Annulation de l’enregistrement du système ..."
+
+#. the widgets are duplicate to allow sliding between two stack pages
+#: panels/info/cc-subscription-details-dialog.c:252
+#: panels/info/cc-subscription-details-dialog.c:253
+#: panels/info/cc-subscription-details-dialog.c:254
+msgid "No installed products detected."
+msgstr "Aucun produit installé n’a été détecté."
+
+#: panels/info/cc-subscription-details-dialog.ui:42
+msgid "_Unregister"
+msgstr "_Annulation"
+
+#: panels/info/cc-subscription-details-dialog.ui:63
+msgid "_Subscribe"
+msgstr "_S’abonner"
+
+#: panels/info/cc-subscription-details-dialog.ui:138
+msgid "Failed to Unregister System"
+msgstr "L’annulation de l’enregistrement du système a échoué"
+
+#: panels/info/cc-subscription-details-dialog.ui:197
+msgid "This system is subscribed to receive software updates."
+msgstr "Ce système est lié à un niveau d’abonnement qui permet de recevoir les mises à jour des logiciels."
+
+#: panels/info/cc-subscription-details-dialog.ui:215
+msgid ""
+"This system lacks subscriptions to receive updates for some installed "
+"software."
+msgstr "Ce système ne dispose pas d’un niveau d'abonnement qui permette de recevoir les mises à jour de 
certains logiciels installés."
+
+#: panels/info/cc-subscription-details-dialog.ui:233
+msgid "This system lacks subscriptions to receive software updates."
+msgstr "Ce système n’est pas lié à un niveau d’abonnement qui permette de recevoir des mises à jour des 
logiciels."
+
+#: panels/info/cc-subscription-details-dialog.ui:251
+msgid "This system is registered to receive software updates."
+msgstr "Ce système est enregistré pour recevoir les mises à jour des logiciels."
+
+#: panels/info/cc-subscription-details-dialog.ui:269
+msgid "This system has no supported software installed."
+msgstr "Ce système n'a pas de logiciel supporté installé."
+
+#: panels/info/cc-subscription-details-dialog.ui:303
+msgid "_Unregister…"
+msgstr "_Annulation..."
+
+#: panels/info/cc-subscription-details-dialog.ui:324
+msgid "_Subscribe…"
+msgstr "_S’abonner..."
+
+#: panels/info/cc-subscription-details-dialog.ui:357
+msgid ""
+"Subscribing with Red Hat will allow this system to receive software updates."
+msgstr "L'abonnement à Red Hat permettra à ce système de recevoir des mises à jour de logiciels."
+
+#: panels/info/cc-subscription-details-dialog.ui:391
+msgid ""
+"Warning: unregistering this system will result in it no longer receiving "
+"software updates."
+msgstr "Attention : si vous désenregistrez ce système, il ne recevra plus les mises à jour des logiciels."
+
+#: panels/info/cc-subscription-register-dialog.c:81
+#: panels/info/cc-subscription-register-dialog.ui:9
+msgid "Register System"
+msgstr "Enregistrement du système"
+
+#: panels/info/cc-subscription-register-dialog.c:88
+msgid "Registering System…"
+msgstr "Enregistrement du système ..."
+
+#: panels/info/cc-subscription-register-dialog.ui:37
+msgid "_Register"
+msgstr "_Enregistrer"
+
+#: panels/info/cc-subscription-register-dialog.ui:107
+msgid "Failed to Register System"
+msgstr "L’enregistrement du système a échoué"
+
+#: panels/info/cc-subscription-register-dialog.ui:159
+msgid "Register this system with Red Hat to receive software updates."
+msgstr "Ce système est enregistré avec Red Hat pour recevoir les mises à jour des logiciels."
+
+#: panels/info/cc-subscription-register-dialog.ui:179
+msgid "Registration Server"
+msgstr "Serveur d'enregistrement"
+
+#: panels/info/cc-subscription-register-dialog.ui:199
+msgid "Red Hat"
+msgstr "Red Hat"
+
+#: panels/info/cc-subscription-register-dialog.ui:212
+msgid "Custom Address"
+msgstr "Adresse personnalisée"
+
+#: panels/info/cc-subscription-register-dialog.ui:236
+msgid "_URL"
+msgstr "_URL"
+
+#: panels/info/cc-subscription-register-dialog.ui:270
+msgid "Registration Type"
+msgstr "Type d'enregistrement"
+
+#: panels/info/cc-subscription-register-dialog.ui:289
+msgid "Red Hat Account"
+msgstr "Compte Red Hat"
+
+#: panels/info/cc-subscription-register-dialog.ui:302
+msgid "Activation Keys"
+msgstr "Clé d'activation"
+
+#: panels/info/cc-subscription-register-dialog.ui:355
+msgid "_Login"
+msgstr "_Login"
+
+#: panels/info/cc-subscription-register-dialog.ui:388
+#: 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/sharing.ui:351
+#: panels/user-accounts/data/account-dialog.ui:300
+#: panels/user-accounts/data/account-dialog.ui:525
+#: panels/user-accounts/data/user-accounts-dialog.ui:205
+msgid "_Password"
+msgstr "_Mot de passe"
+
+#: panels/info/cc-subscription-register-dialog.ui:427
+#: panels/info/cc-subscription-register-dialog.ui:540
+msgid "_Organization"
+msgstr "_Organisation"
+
+#: panels/info/cc-subscription-register-dialog.ui:487
+msgid ""
+"Enter comma separated activation key(s). If the activation keys have "
+"conflicting settings, the rightmost key takes precedence."
+msgstr "Entrez la ou les clés d'activation séparées par des virgules. Si les clés d'activation ont des 
paramètres contradictoires, la clé la plus à droite sera priorisée."
+
+#: panels/info/cc-subscription-register-dialog.ui:508
+msgid "_Activation Keys"
+msgstr "_Clé d'activation"
+
 #: panels/info/gnome-default-apps-panel.desktop.in.in:3
 msgid "Default Applications"
 msgstr "Applications par défaut"
@@ -1517,10 +1677,7 @@ msgstr "help-about"
 msgid ""
 "device;system;information;memory;processor;version;default;application;"
 "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
-msgstr ""
-"périphérique;système;information;mémoire;processeur;version;défaut;"
-"application;préféré;cd;dvd;usb;audio;vidéo;disque;amovible;média;exécution "
-"automatique;"
+msgstr 
"périphérique;système;information;mémoire;processeur;version;défaut;application;préféré;cd;dvd;usb;audio;vidéo;disque;amovible;média;exécution
 automatique;"
 
 #: panels/info/gnome-removable-media-panel.desktop.in.in:3
 msgid "Removable Media"
@@ -1540,9 +1697,7 @@ msgstr "media-removable"
 msgid ""
 "device;system;default;application;preferred;cd;dvd;usb;audio;video;disc;"
 "removable;media;autorun;"
-msgstr ""
-"périphérique;système;par défaut;application;préférée;cd;dvd;usb;audio;vidéo;"
-"disque;amovible;média;exécution automatique;"
+msgstr "périphérique;système;par 
défaut;application;préférée;cd;dvd;usb;audio;vidéo;disque;amovible;média;exécution automatique;"
 
 #: panels/info/info-default-apps.ui:31
 msgid "_Web"
@@ -1568,47 +1723,70 @@ msgstr "_Vidéos"
 msgid "_Photos"
 msgstr "_Photos"
 
-#: panels/info/info-overview.ui:58
+#: panels/info/info-overview.ui:61
 msgid "Device name"
 msgstr "Nom du périphérique"
 
-#: panels/info/info-overview.ui:74
+#: panels/info/info-overview.ui:77
 msgid "Memory"
 msgstr "Mémoire"
 
-#: panels/info/info-overview.ui:90
+#: panels/info/info-overview.ui:93
 msgid "Processor"
 msgstr "Processeur"
 
-#: panels/info/info-overview.ui:106
+#: panels/info/info-overview.ui:109
 msgid "Graphics"
 msgstr "Carte graphique"
 
-#. To translators: this field contains the distro name and version
-#: panels/info/info-overview.ui:121
-msgid "OS name"
-msgstr "Nom du système d’exploitation"
-
 #. To translators: this field contains the distro type
-#: panels/info/info-overview.ui:137
+#: panels/info/info-overview.ui:140
 msgid "OS type"
 msgstr "Type de système d’exploitation"
 
-#: panels/info/info-overview.ui:153
+#: panels/info/info-overview.ui:156
 msgid "Virtualization"
 msgstr "Virtualisation"
 
-#: panels/info/info-overview.ui:169
+#: panels/info/info-overview.ui:172
 msgid "Disk"
 msgstr "Disque"
 
-#: panels/info/info-overview.ui:274
+#: panels/info/info-overview.ui:277
 msgid "Calculating…"
 msgstr "Calcul en cours…"
 
-#: panels/info/info-overview.ui:314
-msgid "Check for updates"
-msgstr "Recherche de mises à jour"
+#: panels/info/info-overview.ui:333
+msgid "System Not Registered"
+msgstr "Le système n'est pas enregistré"
+
+#: panels/info/info-overview.ui:345
+msgid "Register this system to receive software updates."
+msgstr "Enregistrez ce système pour recevoir les mises à jour du logiciel."
+
+#: panels/info/info-overview.ui:355
+msgid "_Register…"
+msgstr "_Enregistrer..."
+
+#: panels/info/info-overview.ui:388
+msgid "Registered System"
+msgstr "Système enregistré"
+
+#: panels/info/info-overview.ui:404
+msgid "System is registered and able to receive software updates."
+msgstr "Ce système est enregistré et en mesure de recevoir les mises à jour des logiciels."
+
+#: panels/info/info-overview.ui:418
+msgid "System is registered but is unable to receive all software updates."
+msgstr "Ce système est enregistré mais n’est pas en mesure de recevoir les mises à jour des logiciels."
+
+#: panels/info/info-overview.ui:433
+msgid "_Details"
+msgstr "_Détails"
+
+#: panels/info/info-overview.ui:457
+msgid "_View Updates"
+msgstr "_Afficher les détails des mises à jour"
 
 #: panels/info/info-removable-media.ui:43
 msgid "Select how media should be handled"
@@ -1714,8 +1892,8 @@ msgstr "Lanceurs"
 msgid "Launch help browser"
 msgstr "Démarrer le navigateur d’aide"
 
-#: panels/keyboard/01-launchers.xml.in:6 shell/cc-window.c:223
-#: shell/cc-window.c:761 shell/gnome-control-center.desktop.in.in:3
+#: panels/keyboard/01-launchers.xml.in:6 shell/cc-window.c:220
+#: shell/cc-window.c:756 shell/gnome-control-center.desktop.in.in:3
 #: shell/window.ui:125
 msgid "Settings"
 msgstr "Paramètres"
@@ -1741,6 +1919,11 @@ msgstr "Dossier personnel"
 msgid "Search"
 msgstr "Recherche"
 
+#: panels/keyboard/01-launchers.xml.in:16
+msgctxt "keybinding"
+msgid "Search"
+msgstr "Recherche"
+
 #: panels/keyboard/01-screenshot.xml.in:2
 msgid "Screenshots"
 msgstr "Captures d’écran"
@@ -1861,8 +2044,7 @@ msgstr "Touche de composition"
 
 #: panels/keyboard/cc-keyboard-option.c:355
 msgid "Modifiers-only switch to next source"
-msgstr ""
-"Avec les touches de modification seules, basculer vers la source suivante"
+msgstr "Avec les touches de modification seules, basculer vers la source suivante"
 
 #: panels/keyboard/cc-keyboard-panel.c:181
 msgid "Reset All Shortcuts?"
@@ -1872,9 +2054,7 @@ msgstr "Réinitialiser tous les raccourcis ?"
 msgid ""
 "Resetting the shortcuts may affect your custom shortcuts. This cannot be "
 "undone."
-msgstr ""
-"Réinitialiser tous les raccourcis peut aussi affecter vos raccourcis "
-"personnalisés. Cette action est irréversible."
+msgstr "Réinitialiser tous les raccourcis peut aussi affecter vos raccourcis personnalisés. Cette action est 
irréversible."
 
 #: panels/keyboard/cc-keyboard-panel.c:188
 #: panels/keyboard/shortcut-editor.ui:346
@@ -1896,8 +2076,7 @@ msgstr "Réinitialiser le raccourci à sa valeur par défaut"
 msgid ""
 "%s is already being used for <b>%s</b>. If you replace it, %s will be "
 "disabled"
-msgstr ""
-"%s est déjà utilisé pour <b>%s</b>. Si vous le remplacez, %s sera désactivé"
+msgstr "%s est déjà utilisé pour <b>%s</b>. Si vous le remplacez, %s sera désactivé"
 
 #: panels/keyboard/cc-keyboard-shortcut-editor.c:583
 msgid "Set Custom Shortcut"
@@ -1923,9 +2102,7 @@ msgstr "Clavier"
 
 #: panels/keyboard/gnome-keyboard-panel.desktop.in.in:4
 msgid "View and change keyboard shortcuts and set your typing preferences"
-msgstr ""
-"Afficher, modifier les raccourcis clavier et définir vos préférences de "
-"saisie"
+msgstr "Afficher, modifier les raccourcis clavier et définir vos préférences de saisie"
 
 #. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: panels/keyboard/gnome-keyboard-panel.desktop.in.in:7
@@ -1936,9 +2113,7 @@ msgstr "input-keyboard"
 #: panels/keyboard/gnome-keyboard-panel.desktop.in.in:19
 msgid ""
 "Shortcut;Workspace;Window;Resize;Zoom;Contrast;Input;Source;Lock;Volume;"
-msgstr ""
-"Raccourci;Espace de travail;Fenêtre;Redimensionner;Zoom;Contraste;Saisie;"
-"Source;Verrouiller;Volume;"
+msgstr "Raccourci;Espace de travail;Fenêtre;Redimensionner;Zoom;Contraste;Saisie;Source;Verrouiller;Volume;"
 
 #: panels/keyboard/gnome-keyboard-panel.ui:67 panels/region/input-options.ui:68
 #: shell/cc-application.c:255
@@ -1963,9 +2138,7 @@ msgstr "Essayez une autre recherche"
 
 #: panels/keyboard/shortcut-editor.ui:68 panels/keyboard/shortcut-editor.ui:318
 msgid "Press Esc to cancel or Backspace to reset the keyboard shortcut."
-msgstr ""
-"Appuyer sur Échap pour annuler ou sur Retour arrière pour réinitialiser le "
-"raccourci clavier."
+msgstr "Appuyer sur Échap pour annuler ou sur Retour arrière pour réinitialiser le raccourci clavier."
 
 #: panels/keyboard/shortcut-editor.ui:156 panels/printers/details-dialog.ui:38
 #: panels/sound/gvc-mixer-dialog.c:1480
@@ -2009,7 +2182,7 @@ msgstr "Remplacer"
 msgid "Set"
 msgstr "Définir"
 
-#: panels/mouse/cc-mouse-panel.c:82 panels/wacom/cc-wacom-panel.c:402
+#: panels/mouse/cc-mouse-panel.c:82 panels/wacom/cc-wacom-panel.c:441
 msgid "Test Your _Settings"
 msgstr "Tester vos p_aramètres"
 
@@ -2020,8 +2193,7 @@ msgstr "Sou­ris et pavé tac­tile"
 #: panels/mouse/gnome-mouse-panel.desktop.in.in:4
 msgid ""
 "Change your mouse or touchpad sensitivity and select right or left-handed"
-msgstr ""
-"Modifier la sensibilité du pavé tactile et choisir entre droitier ou gaucher"
+msgstr "Modifier la sensibilité du pavé tactile et choisir entre droitier ou gaucher"
 
 #. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: panels/mouse/gnome-mouse-panel.desktop.in.in:7
@@ -2043,8 +2215,7 @@ msgstr "Bouton principal"
 
 #: panels/mouse/gnome-mouse-properties.ui:102
 msgid "Sets the order of physical buttons on mice and touchpads."
-msgstr ""
-"Définit l’ordre des boutons physiques sur les souris et pavés tactiles."
+msgstr "Définit l’ordre des boutons physiques sur les souris et pavés tactiles."
 
 #: panels/mouse/gnome-mouse-properties.ui:131
 msgid "Left"
@@ -2133,7 +2304,7 @@ msgid "Single click, secondary button"
 msgstr "Simple clic, bouton secondaire"
 
 #. add proxy to device list
-#: panels/network/cc-network-panel.c:579
+#: panels/network/cc-network-panel.c:583
 msgid "Network proxy"
 msgstr "Serveur mandataire"
 
@@ -2141,19 +2312,17 @@ msgstr "Serveur mandataire"
 #. * window for vpn connections, it is also used to display
 #. * vpn connections in the device list.
 #.
-#: panels/network/cc-network-panel.c:715 panels/network/net-vpn.c:192
-#: panels/network/net-vpn.c:321
+#: panels/network/cc-network-panel.c:719 panels/network/net-vpn.c:170
+#: panels/network/net-vpn.c:299
 #, c-format
 msgid "%s VPN"
 msgstr "VPN %s"
 
-#: panels/network/cc-network-panel.c:779 panels/network/wifi.ui:282
+#: panels/network/cc-network-panel.c:810 panels/network/wifi.ui:282
 msgid "Oops, something has gone wrong. Please contact your software vendor."
-msgstr ""
-"Oups, quelque chose s’est mal passé. Veuillez contacter le fournisseur de "
-"votre logiciel."
+msgstr "Oups, quelque chose s’est mal passé. Veuillez contacter le fournisseur de votre logiciel."
 
-#: panels/network/cc-network-panel.c:785
+#: panels/network/cc-network-panel.c:816
 msgid "NetworkManager needs to be running."
 msgstr "NetworkManager doit être en fonctionnement."
 
@@ -2303,7 +2472,7 @@ msgid "Remove VPN"
 msgstr "Supprimer le VPN"
 
 #: panels/network/connection-editor/ce-page-details.c:334
-#: panels/network/network-wifi.ui:1456 shell/cc-window.c:215
+#: panels/network/network-wifi.ui:1456 shell/cc-window.c:212
 #: shell/panel-list.ui:103
 msgid "Details"
 msgstr "Détails"
@@ -2325,12 +2494,12 @@ msgstr "Supprimer l’adresse"
 msgid "Delete Route"
 msgstr "Supprimer la route"
 
-#: panels/network/connection-editor/ce-page-ip4.c:896
+#: panels/network/connection-editor/ce-page-ip4.c:899
 #: panels/network/network-wifi.ui:1464
 msgid "IPv4"
 msgstr "IPv4"
 
-#: panels/network/connection-editor/ce-page-ip6.c:828
+#: panels/network/connection-editor/ce-page-ip6.c:831
 #: panels/network/network-wifi.ui:1468
 msgid "IPv6"
 msgstr "IPv6"
@@ -2625,9 +2794,7 @@ msgid ""
 "connection information\n"
 "\n"
 "Error: %s."
-msgstr ""
-"Le fichier « %s » est illisible ou ne contient pas d’informations de "
-"connexion VPN reconnues\n"
+msgstr "Le fichier « %s » est illisible ou ne contient pas d’informations de connexion VPN reconnues\n"
 "\n"
 "Erreur : %s."
 
@@ -2637,8 +2804,8 @@ msgstr "Sélectionner le fichier à importer"
 
 #: panels/network/connection-editor/vpn-helpers.c:182
 #: panels/printers/pp-details-dialog.c:332
-#: panels/sharing/cc-sharing-panel.c:385
-#: panels/user-accounts/um-photo-dialog.c:230
+#: panels/sharing/cc-sharing-panel.c:393
+#: panels/user-accounts/um-photo-dialog.c:231
 msgid "_Open"
 msgstr "_Ouvrir"
 
@@ -2654,8 +2821,7 @@ msgstr "_Remplacer"
 #: panels/network/connection-editor/vpn-helpers.c:234
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
-msgstr ""
-"Voulez-vous remplacer %s avec la connexion VPN en cours d’enregistrement ?"
+msgstr "Voulez-vous remplacer %s avec la connexion VPN en cours d’enregistrement ?"
 
 #: panels/network/connection-editor/vpn-helpers.c:270
 msgid "Cannot export VPN connection"
@@ -2667,8 +2833,7 @@ msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
 "\n"
 "Error: %s."
-msgstr ""
-"La connexion VPN « %s » n’a pas pu être exportée vers %s.\n"
+msgstr "La connexion VPN « %s » n’a pas pu être exportée vers %s.\n"
 "\n"
 "Erreur : %s."
 
@@ -2714,9 +2879,7 @@ msgstr "network-workgroup"
 msgid ""
 "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;"
 "DNS;"
-msgstr ""
-"Réseau;Sans fil;Wi-Fi;Wifi;IP;LAN;Mandataire;WAN;Large bande;Modem;Bluetooth;"
-"vpn;DNS;"
+msgstr "Réseau;Sans fil;Wi-Fi;Wifi;IP;LAN;Mandataire;WAN;Large bande;Modem;Bluetooth;vpn;DNS;"
 
 #: panels/network/gnome-wifi-panel.desktop.in.in:4
 msgid "Control how you connect to Wi-Fi networks"
@@ -2762,12 +2925,12 @@ msgstr "Dernière utilisation"
 #. * profile. It is also used to display ethernet in the
 #. * device list.
 #.
-#: panels/network/net-device-ethernet.c:276
+#: panels/network/net-device-ethernet.c:277
 #: panels/network/network-ethernet.ui:19 panels/network/network-simple.ui:39
 msgid "Wired"
 msgstr "Filaire"
 
-#: panels/network/net-device-ethernet.c:344
+#: panels/network/net-device-ethernet.c:345
 #: panels/network/net-device-wifi.c:1895 panels/network/network-ethernet.ui:120
 #: panels/network/network-mobile.ui:394 panels/network/network-simple.ui:75
 #: panels/network/network-vpn.ui:79
@@ -2781,16 +2944,13 @@ msgstr "Ajouter une nouvelle connexion"
 #: panels/network/net-device-wifi.c:1368
 #, c-format
 msgid "Switching on the wireless hotspot will disconnect you from <b>%s</b>."
-msgstr ""
-"Basculer sur le point d’accès sans fil va vous déconnecter de <b>%s</b>."
+msgstr "Basculer sur le point d’accès sans fil va vous déconnecter de <b>%s</b>."
 
 #: panels/network/net-device-wifi.c:1372
 msgid ""
 "It is not possible to access the Internet through your wireless while the "
 "hotspot is active."
-msgstr ""
-"Vous ne pouvez pas accéder à Internet par votre connexion sans fil pendant "
-"que le point d’accès est actif."
+msgstr "Vous ne pouvez pas accéder à Internet par votre connexion sans fil pendant que le point d’accès est 
actif."
 
 #: panels/network/net-device-wifi.c:1379
 msgid "Turn On Wi-Fi Hotspot?"
@@ -2800,9 +2960,7 @@ msgstr "Allumer le point d’accès Wi-Fi ?"
 msgid ""
 "Wi-Fi hotspots are usually used to share an additional Internet connection "
 "over Wi-Fi."
-msgstr ""
-"Les points d’accès Wi-Fi sont habituellement utilisés pour partager une "
-"connexion Internet supplémentaire sans fil."
+msgstr "Les points d’accès Wi-Fi sont habituellement utilisés pour partager une connexion Internet 
supplémentaire sans fil."
 
 #: panels/network/net-device-wifi.c:1412
 msgid "_Turn On"
@@ -2822,16 +2980,13 @@ msgstr "Les règles du système interdisent son utilisation comme point d’acc
 
 #: panels/network/net-device-wifi.c:1595
 msgid "Wireless device does not support Hotspot mode"
-msgstr ""
-"Le périphérique sans fil ne prend pas en charge le mode « point d’accès »"
+msgstr "Le périphérique sans fil ne prend pas en charge le mode « point d’accès »"
 
 #: panels/network/net-device-wifi.c:1733
 msgid ""
 "Network details for the selected networks, including passwords and any "
 "custom configuration will be lost."
-msgstr ""
-"Les informations des réseaux sélectionnés, y compris les mots de passe et "
-"toute configuration personnalisée seront perdus."
+msgstr "Les informations des réseaux sélectionnés, y compris les mots de passe et toute configuration 
personnalisée seront perdus."
 
 #: panels/network/net-device-wifi.c:1737 panels/network/network-wifi.ui:1362
 msgid "_Forget"
@@ -2851,9 +3006,7 @@ msgstr "_Oublier"
 #: panels/network/net-proxy.c:102
 msgid ""
 "Web Proxy Autodiscovery is used when a Configuration URL is not provided."
-msgstr ""
-"« Web Proxy Autodiscovery » est utilisé lorsqu’aucun URL de configuration "
-"n’est fourni."
+msgstr "« Web Proxy Autodiscovery » est utilisé lorsqu’aucun URL de configuration n’est fourni."
 
 #. TRANSLATORS: WPAD is bad: if you enable it on an untrusted
 #. * network, then anyone else on that network can tell your
@@ -2919,6 +3072,10 @@ msgstr "URL de _configuration"
 msgid "Turn device off"
 msgstr "Éteindre le périphérique"
 
+#: panels/network/network.ui:101
+msgid "Other Devices"
+msgstr "Autres périphériques"
+
 #: panels/network/network.ui:194
 msgid "Not set up"
 msgstr "Non configuré"
@@ -2935,18 +3092,6 @@ msgstr "Connexion a_utomatique"
 msgid "details"
 msgstr "détails"
 
-#: 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/sharing.ui:351
-#: panels/user-accounts/data/account-dialog.ui:300
-#: panels/user-accounts/data/account-dialog.ui:525
-#: panels/user-accounts/data/user-accounts-dialog.ui:205
-msgid "_Password"
-msgstr "Mot de _passe"
-
 #: panels/network/network-wifi.ui:622
 msgid "Show P_assword"
 msgstr "Afficher le mot de p_asse"
@@ -3011,17 +3156,13 @@ msgstr "_Réinitialiser"
 msgid ""
 "Reset the settings for this connection to their defaults, but remember as a "
 "preferred connection."
-msgstr ""
-"Réinitialiser les paramètres de cette connexion à leurs valeurs par défaut, "
-"mais se souvenir qu’elle est une connexion préférée."
+msgstr "Réinitialiser les paramètres de cette connexion à leurs valeurs par défaut, mais se souvenir qu’elle 
est une connexion préférée."
 
 #: panels/network/network-wifi.ui:1399
 msgid ""
 "Remove all details relating to this network and do not try to automatically "
 "connect to it."
-msgstr ""
-"Supprimer toutes les informations relatives à ce réseau et ne pas essayer de "
-"s’y connecter automatiquement."
+msgstr "Supprimer toutes les informations relatives à ce réseau et ne pas essayer de s’y connecter 
automatiquement."
 
 #: panels/network/network-wifi.ui:1419
 msgid "reset"
@@ -3091,8 +3232,7 @@ msgstr "Mode avion"
 
 #: panels/network/wifi.ui:142
 msgid "Disables Wi-Fi, Bluetooth and mobile broadband"
-msgstr ""
-"Désactive le Wi-Fi, le Bluetooth et les connexions mobiles à large bande"
+msgstr "Désactive le Wi-Fi, le Bluetooth et les connexions mobiles à large bande"
 
 #: panels/network/wifi.ui:192
 msgid "Visible Networks"
@@ -3383,23 +3523,23 @@ msgstr "Micrologiciel absent"
 msgid "Cable unplugged"
 msgstr "Câble débranché"
 
-#: panels/network/wireless-security/eap-method.c:57
+#: panels/network/wireless-security/eap-method.c:69
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr "erreur de sécurité inconnue dans 802.1X (wpa-eap)"
 
-#: panels/network/wireless-security/eap-method.c:233
+#: panels/network/wireless-security/eap-method.c:245
 msgid "no file selected"
 msgstr "aucun fichier sélectionné"
 
-#: panels/network/wireless-security/eap-method.c:264
+#: panels/network/wireless-security/eap-method.c:276
 msgid "unspecified error validating eap-method file"
 msgstr "erreur inconnue à la validation du fichier eap-method"
 
-#: panels/network/wireless-security/eap-method.c:439
+#: panels/network/wireless-security/eap-method.c:451
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "Clés privées DER, PEM, ou PKCS#12 (*.der, *.pem, *.p12, *.key)"
 
-#: panels/network/wireless-security/eap-method.c:442
+#: panels/network/wireless-security/eap-method.c:454
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "Certificats DER ou PEM (*.der, *.pem, *.crt, *.cer)"
 
@@ -3564,10 +3704,7 @@ msgid ""
 "password-protected private key.\n"
 "\n"
 "(You can password-protect your private key with openssl)"
-msgstr ""
-"La clé privée sélectionnée ne semble pas être protégée par un mot de passe. "
-"Cela met en danger vos identifiants. Veuillez sélectionner une clé privée "
-"protégée par mot de passe.\n"
+msgstr "La clé privée sélectionnée ne semble pas être protégée par un mot de passe. Cela met en danger vos 
identifiants. Veuillez sélectionner une clé privée protégée par mot de passe.\n"
 "\n"
 "(Vous pouvez protéger votre clé par mot de passe avec openssl)"
 
@@ -3665,25 +3802,20 @@ msgstr "clé wep manquante"
 #: panels/network/wireless-security/ws-wep-key.c:116
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
-msgstr ""
-"clé wep non valide : une clé de %zu ne doit contenir que des caractères "
-"hexadécimaux"
+msgstr "clé wep non valide : une clé de %zu ne doit contenir que des caractères hexadécimaux"
 
 #: panels/network/wireless-security/ws-wep-key.c:124
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
-msgstr ""
-"clé wep non valide : une clé de %zu ne doit contenir que des caractères ascii"
+msgstr "clé wep non valide : une clé de %zu ne doit contenir que des caractères ascii"
 
 #: panels/network/wireless-security/ws-wep-key.c:130
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
-msgstr ""
-"clé wep non valide : longueur de clé %zu incorrecte. Elle doit être de 5 à "
-"13 caractères en ascii ou de 10 à 26 en hexa"
+msgstr "clé wep non valide : longueur de clé %zu incorrecte. Elle doit être de 5 à 13 caractères en ascii ou 
de 10 à 26 en hexa"
 
 #: panels/network/wireless-security/ws-wep-key.c:137
 msgid "invalid wep-key: passphrase must be non-empty"
@@ -3691,8 +3823,7 @@ msgstr "clé wep non valide : phrase de passe non renseignée"
 
 #: panels/network/wireless-security/ws-wep-key.c:139
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
-msgstr ""
-"clé wep non valide : la phrase de passe doit contenir moins de 64 caractères"
+msgstr "clé wep non valide : la phrase de passe doit contenir moins de 64 caractères"
 
 #: panels/network/wireless-security/ws-wep-key.ui:11
 msgid "1 (Default)"
@@ -3723,15 +3854,11 @@ msgstr "Inde_x WEP"
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
-msgstr ""
-"wpa-psk non valide : longueur de clé %zu incorrecte. Doit être de [8,63] "
-"octets ou 64 caratères hexadécimaux"
+msgstr "wpa-psk non valide : longueur de clé %zu incorrecte. Doit être de [8,63] octets ou 64 caratères 
hexadécimaux"
 
 #: panels/network/wireless-security/ws-wpa-psk.c:79
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
-msgstr ""
-"wpa-psk non valide : impossible de considérer une clé de 64 octets comme "
-"hexadécimale"
+msgstr "wpa-psk non valide : impossible de considérer une clé de 64 octets comme hexadécimale"
 
 #: panels/network/wireless-security/ws-wpa-psk.ui:50
 msgid "_Type"
@@ -3758,9 +3885,7 @@ msgstr "_Bannières de notifications"
 msgid ""
 "Notifications will continue to appear in the notification list when popups "
 "are disabled."
-msgstr ""
-"Les notifications continuent à s’afficher dans la liste du tiroir lorsque "
-"l’affichage des bannières est désactivé."
+msgstr "Les notifications continuent à s’afficher dans la liste du tiroir lorsque l’affichage des bannières 
est désactivé."
 
 #. Popups here refers to message tray notifications in the middle of the screen.
 #: panels/notifications/edit-dialog.ui:253
@@ -3817,19 +3942,19 @@ msgstr "Autre"
 
 #. 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:551
+#: panels/online-accounts/cc-online-accounts-panel.c:612
 #, c-format
 msgid "%s Account"
 msgstr "Compte %s"
 
-#: panels/online-accounts/cc-online-accounts-panel.c:843
+#: panels/online-accounts/cc-online-accounts-panel.c:904
 msgid "Error removing account"
 msgstr "Erreur lors de la suppression du compte"
 
 #. Translators: The %s is the username (eg., debarshi ray gmail com
 #. * or rishi).
 #.
-#: panels/online-accounts/cc-online-accounts-panel.c:908
+#: panels/online-accounts/cc-online-accounts-panel.c:969
 #, c-format
 msgid "<b>%s</b> removed"
 msgstr "<b>%s</b> supprimé"
@@ -3855,9 +3980,7 @@ msgstr "goa-panel"
 msgid ""
 "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;"
 "Kerberos;IMAP;SMTP;Pocket;ReadItLater;"
-msgstr ""
-"Google;Facebook;Twitter;Yahoo;Web;En ligne;Discussion;Agenda;Courriel;Email;"
-"Contact;ownCloud;Kerberos;IMAP;SMTP;Pocket;ReadItLater;"
+msgstr "Google;Facebook;Twitter;Yahoo;Web;En 
ligne;Discussion;Agenda;Courriel;Email;Contact;ownCloud;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:71
@@ -3870,9 +3993,7 @@ msgstr "Connexion à vos données du nuage"
 
 #: panels/online-accounts/online-accounts.ui:137
 msgid "No internet connection — connect to set up new online accounts"
-msgstr ""
-"Aucune connexion Internet — connectez-vous pour configurer de nouveaux "
-"comptes en ligne"
+msgstr "Aucune connexion Internet — connectez-vous pour configurer de nouveaux comptes en ligne"
 
 #: panels/online-accounts/online-accounts.ui:159
 msgid "Add an account"
@@ -3998,7 +4119,7 @@ msgid "Media player"
 msgstr "Lecteur multimédia"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:555 panels/wacom/cc-wacom-panel.c:793
+#: panels/power/cc-power-panel.c:555 panels/wacom/cc-wacom-panel.c:837
 msgid "Tablet"
 msgstr "Tablette"
 
@@ -4014,7 +4135,7 @@ msgstr "Périphérique d’entrée pour jeux"
 
 #. TRANSLATORS: secondary battery, misc
 #: panels/power/cc-power-panel.c:564 panels/power/cc-power-panel.c:804
-#: panels/power/cc-power-panel.c:2377
+#: panels/power/cc-power-panel.c:2380
 msgid "Battery"
 msgstr "Batterie"
 
@@ -4058,102 +4179,100 @@ msgstr "Déchargée"
 msgid "Batteries"
 msgstr "Batteries"
 
-#: panels/power/cc-power-panel.c:1239
+#: panels/power/cc-power-panel.c:1242
 msgid "When _idle"
 msgstr "Quand _inactif"
 
-#: panels/power/cc-power-panel.c:1693
+#: panels/power/cc-power-panel.c:1696
 msgid "Power Saving"
 msgstr "Économie d’énergie"
 
-#: panels/power/cc-power-panel.c:1724
+#: panels/power/cc-power-panel.c:1727
 msgid "_Screen brightness"
 msgstr "Luminosité de l’é_cran"
 
-#: panels/power/cc-power-panel.c:1743
+#: panels/power/cc-power-panel.c:1746
 msgid "Automatic brightness"
 msgstr "Luminosité automatique"
 
-#: panels/power/cc-power-panel.c:1763
+#: panels/power/cc-power-panel.c:1766
 msgid "_Keyboard brightness"
 msgstr "Luminosité du _clavier"
 
-#: panels/power/cc-power-panel.c:1773
+#: panels/power/cc-power-panel.c:1776
 msgid "_Dim screen when inactive"
 msgstr "A_ssombrir l’écran si inactif"
 
-#: panels/power/cc-power-panel.c:1798
+#: panels/power/cc-power-panel.c:1801
 msgid "_Blank screen"
 msgstr "Écran _noir"
 
-#: panels/power/cc-power-panel.c:1835
+#: panels/power/cc-power-panel.c:1838
 msgid "_Wi-Fi"
 msgstr "_Wi-Fi"
 
-#: panels/power/cc-power-panel.c:1840
+#: panels/power/cc-power-panel.c:1843
 msgid "Turn off Wi-Fi to save power."
 msgstr "Désactivez le Wi-Fi pour économiser de l’énergie."
 
-#: panels/power/cc-power-panel.c:1865
+#: panels/power/cc-power-panel.c:1868
 msgid "_Mobile broadband"
 msgstr "_Mobile à large bande"
 
-#: panels/power/cc-power-panel.c:1870
+#: panels/power/cc-power-panel.c:1873
 msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power."
-msgstr ""
-"Désactivez les périphériques mobiles à large bande (3G, 4G, LTE, etc.) pour "
-"économiser de l’énergie."
+msgstr "Désactivez les périphériques mobiles à large bande (3G, 4G, LTE, etc.) pour économiser de l’énergie."
 
-#: panels/power/cc-power-panel.c:1923
+#: panels/power/cc-power-panel.c:1926
 msgid "_Bluetooth"
 msgstr "_Bluetooth"
 
-#: panels/power/cc-power-panel.c:1928
+#: panels/power/cc-power-panel.c:1931
 msgid "Turn off Bluetooth to save power."
 msgstr "Désactivez le Bluetooth pour économiser de l’énergie."
 
-#: panels/power/cc-power-panel.c:1987
+#: panels/power/cc-power-panel.c:1990
 msgid "When on battery power"
 msgstr "Quand sur batterie"
 
-#: panels/power/cc-power-panel.c:1989
+#: panels/power/cc-power-panel.c:1992
 msgid "When plugged in"
 msgstr "Quand le câble est branché"
 
-#: panels/power/cc-power-panel.c:2084
+#: panels/power/cc-power-panel.c:2087
 msgid "Suspend"
 msgstr "Mettre en veille"
 
-#: panels/power/cc-power-panel.c:2085
+#: panels/power/cc-power-panel.c:2088
 msgid "Power Off"
 msgstr "Éteindre"
 
-#: panels/power/cc-power-panel.c:2086
+#: panels/power/cc-power-panel.c:2089
 msgid "Hibernate"
 msgstr "Hiberner"
 
-#: panels/power/cc-power-panel.c:2087
+#: panels/power/cc-power-panel.c:2090
 msgid "Nothing"
 msgstr "Rien"
 
 #. Frame header
-#: panels/power/cc-power-panel.c:2201
+#: panels/power/cc-power-panel.c:2204
 msgid "Suspend & Power Button"
 msgstr "Bouton de mise en veille et extinction"
 
-#: panels/power/cc-power-panel.c:2240
+#: panels/power/cc-power-panel.c:2243
 msgid "_Automatic suspend"
 msgstr "Mise en veille _automatique"
 
-#: panels/power/cc-power-panel.c:2241
+#: panels/power/cc-power-panel.c:2244
 msgid "Automatic suspend"
 msgstr "Mise en veille automatique"
 
-#: panels/power/cc-power-panel.c:2308
+#: panels/power/cc-power-panel.c:2311
 msgid "_When the Power Button is pressed"
 msgstr "_Lorsque le bouton d’extinction est enfoncé"
 
-#: panels/power/cc-power-panel.c:2427 shell/cc-window.c:219
+#: panels/power/cc-power-panel.c:2430 shell/cc-window.c:216
 #: shell/panel-list.ui:45
 msgid "Devices"
 msgstr "Périphériques"
@@ -4164,9 +4283,7 @@ msgstr "Énergie"
 
 #: panels/power/gnome-power-panel.desktop.in.in:4
 msgid "View your battery status and change power saving settings"
-msgstr ""
-"S’informer sur l’état de la batterie et modifier les paramètres d’économie "
-"d’énergie"
+msgstr "S’informer sur l’état de la batterie et modifier les paramètres d’économie d’énergie"
 
 #. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: panels/power/gnome-power-panel.desktop.in.in:7
@@ -4177,9 +4294,7 @@ msgstr "gnome-power-manager"
 #: panels/power/gnome-power-panel.desktop.in.in:19
 msgid ""
 "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;"
-msgstr ""
-"Énergie;Alimentation;Veille;Suspension;Hibernation;Batterie;Luminosité;"
-"Assombrir;Noir;Écran;DPMS;Inactif;"
+msgstr 
"Énergie;Alimentation;Veille;Suspension;Hibernation;Batterie;Luminosité;Assombrir;Noir;Écran;DPMS;Inactif;"
 
 #: panels/power/power.ui:17
 msgid "20 minutes"
@@ -4290,18 +4405,18 @@ msgid "Authentication Required"
 msgstr "Authentification requise"
 
 #. Translators: %s is the printer name
-#: panels/printers/cc-printers-panel.c:808
+#: panels/printers/cc-printers-panel.c:842
 #, c-format
 msgid "Printer “%s” has been deleted"
 msgstr "L’imprimante « %s » a été supprimée"
 
 #. Translators: Addition of the new printer failed.
-#: panels/printers/cc-printers-panel.c:1053
+#: panels/printers/cc-printers-panel.c:1142
 msgid "Failed to add new printer."
 msgstr "L’ajout de la nouvelle imprimante a échoué."
 
 #. Translators: The XML file containing user interface can not be loaded
-#: panels/printers/cc-printers-panel.c:1388
+#: panels/printers/cc-printers-panel.c:1514
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "Impossible de charger l’interface utilisateur : %s"
@@ -4338,9 +4453,7 @@ msgstr "Imprimantes"
 
 #: panels/printers/gnome-printers-panel.desktop.in.in:4
 msgid "Add printers, view printer jobs and decide how you want to print"
-msgstr ""
-"Ajouter des imprimantes, afficher les tâches et décider quand vous voulez "
-"imprimer"
+msgstr "Ajouter des imprimantes, afficher les tâches et décider quand vous voulez imprimer"
 
 #. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: panels/printers/gnome-printers-panel.desktop.in.in:7
@@ -4403,9 +4516,7 @@ msgstr "Saisissez l’adresse d’un réseau ou recherchez une imprimante"
 
 #: panels/printers/new-printer-dialog.ui:352
 msgid "Enter username and password to view printers on Print Server."
-msgstr ""
-"Saisissez votre nom d’utilisateur et votre mot de passe pour afficher les "
-"imprimantes sur le serveur."
+msgstr "Saisissez votre nom d’utilisateur et votre mot de passe pour afficher les imprimantes sur le 
serveur."
 
 #. Translators: This button triggers the printing of a test page.
 #. Translators: Name of job which makes printer to print test page
@@ -4432,16 +4543,14 @@ msgstr "Sélectionnez un fichier PPD"
 msgid ""
 "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
 "PPD.GZ)"
-msgstr ""
-"Fichiers de description PostScript de l’imprimante (*.ppd, *.PPD, *.ppd.gz, "
-"*.PPD.gz, *.PPD.GZ)"
+msgstr "Fichiers de description PostScript de l’imprimante (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD.GZ)"
 
 #: panels/printers/ppd-selection-dialog.ui:10
 msgid "Select Printer Driver"
 msgstr "Sélectionner un pilote d’imprimante"
 
 #: panels/printers/ppd-selection-dialog.ui:40
-#: panels/user-accounts/um-photo-dialog.c:104
+#: panels/user-accounts/um-photo-dialog.c:105
 msgid "Select"
 msgstr "Sélectionner"
 
@@ -4498,55 +4607,55 @@ msgid "Reverse portrait"
 msgstr "Portrait inversé"
 
 #. Translators: Job's state (job is waiting to be printed)
-#: panels/printers/pp-jobs-dialog.c:243
+#: panels/printers/pp-jobs-dialog.c:234
 msgctxt "print job"
 msgid "Pending"
 msgstr "En attente"
 
 #. Translators: Job's state (job is held for printing)
-#: panels/printers/pp-jobs-dialog.c:249
+#: panels/printers/pp-jobs-dialog.c:240
 msgctxt "print job"
 msgid "Paused"
 msgstr "En pause"
 
 #. Translators: Job's state (job needs authentication to proceed further)
-#: panels/printers/pp-jobs-dialog.c:254
+#: panels/printers/pp-jobs-dialog.c:245
 msgctxt "print job"
 msgid "Authentication required"
 msgstr "Authentification requise"
 
 #. Translators: Job's state (job is currently printing)
-#: panels/printers/pp-jobs-dialog.c:259
+#: panels/printers/pp-jobs-dialog.c:250
 msgctxt "print job"
 msgid "Processing"
 msgstr "Traitement en cours"
 
 #. Translators: Job's state (job has been stopped)
-#: panels/printers/pp-jobs-dialog.c:263
+#: panels/printers/pp-jobs-dialog.c:254
 msgctxt "print job"
 msgid "Stopped"
 msgstr "Arrêtée"
 
 #. Translators: Job's state (job has been canceled)
-#: panels/printers/pp-jobs-dialog.c:267
+#: panels/printers/pp-jobs-dialog.c:258
 msgctxt "print job"
 msgid "Canceled"
 msgstr "Interrompue"
 
 #. Translators: Job's state (job has aborted due to error)
-#: panels/printers/pp-jobs-dialog.c:271
+#: panels/printers/pp-jobs-dialog.c:262
 msgctxt "print job"
 msgid "Aborted"
 msgstr "Annulée"
 
 #. Translators: Job's state (job has completed successfully)
-#: panels/printers/pp-jobs-dialog.c:275
+#: panels/printers/pp-jobs-dialog.c:266
 msgctxt "print job"
 msgid "Completed"
 msgstr "Terminée"
 
 #. Translators: This label shows how many jobs of this printer needs to be authenticated to be printed.
-#: panels/printers/pp-jobs-dialog.c:399
+#: panels/printers/pp-jobs-dialog.c:390
 #, c-format
 msgid "%u Job Requires Authentication"
 msgid_plural "%u Jobs Require Authentication"
@@ -4554,18 +4663,17 @@ msgstr[0] "%u tâche nécessite une authentification"
 msgstr[1] "%u tâches nécessitent une authentification"
 
 #. Translators: This is the printer name for which we are showing the active jobs
-#: panels/printers/pp-jobs-dialog.c:617
+#: panels/printers/pp-jobs-dialog.c:620
 #, c-format
 msgctxt "Printer jobs dialog title"
 msgid "%s — Active Jobs"
 msgstr "%s - tâches d’impression actives"
 
 #. Translators: The printer needs authentication info to print.
-#: panels/printers/pp-jobs-dialog.c:622
+#: panels/printers/pp-jobs-dialog.c:625
 #, c-format
 msgid "Enter credentials to print from %s."
-msgstr ""
-"Saisissez vos informations d’authentification pour imprimer à partir de %s."
+msgstr "Saisissez vos informations d’authentification pour imprimer à partir de %s."
 
 #: panels/printers/pp-new-printer-dialog.c:402
 msgid "Unlock Print Server"
@@ -4581,9 +4689,7 @@ msgstr "Déverrouiller %s."
 #: panels/printers/pp-new-printer-dialog.c:411
 #, c-format
 msgid "Enter username and password to view printers on %s."
-msgstr ""
-"Saisissez votre nom d’utilisateur et votre mot de passe pour afficher les "
-"imprimantes sur %s."
+msgstr "Saisissez votre nom d’utilisateur et votre mot de passe pour afficher les imprimantes sur %s."
 
 #: panels/printers/pp-new-printer-dialog.c:876
 msgid "Searching for Printers"
@@ -4746,127 +4852,127 @@ msgid "Manufacturer"
 msgstr "Fabricant"
 
 #. Translators: This is the label of the button that opens the Jobs Dialog.
-#: panels/printers/pp-printer-entry.c:598 panels/printers/printer-entry.ui:166
+#: panels/printers/pp-printer-entry.c:613 panels/printers/printer-entry.ui:166
 msgid "No Active Jobs"
 msgstr "Aucune tâche d’impression active"
 
 #. Translators: This is the label of the button that opens the Jobs Dialog.
-#: panels/printers/pp-printer-entry.c:603
+#: panels/printers/pp-printer-entry.c:618
 #, c-format
 msgid "%u Job"
 msgid_plural "%u Jobs"
 msgstr[0] "%u tâche"
 msgstr[1] "%u tâches"
 
+#. Translators: Name of job which makes printer to clean its heads
+#: panels/printers/pp-printer-entry.c:752
+msgid "Clean print heads"
+msgstr "Nettoyage des têtes d’impression"
+
 #. Translators: The printer is low on toner
-#: panels/printers/pp-printer-entry.c:766
+#: panels/printers/pp-printer-entry.c:804
 msgid "Low on toner"
 msgstr "Toner pratiquement épuisé"
 
 #. Translators: The printer has no toner left
-#: panels/printers/pp-printer-entry.c:768
+#: panels/printers/pp-printer-entry.c:806
 msgid "Out of toner"
 msgstr "Plus de toner"
 
 #. 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:809
 msgid "Low on developer"
 msgstr "Révélateur pratiquement épuisé"
 
 #. 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:812
 msgid "Out of developer"
 msgstr "Plus de révélateur"
 
 #. Translators: "marker" is one color bin of the printer
-#: panels/printers/pp-printer-entry.c:776
+#: panels/printers/pp-printer-entry.c:814
 msgid "Low on a marker supply"
 msgstr "Cartouche de couleur pratiquement vide"
 
 #. Translators: "marker" is one color bin of the printer
-#: panels/printers/pp-printer-entry.c:778
+#: panels/printers/pp-printer-entry.c:816
 msgid "Out of a marker supply"
 msgstr "Cartouche de couleur vide"
 
 #. Translators: One or more covers on the printer are open
-#: panels/printers/pp-printer-entry.c:780
+#: panels/printers/pp-printer-entry.c:818
 msgid "Open cover"
 msgstr "Couvercle ouvert"
 
 #. Translators: One or more doors on the printer are open
-#: panels/printers/pp-printer-entry.c:782
+#: panels/printers/pp-printer-entry.c:820
 msgid "Open door"
 msgstr "Porte ouverte"
 
 #. Translators: At least one input tray is low on media
-#: panels/printers/pp-printer-entry.c:784
+#: panels/printers/pp-printer-entry.c:822
 msgid "Low on paper"
 msgstr "Pratiquement plus de papier"
 
 #. Translators: At least one input tray is empty
-#: panels/printers/pp-printer-entry.c:786
+#: panels/printers/pp-printer-entry.c:824
 msgid "Out of paper"
 msgstr "Plus de papier"
 
 #. Translators: The printer is offline
-#: panels/printers/pp-printer-entry.c:788
+#: panels/printers/pp-printer-entry.c:826
 msgctxt "printer state"
 msgid "Offline"
 msgstr "Hors ligne"
 
 #. 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:920
+#: panels/printers/pp-printer-entry.c:828
+#: panels/printers/pp-printer-entry.c:971
 msgctxt "printer state"
 msgid "Stopped"
 msgstr "Arrêtée"
 
 #. Translators: The printer marker supply waste receptacle is almost full
-#: panels/printers/pp-printer-entry.c:792
+#: panels/printers/pp-printer-entry.c:830
 msgid "Waste receptacle almost full"
 msgstr "Récipient à déchets pratiquement plein"
 
 #. Translators: The printer marker supply waste receptacle is full
-#: panels/printers/pp-printer-entry.c:794
+#: panels/printers/pp-printer-entry.c:832
 msgid "Waste receptacle full"
 msgstr "Récipient à déchets plein"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: panels/printers/pp-printer-entry.c:796
+#: panels/printers/pp-printer-entry.c:834
 msgid "The optical photo conductor is near end of life"
 msgstr "Le photo-conducteur optique est pratiquement en fin de vie"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: panels/printers/pp-printer-entry.c:798
+#: panels/printers/pp-printer-entry.c:836
 msgid "The optical photo conductor is no longer functioning"
 msgstr "Le photo-conducteur optique n’est plus en état"
 
 #. Translators: Printer's state (can start new job without waiting)
-#: panels/printers/pp-printer-entry.c:906
+#: panels/printers/pp-printer-entry.c:957
 msgctxt "printer state"
 msgid "Ready"
 msgstr "Prête"
 
 #. Translators: Printer's state (printer is ready but doesn't accept new jobs)
-#: panels/printers/pp-printer-entry.c:911
+#: panels/printers/pp-printer-entry.c:962
 msgctxt "printer state"
 msgid "Does not accept jobs"
 msgstr "N’accepte plus de tâche supplémentaire"
 
 #. Translators: Printer's state (jobs are processing)
-#: panels/printers/pp-printer-entry.c:916
+#: panels/printers/pp-printer-entry.c:967
 msgctxt "printer state"
 msgid "Processing"
 msgstr "Traitement en cours"
 
-#. Translators: Name of job which makes printer to clean its heads
-#: panels/printers/pp-printer-entry.c:940
-msgid "Clean print heads"
-msgstr "Nettoyage des têtes d’impression"
-
 #: panels/printers/printer-entry.ui:14
 msgid "Printing Options"
 msgstr "Options d’impression"
@@ -4926,8 +5032,7 @@ msgstr "Ajouter une imprimante…"
 msgid ""
 "Sorry! The system printing service\n"
 "doesn’t seem to be available."
-msgstr ""
-"Désolé ! Le service d’impression du système\n"
+msgstr "Désolé ! Le service d’impression du système\n"
 "ne semble pas être disponible."
 
 #: panels/privacy/cc-privacy-panel.c:387 panels/privacy/privacy.ui:280
@@ -4998,10 +5103,7 @@ msgstr "Signalement de problèmes"
 msgid ""
 "Sending reports of technical problems helps us improve %s. Reports are sent "
 "anonymously and are scrubbed of personal data."
-msgstr ""
-"Envoyer des rapports ou signaler des problèmes techniques nous aide à "
-"améliorer %s. Les rapports sont envoyés anonymement et sont épurés de toute "
-"donnée personnelle."
+msgstr "Envoyer des rapports ou signaler des problèmes techniques nous aide à améliorer %s. Les rapports 
sont envoyés anonymement et sont épurés de toute donnée personnelle."
 
 #: panels/privacy/cc-privacy-panel.c:1231 panels/privacy/privacy.ui:719
 msgid "Privacy Policy"
@@ -5013,9 +5115,7 @@ msgstr "Confidentialité"
 
 #: panels/privacy/gnome-privacy-panel.desktop.in.in:4
 msgid "Protect your personal information and control what others might see"
-msgstr ""
-"Protéger vos informations personnelles et contrôler ce que d’autres peuvent "
-"voir"
+msgstr "Protéger vos informations personnelles et contrôler ce que d’autres peuvent voir"
 
 #. FIXME
 #. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
@@ -5028,9 +5128,7 @@ msgstr "preferences-system-privacy"
 msgid ""
 "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
 "network;identity;"
-msgstr ""
-"écran;verrouiller;verrouillage;diagnostique;plantage;privé;confidentiel;"
-"récent;temporaire;tmp;index;nom;réseaux;identité;"
+msgstr 
"écran;verrouiller;verrouillage;diagnostique;plantage;privé;confidentiel;récent;temporaire;tmp;index;nom;réseaux;identité;"
 
 #: panels/privacy/privacy.ui:14
 msgid "Screen Turns Off"
@@ -5084,9 +5182,7 @@ msgstr "Toujours"
 msgid ""
 "Remembering your history makes things easier to find again. These items are "
 "never shared over the network."
-msgstr ""
-"L’enregistrement de votre historique permet de retrouver les choses plus "
-"facilement. Ces éléments ne sont jamais partagés sur le réseau."
+msgstr "L’enregistrement de votre historique permet de retrouver les choses plus facilement. Ces éléments ne 
sont jamais partagés sur le réseau."
 
 #: panels/privacy/privacy.ui:176
 msgid "_Recently Used"
@@ -5102,9 +5198,7 @@ msgstr "Effac_er l’historique récent"
 
 #: panels/privacy/privacy.ui:301
 msgid "The Screen Lock protects your privacy when you are away."
-msgstr ""
-"Le verrouillage de l’écran protège votre vie privée lorsque vous vous "
-"éloignez."
+msgstr "Le verrouillage de l’écran protège votre vie privée lorsque vous vous éloignez."
 
 #: panels/privacy/privacy.ui:328
 msgid "Automatic Screen _Lock"
@@ -5122,9 +5216,7 @@ msgstr "Afficher les _notifications"
 msgid ""
 "Automatically purge the Trash and temporary files to help keep your computer "
 "free of unnecessary sensitive information."
-msgstr ""
-"Vider automatiquement la corbeille et les fichiers temporaires pour ne pas "
-"conserver des informations sensibles sur votre ordinateur."
+msgstr "Vider automatiquement la corbeille et les fichiers temporaires pour ne pas conserver des 
informations sensibles sur votre ordinateur."
 
 #: panels/privacy/privacy.ui:483
 msgid "Automatically empty _Trash"
@@ -5154,12 +5246,9 @@ msgid ""
 "\n"
 "All the information we collect is made anonymous, and we will never share "
 "your data with third parties."
-msgstr ""
-"L’envoi d’information sur l’usage des logiciels nous aide à vous fournir des "
-"recommendations plus précises et à améliorer nos logiciels.\n"
+msgstr "L’envoi d’information sur l’usage des logiciels nous aide à vous fournir des recommendations plus 
précises et à améliorer nos logiciels.\n"
 "\n"
-"Toutes les informations que nous récoltons sont anonymisés, et nous ne "
-"partagerons jamais vos données avec un tiers."
+"Toutes les informations que nous récoltons sont anonymisés, et nous ne partagerons jamais vos données avec 
un tiers."
 
 #: panels/privacy/privacy.ui:681
 msgid "_Send software usage statistics"
@@ -5169,18 +5258,13 @@ msgstr "Envoyer les _statistiques d’utilisation du logiciel"
 msgid ""
 "Location services allow applications to know your location. Using Wi-Fi and "
 "mobile broadband increases accuracy."
-msgstr ""
-"Le services de localisation permet aux applications de connaître votre "
-"emplacement. Utiliser le Wi-Fi et le réseau mobile permet d’augmenter la "
-"précision."
+msgstr "Le services de localisation permet aux applications de connaître votre emplacement. Utiliser le 
Wi-Fi et le réseau mobile permet d’augmenter la précision."
 
 #: panels/privacy/privacy.ui:778
 msgid ""
 "Uses Mozilla Location Service: <a href='https://location.services.mozilla.";
 "com/privacy'>Privacy Policy</a>"
-msgstr ""
-"Utilise le service de localisation de Mozilla : <a href='https://location.";
-"services.mozilla.com/privacy'>Politique de Confidentialité</a>"
+msgstr "Utilise le service de localisation de Mozilla : <a 
href='https://location.services.mozilla.com/privacy'>Politique de Confidentialité</a>"
 
 #: panels/privacy/privacy.ui:828
 msgid "_Location Services"
@@ -5260,9 +5344,7 @@ msgstr "Pays et langue"
 #: panels/region/gnome-region-panel.desktop.in.in:4
 msgid ""
 "Select your display language, formats, keyboard layouts and input sources"
-msgstr ""
-"Sélectionnez la langue, les formats, l’agencement clavier et les sources de "
-"saisie"
+msgstr "Sélectionnez la langue, les formats, l’agencement clavier et les sources de saisie"
 
 #. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: panels/region/gnome-region-panel.desktop.in.in:7
@@ -5280,8 +5362,7 @@ msgstr "Ajouter une source de saisie"
 
 #: panels/region/input-chooser.ui:76
 msgid "Input methods can’t be used on the login screen"
-msgstr ""
-"Les méthodes de saisie ne peuvent pas être utilisées sur l’écran de connexion"
+msgstr "Les méthodes de saisie ne peuvent pas être utilisées sur l’écran de connexion"
 
 #: panels/region/input-options.ui:7
 msgid "Input Source Options"
@@ -5382,9 +5463,7 @@ msgstr "Afficher la disposition de clavier de la source de saisie"
 
 #: panels/region/region.ui:530
 msgid "Login settings are used by all users when logging into the system"
-msgstr ""
-"Les paramètres de connexion sont utilisés par tous les utilisateurs pour "
-"accéder au système"
+msgstr "Les paramètres de connexion sont utilisés par tous les utilisateurs pour accéder au système"
 
 #: panels/search/cc-search-locations-dialog.c:639
 msgid "Select Location"
@@ -5401,9 +5480,7 @@ msgstr "Aucune application trouvée"
 #: panels/search/gnome-search-panel.desktop.in.in:4
 msgid ""
 "Control which applications show search results in the Activities Overview"
-msgstr ""
-"Contrôler quelles applications affichent les résultats d’une recherche dans "
-"la vue d’ensemble des activités"
+msgstr "Contrôler quelles applications affichent les résultats d’une recherche dans la vue d’ensemble des 
activités"
 
 #. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: panels/search/gnome-search-panel.desktop.in.in:7
@@ -5448,64 +5525,58 @@ msgstr "Préférences"
 msgid "No networks selected for sharing"
 msgstr "Aucun réseau de partage n’est sélectionné"
 
-#: panels/sharing/cc-sharing-panel.c:275
+#: panels/sharing/cc-sharing-panel.c:283
 msgctxt "service is enabled"
 msgid "On"
 msgstr "Activé"
 
-#: panels/sharing/cc-sharing-panel.c:277 panels/sharing/cc-sharing-panel.c:304
+#: panels/sharing/cc-sharing-panel.c:285 panels/sharing/cc-sharing-panel.c:312
 msgctxt "service is disabled"
 msgid "Off"
 msgstr "Désactivé"
 
-#: panels/sharing/cc-sharing-panel.c:307
+#: panels/sharing/cc-sharing-panel.c:315
 msgctxt "service is enabled"
 msgid "Enabled"
 msgstr "Activé"
 
-#: panels/sharing/cc-sharing-panel.c:310
+#: panels/sharing/cc-sharing-panel.c:318
 msgctxt "service is active"
 msgid "Active"
 msgstr "Actif"
 
-#: panels/sharing/cc-sharing-panel.c:381
+#: panels/sharing/cc-sharing-panel.c:389
 msgid "Choose a Folder"
 msgstr "Choisir un dossier"
 
-#: panels/sharing/cc-sharing-panel.c:693
+#: panels/sharing/cc-sharing-panel.c:701
 #, c-format
 msgid ""
 "File Sharing allows you to share your Public folder with others on your "
 "current network using: <a href=\"dav://%s\">dav://%s</a>"
-msgstr ""
-"Le partage de fichiers vous permet de partager votre dossier Public avec les "
-"autres sur le réseau actuel en utilisant : <a href=\"dav://%s\">dav://%s</a>"
+msgstr "Le partage de fichiers vous permet de partager votre dossier Public avec les autres sur le réseau 
actuel en utilisant : <a href=\"dav://%s\">dav://%s</a>"
 
-#: panels/sharing/cc-sharing-panel.c:695
+#: panels/sharing/cc-sharing-panel.c:703
 #, c-format
 msgid ""
 "When remote login is enabled, remote users can connect using the Secure "
 "Shell command:\n"
 "<a href=\"ssh %s\">ssh %s</a>"
-msgstr ""
-"Lorsque la connexion à distance est activée, tout utilisateur distant peut "
-"se connecter à l’aide de cette commande shell sécurisée :\n"
+msgstr "Lorsque la connexion à distance est activée, tout utilisateur distant peut se connecter à l’aide de 
cette commande shell sécurisée :\n"
 "<a href=\"ssh %s\">ssh %s</a>"
 
-#: panels/sharing/cc-sharing-panel.c:697
+#: panels/sharing/cc-sharing-panel.c:705
 #, c-format
 msgid ""
 "Screen sharing allows remote users to view or control your screen by "
 "connecting to <a href=\"vnc://%s\">vnc://%s</a>"
-msgstr ""
-"Le partage d’écran permet aux utilisateurs distants de voir ou contrôler "
-"votre écran en se connectant à <a href=\"vnc://%s\">vnc://%s</a>"
+msgstr "Le partage d’écran permet aux utilisateurs distants de voir ou contrôler votre écran en se 
connectant à <a href=\"vnc://%s\">vnc://%s</a>"
 
-#: panels/sharing/cc-sharing-panel.c:809
+#: panels/sharing/cc-sharing-panel.c:817
 msgid "Copy"
 msgstr "Copier"
 
-#: panels/sharing/cc-sharing-panel.c:1236
+#: panels/sharing/cc-sharing-panel.c:1294
 #: panels/sharing/gnome-sharing-panel.desktop.in.in:3
 msgid "Sharing"
 msgstr "Partage"
@@ -5524,9 +5595,7 @@ msgstr "preferences-system-sharing"
 msgid ""
 "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;"
 "movies;server;renderer;"
-msgstr ""
-"partage;partager;ssh;hôte;nom;distant;bureau;média;audio;vidéo;images;photos;"
-"film,serveur;moteur de rendu;"
+msgstr "partage;partager;ssh;hôte;nom;distant;bureau;média;audio;vidéo;images;photos;film,serveur;moteur de 
rendu;"
 
 #: panels/sharing/networks.ui:19
 msgid "Networks"
@@ -5538,8 +5607,7 @@ msgstr "Activer ou désactiver une connexion distante"
 
 #: panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in:12
 msgid "Authentication is required to enable or disable remote login"
-msgstr ""
-"Authentification requise pour activer ou désactiver une connexion distante"
+msgstr "Authentification requise pour activer ou désactiver une connexion distante"
 
 #: panels/sharing/sharing.ui:46
 msgid "_Computer Name"
@@ -5623,8 +5691,7 @@ msgstr "Son"
 
 #: panels/sound/data/gnome-sound-panel.desktop.in.in:4
 msgid "Change sound levels, inputs, outputs, and alert sounds"
-msgstr ""
-"Modifier les volumes sonores, les saisies, les sorties et les alertes sonores"
+msgstr "Modifier les volumes sonores, les saisies, les sorties et les alertes sonores"
 
 #. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: panels/sound/data/gnome-sound-panel.desktop.in.in:7
@@ -5871,10 +5938,7 @@ msgstr "preferences-desktop-accessibility"
 msgid ""
 "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;"
 "AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;click;Delay;Assist;Repeat;Blink;"
-msgstr ""
-"Clavier;Souris;lien;Accessibilité;Contraste;Zoom;Lecteur d’écran;texte;"
-"police;taille;AccessX;Touches rémanentes;Touches lentes;Rebonds de touches;"
-"Touches de la souris;Double clic;Délai;Assistance;Répétition;Clignotement;"
+msgstr "Clavier;Souris;lien;Accessibilité;Contraste;Zoom;Lecteur d’écran;texte;police;taille;AccessX;Touches 
rémanentes;Touches lentes;Rebonds de touches;Touches de la souris;Double 
clic;Délai;Assistance;Répétition;Clignotement;"
 
 #: panels/universal-access/uap.ui:89
 msgid "_Always Show Universal Access Menu"
@@ -5960,8 +6024,7 @@ msgstr "Taille du curseur"
 #: panels/universal-access/uap.ui:1069
 msgid ""
 "Cursor size can be combined with zoom to make it easier to see the cursor."
-msgstr ""
-"La taille du curseur peut-être associée au zoom pour faciliter sa visibilité."
+msgstr "La taille du curseur peut-être associée au zoom pour faciliter sa visibilité."
 
 #: panels/universal-access/uap.ui:1105
 msgid "Screen Reader"
@@ -5969,9 +6032,7 @@ msgstr "Lecteur d’écran"
 
 #: panels/universal-access/uap.ui:1122
 msgid "The screen reader reads displayed text as you move the focus."
-msgstr ""
-"Le lecteur d’écran lit le texte affiché au fur et à mesure que vous déplacez "
-"le focus."
+msgstr "Le lecteur d’écran lit le texte affiché au fur et à mesure que vous déplacez le focus."
 
 #: panels/universal-access/uap.ui:1155
 msgid "_Screen Reader"
@@ -6047,9 +6108,7 @@ msgstr "Touches _rémanentes"
 
 #: panels/universal-access/uap.ui:1848
 msgid "Treats a sequence of modifier keys as a key combination"
-msgstr ""
-"Traiter la frappe d’une suite de touches modificatrices comme une "
-"combinaison de celles-ci"
+msgstr "Traiter la frappe d’une suite de touches modificatrices comme une combinaison de celles-ci"
 
 #: panels/universal-access/uap.ui:1872
 msgid "_Disable if two keys are pressed together"
@@ -6126,8 +6185,7 @@ msgstr "_Activer au clavier"
 
 #: panels/universal-access/uap.ui:2387
 msgid "Turn accessibility features on and off using the keyboard"
-msgstr ""
-"Activer et désactiver les fonctionnalités d’accessibilité à partir du clavier"
+msgstr "Activer et désactiver les fonctionnalités d’accessibilité à partir du clavier"
 
 #: panels/universal-access/uap.ui:2451
 msgid "Click Assist"
@@ -6139,8 +6197,7 @@ msgstr "_Simulation du clic secondaire"
 
 #: panels/universal-access/uap.ui:2505
 msgid "Trigger a secondary click by holding down the primary button"
-msgstr ""
-"Déclencher un clic secondaire en maintenant enfoncé le bouton principal"
+msgstr "Déclencher un clic secondaire en maintenant enfoncé le bouton principal"
 
 #: panels/universal-access/uap.ui:2559
 msgctxt "secondary click"
@@ -6394,8 +6451,7 @@ msgstr "_Type de compte"
 
 #: panels/user-accounts/data/account-dialog.ui:260
 msgid "Allow user to set a password when they next _login"
-msgstr ""
-"Autoriser l’utilisateur à définir un mot de passe à la prochaine conne_xion"
+msgstr "Autoriser l’utilisateur à définir un mot de passe à la prochaine conne_xion"
 
 #: panels/user-accounts/data/account-dialog.ui:274
 msgid "Set a password _now"
@@ -6411,10 +6467,7 @@ msgid ""
 "Enterprise login allows an existing centrally managed user account to be "
 "used on this device. You can also use this account to access company "
 "resources on the internet."
-msgstr ""
-"Un compte d’entreprise autorise l’usage d’un compte utilisateur centralisé à "
-"partir de ce périphérique. Il permet aussi d’accéder aux différents sites de "
-"la compagnie présents sur Internet."
+msgstr "Un compte d’entreprise autorise l’usage d’un compte utilisateur centralisé à partir de ce 
périphérique. Il permet aussi d’accéder aux différents sites de la compagnie présents sur Internet."
 
 #: panels/user-accounts/data/account-dialog.ui:485
 #: panels/user-accounts/data/join-dialog.ui:116
@@ -6427,8 +6480,7 @@ msgstr "Vous êtes hors ligne"
 
 #: panels/user-accounts/data/account-dialog.ui:726
 msgid "You must be online in order to add enterprise users."
-msgstr ""
-"Vous devez être en ligne pour ajouter des utilisateurs de l’entreprise."
+msgstr "Vous devez être en ligne pour ajouter des utilisateurs de l’entreprise."
 
 #: panels/user-accounts/data/account-dialog.ui:760
 msgid "_Enterprise Login"
@@ -6483,14 +6535,11 @@ msgstr "Index _gauche"
 msgid "_Other finger:"
 msgstr "_Autre doigt :"
 
-#: panels/user-accounts/data/account-fingerprint.ui:262
+#: panels/user-accounts/data/account-fingerprint.ui:324
 msgid ""
 "Your fingerprint was successfully saved. You should now be able to log in "
 "using your fingerprint reader."
-msgstr ""
-"L’enregistrement de votre empreinte digitale a réussi. Vous devriez "
-"maintenant pouvoir vous identifier à l’aide du lecteur d’empreintes "
-"digitales."
+msgstr "L’enregistrement de votre empreinte digitale a réussi. Vous devriez maintenant pouvoir vous 
identifier à l’aide du lecteur d’empreintes digitales."
 
 #: panels/user-accounts/data/avatar-chooser.ui:27
 msgid "Take a Picture…"
@@ -6532,8 +6581,7 @@ msgid ""
 "In order to use enterprise logins, this computer needs to be\n"
 "enrolled in the domain. Please have your network administrator\n"
 "type their domain password here."
-msgstr ""
-"Pour utiliser des identifiants d’entreprise, cet ordinateur doit\n"
+msgstr "Pour utiliser des identifiants d’entreprise, cet ordinateur doit\n"
 "être inscrit au domaine. Veuillez demander à votre administrateur\n"
 "réseau de saisir son mot de passe du domaine ici."
 
@@ -6567,8 +6615,7 @@ msgstr "Mot de _passe actuel"
 
 #: panels/user-accounts/data/password-dialog.ui:243
 msgid "Allow user to change their password on next login"
-msgstr ""
-"Autoriser l’utilisateur à changer son mot de passe à la prochaine connexion"
+msgstr "Autoriser l’utilisateur à changer son mot de passe à la prochaine connexion"
 
 #: panels/user-accounts/data/password-dialog.ui:256
 msgid "Set a password now"
@@ -6580,9 +6627,7 @@ msgstr "_Ajouter un utilisateur…"
 
 #: panels/user-accounts/data/user-accounts-dialog.ui:69
 msgid "Your session needs to be restarted for changes to take effect"
-msgstr ""
-"Vous devez redémarrer la session pour que les changements soient pris en "
-"compte"
+msgstr "Vous devez redémarrer la session pour que les changements soient pris en compte"
 
 #: panels/user-accounts/data/user-accounts-dialog.ui:77
 msgid "Restart Now"
@@ -6644,8 +6689,7 @@ msgstr "Essayez de modifier un peu plus le mot de passe."
 #: panels/user-accounts/pw-utils.c:87
 msgctxt "Password hint"
 msgid "A password without your user name would be stronger."
-msgstr ""
-"Un mot de passe ne contenant pas votre nom d’utilisateur serait plus fort."
+msgstr "Un mot de passe ne contenant pas votre nom d’utilisateur serait plus fort."
 
 #: panels/user-accounts/pw-utils.c:89
 msgctxt "Password hint"
@@ -6690,8 +6734,7 @@ msgstr "Essayez d’utiliser plus de caractères spéciaux, comme les pontuation
 #: panels/user-accounts/pw-utils.c:107
 msgctxt "Password hint"
 msgid "Try to use a mixture of letters, numbers and punctuation."
-msgstr ""
-"Essayez d’utiliser un mélange de lettres, de chiffres et de ponctuations."
+msgstr "Essayez d’utiliser un mélange de lettres, de chiffres et de ponctuations."
 
 #: panels/user-accounts/pw-utils.c:109
 msgctxt "Password hint"
@@ -6703,9 +6746,7 @@ msgctxt "Password hint"
 msgid ""
 "Try to avoid repeating the same type of character: you need to mix up "
 "letters, numbers and punctuation."
-msgstr ""
-"Essayez d’éviter la répétition du même caractère : vous devez mélanger des "
-"lettres, des chiffres et des ponctuations."
+msgstr "Essayez d’éviter la répétition du même caractère : vous devez mélanger des lettres, des chiffres et 
des ponctuations."
 
 #: panels/user-accounts/pw-utils.c:113
 msgctxt "Password hint"
@@ -6717,9 +6758,7 @@ msgctxt "Password hint"
 msgid ""
 "Password needs to be longer. Try to add more letters, numbers and "
 "punctuation."
-msgstr ""
-"Le mot de passe doit être plus long. Essayez d’ajouter des lettres, des "
-"chiffres et des ponctuations."
+msgstr "Le mot de passe doit être plus long. Essayez d’ajouter des lettres, des chiffres et des 
ponctuations."
 
 #: panels/user-accounts/pw-utils.c:117
 msgctxt "Password hint"
@@ -6730,9 +6769,7 @@ msgstr "Mélangez des majuscules, des minuscules et aussi un ou deux nombres."
 msgctxt "Password hint"
 msgid ""
 "Adding more letters, numbers and punctuation will make the password stronger."
-msgstr ""
-"L’ajout de lettres, de chiffres et de ponctuations renforcera le mot de "
-"passe."
+msgstr "L’ajout de lettres, de chiffres et de ponctuations renforcera le mot de passe."
 
 #: panels/user-accounts/run-passwd.c:422
 msgid "Authentication failed"
@@ -6761,8 +6798,7 @@ msgstr "Le nouveau mot de passe a déjà été utilisé récemment."
 #: panels/user-accounts/run-passwd.c:520
 #, c-format
 msgid "The new password must contain numeric or special characters"
-msgstr ""
-"Le nouveau mot de passe doit contenir des caractères spéciaux ou numériques"
+msgstr "Le nouveau mot de passe doit contenir des caractères spéciaux ou numériques"
 
 #: panels/user-accounts/run-passwd.c:524
 #, c-format
@@ -6772,14 +6808,12 @@ msgstr "L’ancien et le nouveau mot de passe sont identiques"
 #: panels/user-accounts/run-passwd.c:528
 #, c-format
 msgid "Your password has been changed since you initially authenticated!"
-msgstr ""
-"Votre mot de passe a été modifié depuis que vous vous êtes authentifié !"
+msgstr "Votre mot de passe a été modifié depuis que vous vous êtes authentifié !"
 
 #: panels/user-accounts/run-passwd.c:532
 #, c-format
 msgid "The new password does not contain enough different characters"
-msgstr ""
-"Le nouveau mot de passe ne comporte pas suffisamment de caractères différents"
+msgstr "Le nouveau mot de passe ne comporte pas suffisamment de caractères différents"
 
 #: panels/user-accounts/run-passwd.c:536
 #, c-format
@@ -6816,16 +6850,14 @@ msgstr "Impossible de joindre ce domaine"
 msgid ""
 "That login name didn’t work.\n"
 "Please try again."
-msgstr ""
-"Cet identifiant de connexion ne fonctionne pas.\n"
+msgstr "Cet identifiant de connexion ne fonctionne pas.\n"
 "Veuillez réessayer."
 
 #: panels/user-accounts/um-account-dialog.c:1048
 msgid ""
 "That login password didn’t work.\n"
 "Please try again."
-msgstr ""
-"Ce mot de passe de connexion ne fonctionne pas.\n"
+msgstr "Ce mot de passe de connexion ne fonctionne pas.\n"
 "Veuillez réessayer."
 
 #: panels/user-accounts/um-account-dialog.c:1056
@@ -6849,9 +6881,7 @@ msgstr "Administrateur"
 #: panels/user-accounts/um-fingerprint-dialog.c:139
 msgid ""
 "You are not allowed to access the device. Contact your system administrator."
-msgstr ""
-"Vous n’avez pas accès au périphérique. Contactez votre administrateur "
-"système."
+msgstr "Vous n’avez pas accès au périphérique. Contactez votre administrateur système."
 
 #: panels/user-accounts/um-fingerprint-dialog.c:141
 msgid "The device is already in use."
@@ -6877,9 +6907,7 @@ msgstr "_Supprimer les empreintes"
 msgid ""
 "Do you want to delete your registered fingerprints so fingerprint login is "
 "disabled?"
-msgstr ""
-"Souhaitez-vous supprimer les empreintes digitales enregistrées et désactiver "
-"ainsi ce type de connexion ?"
+msgstr "Souhaitez-vous supprimer les empreintes digitales enregistrées et désactiver ainsi ce type de 
connexion ?"
 
 #: panels/user-accounts/um-fingerprint-dialog.c:440
 msgid "Done!"
@@ -6900,8 +6928,7 @@ msgstr "Impossible d’accéder au périphérique « %s »"
 #: panels/user-accounts/um-fingerprint-dialog.c:584
 #, c-format
 msgid "Could not start finger capture on “%s” device"
-msgstr ""
-"Impossible de démarrer la capture d’empreintes avec le périphérique « %s »"
+msgstr "Impossible de démarrer la capture d’empreintes avec le périphérique « %s »"
 
 #: panels/user-accounts/um-fingerprint-dialog.c:628
 msgid "Could not access any fingerprint readers"
@@ -6921,9 +6948,7 @@ msgstr "Contactez votre administrateur système pour assistance."
 msgid ""
 "To enable fingerprint login, you need to save one of your fingerprints, "
 "using the “%s” device."
-msgstr ""
-"Pour activer l’authentification par empreintes digitales, vous devez "
-"enregistrer une de vos empreintes à l’aide du périphérique « %s »."
+msgstr "Pour activer l’authentification par empreintes digitales, vous devez enregistrer une de vos 
empreintes à l’aide du périphérique « %s »."
 
 #: panels/user-accounts/um-fingerprint-dialog.c:718
 msgid "Selecting finger"
@@ -6969,7 +6994,7 @@ msgstr "%s — %s"
 #. 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/um-history-dialog.c:177
-#: panels/user-accounts/um-user-panel.c:767
+#: panels/user-accounts/um-user-panel.c:766
 msgctxt "login date-time"
 msgid "%k:%M"
 msgstr "%k:%M"
@@ -6977,7 +7002,7 @@ msgstr "%k:%M"
 #. Translators: This indicates a login date-time.
 #. The first %s is a date, and the second %s a time.
 #: panels/user-accounts/um-history-dialog.c:180
-#: panels/user-accounts/um-user-panel.c:771
+#: panels/user-accounts/um-user-panel.c:770
 #, c-format
 msgctxt "login date-time"
 msgid "%s, %s"
@@ -7014,7 +7039,7 @@ msgstr "Le mot de passe ne peut pas être modifié"
 msgid "The passwords do not match."
 msgstr "Les mots de passe ne concordent pas."
 
-#: panels/user-accounts/um-photo-dialog.c:226
+#: panels/user-accounts/um-photo-dialog.c:227
 msgid "Browse for more pictures"
 msgstr "Rechercher d’autres images"
 
@@ -7042,92 +7067,87 @@ msgstr "Mot de passe non valide, essayez à nouveau"
 msgid "Couldn’t connect to the %s domain: %s"
 msgstr "Connexion au domaine %s impossible : %s"
 
-#: panels/user-accounts/um-user-panel.c:201
+#: panels/user-accounts/um-user-panel.c:200
 msgid "Your account"
 msgstr "Votre compte"
 
-#: panels/user-accounts/um-user-panel.c:381
+#: panels/user-accounts/um-user-panel.c:380
 msgid "Failed to delete user"
 msgstr "La suppression de l’utilisateur a échoué"
 
-#: panels/user-accounts/um-user-panel.c:439
-#: panels/user-accounts/um-user-panel.c:498
-#: panels/user-accounts/um-user-panel.c:550
+#: panels/user-accounts/um-user-panel.c:438
+#: panels/user-accounts/um-user-panel.c:497
+#: panels/user-accounts/um-user-panel.c:549
 msgid "Failed to revoke remotely managed user"
 msgstr "La révocation de l’utilisateur géré à distance a échoué"
 
-#: panels/user-accounts/um-user-panel.c:604
+#: panels/user-accounts/um-user-panel.c:603
 msgid "You cannot delete your own account."
 msgstr "Vous ne pouvez pas supprimer votre propre compte."
 
-#: panels/user-accounts/um-user-panel.c:613
+#: panels/user-accounts/um-user-panel.c:612
 #, c-format
 msgid "%s is still logged in"
 msgstr "%s est encore connecté"
 
-#: panels/user-accounts/um-user-panel.c:617
+#: panels/user-accounts/um-user-panel.c:616
 msgid ""
 "Deleting a user while they are logged in can leave the system in an "
 "inconsistent state."
-msgstr ""
-"Supprimer un utilisateur alors qu’il est connecté peut laisser le système "
-"dans un état instable."
+msgstr "Supprimer un utilisateur alors qu’il est connecté peut laisser le système dans un état instable."
 
-#: panels/user-accounts/um-user-panel.c:626
+#: panels/user-accounts/um-user-panel.c:625
 #, c-format
 msgid "Do you want to keep %s’s files?"
 msgstr "Voulez-vous conserver les fichiers de %s ?"
 
-#: panels/user-accounts/um-user-panel.c:630
+#: panels/user-accounts/um-user-panel.c:629
 msgid ""
 "It is possible to keep the home directory, mail spool and temporary files "
 "around when deleting a user account."
-msgstr ""
-"Il est possible de conserver le répertoire personnel, les courriers "
-"électroniques en attente (le « spool ») et les fichiers temporaires d’un "
-"compte utilisateur lors de sa suppression."
+msgstr "Il est possible de conserver le répertoire personnel, les courriers électroniques en attente (le « 
spool ») et les fichiers temporaires d’un compte utilisateur lors de sa suppression."
 
-#: panels/user-accounts/um-user-panel.c:633
+#: panels/user-accounts/um-user-panel.c:632
 msgid "_Delete Files"
 msgstr "_Supprimer les fichiers"
 
-#: panels/user-accounts/um-user-panel.c:634
+#: panels/user-accounts/um-user-panel.c:633
 msgid "_Keep Files"
 msgstr "_Conserver les fichiers"
 
-#: panels/user-accounts/um-user-panel.c:648
+#: panels/user-accounts/um-user-panel.c:647
 #, c-format
 msgid "Are you sure you want to revoke remotely managed %s’s account?"
 msgstr "Êtes-vous sûr de vouloir révoquer le compte distant de %s ?"
 
-#: panels/user-accounts/um-user-panel.c:652
+#: panels/user-accounts/um-user-panel.c:651
 msgid "_Delete"
 msgstr "_Supprimer"
 
-#: panels/user-accounts/um-user-panel.c:702
+#: panels/user-accounts/um-user-panel.c:701
 msgctxt "Password mode"
 msgid "Account disabled"
 msgstr "Compte désactivé"
 
-#: panels/user-accounts/um-user-panel.c:710
+#: panels/user-accounts/um-user-panel.c:709
 msgctxt "Password mode"
 msgid "To be set at next login"
 msgstr "À définir lors de la prochaine connexion"
 
-#: panels/user-accounts/um-user-panel.c:713
+#: panels/user-accounts/um-user-panel.c:712
 msgctxt "Password mode"
 msgid "None"
 msgstr "Aucun"
 
-#: panels/user-accounts/um-user-panel.c:760
+#: panels/user-accounts/um-user-panel.c:759
 msgid "Logged in"
 msgstr "Connecté"
 
-#: panels/user-accounts/um-user-panel.c:1107
+#: panels/user-accounts/um-user-panel.c:1106
 msgid "Failed to contact the accounts service"
 msgstr "La connexion au service des comptes a échoué"
 
-#: panels/user-accounts/um-user-panel.c:1109
+#: panels/user-accounts/um-user-panel.c:1108
 msgid "Please make sure that the AccountService is installed and enabled."
 msgstr "Veuillez vérifier que AccountService est installé et activé."
 
@@ -7135,45 +7155,40 @@ msgstr "Veuillez vérifier que AccountService est installé et activé."
 #. * 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/um-user-panel.c:1141
+#: panels/user-accounts/um-user-panel.c:1140
 msgid ""
 "To make changes,\n"
 "click the * icon first"
-msgstr ""
-"Pour effectuer les modifications,\n"
+msgstr "Pour effectuer les modifications,\n"
 "cliquez d’abord sur l’icône *"
 
-#: panels/user-accounts/um-user-panel.c:1181
+#: panels/user-accounts/um-user-panel.c:1180
 msgid "Create a user account"
 msgstr "Créer un compte utilisateur"
 
-#: panels/user-accounts/um-user-panel.c:1192
-#: panels/user-accounts/um-user-panel.c:1371
+#: panels/user-accounts/um-user-panel.c:1191
+#: panels/user-accounts/um-user-panel.c:1370
 msgid ""
 "To create a user account,\n"
 "click the * icon first"
-msgstr ""
-"Pour créer un compte utilisateur,\n"
+msgstr "Pour créer un compte utilisateur,\n"
 "cliquez d’abord sur l’icône *"
 
-#: panels/user-accounts/um-user-panel.c:1202
+#: panels/user-accounts/um-user-panel.c:1201
 msgid "Delete the selected user account"
 msgstr "Supprimer le compte utilisateur sélectionné"
 
-#: panels/user-accounts/um-user-panel.c:1214
-#: panels/user-accounts/um-user-panel.c:1376
+#: panels/user-accounts/um-user-panel.c:1213
+#: panels/user-accounts/um-user-panel.c:1375
 msgid ""
 "To delete the selected user account,\n"
 "click the * icon first"
-msgstr ""
-"Pour supprimer le compte utilisateur sélectionné,\n"
+msgstr "Pour supprimer le compte utilisateur sélectionné,\n"
 "cliquez d’abord sur l’icône *"
 
 #: panels/user-accounts/um-utils.c:496
 msgid "Sorry, that user name isn’t available. Please try another."
-msgstr ""
-"Désolé, ce nom d’utilisateur n’est pas disponible. Veuillez en choisir un "
-"autre."
+msgstr "Désolé, ce nom d’utilisateur n’est pas disponible. Veuillez en choisir un autre."
 
 #: panels/user-accounts/um-utils.c:499
 #, c-format
@@ -7188,14 +7203,11 @@ msgstr "Le nom d’utilisateur ne peut pas débuter par « - »."
 msgid ""
 "The username should only consist of upper and lower case letters from a-z, "
 "digits and the following characters: . - _"
-msgstr ""
-"Un nom d’utilisateur ne peut contenir que des lettres minuscules ou "
-"majuscules de a à z et l’un de ces caractères : . - _"
+msgstr "Un nom d’utilisateur ne peut contenir que des lettres minuscules ou majuscules de a à z et l’un de 
ces caractères : . - _"
 
 #: panels/user-accounts/um-utils.c:509
 msgid "This will be used to name your home folder and can’t be changed."
-msgstr ""
-"Ceci est utilisé pour nommer votre dossier personnel et ne peut être modifié."
+msgstr "Ceci est utilisé pour nommer votre dossier personnel et ne peut être modifié."
 
 #: panels/wacom/button-mapping.ui:9
 msgid "Map Buttons"
@@ -7214,18 +7226,13 @@ msgstr "Associer les boutons aux fonctions"
 msgid ""
 "To edit a shortcut, choose the “Send Keystroke” action, press the keyboard "
 "shortcut button and hold down the new keys or press Backspace to clear."
-msgstr ""
-"Pour modifier un raccourci, choisissez l’action « Send Keystroke », appuyez "
-"sur le bouton du raccourci clavier et tenez enfoncées les nouvelles touches. "
-"Sinon, appuyez sur la touche Retour arrière pour annuler."
+msgstr "Pour modifier un raccourci, choisissez l’action « Send Keystroke », appuyez sur le bouton du 
raccourci clavier et tenez enfoncées les nouvelles touches. Sinon, appuyez sur la touche Retour arrière pour 
annuler."
 
 #: panels/wacom/calibrator/calibrator-gui.c:83
 msgid ""
 "Please tap the target markers as they appear on screen to calibrate the "
 "tablet."
-msgstr ""
-"Veuillez taper sur les cibles lorsqu’elles apparaissent à l’écran pour "
-"étalonner la tablette."
+msgstr "Veuillez taper sur les cibles lorsqu’elles apparaissent à l’écran pour étalonner la tablette."
 
 #: panels/wacom/calibrator/calibrator-gui.c:87
 msgid "Mis-click detected, restarting…"
@@ -7279,7 +7286,7 @@ msgstr "%d sur %d"
 msgid "Display Mapping"
 msgstr "Afficher la correspondance"
 
-#: panels/wacom/cc-wacom-panel.c:790 panels/wacom/wacom-stylus-page.ui:127
+#: panels/wacom/cc-wacom-panel.c:834 panels/wacom/wacom-stylus-page.ui:127
 msgid "Stylus"
 msgstr "Stylet"
 
@@ -7294,9 +7301,7 @@ msgstr "Tablette Wacom"
 
 #: panels/wacom/gnome-wacom-panel.desktop.in.in:4
 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets"
-msgstr ""
-"Associer les boutons et ajuster la sensibilité du stylet des tablettes "
-"graphiques"
+msgstr "Associer les boutons et ajuster la sensibilité du stylet des tablettes graphiques"
 
 #. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: panels/wacom/gnome-wacom-panel.desktop.in.in:7
@@ -7390,9 +7395,7 @@ msgstr "Aucun stylet trouvé"
 
 #: panels/wacom/wacom-stylus-page.ui:91
 msgid "Please move your stylus to the proximity of the tablet to configure it"
-msgstr ""
-"Veuillez placer votre stylet sur les cibles du bord de la tablette pour la "
-"configurer"
+msgstr "Veuillez placer votre stylet sur les cibles du bord de la tablette pour la configurer"
 
 #: panels/wacom/wacom-stylus-page.ui:167
 msgid "Eraser Pressure Feel"
@@ -7438,9 +7441,7 @@ msgstr "Utilitaire pour configurer l’environnement GNOME"
 msgid ""
 "The control center is GNOME’s main interface for configuration of various "
 "aspects of your desktop."
-msgstr ""
-"Le centre de contrôle est l’interface principale de GNOME pour la "
-"configuration de divers aspects de votre environnement."
+msgstr "Le centre de contrôle est l’interface principale de GNOME pour la configuration de divers aspects de 
votre environnement."
 
 #: shell/cc-application.c:47
 msgid "Display version number"
@@ -7505,7 +7506,7 @@ msgstr "Quitter"
 #: shell/help-overlay.ui:27 shell/help-overlay.ui:48
 msgctxt "shortcut window"
 msgid "Search"
-msgstr "Rechercher"
+msgstr "Recherche"
 
 #: shell/help-overlay.ui:35
 msgctxt "shortcut window"
@@ -7536,9 +7537,7 @@ msgstr "L’identifiant du dernier panneau de paramètres à ouvrir"
 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 ""
-"L’identifiant du dernier panneau de paramètres à ouvrir. Les valeurs non "
-"reconnues seront ignorées et le premier panneau de la liste sera sélectionné."
+msgstr "L’identifiant du dernier panneau de paramètres à ouvrir. Les valeurs non reconnues seront ignorées 
et le premier panneau de la liste sera sélectionné."
 
 #: shell/panel-list.ui:195
 msgid "No results found"
@@ -7569,3 +7568,6 @@ msgstr[1] "%u entrées"
 #: subprojects/gvc/gvc-mixer-control.c:2738
 msgid "System Sounds"
 msgstr "Sons système"
+
+#~ msgid "OS name"
+#~ msgstr "Nom du système d’exploitation"
diff --git a/po/ja.po b/po/ja.po
index bc144dd5d..f9ad4605c 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -19,9 +19,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center master\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
-"control-center&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-09-12 10:59+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-02-12 14:19+0100\n"
 "PO-Revision-Date: 2017-09-19 22:58+0900\n"
 "Last-Translator: Jiro Matsuzawa <jmatsuzawa gnome org>\n"
 "Language-Team: Japanese <gnome-translation gnome gr jp>\n"
@@ -31,213 +30,220 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../panels/background/background.ui.h:1
+#: panels/background/background.ui:49
 msgid "_Background"
 msgstr "背景(_B)"
 
 #. This refers to a slideshow background
-#: ../panels/background/background.ui.h:3
+#: panels/background/background.ui:99 panels/background/background.ui:212
 msgid "Changes throughout the day"
 msgstr "時間の経過とともに画像が変化します"
 
 #. To translators: This is a noun, not a verb
-#: ../panels/background/background.ui.h:5
+#: panels/background/background.ui:162
 msgid "_Lock Screen"
 msgstr "ロック画面(_L)"
 
-#: ../panels/background/background.ui.h:6
+#: panels/background/background.ui:268
 msgctxt "background, style"
 msgid "Tile"
 msgstr "並べる"
 
-#: ../panels/background/background.ui.h:7
+#: panels/background/background.ui:272
 msgctxt "background, style"
 msgid "Zoom"
 msgstr "ズーム"
 
-#: ../panels/background/background.ui.h:8
+#: panels/background/background.ui:276
 msgctxt "background, style"
 msgid "Center"
 msgstr "中央"
 
-#: ../panels/background/background.ui.h:9
+#: panels/background/background.ui:280
 msgctxt "background, style"
 msgid "Scale"
 msgstr "サイズ調整"
 
-#: ../panels/background/background.ui.h:10
+#: panels/background/background.ui:284
 msgctxt "background, style"
 msgid "Fill"
 msgstr "引き伸ばす"
 
-#: ../panels/background/background.ui.h:11
+#: panels/background/background.ui:288
 msgctxt "background, style"
 msgid "Span"
 msgstr "スパン(複数に跨げる)"
 
-#: ../panels/background/cc-background-chooser-dialog.c:430
+#: panels/background/cc-background-chooser-dialog.c:424
 msgid "Wallpapers"
 msgstr "壁紙"
 
-#: ../panels/background/cc-background-chooser-dialog.c:439
+#: panels/background/cc-background-chooser-dialog.c:433
 msgid "Colors"
 msgstr "色"
 
 #. translators: This is the title of the wallpaper chooser dialog.
-#: ../panels/background/cc-background-chooser-dialog.c:476
+#: panels/background/cc-background-chooser-dialog.c:468
 msgid "Select Background"
 msgstr "背景の選択"
 
-#: ../panels/background/cc-background-chooser-dialog.c:504
+#: panels/background/cc-background-chooser-dialog.c:496
 msgid "Pictures"
 msgstr "画像"
 
 #. translators: No pictures were found
-#: ../panels/background/cc-background-chooser-dialog.c:536
+#: panels/background/cc-background-chooser-dialog.c:528
 msgid "No Pictures Found"
 msgstr "画像が見つかりません"
 
 #. translators: "Home" is used in place of the Pictures
 #. * directory in the string below when XDG_PICTURES_DIR is
 #. * undefined
-#: ../panels/background/cc-background-chooser-dialog.c:554
-#: ../panels/search/cc-search-locations-dialog.c:302
+#: panels/background/cc-background-chooser-dialog.c:545
+#: panels/search/cc-search-locations-dialog.c:302
 msgid "Home"
 msgstr "ホーム"
 
 #. translators: %s here is the name of the Pictures directory, the string should be translated in
 #. * the context "You can add images to your Pictures folder and they will show up here"
-#: ../panels/background/cc-background-chooser-dialog.c:566
+#: panels/background/cc-background-chooser-dialog.c:555
 #, c-format
 msgid "You can add images to your %s folder and they will show up here"
 msgstr "画像を %s フォルダーに追加すると、その画像がここに表示されます。"
 
-#: ../panels/background/cc-background-chooser-dialog.c:573
-#: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963
-#: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30
-#: ../panels/common/language-chooser.ui.h:3
-#: ../panels/display/cc-display-panel.c:2697
-#: ../panels/network/connection-editor/connection-editor.ui.h:1
-#: ../panels/network/connection-editor/vpn-helpers.c:181
-#: ../panels/network/connection-editor/vpn-helpers.c:310
-#: ../panels/network/net-device-wifi.c:1318
-#: ../panels/network/net-device-wifi.c:1398
-#: ../panels/network/net-device-wifi.c:1633
-#: ../panels/network/network-wifi.ui.h:1
-#: ../panels/printers/new-printer-dialog.ui.h:3
-#: ../panels/printers/pp-details-dialog.c:319
-#: ../panels/privacy/cc-privacy-panel.c:1049
-#: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2
-#: ../panels/search/cc-search-locations-dialog.c:642
-#: ../panels/sharing/cc-sharing-panel.c:382
-#: ../panels/user-accounts/data/account-dialog.ui.h:2
-#: ../panels/user-accounts/data/join-dialog.ui.h:2
-#: ../panels/user-accounts/data/password-dialog.ui.h:2
-#: ../panels/user-accounts/um-fingerprint-dialog.c:264
-#: ../panels/user-accounts/um-photo-dialog.c:94
-#: ../panels/user-accounts/um-photo-dialog.c:221
-#: ../panels/user-accounts/um-user-panel.c:644
-#: ../panels/user-accounts/um-user-panel.c:662
+#: panels/background/cc-background-chooser-dialog.c:560
+#: panels/color/cc-color-panel.c:225 panels/color/cc-color-panel.c:963
+#: panels/color/color-calibrate.ui:25 panels/color/color.ui:657
+#: panels/common/language-chooser.ui:23 panels/display/cc-display-panel.c:2597
+#: panels/info/cc-subscription-register-dialog.ui:18
+#: panels/network/connection-editor/connection-editor.ui:15
+#: panels/network/connection-editor/vpn-helpers.c:181
+#: panels/network/connection-editor/vpn-helpers.c:310
+#: panels/network/net-device-wifi.c:1411 panels/network/net-device-wifi.c:1491
+#: panels/network/net-device-wifi.c:1736 panels/network/network-wifi.ui:24
+#: panels/printers/new-printer-dialog.ui:45
+#: panels/printers/pp-details-dialog.c:331
+#: panels/privacy/cc-privacy-panel.c:1053 panels/region/format-chooser.ui:25
+#: panels/region/input-chooser.ui:13
+#: panels/search/cc-search-locations-dialog.c:642
+#: panels/sharing/cc-sharing-panel.c:392
+#: panels/user-accounts/data/account-dialog.ui:28
+#: panels/user-accounts/data/join-dialog.ui:20
+#: panels/user-accounts/data/password-dialog.ui:21
+#: panels/user-accounts/um-fingerprint-dialog.c:261
+#: panels/user-accounts/um-photo-dialog.c:103
+#: panels/user-accounts/um-photo-dialog.c:230
+#: panels/user-accounts/um-user-panel.c:634
+#: panels/user-accounts/um-user-panel.c:652
 msgid "_Cancel"
 msgstr "キャンセル(_C)"
 
-#: ../panels/background/cc-background-chooser-dialog.c:574
+#: panels/background/cc-background-chooser-dialog.c:561
 msgid "_Select"
 msgstr "選択(_S)"
 
-#: ../panels/background/cc-background-item.c:203
+#: panels/background/cc-background-item.c:192
 msgid "multiple sizes"
 msgstr "複数のサイズ"
 
 #. translators: 100 × 100px
 #. * Note that this is not an "x", but U+00D7 MULTIPLICATION SIGN
-#: ../panels/background/cc-background-item.c:207
+#: panels/background/cc-background-item.c:196
 #, c-format
 msgid "%d × %d"
 msgstr "%d × %d"
 
-#: ../panels/background/cc-background-item.c:333
+#: panels/background/cc-background-item.c:321
 msgid "No Desktop Background"
 msgstr "デスクトップの背景が見つかりません"
 
-#: ../panels/background/cc-background-panel.c:493
+#: panels/background/cc-background-panel.c:291
 msgid "Current background"
 msgstr "現在の背景"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/background/gnome-background-panel.desktop.in.in.h:2
-msgid "Back­ground"
+#: panels/background/gnome-background-panel.desktop.in.in:3
+msgid "Background"
 msgstr "背景"
 
-#: ../panels/background/gnome-background-panel.desktop.in.in.h:3
+#: panels/background/gnome-background-panel.desktop.in.in:4
 msgid "Change your background image to a wallpaper or photo"
 msgstr "背景画像を変更します。"
 
-#. Translators: those are keywords for the background control-center panel
-#: ../panels/background/gnome-background-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/background/gnome-background-panel.desktop.in.in:7
+msgid "preferences-desktop-wallpaper"
+msgstr "preferences-desktop-wallpaper"
+
+#. Translators: Search terms to find the Background panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#: panels/background/gnome-background-panel.desktop.in.in:15
 msgid "Wallpaper;Screen;Desktop;"
 msgstr "Wallpaper;Screen;Desktop;壁紙;スクリーン;デスクトップ;Background;背景;"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:268
+#: panels/bluetooth/cc-bluetooth-panel.c:265
 msgid "Turn Off Airplane Mode"
 msgstr "機内モードをオフにする"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:334
+#: panels/bluetooth/cc-bluetooth-panel.c:330
 msgid "No Bluetooth Found"
 msgstr "Bluetooth が見つかりません"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:334
+#: panels/bluetooth/cc-bluetooth-panel.c:330
 msgid "Plug in a dongle to use Bluetooth."
 msgstr "Bluetooth を使用するにはドングルを接続してください。"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:335
+#: panels/bluetooth/cc-bluetooth-panel.c:331
 msgid "Bluetooth Turned Off"
 msgstr "Bluetooth がオフになっています"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:335
+#: panels/bluetooth/cc-bluetooth-panel.c:331
 msgid "Turn on to connect devices and receive file transfers."
-msgstr ""
-"デバイスの接続やファイルの受信を行うには Bluetooth をオンにしてください。"
+msgstr "デバイスの接続やファイルの受信を行うには Bluetooth をオンにしてください。"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:336
+#: panels/bluetooth/cc-bluetooth-panel.c:332
 msgid "Airplane Mode is on"
 msgstr "機内モードがオンになっています"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:336
+#: panels/bluetooth/cc-bluetooth-panel.c:332
 msgid "Bluetooth is disabled when airplane mode is on."
 msgstr "機内モードがオンの場合、Bluetooth は使用できません。"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:337
+#: panels/bluetooth/cc-bluetooth-panel.c:333
 msgid "Hardware Airplane Mode is on"
 msgstr "ハードウェア機内モードがオンになっています"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:337
+#: panels/bluetooth/cc-bluetooth-panel.c:333
 msgid "Turn off the Airplane mode switch to enable Bluetooth."
 msgstr "Bluetooth を使用するには機内モードスイッチをオフにしてください。"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2
-msgid "Blue­tooth"
-msgstr "Blue­tooth"
+#. 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:1816
+msgid "Bluetooth"
+msgstr "Bluetooth"
 
-#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3
+#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:4
 msgid "Turn Bluetooth on and off and connect your devices"
 msgstr "Bluetooth のオン/オフやデバイスへの接続を行います。"
 
-#. Translators: those are keywords for the bluetooth control-center panel
-#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:6
+msgid "bluetooth"
+msgstr "bluetooth"
+
+#. Translators: Search terms to find the Bluetooth panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:19
 msgid "share;sharing;bluetooth;obex;"
 msgstr "share;sharing;bluetooth;obex;共有;シェアリング;ブルートゥース;"
 
 #. TRANSLATORS: The user has to attach the sensor to the screen
-#: ../panels/color/cc-color-calibrate.c:361
+#: panels/color/cc-color-calibrate.c:361
 msgid "Place your calibration device over the square and press “Start”"
 msgstr "キャリブレーション装置を四角形に合わせて \"開始\" を押してください"
 
 #. TRANSLATORS: Some calibration devices need the user to move a
 #. * dial or switch manually. We also show a picture showing them
 #. * what to do...
-#: ../panels/color/cc-color-calibrate.c:367
+#: panels/color/cc-color-calibrate.c:367
 msgid ""
 "Move your calibration device to the calibrate position and press “Continue”"
 msgstr "キャリブレーション装置を測定位置に移動して \"次へ\" を押してください"
@@ -245,7 +251,7 @@ msgstr "キャリブレーション装置を測定位置に移動して \"次へ
 #. TRANSLATORS: Some calibration devices need the user to move a
 #. * dial or switch manually. We also show a picture showing them
 #. * what to do...
-#: ../panels/color/cc-color-calibrate.c:373
+#: panels/color/cc-color-calibrate.c:373
 msgid ""
 "Move your calibration device to the surface position and press “Continue”"
 msgstr "キャリブレーション装置を表面の位置に移動して \"次へ\" を押してください"
@@ -253,158 +259,158 @@ msgstr "キャリブレーション装置を表面の位置に移動して \"次
 #. TRANSLATORS: on some hardware e.g. Lenovo W700 the sensor
 #. * is built into the palmrest and we need to fullscreen the
 #. * sample widget and shut the lid.
-#: ../panels/color/cc-color-calibrate.c:379
+#: panels/color/cc-color-calibrate.c:379
 msgid "Shut the laptop lid"
 msgstr "ノート PC を閉じてください"
 
 #. TRANSLATORS: We suck, the calibation failed and we have no
 #. * good idea why or any suggestions
-#: ../panels/color/cc-color-calibrate.c:410
+#: panels/color/cc-color-calibrate.c:410
 msgid "An internal error occurred that could not be recovered."
 msgstr "回復できないエラーが発生しました。"
 
 #. TRANSLATORS: Some required-at-runtime tools were not
 #. * installed, which should only affect insane distros
-#: ../panels/color/cc-color-calibrate.c:415
+#: panels/color/cc-color-calibrate.c:415
 msgid "Tools required for calibration are not installed."
 msgstr "キャリブレーションに必要なツールがインストールされていません。"
 
 #. TRANSLATORS: The profile failed for some reason
-#: ../panels/color/cc-color-calibrate.c:421
+#: panels/color/cc-color-calibrate.c:421
 msgid "The profile could not be generated."
 msgstr "プロファイルを生成できません。"
 
 #. TRANSLATORS: The user specified a whitepoint that was
 #. * unobtainable with the hardware they've got -- see
 #. * https://en.wikipedia.org/wiki/White_point for details
-#: ../panels/color/cc-color-calibrate.c:427
+#: panels/color/cc-color-calibrate.c:427
 msgid "The target whitepoint was not obtainable."
 msgstr "対象の白色点は取得できません。"
 
 #. TRANSLATORS: the display calibration process is finished
-#: ../panels/color/cc-color-calibrate.c:467
+#: panels/color/cc-color-calibrate.c:467
 msgid "Complete!"
 msgstr "完了!"
 
 #. TRANSLATORS: the display calibration failed, and we also show
 #. * the translated (or untranslated) error string after this
-#: ../panels/color/cc-color-calibrate.c:475
+#: panels/color/cc-color-calibrate.c:475
 msgid "Calibration failed!"
 msgstr "キャリブレーションに失敗!"
 
 #. TRANSLATORS: The user can now remove the sensor from the screen
-#: ../panels/color/cc-color-calibrate.c:482
+#: panels/color/cc-color-calibrate.c:482
 msgid "You can remove the calibration device."
 msgstr "キャリブレーション装置を取り外せます。"
 
 #. TRANSLATORS: The user has to be careful not to knock the
 #. * display off the screen (although we do cope if this is
 #. * detected early enough)
-#: ../panels/color/cc-color-calibrate.c:553
+#: panels/color/cc-color-calibrate.c:553
 msgid "Do not disturb the calibration device while in progress"
 msgstr "測定中はキャリブレーション装置に触らないでください"
 
 #. TRANSLATORS: This refers to the TFT display on a laptop
-#: ../panels/color/cc-color-common.c:41
+#: panels/color/cc-color-common.c:41
 msgid "Laptop Screen"
 msgstr "ラップトップ画面"
 
 #. TRANSLATORS: This refers to the embedded webcam on a laptop
-#: ../panels/color/cc-color-common.c:50
+#: panels/color/cc-color-common.c:50
 msgid "Built-in Webcam"
 msgstr "組み込みのウェブカム"
 
 #. TRANSLATORS: an externally connected display, where %s is either the
 #. * model, vendor or ID, e.g. 'LP2480zx Monitor'
-#: ../panels/color/cc-color-common.c:65
+#: panels/color/cc-color-common.c:65
 #, c-format
 msgid "%s Monitor"
 msgstr "%s モニター"
 
 #. TRANSLATORS: a flatbed scanner device, e.g. 'Epson Scanner'
-#: ../panels/color/cc-color-common.c:69
+#: panels/color/cc-color-common.c:69
 #, c-format
 msgid "%s Scanner"
 msgstr "%s スキャナー"
 
 #. TRANSLATORS: a camera device, e.g. 'Nikon D60 Camera'
-#: ../panels/color/cc-color-common.c:73
+#: panels/color/cc-color-common.c:73
 #, c-format
 msgid "%s Camera"
 msgstr "%s カメラ"
 
 #. TRANSLATORS: a printer device, e.g. 'Epson Photosmart Printer'
-#: ../panels/color/cc-color-common.c:77
+#: panels/color/cc-color-common.c:77
 #, c-format
 msgid "%s Printer"
 msgstr "%s プリンター"
 
 #. TRANSLATORS: a webcam device, e.g. 'Philips HiDef Camera'
-#: ../panels/color/cc-color-common.c:81
+#: panels/color/cc-color-common.c:81
 #, c-format
 msgid "%s Webcam"
 msgstr "%s ウェブカム"
 
-#: ../panels/color/cc-color-device.c:89
+#: panels/color/cc-color-device.c:89
 #, c-format
 msgid "Enable color management for %s"
 msgstr "%s のカラーマネージメントを有効にする"
 
-#: ../panels/color/cc-color-device.c:93
+#: panels/color/cc-color-device.c:93
 #, c-format
 msgid "Show color profiles for %s"
 msgstr "%s のカラープロファイルを表示する"
 
 #. not calibrated
-#: ../panels/color/cc-color-device.c:323
+#: panels/color/cc-color-device.c:323
 msgid "Not calibrated"
 msgstr "未較正"
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile has been auto-generated for this hardware
-#: ../panels/color/cc-color-panel.c:141
+#: panels/color/cc-color-panel.c:141
 msgid "Default: "
 msgstr "デフォルト: "
 
 # ref. gnome-color-manager
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile his a standard space like AdobeRGB
-#: ../panels/color/cc-color-panel.c:149
+#: panels/color/cc-color-panel.c:149
 msgid "Colorspace: "
-msgstr "色空間:"
+msgstr "色空間: "
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile is a test profile
-#: ../panels/color/cc-color-panel.c:156
+#: panels/color/cc-color-panel.c:156
 msgid "Test profile: "
 msgstr "テスト用プロファイル: "
 
 #. TRANSLATORS: an ICC profile is a file containing colorspace data
-#: ../panels/color/cc-color-panel.c:223
+#: panels/color/cc-color-panel.c:223
 msgid "Select ICC Profile File"
 msgstr "ICC プロファイルの選択"
 
-#: ../panels/color/cc-color-panel.c:226
+#: panels/color/cc-color-panel.c:226
 msgid "_Import"
 msgstr "インポート(_I)"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: ../panels/color/cc-color-panel.c:237
+#: panels/color/cc-color-panel.c:237
 msgid "Supported ICC profiles"
 msgstr "サポートする ICC プロファイル"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: ../panels/color/cc-color-panel.c:244
-#: ../panels/network/wireless-security/eap-method-fast.c:417
+#: panels/color/cc-color-panel.c:244
+#: panels/network/wireless-security/eap-method-fast.c:417
 msgid "All files"
 msgstr "すべてのファイル"
 
-#: ../panels/color/cc-color-panel.c:583
+#: panels/color/cc-color-panel.c:583
 msgid "Screen"
 msgstr "画面"
 
 #. TRANSLATORS: this is when the upload of the profile failed
-#: ../panels/color/cc-color-panel.c:908
+#: panels/color/cc-color-panel.c:908
 #, c-format
 msgid "Failed to upload file: %s"
 msgstr "ファイルのアップロードに失敗しました: %s"
@@ -412,69 +418,63 @@ msgstr "ファイルのアップロードに失敗しました: %s"
 #. 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:922
+#: panels/color/cc-color-panel.c:922
 msgid "The profile has been uploaded to:"
 msgstr "プロファイルがアップロードされました:"
 
-#: ../panels/color/cc-color-panel.c:924
+#: panels/color/cc-color-panel.c:924
 msgid "Write down this URL."
 msgstr "この URL をメモしてください。"
 
-#: ../panels/color/cc-color-panel.c:925
+#: panels/color/cc-color-panel.c:925
 msgid "Restart this computer and boot your normal operating system."
-msgstr ""
-"このコンピューターを再起動して通常のオペレーティングシステムを起動してくださ"
-"い。"
+msgstr "このコンピューターを再起動して通常のオペレーティングシステムを起動してください。"
 
-#: ../panels/color/cc-color-panel.c:926
+#: panels/color/cc-color-panel.c:926
 msgid "Type the URL into your browser to download and install the profile."
-msgstr ""
-"ブラウザーで URL を入力し、プロファイルをダウンロードしてインストールしてくだ"
-"さい。"
+msgstr "ブラウザーで URL を入力し、プロファイルをダウンロードしてインストールしてください。"
 
 #. TRANSLATORS: this is the dialog to save the ICC profile
-#: ../panels/color/cc-color-panel.c:960
+#: panels/color/cc-color-panel.c:960
 msgid "Save Profile"
 msgstr "プロファイルの保存"
 
-#: ../panels/color/cc-color-panel.c:964
-#: ../panels/network/connection-editor/vpn-helpers.c:311
+#: panels/color/cc-color-panel.c:964
+#: panels/network/connection-editor/vpn-helpers.c:311
 msgid "_Save"
 msgstr "保存(_S)"
 
 #. TRANSLATORS: this is when the button is sensitive
-#: ../panels/color/cc-color-panel.c:1324
+#: panels/color/cc-color-panel.c:1325
 msgid "Create a color profile for the selected device"
 msgstr "選択したデバイスのカラープロファイルを作成"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:1339 ../panels/color/cc-color-panel.c:1363
+#: panels/color/cc-color-panel.c:1340 panels/color/cc-color-panel.c:1364
 msgid ""
 "The measuring instrument is not detected. Please check it is turned on and "
 "correctly connected."
-msgstr ""
-"計測器が検出できません。電源が入っていること、正しく接続されていることを確認"
-"してください。"
+msgstr "計測器が検出できません。電源が入っていること、正しく接続されていることを確認してください。"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:1373
+#: panels/color/cc-color-panel.c:1374
 msgid "The measuring instrument does not support printer profiling."
 msgstr "計測器がプリンターのプロファイルをサポートしていません。"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:1384
+#: panels/color/cc-color-panel.c:1385
 msgid "The device type is not currently supported."
 msgstr "このデバイスの種類は現在サポートされていません。"
 
 #. TRANSLATORS: standard spaces are well known colorspaces like
 #. * sRGB, AdobeRGB and ProPhotoRGB
-#: ../panels/color/cc-color-profile.c:103
+#: panels/color/cc-color-profile.c:103
 msgid "Standard Space"
 msgstr "標準の色空間"
 
 #. TRANSLATORS: test profiles do things like changing the screen
 #. * a different color, or swap the red and green channels
-#: ../panels/color/cc-color-profile.c:109
+#: panels/color/cc-color-profile.c:109
 msgid "Test Profile"
 msgstr "テスト用プロファイル"
 
@@ -482,7 +482,7 @@ msgstr "テスト用プロファイル"
 #. * by the color management system based on manufacturing data,
 #. * for instance the default monitor profile is created from the
 #. * primaries specified in the monitor EDID
-#: ../panels/color/cc-color-profile.c:117
+#: panels/color/cc-color-profile.c:117
 msgctxt "Automatically generated profile"
 msgid "Automatic"
 msgstr "自動"
@@ -490,13 +490,13 @@ msgstr "自動"
 #. TRANSLATORS: the profile quality - low quality profiles take
 #. * much less time to generate but may be a poor reflection of the
 #. * device capability
-#: ../panels/color/cc-color-profile.c:127
+#: panels/color/cc-color-profile.c:127
 msgctxt "Profile quality"
 msgid "Low Quality"
 msgstr "低品質"
 
 #. TRANSLATORS: the profile quality
-#: ../panels/color/cc-color-profile.c:132
+#: panels/color/cc-color-profile.c:132
 msgctxt "Profile quality"
 msgid "Medium Quality"
 msgstr "中品質"
@@ -504,62 +504,61 @@ msgstr "中品質"
 #. TRANSLATORS: the profile quality - high quality profiles take
 #. * a *long* time, and have the best calibration and
 #. * characterisation data.
-#: ../panels/color/cc-color-profile.c:139
+#: panels/color/cc-color-profile.c:139
 msgctxt "Profile quality"
 msgid "High Quality"
 msgstr "高品質"
 
 #. TRANSLATORS: this default RGB space is used for printers that
 #. * do not have additional printer profiles specified in the PPD
-#: ../panels/color/cc-color-profile.c:156
+#: panels/color/cc-color-profile.c:156
 msgctxt "Colorspace fallback"
 msgid "Default RGB"
 msgstr "デフォルト RGB"
 
 #. TRANSLATORS: this default CMYK space is used for printers that
 #. * do not have additional printer profiles specified in the PPD
-#: ../panels/color/cc-color-profile.c:163
+#: panels/color/cc-color-profile.c:163
 msgctxt "Colorspace fallback"
 msgid "Default CMYK"
 msgstr "デフォルト CMYK"
 
 #. TRANSLATORS: this default gray space is used for printers that
 #. * do not have additional printer profiles specified in the PPD
-#: ../panels/color/cc-color-profile.c:170
+#: panels/color/cc-color-profile.c:170
 msgctxt "Colorspace fallback"
 msgid "Default Gray"
 msgstr "デフォルトグレー"
 
-#: ../panels/color/cc-color-profile.c:194
+#: panels/color/cc-color-profile.c:194
 msgid "Vendor supplied factory calibration data"
 msgstr "ベンダーが提供している工場でのキャリブレーションデータ"
 
-#: ../panels/color/cc-color-profile.c:203
+#: panels/color/cc-color-profile.c:203
 msgid "Full-screen display correction not possible with this profile"
 msgstr "このプロファイルでは全画面表示での補正はできません"
 
-#: ../panels/color/cc-color-profile.c:225
+#: panels/color/cc-color-profile.c:225
 msgid "This profile may no longer be accurate"
 msgstr "このプロファイルはもう正確ではなくなっているかもしれません。"
 
-#: ../panels/color/color-calibrate.ui.h:1
+#: panels/color/color-calibrate.ui:7
 msgid "Display Calibration"
 msgstr "キャリブレーションの表示"
 
 #. This starts the calibration process
-#: ../panels/color/color-calibrate.ui.h:4
+#: panels/color/color-calibrate.ui:40
 msgid "_Start"
 msgstr "開始(_S)"
 
 #. This resumes the calibration process
-#: ../panels/color/color-calibrate.ui.h:6
+#: 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.h:8
-#: ../panels/common/language-chooser.ui.h:2
-#: ../panels/region/format-chooser.ui.h:2
+#: panels/color/color-calibrate.ui:67 panels/common/language-chooser.ui:12
+#: panels/region/format-chooser.ui:14
 msgid "_Done"
 msgstr "完了(_D)"
 
@@ -567,380 +566,364 @@ msgstr "完了(_D)"
 #. 15000 = 15 sec
 #. 750 = 0.75 sec
 #. Text printed on screen
-#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:82
+#: panels/color/color.ui:6 panels/wacom/calibrator/calibrator-gui.c:82
 msgid "Screen Calibration"
 msgstr "画面位置調整"
 
-#: ../panels/color/color.ui.h:2
+#: panels/color/color.ui:23
 msgid ""
 "Calibration will produce a profile that you can use to color manage your "
 "screen. The longer you spend on calibration, the better the quality of the "
 "color profile."
-msgstr ""
-"キャリブレーションは画面の色管理に利用できるプロファイルを作成します。キャリ"
-"ブレーションに時間をかけるほど色プロファイルの品質は向上します。"
+msgstr "キャリブレーションは画面の色管理に利用できるプロファイルを作成します。キャリブレーションに時間をかけるほど色プロファイルの品質は向上します。"
 
-#: ../panels/color/color.ui.h:3
+#: panels/color/color.ui:38
 msgid ""
 "You will not be able to use your computer while calibration takes place."
 msgstr "キャリブレーション処理中はコンピューターを使えなくなります。"
 
 #. This is the approximate time it takes to calibrate the display.
-#: ../panels/color/color.ui.h:5
+#: panels/color/color.ui:58
 msgid "Quality"
 msgstr "品質"
 
 #. This is the approximate time it takes to calibrate the display.
-#: ../panels/color/color.ui.h:7
+#: panels/color/color.ui:75
 msgid "Approximate Time"
 msgstr "予測時間"
 
-#: ../panels/color/color.ui.h:8
+#: panels/color/color.ui:121
 msgid "Calibration Quality"
 msgstr "キャリブレーション品質"
 
-#: ../panels/color/color.ui.h:9
+#: panels/color/color.ui:137
 msgid "Select the sensor device you want to use for calibration."
 msgstr "キャリブレーションに使用するセンサーデバイスを選択してください。"
 
-#: ../panels/color/color.ui.h:10
+#: panels/color/color.ui:174
 msgid "Calibration Device"
 msgstr "キャリブレーション装置"
 
-#: ../panels/color/color.ui.h:11
+#: panels/color/color.ui:189
 msgid "Select the type of display that is connected."
 msgstr "接続しているディスプレイの種類を選択してください。"
 
-#: ../panels/color/color.ui.h:12
+#: panels/color/color.ui:226
 msgid "Display Type"
 msgstr "ディスプレイの種類"
 
-#: ../panels/color/color.ui.h:13
+#: panels/color/color.ui:241
 msgid ""
 "Select a display target white point. Most displays should be calibrated to a "
 "D65 illuminant."
-msgstr ""
-"表示対象の白色点を選択してください。ほとんどのディスプレイが D65 光源に対して"
-"キャリブレーションを行えばいいはずです。"
+msgstr "表示対象の白色点を選択してください。ほとんどのディスプレイが D65 光源に対してキャリブレーションを行えばいいはずです。"
 
-#: ../panels/color/color.ui.h:14
+#: panels/color/color.ui:278
 msgid "Profile Whitepoint"
 msgstr "白色点のプロファイル作成"
 
-#: ../panels/color/color.ui.h:15
+#: panels/color/color.ui:293
 msgid ""
 "Please set the display to a brightness that is typical for you. Color "
 "management will be most accurate at this brightness level."
-msgstr ""
-"ディスプレイを標準的に使っている輝度に設定してください。色管理はこの輝度で最"
-"も正確になります。 "
+msgstr "ディスプレイを標準的に使っている輝度に設定してください。色管理はこの輝度で最も正確になります。"
 
-#: ../panels/color/color.ui.h:16
+#: panels/color/color.ui:307
 msgid ""
 "Alternatively, you can use the brightness level used with one of the other "
 "profiles for this device."
-msgstr ""
-"他のプロファイルで使っている輝度をこのデバイス用に利用することもできます。"
+msgstr "他のプロファイルで使っている輝度をこのデバイス用に利用することもできます。"
 
-#: ../panels/color/color.ui.h:17
+#: panels/color/color.ui:318
 msgid "Display Brightness"
 msgstr "ディスプレイの明るさ"
 
-#: ../panels/color/color.ui.h:18
+#: panels/color/color.ui:333
 msgid ""
 "You can use a color profile on different computers, or even create profiles "
 "for different lighting conditions."
-msgstr ""
-"異なるコンピューターの色プロファイルを利用したり、異なる照明条件のプロファイ"
-"ルを作成することもできます。"
+msgstr "異なるコンピューターの色プロファイルを利用したり、異なる照明条件のプロファイルを作成することもできます。"
 
-#: ../panels/color/color.ui.h:19
+#: panels/color/color.ui:348
 msgid "Profile Name:"
 msgstr "プロファイル名:"
 
-#: ../panels/color/color.ui.h:20
+#: panels/color/color.ui:377
 msgid "Profile Name"
 msgstr "プロファイル名"
 
-#: ../panels/color/color.ui.h:21
+#: panels/color/color.ui:392
 msgid "Profile successfully created!"
 msgstr "プロファイルが正常に作成されました!"
 
-#: ../panels/color/color.ui.h:22
+#: panels/color/color.ui:443
 msgid "Copy profile"
 msgstr "プロファイルの複製"
 
-#: ../panels/color/color.ui.h:23
+#: panels/color/color.ui:456
 msgid "Requires writable media"
 msgstr "書き込み可能メディアが必要です"
 
-#: ../panels/color/color.ui.h:24
+#: panels/color/color.ui:519
 msgid "Upload profile"
 msgstr "プロファイルのアップロード"
 
-#: ../panels/color/color.ui.h:25
+#: panels/color/color.ui:532
 msgid "Requires Internet connection"
 msgstr "インターネット接続が必要です"
 
-#: ../panels/color/color.ui.h:26
+#: panels/color/color.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."
-msgstr ""
-"<a href=\"linux\">GNU/Linux</a> や <a href=\"osx\">Apple OS X</a>、<a href="
-"\"windows\">Microsoft Windows</a> システムでのプロファイルの利用方法が役立つ"
-"かもしません。"
+msgstr "<a href=\"linux\">GNU/Linux</a> や <a href=\"osx\">Apple OS X</a>、<a href=\"windows\">Microsoft 
Windows</a> システムでのプロファイルの利用方法が役立つかもしません。"
 
-#: ../panels/color/color.ui.h:27
-#: ../panels/user-accounts/um-fingerprint-dialog.c:723
+#: panels/color/color.ui:607 panels/user-accounts/um-fingerprint-dialog.c:720
 msgid "Summary"
 msgstr "概要"
 
-#: ../panels/color/color.ui.h:28
+#: panels/color/color.ui:621
 msgid "Add Profile"
 msgstr "プロファイルの追加"
 
-#: ../panels/color/color.ui.h:29
+#: panels/color/color.ui:643
 msgid "_Import File…"
 msgstr "ファイルを読み込む(_I)…"
 
-#: ../panels/color/color.ui.h:31
-#: ../panels/network/connection-editor/net-connection-editor.c:519
-#: ../panels/printers/new-printer-dialog.ui.h:4
-#: ../panels/region/input-chooser.ui.h:3
-#: ../panels/user-accounts/data/account-dialog.ui.h:3
+#: panels/color/color.ui:672
+#: panels/network/connection-editor/net-connection-editor.c:519
+#: panels/printers/new-printer-dialog.ui:80 panels/region/input-chooser.ui:22
+#: panels/user-accounts/data/account-dialog.ui:47
 msgid "_Add"
 msgstr "追加(_A)"
 
-#: ../panels/color/color.ui.h:32
+#: panels/color/color.ui:732
 msgid ""
 "Problems detected. The profile may not work correctly. <a href=\"\">Show "
 "details.</a>"
-msgstr ""
-"問題が検出されました。プロファイルは正しく動作しない可能性があります。<a "
-"href=\"\">詳細を表示する。</a>"
+msgstr "問題が検出されました。プロファイルは正しく動作しない可能性があります。<a href=\"\">詳細を表示する。</a>"
 
-#: ../panels/color/color.ui.h:33
+#: panels/color/color.ui:807
 msgid "Each device needs an up to date color profile to be color managed."
-msgstr ""
-"カラーマネージメントを行うには、各デバイスの最新のカラープロファイルが必要に"
-"なります。"
+msgstr "カラーマネージメントを行うには、各デバイスの最新のカラープロファイルが必要になります。"
 
-#: ../panels/color/color.ui.h:34
+#: panels/color/color.ui:829
 msgid "Learn more"
 msgstr "もっと詳しく"
 
-#: ../panels/color/color.ui.h:35
+#: panels/color/color.ui:834
 msgid "Learn more about color management"
 msgstr "カラーマネージメントについてもっと詳しく知る"
 
-#: ../panels/color/color.ui.h:36
+#: panels/color/color.ui:882
 msgid "_Set for all users"
 msgstr "全ユーザー用に設定(_S)"
 
-#: ../panels/color/color.ui.h:37
+#: panels/color/color.ui:886 panels/color/color.ui:901
+#: panels/color/color.ui:902
 msgid "Set this profile for all users on this computer"
 msgstr "コンピューターのすべてのユーザーでプロファイルを利用"
 
-#: ../panels/color/color.ui.h:38
+#: panels/color/color.ui:897
 msgid "_Enable"
 msgstr "有効にする(_E)"
 
-#: ../panels/color/color.ui.h:39
+#: panels/color/color.ui:928
 msgid "_Add profile"
 msgstr "プロファイルの追加(_A)"
 
-#: ../panels/color/color.ui.h:40
+#: panels/color/color.ui:941
 msgid "_Calibrate…"
 msgstr "キャリブレート(_C)…"
 
-#: ../panels/color/color.ui.h:41
+#: panels/color/color.ui:945
 msgid "Calibrate the device"
 msgstr "デバイスのキャリブレート"
 
-#: ../panels/color/color.ui.h:42
+#: panels/color/color.ui:956
 msgid "_Remove profile"
 msgstr "プロファイルの削除(_R)"
 
-#: ../panels/color/color.ui.h:43
+#: panels/color/color.ui:969
 msgid "_View details"
 msgstr "詳細を表示(_V)"
 
-#: ../panels/color/color.ui.h:44
+#: panels/color/color.ui:1005
 msgid "Unable to detect any devices that can be color managed"
 msgstr "カラーマネジメント対象のデバイスを検出できません"
 
-#: ../panels/color/color.ui.h:45
+#: panels/color/color.ui:1047
 msgid "LCD"
 msgstr "LCD"
 
-#: ../panels/color/color.ui.h:46
+#: panels/color/color.ui:1052
 msgid "LED"
 msgstr "LED"
 
-#: ../panels/color/color.ui.h:47
+#: panels/color/color.ui:1057
 msgid "CRT"
 msgstr "CRT"
 
-#: ../panels/color/color.ui.h:48
+#: panels/color/color.ui:1062
 msgid "Projector"
 msgstr "プロジェクター"
 
-#: ../panels/color/color.ui.h:49
+#: panels/color/color.ui:1067
 msgid "Plasma"
 msgstr "プラズマ"
 
-#: ../panels/color/color.ui.h:50
+#: panels/color/color.ui:1072
 msgid "LCD (CCFL backlight)"
 msgstr "LCD (CCFL バックライト)"
 
-#: ../panels/color/color.ui.h:51
+#: panels/color/color.ui:1077
 msgid "LCD (RGB LED backlight)"
 msgstr "LCD (RGB LED バックライト)"
 
-#: ../panels/color/color.ui.h:52
+#: panels/color/color.ui:1082
 msgid "LCD (white LED backlight)"
 msgstr "LCD (白色 LED バックライト)"
 
-#: ../panels/color/color.ui.h:53
+#: panels/color/color.ui:1087
 msgid "Wide gamut LCD (CCFL backlight)"
 msgstr "広色域 LCD (CCFL バックライト)"
 
-#: ../panels/color/color.ui.h:54
+#: panels/color/color.ui:1092
 msgid "Wide gamut LCD (RGB LED backlight)"
 msgstr "広色域 LCD (RGB LED backlight)"
 
-#: ../panels/color/color.ui.h:55
+#: panels/color/color.ui:1109
 msgctxt "Calibration quality"
 msgid "High"
 msgstr "高"
 
-#: ../panels/color/color.ui.h:56
+#: panels/color/color.ui:1110
 msgid "40 minutes"
 msgstr "40 分"
 
-#: ../panels/color/color.ui.h:57
+#: panels/color/color.ui:1114
 msgctxt "Calibration quality"
 msgid "Medium"
 msgstr "中"
 
-#: ../panels/color/color.ui.h:58 ../panels/power/power.ui.h:2
-#: ../panels/privacy/privacy.ui.h:7
+#: panels/color/color.ui:1115 panels/power/power.ui:25
+#: panels/privacy/privacy.ui:38
 msgid "30 minutes"
 msgstr "30 分"
 
-#: ../panels/color/color.ui.h:59
+#: panels/color/color.ui:1119
 msgctxt "Calibration quality"
 msgid "Low"
 msgstr "低"
 
-#: ../panels/color/color.ui.h:60 ../panels/power/power.ui.h:1
+#: panels/color/color.ui:1120 panels/power/power.ui:13 panels/power/power.ui:95
 msgid "15 minutes"
 msgstr "15 分"
 
-#: ../panels/color/color.ui.h:61
+#: panels/color/color.ui:1142
 msgid "Native to display"
 msgstr "ディスプレイ本来の設定"
 
-#: ../panels/color/color.ui.h:62
+#: panels/color/color.ui:1146
 msgid "D50 (Printing and publishing)"
 msgstr "D50 (印刷および出版)"
 
-#: ../panels/color/color.ui.h:63
+#: panels/color/color.ui:1150
 msgid "D55"
 msgstr "D55"
 
-#: ../panels/color/color.ui.h:64
+#: panels/color/color.ui:1154
 msgid "D65 (Photography and graphics)"
 msgstr "D65 (写真とグラフィック)"
 
-#: ../panels/color/color.ui.h:65
+#: panels/color/color.ui:1158
 msgid "D75"
 msgstr "D75"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:2
-msgid "Co­lor"
-msgstr "色管理"
+#: panels/color/gnome-color-panel.desktop.in.in:3
+msgid "Color"
+msgstr "色"
 
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:3
+#: panels/color/gnome-color-panel.desktop.in.in:4
 msgid ""
 "Calibrate the color of your devices, such as displays, cameras or printers"
 msgstr "ディスプレイやカメラ、プリンター等のデバイスのキャリブレート"
 
-#. Translators: those are keywords for the color control-center panel
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/color/gnome-color-panel.desktop.in.in:7
+msgid "preferences-color"
+msgstr "preferences-color"
+
+#. Translators: Search terms to find the Color panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+#: panels/color/gnome-color-panel.desktop.in.in:19
 msgid "Color;ICC;Profile;Calibrate;Printer;Display;"
-msgstr ""
-"Color;ICC;Profile;Calibrate;Printer;Display;色;ICC;プロファイル;キャリブレー"
-"ション;プリンター;ディスプレイ;"
+msgstr "Color;ICC;Profile;Calibrate;Printer;Display;色;ICC;プロファイル;キャリブレーション;プリンター;ディスプレイ;"
 
-#: ../panels/common/cc-common-language.c:323
+#: panels/common/cc-common-language.c:323
 msgid "Other…"
 msgstr "その他…"
 
-#: ../panels/common/cc-language-chooser.c:124
-#: ../panels/region/cc-format-chooser.c:269
-#: ../panels/region/cc-input-chooser.c:169
+#: panels/common/cc-language-chooser.c:124
+#: panels/region/cc-format-chooser.c:269 panels/region/cc-input-chooser.c:169
 msgid "More…"
 msgstr "さらに…"
 
-#: ../panels/common/cc-language-chooser.c:140
+#: panels/common/cc-language-chooser.c:140
 msgid "No languages found"
 msgstr "言語が見つかりません"
 
-#: ../panels/common/cc-util.c:127
-#: ../panels/network/connection-editor/ce-page-details.c:106
+#: panels/common/cc-util.c:127
+#: panels/network/connection-editor/ce-page-details.c:106
 msgid "Today"
 msgstr "今日"
 
-#: ../panels/common/cc-util.c:131
-#: ../panels/network/connection-editor/ce-page-details.c:108
+#: panels/common/cc-util.c:131
+#: panels/network/connection-editor/ce-page-details.c:108
 msgid "Yesterday"
 msgstr "昨日"
 
 #. Translators: This is a date format string in the style of "Feb 24".
-#: ../panels/common/cc-util.c:138
+#: panels/common/cc-util.c:138
 msgid "%b %e"
 msgstr "%m月%d日"
 
 #. Translators: This is a date format string in the style of "Feb 24, 2013".
-#: ../panels/common/cc-util.c:143
+#: panels/common/cc-util.c:143
 msgid "%b %e, %Y"
 msgstr "%Y年%m月%d日"
 
-#: ../panels/common/language-chooser.ui.h:1
+#: panels/common/language-chooser.ui:5
 msgid "Language"
 msgstr "言語"
 
-#: ../panels/datetime/big.ui.h:1 ../panels/datetime/little.ui.h:1
-#: ../panels/datetime/middle.ui.h:1 ../panels/datetime/ydm.ui.h:1
+#: panels/datetime/big.ui:16 panels/datetime/little.ui:16
+#: panels/datetime/middle.ui:16 panels/datetime/ydm.ui:16
 msgid "Day"
 msgstr "日"
 
-#: ../panels/datetime/big.ui.h:2 ../panels/datetime/little.ui.h:2
-#: ../panels/datetime/middle.ui.h:2 ../panels/datetime/ydm.ui.h:2
+#: panels/datetime/big.ui:32 panels/datetime/little.ui:32
+#: panels/datetime/middle.ui:32 panels/datetime/ydm.ui:32
 msgid "Month"
 msgstr "月"
 
-#: ../panels/datetime/big.ui.h:3 ../panels/datetime/little.ui.h:3
-#: ../panels/datetime/middle.ui.h:3 ../panels/datetime/ydm.ui.h:3
+#: panels/datetime/big.ui:48 panels/datetime/little.ui:48
+#: panels/datetime/middle.ui:48 panels/datetime/ydm.ui:48
 msgid "Year"
 msgstr "年"
 
 #. Translators: This is the full date and time format used in 12-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:339
+#: panels/datetime/cc-datetime-panel.c:333
 msgid "%e %B %Y, %l:%M %p"
 msgstr "%Y年%B%d日 %p%I:%M"
 
 #. Translators: This is the full date and time format used in 24-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:344
+#: panels/datetime/cc-datetime-panel.c:338
 msgid "%e %B %Y, %R"
 msgstr "%Y年%B%d日 %R"
 
 #. Translators: "city, country"
-#: ../panels/datetime/cc-datetime-panel.c:522
+#: panels/datetime/cc-datetime-panel.c:503
 #, c-format
 msgctxt "timezone loc"
 msgid "%s, %s"
@@ -948,7 +931,7 @@ msgstr "%2$s、%1$s"
 
 #. Update the timezone on the listbow row
 #. Translators: "timezone (details)"
-#: ../panels/datetime/cc-datetime-panel.c:552
+#: panels/datetime/cc-datetime-panel.c:530
 #, c-format
 msgctxt "timezone desc"
 msgid "%s (%s)"
@@ -956,384 +939,366 @@ msgstr "%s (%s)"
 
 #. Translators: UTC here means the Coordinated Universal Time.
 #. * %:::z will be replaced by the offset from UTC e.g. UTC+02
-#: ../panels/datetime/cc-datetime-panel.c:560
+#: panels/datetime/cc-datetime-panel.c:537
 msgid "UTC%:::z"
 msgstr "UTC%:::z"
 
 #. Translators: This is the time format used in 12-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:565
+#: panels/datetime/cc-datetime-panel.c:542
 msgid "%l:%M %p"
 msgstr "%p%I:%M"
 
 #. Translators: This is the time format used in 24-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:570
+#: panels/datetime/cc-datetime-panel.c:547
 msgid "%R"
 msgstr "%R"
 
 #. Update the text bubble in the timezone map
 #. Translators: "timezone (utc shift)"
-#: ../panels/datetime/cc-datetime-panel.c:575
+#: panels/datetime/cc-datetime-panel.c:552
 #, c-format
 msgctxt "timezone map"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../panels/datetime/datetime.ui.h:1
+#: panels/datetime/datetime.ui:22
 msgid "January"
 msgstr "1月"
 
-#: ../panels/datetime/datetime.ui.h:2
+#: panels/datetime/datetime.ui:25
 msgid "February"
 msgstr "2月"
 
-#: ../panels/datetime/datetime.ui.h:3
+#: panels/datetime/datetime.ui:28
 msgid "March"
 msgstr "3月"
 
-#: ../panels/datetime/datetime.ui.h:4
+#: panels/datetime/datetime.ui:31
 msgid "April"
 msgstr "4月"
 
-#: ../panels/datetime/datetime.ui.h:5
+#: panels/datetime/datetime.ui:34
 msgid "May"
 msgstr "5月"
 
-#: ../panels/datetime/datetime.ui.h:6
+#: panels/datetime/datetime.ui:37
 msgid "June"
 msgstr "6月"
 
-#: ../panels/datetime/datetime.ui.h:7
+#: panels/datetime/datetime.ui:40
 msgid "July"
 msgstr "7月"
 
-#: ../panels/datetime/datetime.ui.h:8
+#: panels/datetime/datetime.ui:43
 msgid "August"
 msgstr "8月"
 
-#: ../panels/datetime/datetime.ui.h:9
+#: panels/datetime/datetime.ui:46
 msgid "September"
 msgstr "9月"
 
-#: ../panels/datetime/datetime.ui.h:10
+#: panels/datetime/datetime.ui:49
 msgid "October"
 msgstr "10月"
 
-#: ../panels/datetime/datetime.ui.h:11
+#: panels/datetime/datetime.ui:52
 msgid "November"
 msgstr "11月"
 
-#: ../panels/datetime/datetime.ui.h:12
+#: panels/datetime/datetime.ui:55
 msgid "December"
 msgstr "12月"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/datetime/datetime.ui.h:13
-#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2
+#: panels/datetime/datetime.ui:61
+#: panels/datetime/gnome-datetime-panel.desktop.in.in:3
 msgid "Date & Time"
 msgstr "日付と時刻"
 
-#: ../panels/datetime/datetime.ui.h:14
+#: panels/datetime/datetime.ui:106
 msgid "Hour"
 msgstr "時"
 
 #. Translator: this is the separator between hours and minutes, like in HH∶MM
-#: ../panels/datetime/datetime.ui.h:16
+#: panels/datetime/datetime.ui:121
 msgid "∶"
 msgstr "∶"
 
-#: ../panels/datetime/datetime.ui.h:17
+#: panels/datetime/datetime.ui:143
 msgid "Minute"
 msgstr "分"
 
-#: ../panels/datetime/datetime.ui.h:18
+#: panels/datetime/datetime.ui:208
 msgid "Time Zone"
 msgstr "タイムゾーン"
 
-#: ../panels/datetime/datetime.ui.h:19
+#: panels/datetime/datetime.ui:228
 msgid "Search for a city"
 msgstr "都市を検索する"
 
-#: ../panels/datetime/datetime.ui.h:20
+#: panels/datetime/datetime.ui:304
 msgid "Automatic _Date & Time"
 msgstr "自動日時設定(_D)"
 
-#: ../panels/datetime/datetime.ui.h:21
+#: panels/datetime/datetime.ui:319 panels/datetime/datetime.ui:397
 msgid "Requires internet access"
 msgstr "インターネットアクセスが必要です"
 
-#: ../panels/datetime/datetime.ui.h:22
+#: panels/datetime/datetime.ui:382
 msgid "Automatic Time _Zone"
 msgstr "自動タイムゾーン設定(_Z)"
 
-#: ../panels/datetime/datetime.ui.h:23
+#: panels/datetime/datetime.ui:454
 msgid "Date & _Time"
 msgstr "日付と時刻(_T)"
 
-#: ../panels/datetime/datetime.ui.h:24
+#: panels/datetime/datetime.ui:502
 msgid "Time Z_one"
 msgstr "タイムゾーン(_O)"
 
-#: ../panels/datetime/datetime.ui.h:25
+#: panels/datetime/datetime.ui:570
 msgid "Time _Format"
 msgstr "日時書式(_F)"
 
-#: ../panels/datetime/datetime.ui.h:26
+#: panels/datetime/datetime.ui:588
 msgid "24-hour"
 msgstr "24時制"
 
-#: ../panels/datetime/datetime.ui.h:27
+#: panels/datetime/datetime.ui:589
 msgid "AM / PM"
 msgstr "午前/午後"
 
-#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3
+#: panels/datetime/gnome-datetime-panel.desktop.in.in:4
 msgid "Change the date and time, including time zone"
 msgstr "日付、時刻、タイムゾーンを変更します。"
 
-#. Translators: those are keywords for the date and time control-center panel
-#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/datetime/gnome-datetime-panel.desktop.in.in:7
+msgid "preferences-system-time"
+msgstr "preferences-system-time"
+
+#. Translators: Search terms to find the Date and Time panel. Do NOT translate or localize the semicolons! 
The list MUST also end with a semicolon!
+#: panels/datetime/gnome-datetime-panel.desktop.in.in:15
 msgid "Clock;Timezone;Location;"
-msgstr ""
-"Clock;Timezone;Location;時計;日付;時刻;時間;日時;タイムゾーン;場所;Date;Time;"
+msgstr "Clock;Timezone;Location;時計;日付;時刻;時間;日時;タイムゾーン;場所;Date;Time;"
 
-#: ../panels/datetime/org.gnome.controlcenter.datetime.policy.in.h:1
+#: panels/datetime/org.gnome.controlcenter.datetime.policy.in:11
 msgid "Change system time and date settings"
 msgstr "システムの時刻と日付の設定を変更"
 
-#: ../panels/datetime/org.gnome.controlcenter.datetime.policy.in.h:2
+#: panels/datetime/org.gnome.controlcenter.datetime.policy.in:12
 msgid "To change time or date settings, you need to authenticate."
 msgstr "時刻と日付の設定を変更するには、認証が必要です。"
 
-#: ../panels/display/cc-display-panel.c:738
+#: panels/display/cc-display-panel.c:732
 msgctxt "Display rotation"
 msgid "Landscape"
 msgstr "横方向"
 
-#: ../panels/display/cc-display-panel.c:741
-#, fuzzy
-#| msgid "Portrait"
+#: panels/display/cc-display-panel.c:735
 msgctxt "Display rotation"
 msgid "Portrait Right"
-msgstr "縦方向"
+msgstr "縦方向 (右)"
 
-#: ../panels/display/cc-display-panel.c:744
-#, fuzzy
-#| msgid "Portrait"
+#: panels/display/cc-display-panel.c:738
 msgctxt "Display rotation"
 msgid "Portrait Left"
-msgstr "縦方向"
+msgstr "縦方向 (左)"
 
-#: ../panels/display/cc-display-panel.c:747
-#, fuzzy
-#| msgid "Landscape"
+#: panels/display/cc-display-panel.c:741
 msgctxt "Display rotation"
 msgid "Landscape (flipped)"
 msgstr "横方向 (逆)"
 
 #. Translators: This option sets orientation of print (portrait, landscape...)
-#: ../panels/display/cc-display-panel.c:788
-#: ../panels/display/cc-display-panel.c:838
-#: ../panels/printers/pp-options-dialog.c:558
+#: panels/display/cc-display-panel.c:808
+#: panels/printers/pp-options-dialog.c:558
 msgid "Orientation"
 msgstr "向き"
 
-#: ../panels/display/cc-display-panel.c:881
-#: ../panels/display/cc-display-panel.c:933
-#: ../panels/display/cc-display-panel.c:1751
-#: ../panels/display/cc-display-panel.c:1797
-#: ../panels/printers/pp-options-dialog.c:87
+#: panels/display/cc-display-panel.c:873 panels/display/cc-display-panel.c:1676
+#: panels/printers/pp-options-dialog.c:87
 msgid "Resolution"
 msgstr "解像度"
 
-#: ../panels/display/cc-display-panel.c:978
-#: ../panels/display/cc-display-panel.c:1049
+#: panels/display/cc-display-panel.c:961
 msgid "Refresh Rate"
 msgstr "リフレッシュレート"
 
-#: ../panels/display/cc-display-panel.c:1186
-#, fuzzy
-#| msgctxt "background, style"
-#| msgid "Scale"
+#: panels/display/cc-display-panel.c:1098
 msgid "Scale"
 msgstr "サイズ調整"
 
-#: ../panels/display/cc-display-panel.c:1239
+#: panels/display/cc-display-panel.c:1151
 msgid "Adjust for TV"
 msgstr "TV向けに調整"
 
-#: ../panels/display/cc-display-panel.c:1451
-#: ../panels/display/cc-display-panel.c:1497
-#, fuzzy
-#| msgid "Secondary Display"
+#: panels/display/cc-display-panel.c:1413
 msgid "Primary Display"
-msgstr "セカンダリディスプレイ"
+msgstr "プライマリーディスプレイ"
 
-#: ../panels/display/cc-display-panel.c:1546
-#, fuzzy
-#| msgid "Display Mapping"
+#: panels/display/cc-display-panel.c:1442
 msgid "Display Arrangement"
-msgstr "画面のマッピング"
+msgstr "ディスプレイ配置"
 
-#: ../panels/display/cc-display-panel.c:1547
+#: panels/display/cc-display-panel.c:1443
 msgid ""
 "Drag displays to match your setup. The top bar is placed on the primary "
 "display."
-msgstr ""
+msgstr "セットアップに合わせてディスプレイをドラッグします。トップバーはプライマリーディスプレイに配置されます。"
 
-#: ../panels/display/cc-display-panel.c:1985
+#: panels/display/cc-display-panel.c:1866
 msgid "Display Mode"
 msgstr "ディスプレイモード"
 
-#: ../panels/display/cc-display-panel.c:2001
-#, fuzzy
-#| msgid "Dis­plays"
+#: panels/display/cc-display-panel.c:1882
 msgid "Join Displays"
-msgstr "ディスプレイ"
+msgstr "ディスプレイの結合"
 
-#: ../panels/display/cc-display-panel.c:2004
+#: panels/display/cc-display-panel.c:1885
 msgid "Mirror"
 msgstr "ミラー"
 
-#: ../panels/display/cc-display-panel.c:2007
+#: panels/display/cc-display-panel.c:1888
 msgid "Single Display"
 msgstr "シングルディスプレイ"
 
-#: ../panels/display/cc-display-panel.c:2693
+#: panels/display/cc-display-panel.c:2593
 msgid "Apply Changes?"
 msgstr "変更を適用しますか?"
 
-#: ../panels/display/cc-display-panel.c:2707
-#: ../panels/network/connection-editor/connection-editor.ui.h:2
-#: ../panels/network/network-wifi.ui.h:2
+#: panels/display/cc-display-panel.c:2607
+#: panels/network/connection-editor/connection-editor.ui:24
+#: panels/network/network-wifi.ui:38
 msgid "_Apply"
 msgstr "適用(_A)"
 
-#: ../panels/display/cc-display-panel.c:3083
+#: panels/display/cc-display-panel.c:2982
 #, c-format
 msgid "%.2lf Hz"
 msgstr "%.2lf Hz"
 
 #. TRANSLATORS: the state of the night light setting
-#: ../panels/display/cc-display-panel.c:3299
-#: ../panels/notifications/cc-notifications-panel.c:293
-#: ../panels/power/cc-power-panel.c:1970 ../panels/power/cc-power-panel.c:1977
-#: ../panels/privacy/cc-privacy-panel.c:190
-#: ../panels/privacy/cc-privacy-panel.c:257
-#: ../panels/universal-access/cc-ua-panel.c:331
-#: ../panels/universal-access/cc-ua-panel.c:712
-#: ../panels/universal-access/cc-ua-panel.c:725
-#: ../panels/universal-access/cc-ua-panel.c:737
-#: ../panels/universal-access/cc-ua-panel.c:908
+#: panels/display/cc-display-panel.c:3198
+#: panels/notifications/cc-notifications-panel.c:292
+#: panels/power/cc-power-panel.c:1994 panels/power/cc-power-panel.c:2001
+#: panels/privacy/cc-privacy-panel.c:190 panels/privacy/cc-privacy-panel.c:257
+#: panels/universal-access/cc-ua-panel.c:333
+#: panels/universal-access/cc-ua-panel.c:714
+#: panels/universal-access/cc-ua-panel.c:727
+#: panels/universal-access/cc-ua-panel.c:739
+#: panels/universal-access/cc-ua-panel.c:910
 msgid "On"
 msgstr "オン"
 
-#: ../panels/display/cc-display-panel.c:3299 ../panels/network/net-proxy.c:54
-#: ../panels/notifications/cc-notifications-panel.c:293
-#: ../panels/power/cc-power-panel.c:1964 ../panels/power/cc-power-panel.c:1975
-#: ../panels/privacy/cc-privacy-panel.c:190
-#: ../panels/privacy/cc-privacy-panel.c:257
-#: ../panels/universal-access/cc-ua-panel.c:331
-#: ../panels/universal-access/cc-ua-panel.c:712
-#: ../panels/universal-access/cc-ua-panel.c:725
-#: ../panels/universal-access/cc-ua-panel.c:737
-#: ../panels/universal-access/cc-ua-panel.c:908
-#: ../panels/universal-access/uap.ui.h:7
+#: panels/display/cc-display-panel.c:3198 panels/network/net-proxy.c:54
+#: panels/notifications/cc-notifications-panel.c:292
+#: panels/power/cc-power-panel.c:1988 panels/power/cc-power-panel.c:1999
+#: panels/privacy/cc-privacy-panel.c:190 panels/privacy/cc-privacy-panel.c:257
+#: panels/universal-access/cc-ua-panel.c:333
+#: panels/universal-access/cc-ua-panel.c:714
+#: panels/universal-access/cc-ua-panel.c:727
+#: panels/universal-access/cc-ua-panel.c:739
+#: panels/universal-access/cc-ua-panel.c:910 panels/universal-access/uap.ui:334
+#: panels/universal-access/uap.ui:380 panels/universal-access/uap.ui:426
+#: panels/universal-access/uap.ui:532 panels/universal-access/uap.ui:685
+#: panels/universal-access/uap.ui:731 panels/universal-access/uap.ui:777
+#: panels/universal-access/uap.ui:929
 msgid "Off"
 msgstr "オフ"
 
-#: ../panels/display/cc-display-panel.c:3320
+#: panels/display/cc-display-panel.c:3219
 msgid "_Night Light"
 msgstr "夜間モード(_N)"
 
-#: ../panels/display/cc-display-panel.c:3385
+#: panels/display/cc-display-panel.c:3284
 msgid "Could not get screen information"
 msgstr "スクリーンの情報を取得できませんでした"
 
 #. This cancels the redshift inhibit.
-#: ../panels/display/display.ui.h:2
+#: panels/display/display.ui:71
 msgid "Restart Filter"
 msgstr "フィルターを再起動"
 
 #. Inhibit the redshift functionality until the next day starts
-#: ../panels/display/display.ui.h:4
+#: panels/display/display.ui:103
 msgid "Temporarily Disabled Until Tomorrow"
 msgstr "明日まで一時的に無効にする"
 
-#: ../panels/display/display.ui.h:5
+#: panels/display/display.ui:144
 msgid ""
 "Night light makes the screen color warmer. This can help to prevent eye "
 "strain and sleeplessness."
-msgstr ""
-"夜間モードは画面の色を少し暖色にします。これは目の疲れを緩和し、不眠を防ぐの"
-"に役立ちます。"
+msgstr "夜間モードは画面の色を少し暖色にします。これは目の疲れを緩和し、不眠を防ぐのに役立ちます。"
 
 #. This is the redshift functionality where we suppress blue light when the sun has gone down
-#: ../panels/display/display.ui.h:7
+#: panels/display/display.ui:171 panels/display/display.ui:567
 msgid "Night Light"
 msgstr "夜間モード"
 
-#: ../panels/display/display.ui.h:8
+#: panels/display/display.ui:187
 msgid "Schedule"
 msgstr "スケジュール"
 
-#: ../panels/display/display.ui.h:9
+#: panels/display/display.ui:215
 msgid "Sunset to Sunrise"
 msgstr "日没から日の出まで"
 
-#: ../panels/display/display.ui.h:10
-#: ../panels/network/connection-editor/ip4-page.ui.h:4
-#: ../panels/network/connection-editor/ip6-page.ui.h:5
-#: ../panels/network/net-proxy.c:56 ../panels/network/network-proxy.ui.h:3
-#: ../panels/network/network-wifi.ui.h:26
-#: ../panels/privacy/cc-privacy-panel.c:217
+#: panels/display/display.ui:229
+#: 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:777 panels/network/network-wifi.ui:1054
+#: panels/privacy/cc-privacy-panel.c:217
 msgid "Manual"
 msgstr "手動"
 
-#: ../panels/display/display.ui.h:11
+#: panels/display/display.ui:268
 msgid "From"
 msgstr "開始"
 
-#: ../panels/display/display.ui.h:12
+#: panels/display/display.ui:309 panels/display/display.ui:430
 msgid ":"
 msgstr ":"
 
 #. This is the short form for the time period in the morning
-#: ../panels/display/display.ui.h:14
+#: panels/display/display.ui:343 panels/display/display.ui:464
 msgid "AM"
 msgstr "午前"
 
 #. This is the short form for the time period in the afternoon
-#: ../panels/display/display.ui.h:16
+#: panels/display/display.ui:359 panels/display/display.ui:480
 msgid "PM"
 msgstr "午後"
 
-#: ../panels/display/display.ui.h:17
+#: panels/display/display.ui:528
 msgid "To"
 msgstr "終了"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/display/gnome-display-panel.desktop.in.in.h:2
-msgid "Dis­plays"
+#: panels/display/gnome-display-panel.desktop.in.in:3
+msgid "Displays"
 msgstr "ディスプレイ"
 
-#: ../panels/display/gnome-display-panel.desktop.in.in.h:3
+#: panels/display/gnome-display-panel.desktop.in.in:4
 msgid "Choose how to use connected monitors and projectors"
 msgstr "接続したモニターやプロジェクターの使用方法を変更します。"
 
-#. Translators: those are keywords for the display control-center panel
-#: ../panels/display/gnome-display-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/display/gnome-display-panel.desktop.in.in:7
+msgid "preferences-desktop-display"
+msgstr "preferences-desktop-display"
+
+#. Translators: Search terms to find the Displays panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#: panels/display/gnome-display-panel.desktop.in.in:19
 msgid ""
 "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;Night;Light;Blue;"
 "redshift;color;sunset;sunrise;"
-msgstr ""
-"Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;Night;Light;Blue;"
-"redshift;color;sunset;sunrise;パネル;プロジェクター;画面;解像度;リフレッシュ;"
-"モニター;ナイトライト;夜間モード;ブルーライト;色管理;ディスプレイ;ディスプ"
-"レー;Displays;日没;日の出;"
+msgstr 
"Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;Night;Light;Blue;redshift;color;sunset;sunrise;パネル;プロジェクター;画面;解像度;リフレッシュ;モニター;ナイトライト;夜間モード;ブルーライト;色管理;ディスプレイ;ディスプレー;Displays;日没;日の出;"
 
 #. TRANSLATORS: AP type
-#: ../panels/info/cc-info-overview-panel.c:381
-#: ../panels/info/cc-info-overview-panel.c:468
-#: ../panels/network/panel-common.c:123
+#: panels/info/cc-info-overview-panel.c:385
+#: panels/info/cc-info-overview-panel.c:465
+#: panels/info/cc-subscription-details-dialog.c:109
+#: panels/network/panel-common.c:123
 msgid "Unknown"
 msgstr "不明"
 
@@ -1341,77 +1306,61 @@ msgstr "不明"
 #. * example:
 #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or
 #. * "Ubuntu 16.04 LTS; Build ID: jki"
-#: ../panels/info/cc-info-overview-panel.c:476
+#: panels/info/cc-info-overview-panel.c:473
 #, 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:493
+#: panels/info/cc-info-overview-panel.c:490
 #, c-format
 msgid "64-bit"
 msgstr "64 ビット"
 
 #. translators: This is the type of architecture for the OS
-#: ../panels/info/cc-info-overview-panel.c:496
+#: panels/info/cc-info-overview-panel.c:493
 #, c-format
 msgid "32-bit"
 msgstr "32 ビット"
 
-#: ../panels/info/cc-info-overview-panel.c:807
+#: panels/info/cc-info-overview-panel.c:782
 #, c-format
 msgid "Version %s"
 msgstr "バージョン %s"
 
-#: ../panels/info/cc-info-panel.c:138
-msgid "Section"
-msgstr "セクション"
-
-#: ../panels/info/cc-info-panel.c:147 ../panels/info/info.ui.h:1
-msgid "Overview"
-msgstr "概要"
-
-#: ../panels/info/cc-info-panel.c:153 ../panels/info/info.ui.h:2
-msgid "Default Applications"
-msgstr "既定のアプリケーション"
-
-#: ../panels/info/cc-info-panel.c:158 ../panels/info/info.ui.h:3
-msgid "Removable Media"
-msgstr "リムーバブルメディア"
-
-#: ../panels/info/cc-info-removable-media-panel.c:312
+#: panels/info/cc-info-removable-media-panel.c:298
 msgid "Ask what to do"
 msgstr "どうするか確認する"
 
-#: ../panels/info/cc-info-removable-media-panel.c:316
+#: panels/info/cc-info-removable-media-panel.c:302
 msgid "Do nothing"
 msgstr "なにもしない"
 
-#: ../panels/info/cc-info-removable-media-panel.c:320
+#: panels/info/cc-info-removable-media-panel.c:306
 msgid "Open folder"
 msgstr "フォルダーを開く"
 
-#: ../panels/info/cc-info-removable-media-panel.c:411
+#: panels/info/cc-info-removable-media-panel.c:391
 msgid "Other Media"
 msgstr "他のメディア"
 
-#: ../panels/info/cc-info-removable-media-panel.c:444
+#: panels/info/cc-info-removable-media-panel.c:424
 msgid "Select an application for audio CDs"
 msgstr "オーディオCD用のアプリケーションを選択"
 
-#: ../panels/info/cc-info-removable-media-panel.c:445
+#: panels/info/cc-info-removable-media-panel.c:425
 msgid "Select an application for video DVDs"
 msgstr "ビデオDVD用のアプリケーションを選択"
 
-#: ../panels/info/cc-info-removable-media-panel.c:446
+#: panels/info/cc-info-removable-media-panel.c:426
 msgid "Select an application to run when a music player is connected"
 msgstr "ミュージックプレイヤーが接続された時に実行するアプリケーションを選択"
 
-#: ../panels/info/cc-info-removable-media-panel.c:447
+#: panels/info/cc-info-removable-media-panel.c:427
 msgid "Select an application to run when a camera is connected"
 msgstr "カメラが接続された時に起動するアプリケーションを選択"
 
-#: ../panels/info/cc-info-removable-media-panel.c:448
+#: panels/info/cc-info-removable-media-panel.c:428
 msgid "Select an application for software CDs"
 msgstr "ソフトウェアの CD を開くアプリケーションを選択してください"
 
@@ -1420,404 +1369,629 @@ msgstr "ソフトウェアの CD を開くアプリケーションを選択し
 #. * If the shared-mime-info translation works for your language,
 #. * simply leave these untranslated.
 #.
-#: ../panels/info/cc-info-removable-media-panel.c:460
+#: panels/info/cc-info-removable-media-panel.c:440
 msgid "audio DVD"
 msgstr "オーディオ DVD"
 
-#: ../panels/info/cc-info-removable-media-panel.c:461
+#: panels/info/cc-info-removable-media-panel.c:441
 msgid "blank Blu-ray disc"
 msgstr "空のブルーレイディスク"
 
-#: ../panels/info/cc-info-removable-media-panel.c:462
+#: panels/info/cc-info-removable-media-panel.c:442
 msgid "blank CD disc"
 msgstr "空の CD"
 
-#: ../panels/info/cc-info-removable-media-panel.c:463
+#: panels/info/cc-info-removable-media-panel.c:443
 msgid "blank DVD disc"
 msgstr "空の DVD"
 
-#: ../panels/info/cc-info-removable-media-panel.c:464
+#: panels/info/cc-info-removable-media-panel.c:444
 msgid "blank HD DVD disc"
 msgstr "空の HD DVD"
 
-#: ../panels/info/cc-info-removable-media-panel.c:465
+#: panels/info/cc-info-removable-media-panel.c:445
 msgid "Blu-ray video disc"
 msgstr "ブルーレイビデオディスク"
 
-#: ../panels/info/cc-info-removable-media-panel.c:466
+#: panels/info/cc-info-removable-media-panel.c:446
 msgid "e-book reader"
 msgstr "電子書籍リーダー"
 
-#: ../panels/info/cc-info-removable-media-panel.c:467
+#: panels/info/cc-info-removable-media-panel.c:447
 msgid "HD DVD video disc"
 msgstr "HD DVD ビデオディスク"
 
-#: ../panels/info/cc-info-removable-media-panel.c:468
+#: panels/info/cc-info-removable-media-panel.c:448
 msgid "Picture CD"
 msgstr "ピクチャーCD"
 
-#: ../panels/info/cc-info-removable-media-panel.c:469
+#: panels/info/cc-info-removable-media-panel.c:449
 msgid "Super Video CD"
 msgstr "スーパービデオCD"
 
-#: ../panels/info/cc-info-removable-media-panel.c:470
+#: panels/info/cc-info-removable-media-panel.c:450
 msgid "Video CD"
 msgstr "ビデオCD"
 
-#: ../panels/info/cc-info-removable-media-panel.c:471
+#: panels/info/cc-info-removable-media-panel.c:451
 msgid "Windows software"
 msgstr "Windows ソフトウェア"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/info/gnome-default-apps-panel.desktop.in.in.h:2
-msgid "Defa­ult Applications"
+#: panels/info/cc-subscription-details-dialog.c:125
+msgid "Subscribed"
+msgstr "サブスクライブ済み"
+
+#: panels/info/cc-subscription-details-dialog.c:127
+msgid "No Specific Subscription"
+msgstr "特定のサブスクリプションはありません"
+
+#: panels/info/cc-subscription-details-dialog.c:129
+msgid "Not Subscribed"
+msgstr "サブスクライブなし"
+
+#: panels/info/cc-subscription-details-dialog.c:138
+msgid "Product Name"
+msgstr "製品名"
+
+#: panels/info/cc-subscription-details-dialog.c:139
+msgid "Product ID"
+msgstr "製品 ID"
+
+#: panels/info/cc-subscription-details-dialog.c:140
+msgid "Version"
+msgstr "バージョン"
+
+#: panels/info/cc-subscription-details-dialog.c:141
+msgid "Arch"
+msgstr "Arch"
+
+#: panels/info/cc-subscription-details-dialog.c:142
+msgid "Status"
+msgstr "ステータス"
+
+#: panels/info/cc-subscription-details-dialog.c:146
+msgid "Starts"
+msgstr "開始"
+
+#: panels/info/cc-subscription-details-dialog.c:147
+msgid "Ends"
+msgstr "終了"
+
+#: panels/info/cc-subscription-details-dialog.c:175
+#: panels/info/cc-subscription-details-dialog.ui:9
+#: panels/info/cc-subscription-register-dialog.ui:337
+#: panels/info/cc-subscription-register-dialog.ui:470
+msgid "Registration Details"
+msgstr "登録の詳細"
+
+#: panels/info/cc-subscription-details-dialog.c:188
+msgid "Subscribe System"
+msgstr "システムのサブスクライブ"
+
+#: panels/info/cc-subscription-details-dialog.c:201
+msgid "Looking For Available Subscriptions…"
+msgstr "利用できる全サブスクリプションを検索中..."
+
+#: panels/info/cc-subscription-details-dialog.c:215
+msgid "Unregister System"
+msgstr "システムの登録解除"
+
+#: panels/info/cc-subscription-details-dialog.c:229
+msgid "Unregistering System…"
+msgstr "システムを登録解除中..."
+
+#. the widgets are duplicate to allow sliding between two stack pages
+#: panels/info/cc-subscription-details-dialog.c:252
+#: panels/info/cc-subscription-details-dialog.c:253
+#: panels/info/cc-subscription-details-dialog.c:254
+msgid "No installed products detected."
+msgstr "インストール済みの製品は検出されませんでした。"
+
+#: panels/info/cc-subscription-details-dialog.ui:42
+msgid "_Unregister"
+msgstr "登録解除 (_U)"
+
+#: panels/info/cc-subscription-details-dialog.ui:63
+msgid "_Subscribe"
+msgstr "サブスクライブ (_S)"
+
+#: panels/info/cc-subscription-details-dialog.ui:138
+msgid "Failed to Unregister System"
+msgstr "システムの登録に失敗しました"
+
+#: panels/info/cc-subscription-details-dialog.ui:197
+msgid "This system is subscribed to receive software updates."
+msgstr "このシステムは、ソフトウェア更新を受け取るためにサブスクライブ済みです。"
+
+#: panels/info/cc-subscription-details-dialog.ui:215
+msgid ""
+"This system lacks subscriptions to receive updates for some installed "
+"software."
+msgstr "このシステムでは、インストールされている一部のソフトウェアの更新を受信するためのサブスクリプションが欠落しています。"
+
+#: panels/info/cc-subscription-details-dialog.ui:233
+msgid "This system lacks subscriptions to receive software updates."
+msgstr "このシステムには、ソフトウェア更新を受信するためのサブスクリプションが欠落しています。"
+
+#: panels/info/cc-subscription-details-dialog.ui:251
+msgid "This system is registered to receive software updates."
+msgstr "このシステムは、ソフトウェア更新を受信するために登録されています。"
+
+#: panels/info/cc-subscription-details-dialog.ui:269
+msgid "This system has no supported software installed."
+msgstr "このシステムには、対応ソフトウェアがインストールされていません。"
+
+#: panels/info/cc-subscription-details-dialog.ui:303
+msgid "_Unregister…"
+msgstr "登録解除...(_U)"
+
+#: panels/info/cc-subscription-details-dialog.ui:324
+msgid "_Subscribe…"
+msgstr "サブスクライブ...(_S)"
+
+#: panels/info/cc-subscription-details-dialog.ui:357
+msgid ""
+"Subscribing with Red Hat will allow this system to receive software updates."
+msgstr "Red Hat のサブスクライブ登録を行うと、このシステムはソフトウェアの更新を受け取ることができます。"
+
+#: panels/info/cc-subscription-details-dialog.ui:391
+msgid ""
+"Warning: unregistering this system will result in it no longer receiving "
+"software updates."
+msgstr "警告: このシステムの登録を解除すると、ソフトウェアの更新を受けられなくなります。"
+
+#: panels/info/cc-subscription-register-dialog.c:81
+#: panels/info/cc-subscription-register-dialog.ui:9
+msgid "Register System"
+msgstr "システムの登録"
+
+#: panels/info/cc-subscription-register-dialog.c:88
+msgid "Registering System…"
+msgstr "システムを登録中..."
+
+#: panels/info/cc-subscription-register-dialog.ui:37
+msgid "_Register"
+msgstr "登録(_R)"
+
+#: panels/info/cc-subscription-register-dialog.ui:107
+msgid "Failed to Register System"
+msgstr "システムの登録に失敗しました"
+
+#: panels/info/cc-subscription-register-dialog.ui:159
+msgid "Register this system with Red Hat to receive software updates."
+msgstr "このシステムは、ソフトウェア更新を受信するために Red Hat に登録されています。"
+
+#: panels/info/cc-subscription-register-dialog.ui:179
+msgid "Registration Server"
+msgstr "登録サービス"
+
+#: panels/info/cc-subscription-register-dialog.ui:199
+msgid "Red Hat"
+msgstr "Red Hat"
+
+#: panels/info/cc-subscription-register-dialog.ui:212
+msgid "Custom Address"
+msgstr "カスタムアドレス"
+
+#: panels/info/cc-subscription-register-dialog.ui:236
+msgid "_URL"
+msgstr "URL(_U)"
+
+#: panels/info/cc-subscription-register-dialog.ui:270
+msgid "Registration Type"
+msgstr "登録タイプ"
+
+#: panels/info/cc-subscription-register-dialog.ui:289
+msgid "Red Hat Account"
+msgstr "Red Hat アカウント"
+
+#: panels/info/cc-subscription-register-dialog.ui:302
+msgid "Activation Keys"
+msgstr "アクティベーションキー"
+
+#: panels/info/cc-subscription-register-dialog.ui:355
+msgid "_Login"
+msgstr "ログイン(_R)"
+
+#: panels/info/cc-subscription-register-dialog.ui:388
+#: 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/sharing.ui:351
+#: panels/user-accounts/data/account-dialog.ui:300
+#: panels/user-accounts/data/account-dialog.ui:525
+#: panels/user-accounts/data/user-accounts-dialog.ui:205
+msgid "_Password"
+msgstr "パスワード(_P)"
+
+#: panels/info/cc-subscription-register-dialog.ui:427
+#: panels/info/cc-subscription-register-dialog.ui:540
+msgid "_Organization"
+msgstr "組織(_O)"
+
+#: panels/info/cc-subscription-register-dialog.ui:487
+msgid ""
+"Enter comma separated activation key(s). If the activation keys have "
+"conflicting settings, the rightmost key takes precedence."
+msgstr "アクティベーションキーをコンマで区切って入力します。アクティベーションキーの設定が競合する場合は、右端のキーが優先されます。"
+
+#: panels/info/cc-subscription-register-dialog.ui:508
+msgid "_Activation Keys"
+msgstr "アクティベーションキー(_A)"
+
+#: panels/info/gnome-default-apps-panel.desktop.in.in:3
+msgid "Default Applications"
 msgstr "既定のアプリケーション"
 
-#: ../panels/info/gnome-default-apps-panel.desktop.in.in.h:3
+#: panels/info/gnome-default-apps-panel.desktop.in.in:4
 msgid "Configure Default Applications"
 msgstr "既定のアプリケーションを設定します"
 
-#. Translators: those are keywords for the Default Applications panel
-#: ../panels/info/gnome-default-apps-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/info/gnome-default-apps-panel.desktop.in.in:7
+msgid "starred"
+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/info/gnome-default-apps-panel.desktop.in.in:19
 msgid "default;application;preferred;media;"
-msgstr ""
-"default;application;preferred;media;デフォルト;既定;アプリケーション;メディ"
-"ア;"
+msgstr "default;application;preferred;media;デフォルト;既定;アプリケーション;メディア;"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/info/gnome-info-overview-panel.desktop.in.in.h:2
-msgid "Ab­out"
+#: panels/info/gnome-info-overview-panel.desktop.in.in:3
+msgid "About"
 msgstr "情報"
 
-#: ../panels/info/gnome-info-overview-panel.desktop.in.in.h:3
-#: ../panels/info/gnome-info-panel.desktop.in.in.h:3
+#: panels/info/gnome-info-overview-panel.desktop.in.in:4
 msgid "View information about your system"
 msgstr "システム情報を表示します。"
 
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/info/gnome-info-overview-panel.desktop.in.in:7
+msgid "help-about"
+msgstr "help-about"
+
+#. Translators: Search terms to find the About panel.
+#. Do NOT translate or localize the semicolons!
+#. 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.h:5
-#: ../panels/info/gnome-info-panel.desktop.in.in.h:5
+#: 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;デバイス;システ"
-"ム;情報;メモリ;プロセッサ;バージョン;デフォルト;アプリケーション;設定;オー"
-"ディオ;音声;音楽;ミュージック;ビデオ;動画;ディスク;リムーバブルメディア;媒体;"
-"自動起動;オートラン;Details;詳細;"
-
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/info/gnome-info-panel.desktop.in.in.h:2
-msgid "De­tails"
-msgstr "詳細"
+msgstr 
"device;system;information;memory;processor;version;default;application;preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;デバイス;システム;情報;メモリ;プロセッサ;バージョン;デフォルト;アプリケーション;設定;オーディオ;音声;音楽;ミュージック;ビデオ;動画;ディスク;リムーバブルメディア;媒体;自動起動;オートラン;Details;詳細;"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/info/gnome-removable-media-panel.desktop.in.in.h:2
-msgid "Remo­vable Media"
+#: panels/info/gnome-removable-media-panel.desktop.in.in:3
+msgid "Removable Media"
 msgstr "リムーバブルメディア"
 
-#: ../panels/info/gnome-removable-media-panel.desktop.in.in.h:3
+#: panels/info/gnome-removable-media-panel.desktop.in.in:4
 msgid "Configure Removable Media settings"
 msgstr "リムーバブルメディアを設定します"
 
-#. Translators: those are keywords for the Removable Media panel
-#: ../panels/info/gnome-removable-media-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/info/gnome-removable-media-panel.desktop.in.in:7
+msgid "media-removable"
+msgstr "media-removable"
+
+#. 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
 msgid ""
 "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;デバイス;システム;デフォルト;既定;アプリケーション;設"
-"定;オーディオ;音声;音楽;ミュージック;ビデオ;動画;ディスク;リムーバブルメディ"
-"ア;媒体;自動起動;オートラン;"
+msgstr 
"device;system;default;application;preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;デバイス;システム;デフォルト;既定;アプリケーション;設定;オーディオ;音声;音楽;ミュージック;ビデオ;動画;ディスク;リムーバブルメディア;媒体;自動起動;オートラン;"
 
-#: ../panels/info/info-default-apps.ui.h:1
+#: panels/info/info-default-apps.ui:31
 msgid "_Web"
 msgstr "ウェブ(_W)"
 
-#: ../panels/info/info-default-apps.ui.h:2
+#: panels/info/info-default-apps.ui:43
 msgid "_Mail"
 msgstr "メール(_M)"
 
-#: ../panels/info/info-default-apps.ui.h:3
+#: panels/info/info-default-apps.ui:59
 msgid "_Calendar"
 msgstr "カレンダー(_C)"
 
-#: ../panels/info/info-default-apps.ui.h:4
+#: panels/info/info-default-apps.ui:75
 msgid "M_usic"
 msgstr "音楽(_U)"
 
-#: ../panels/info/info-default-apps.ui.h:5
+#: panels/info/info-default-apps.ui:91
 msgid "_Video"
 msgstr "ビデオ(_V)"
 
-#: ../panels/info/info-default-apps.ui.h:6
-#: ../panels/info/info-removable-media.ui.h:5
+#: panels/info/info-default-apps.ui:162 panels/info/info-removable-media.ui:161
 msgid "_Photos"
 msgstr "写真(_P)"
 
-#: ../panels/info/info-overview.ui.h:1
+#: panels/info/info-overview.ui:61
 msgid "Device name"
 msgstr "デバイス名"
 
-#: ../panels/info/info-overview.ui.h:2
+#: panels/info/info-overview.ui:77
 msgid "Memory"
 msgstr "メモリ"
 
-#: ../panels/info/info-overview.ui.h:3
+#: panels/info/info-overview.ui:93
 msgid "Processor"
 msgstr "プロセッサ"
 
-#: ../panels/info/info-overview.ui.h:4
+#: panels/info/info-overview.ui:109
 msgid "Graphics"
 msgstr "グラフィック"
 
-#. To translators: this field contains the distro name and version
-#: ../panels/info/info-overview.ui.h:6
-msgid "OS name"
-msgstr "OS 名"
-
 #. To translators: this field contains the distro type
-#: ../panels/info/info-overview.ui.h:8
+#: panels/info/info-overview.ui:140
 msgid "OS type"
 msgstr "OSの種類"
 
-#: ../panels/info/info-overview.ui.h:9
+#: panels/info/info-overview.ui:156
 msgid "Virtualization"
 msgstr "仮想化"
 
-#: ../panels/info/info-overview.ui.h:10
+#: panels/info/info-overview.ui:172
 msgid "Disk"
 msgstr "ディスク"
 
-#: ../panels/info/info-overview.ui.h:11
+#: panels/info/info-overview.ui:277
 msgid "Calculating…"
 msgstr "計算中…"
 
-#: ../panels/info/info-overview.ui.h:12
-msgid "Check for updates"
-msgstr "更新の確認"
+#: panels/info/info-overview.ui:333
+msgid "System Not Registered"
+msgstr "システムは登録されていません"
+
+#: panels/info/info-overview.ui:345
+msgid "Register this system to receive software updates."
+msgstr "ソフトウェア更新を受信するために、このシステムを登録します。"
+
+#: panels/info/info-overview.ui:355
+msgid "_Register…"
+msgstr "登録...(_R)"
+
+#: panels/info/info-overview.ui:388
+msgid "Registered System"
+msgstr "登録済みシステム"
+
+#: panels/info/info-overview.ui:404
+msgid "System is registered and able to receive software updates."
+msgstr "システムは登録されているため、ソフトウェア更新を受け取ることが可能です。"
+
+#: panels/info/info-overview.ui:418
+msgid "System is registered but is unable to receive all software updates."
+msgstr "システムは登録されていますが、すべてのソフトウェア更新を受信できません。"
 
-#: ../panels/info/info-removable-media.ui.h:1
+#: panels/info/info-overview.ui:433
+msgid "_Details"
+msgstr "詳細(_D)"
+
+#: panels/info/info-overview.ui:457
+msgid "_View Updates"
+msgstr "詳細を表示(_V)"
+
+#: panels/info/info-removable-media.ui:43
 msgid "Select how media should be handled"
 msgstr "メディアの処理方法を選択してください"
 
-#: ../panels/info/info-removable-media.ui.h:2
+#: panels/info/info-removable-media.ui:74
 msgid "CD _audio"
 msgstr "CD オーディオ(_A)"
 
-#: ../panels/info/info-removable-media.ui.h:3
+#: panels/info/info-removable-media.ui:91
 msgid "_DVD video"
 msgstr "DVD ビデオ(_D)"
 
-#: ../panels/info/info-removable-media.ui.h:4
+#: panels/info/info-removable-media.ui:132
 msgid "_Music player"
 msgstr "音楽プレイヤー(_M)"
 
-#: ../panels/info/info-removable-media.ui.h:6
+#: panels/info/info-removable-media.ui:190
 msgid "_Software"
 msgstr "ソフトウェア(_S)"
 
-#: ../panels/info/info-removable-media.ui.h:7
+#: panels/info/info-removable-media.ui:228
 msgid "_Other Media…"
 msgstr "他のメディア(_O)…"
 
-#: ../panels/info/info-removable-media.ui.h:8
+#: panels/info/info-removable-media.ui:272
 msgid "_Never prompt or start programs on media insertion"
-msgstr ""
-"メディア挿入時にどう処理するか確認したり、プログラムを実行したりしない(_N)"
+msgstr "メディア挿入時にどう処理するか確認したり、プログラムを実行したりしない(_N)"
 
-#: ../panels/info/info-removable-media.ui.h:9
+#: panels/info/info-removable-media.ui:331
 msgid "Select how other media should be handled"
 msgstr "他のメディアの処理を選択してください"
 
-#: ../panels/info/info-removable-media.ui.h:10
+#: panels/info/info-removable-media.ui:370
 msgid "_Action:"
 msgstr "アクション(_A):"
 
-#: ../panels/info/info-removable-media.ui.h:11
+#: panels/info/info-removable-media.ui:393
 msgid "_Type:"
 msgstr "種類(_T):"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:1
+#: panels/keyboard/00-multimedia.xml.in:2
 msgid "Sound and Media"
 msgstr "音とメディア"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:2
+#: panels/keyboard/00-multimedia.xml.in:4
 msgid "Volume mute"
 msgstr "ミュートにする"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:3
+#: panels/keyboard/00-multimedia.xml.in:6
 msgid "Volume down"
 msgstr "音量を下げる"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:4
+#: panels/keyboard/00-multimedia.xml.in:8
 msgid "Volume up"
 msgstr "音量を上げる"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:5
+#: panels/keyboard/00-multimedia.xml.in:10
 msgid "Launch media player"
 msgstr "メディアプレイヤーを起動"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:6
+#: panels/keyboard/00-multimedia.xml.in:12
 msgid "Play (or play/pause)"
 msgstr "再生 (あるいは再生/一時停止)"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:7
+#: panels/keyboard/00-multimedia.xml.in:14
 msgid "Pause playback"
 msgstr "再生を一時停止"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:8
+#: panels/keyboard/00-multimedia.xml.in:16
 msgid "Stop playback"
 msgstr "再生を停止"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:9
+#: panels/keyboard/00-multimedia.xml.in:18
 msgid "Previous track"
 msgstr "前のトラック"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:10
+#: panels/keyboard/00-multimedia.xml.in:20
 msgid "Next track"
 msgstr "次のトラック"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:11
+#: panels/keyboard/00-multimedia.xml.in:22
 msgid "Eject"
 msgstr "取り出し"
 
-#: ../panels/keyboard/01-input-sources.xml.in.h:1
-#: ../panels/universal-access/uap.ui.h:12
+#: panels/keyboard/01-input-sources.xml.in:4 panels/universal-access/uap.ui:576
 msgid "Typing"
 msgstr "タイピング"
 
-#: ../panels/keyboard/01-input-sources.xml.in.h:2
+#: panels/keyboard/01-input-sources.xml.in:8
 msgid "Switch to next input source"
 msgstr "次の入力ソースへ切り替える"
 
-#: ../panels/keyboard/01-input-sources.xml.in.h:3
+#: panels/keyboard/01-input-sources.xml.in:13
 msgid "Switch to previous input source"
 msgstr "前の入力ソースへ切り替える"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:1
+#: panels/keyboard/01-launchers.xml.in:2
 msgid "Launchers"
 msgstr "ランチャー"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:2
+#: panels/keyboard/01-launchers.xml.in:4
 msgid "Launch help browser"
 msgstr "ヘルプブラウザーを起動"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:1590
-#: ../shell/cc-window.c:251 ../shell/cc-window.c:794
-#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1
+#: panels/keyboard/01-launchers.xml.in:6 shell/cc-window.c:220
+#: shell/cc-window.c:756 shell/gnome-control-center.desktop.in.in:3
+#: shell/window.ui:125
 msgid "Settings"
 msgstr "設定"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:4
+#: panels/keyboard/01-launchers.xml.in:8
 msgid "Launch calculator"
 msgstr "電卓を起動"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:5
+#: panels/keyboard/01-launchers.xml.in:10
 msgid "Launch email client"
 msgstr "メールクライアントを起動"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:6
+#: panels/keyboard/01-launchers.xml.in:12
 msgid "Launch web browser"
 msgstr "ウェブブラウザーを起動"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:7
+#: panels/keyboard/01-launchers.xml.in:14
 msgid "Home folder"
 msgstr "ホームフォルダー"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:8
+#: panels/keyboard/01-launchers.xml.in:16
+#: panels/search/gnome-search-panel.desktop.in.in:3 shell/window.ui:157
+msgid "Search"
+msgstr "検索"
+
+#: panels/keyboard/01-launchers.xml.in:16
 msgctxt "keybinding"
 msgid "Search"
 msgstr "検索"
 
-#: ../panels/keyboard/01-screenshot.xml.in.h:1
+#: panels/keyboard/01-screenshot.xml.in:2
 msgid "Screenshots"
 msgstr "スクリーンショット"
 
-#. translators: $PICTURES will be replaced by the name of the XDG Pictures directory
-#: ../panels/keyboard/01-screenshot.xml.in.h:3
+#: panels/keyboard/01-screenshot.xml.in:6
 msgid "Save a screenshot to $PICTURES"
 msgstr "スクリーンショットを$PICTURESフォルダーに保存する"
 
-#. translators: $PICTURES will be replaced by the name of the XDG Pictures directory
-#: ../panels/keyboard/01-screenshot.xml.in.h:5
+#: panels/keyboard/01-screenshot.xml.in:10
 msgid "Save a screenshot of a window to $PICTURES"
 msgstr "ウィンドウのスクリーンショットを$PICTURESフォルダーに保存する"
 
-#. translators: $PICTURES will be replaced by the name of the XDG Pictures directory
-#: ../panels/keyboard/01-screenshot.xml.in.h:7
+#: panels/keyboard/01-screenshot.xml.in:14
 msgid "Save a screenshot of an area to $PICTURES"
 msgstr "選択領域のスクリーンショットを$PICTURESフォルダーに保存する"
 
-#: ../panels/keyboard/01-screenshot.xml.in.h:8
+#: panels/keyboard/01-screenshot.xml.in:17
 msgid "Copy a screenshot to clipboard"
 msgstr "スクリーンショットをクリップボードにコピーする"
 
-#: ../panels/keyboard/01-screenshot.xml.in.h:9
+#: panels/keyboard/01-screenshot.xml.in:20
 msgid "Copy a screenshot of a window to clipboard"
 msgstr "ウィンドウのスクリーンショットをクリップボードにコピーする"
 
-#: ../panels/keyboard/01-screenshot.xml.in.h:10
+#: panels/keyboard/01-screenshot.xml.in:23
 msgid "Copy a screenshot of an area to clipboard"
 msgstr "選択領域のスクリーンショットをクリップボードにコピーする"
 
-#: ../panels/keyboard/01-screenshot.xml.in.h:11
+#: panels/keyboard/01-screenshot.xml.in:26
 msgid "Record a short screencast"
 msgstr "スクリーンキャストを撮る"
 
-#: ../panels/keyboard/01-system.xml.in.h:1
+#: panels/keyboard/01-system.xml.in:2
 msgid "System"
 msgstr "システム"
 
-#: ../panels/keyboard/01-system.xml.in.h:2
+#: panels/keyboard/01-system.xml.in:4
 msgid "Log out"
 msgstr "ログアウト"
 
-#: ../panels/keyboard/01-system.xml.in.h:3
+#: panels/keyboard/01-system.xml.in:6
 msgid "Lock screen"
 msgstr "画面をロック"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:1
+#: panels/keyboard/50-accessibility.xml.in:2
+#: panels/universal-access/gnome-universal-access-panel.desktop.in.in:3
 msgid "Universal Access"
 msgstr "ユニバーサルアクセス"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:2
+#: panels/keyboard/50-accessibility.xml.in:4
 msgid "Turn zoom on or off"
 msgstr "ズームのオン/オフを切り替える"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:3
+#: panels/keyboard/50-accessibility.xml.in:6
 msgid "Zoom in"
 msgstr "ズームイン"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:4
+#: panels/keyboard/50-accessibility.xml.in:8
 msgid "Zoom out"
 msgstr "ズームアウト"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:5
+#: panels/keyboard/50-accessibility.xml.in:10
 msgid "Turn screen reader on or off"
 msgstr "スクリーンリーダーのオン/オフを切り替える"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:6
+#: panels/keyboard/50-accessibility.xml.in:12
 msgid "Turn on-screen keyboard on or off"
 msgstr "オンスクリーンキーボードのオン/オフを切り替える"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:7
+#: panels/keyboard/50-accessibility.xml.in:14
 msgid "Increase text size"
 msgstr "文字サイズを拡大"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:8
+#: panels/keyboard/50-accessibility.xml.in:16
 msgid "Decrease text size"
 msgstr "文字サイズを縮小"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:9
+#: panels/keyboard/50-accessibility.xml.in:18
 msgid "High contrast on or off"
 msgstr "ハイコントラストのオン/オフを切り替える"
 
-#: ../panels/keyboard/cc-keyboard-manager.c:506
-#: ../panels/keyboard/cc-keyboard-manager.c:514
-#: ../panels/keyboard/cc-keyboard-manager.c:822
+#: panels/keyboard/cc-keyboard-manager.c:506
+#: panels/keyboard/cc-keyboard-manager.c:514
+#: panels/keyboard/cc-keyboard-manager.c:822
 msgid "Custom Shortcuts"
 msgstr "独自のショートカット"
 
@@ -1826,14 +2000,13 @@ msgstr "独自のショートカット"
 #.
 #. translators:
 #. * The device has been disabled
-#: ../panels/keyboard/cc-keyboard-option.c:276
-#: ../panels/keyboard/cc-keyboard-option.c:395
-#: ../panels/keyboard/keyboard-shortcuts.c:435
-#: ../panels/keyboard/shortcut-editor.ui.h:2
-#: ../panels/network/network-proxy.ui.h:4
-#: ../panels/network/network-wifi.ui.h:31
-#: ../panels/sound/gvc/gvc-mixer-control.c:1866
-#: ../panels/user-accounts/um-fingerprint-dialog.c:214
+#: panels/keyboard/cc-keyboard-option.c:263
+#: panels/keyboard/cc-keyboard-option.c:382
+#: panels/keyboard/keyboard-shortcuts.c:435
+#: panels/keyboard/shortcut-editor.ui:96 panels/network/network-proxy.ui:123
+#: panels/network/network-wifi.ui:782 panels/network/network-wifi.ui:1059
+#: panels/user-accounts/um-fingerprint-dialog.c:211
+#: subprojects/gvc/gvc-mixer-control.c:1866
 msgid "Disabled"
 msgstr "無効"
 
@@ -1841,7 +2014,7 @@ msgstr "無効"
 #. * chooser'. AltGr is often used for this purpose. See
 #. * https://live.gnome.org/Design/SystemSettings/RegionAndLanguage
 #.
-#: ../panels/keyboard/cc-keyboard-option.c:354
+#: panels/keyboard/cc-keyboard-option.c:341
 msgid "Alternative Characters Key"
 msgstr "代替文字キー"
 
@@ -1849,275 +2022,274 @@ msgstr "代替文字キー"
 #. * sequences that are combined to form a single character.
 #. * See http://en.wikipedia.org/wiki/Compose_key
 #.
-#: ../panels/keyboard/cc-keyboard-option.c:363
+#: panels/keyboard/cc-keyboard-option.c:350
 msgid "Compose Key"
 msgstr "Compose キー"
 
-#: ../panels/keyboard/cc-keyboard-option.c:368
+#: panels/keyboard/cc-keyboard-option.c:355
 msgid "Modifiers-only switch to next source"
 msgstr "次の入力ソースへ切り替える (修飾キーのみ)"
 
-#: ../panels/keyboard/cc-keyboard-panel.c:181
+#: panels/keyboard/cc-keyboard-panel.c:181
 msgid "Reset All Shortcuts?"
 msgstr "すべてのショートカットをリセットしますか?"
 
-#: ../panels/keyboard/cc-keyboard-panel.c:184
+#: panels/keyboard/cc-keyboard-panel.c:184
 msgid ""
 "Resetting the shortcuts may affect your custom shortcuts. This cannot be "
 "undone."
-msgstr ""
-"ショートカットをリセットするとカスタムショートカットが影響を受ける可能性があ"
-"ります。 この処理を元に戻すことはできません。"
+msgstr "ショートカットをリセットするとカスタムショートカットが影響を受ける可能性があります。 この処理を元に戻すことはできません。"
 
-#: ../panels/keyboard/cc-keyboard-panel.c:188
-#: ../panels/keyboard/shortcut-editor.ui.h:9
-#: ../panels/printers/authentication-dialog.ui.h:2
-#: ../panels/printers/ppd-selection-dialog.ui.h:2
+#: panels/keyboard/cc-keyboard-panel.c:188
+#: panels/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:189
+#: panels/keyboard/cc-keyboard-panel.c:189
 msgid "Reset All"
 msgstr "すべてリセット"
 
-#: ../panels/keyboard/cc-keyboard-panel.c:281
+#: panels/keyboard/cc-keyboard-panel.c:281
 msgid "Reset the shortcut to its default value"
 msgstr "ショートカットをデフォルトの値にリセットする"
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:427
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:413
 #, c-format
 msgid ""
 "%s is already being used for <b>%s</b>. If you replace it, %s will be "
 "disabled"
-msgstr ""
-"すでに %s は <b>%s</b> のために使われています。もし入れ替えなければ %s が無効"
-"化されます。"
+msgstr "すでに %s は <b>%s</b> のために使われています。もし入れ替えなければ %s が無効化されます。"
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:597
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:583
 msgid "Set Custom Shortcut"
 msgstr "独自のショートカットの設定"
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:597
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:583
 msgid "Set Shortcut"
 msgstr "ショートカットの設定"
 
 #. Setup the top label
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:606
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:592
 #, c-format
 msgid "Enter new shortcut to change <b>%s</b>."
 msgstr "<b>%s</b> の新しいショートカットを入力してください。"
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:1033
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:1019
 msgid "Add Custom Shortcut"
 msgstr "ショートカットの追加"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2
-msgid "Key­board"
+#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:3
+msgid "Keyboard"
 msgstr "キーボード"
 
-#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3
+#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:4
 msgid "View and change keyboard shortcuts and set your typing preferences"
 msgstr "キーボードショートカットの表示や変更、タイピングの設定を行います"
 
-#. Translators: those are keywords for the keyboard control-center panel
-#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:7
+msgid "input-keyboard"
+msgstr "input-keyboard"
+
+#. 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;"
-"ショートカット;ワークスペース;ウィンドウ;リサイズ;サイズ変更;ズーム;コントラ"
-"スト;入力;インプット;ソース;ロック;ボリューム;音量;"
+msgstr 
"Shortcut;Workspace;Window;Resize;Zoom;Contrast;Input;Source;Lock;Volume;ショートカット;ワークスペース;ウィンドウ;リサイズ;サイズ変更;ズーム;コントラスト;入力;インプット;ソース;ロック;ボリューム;音量;"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:1
-#: ../panels/region/input-options.ui.h:4 ../shell/cc-application.c:251
+#: panels/keyboard/gnome-keyboard-panel.ui:67 panels/region/input-options.ui:68
+#: shell/cc-application.c:255
 msgid "Keyboard Shortcuts"
 msgstr "キーボードショートカット"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2
+#: panels/keyboard/gnome-keyboard-panel.ui:77
 msgid "Reset All…"
 msgstr "すべてリセット…"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:3
+#: panels/keyboard/gnome-keyboard-panel.ui:78
 msgid "Reset all shortcuts to their default keybindings"
 msgstr "すべてのショートカットをデフォルトのキーバインディングにリセットする"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
+#: panels/keyboard/gnome-keyboard-panel.ui:164
 msgid "No keyboard shortcut found"
 msgstr "キーボードショートカットがありません"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5 ../shell/panel-list.ui.h:4
+#: panels/keyboard/gnome-keyboard-panel.ui:175 shell/panel-list.ui:206
 msgid "Try a different search"
 msgstr "別の検索を試す"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:1
+#: panels/keyboard/shortcut-editor.ui:68 panels/keyboard/shortcut-editor.ui:318
 msgid "Press Esc to cancel or Backspace to reset the keyboard shortcut."
-msgstr ""
-"Esc でキャンセル、Backspace でキーボードショートカットをリセットできます。"
+msgstr "Esc でキャンセル、Backspace でキーボードショートカットをリセットできます。"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:3
-#: ../panels/printers/details-dialog.ui.h:1
-#: ../panels/sound/gvc-mixer-dialog.c:1493
-#: ../panels/sound/gvc-sound-theme-chooser.c:564
+#: panels/keyboard/shortcut-editor.ui:156 panels/printers/details-dialog.ui:38
+#: panels/sound/gvc-mixer-dialog.c:1480
+#: panels/sound/gvc-sound-theme-chooser.c:554
 msgid "Name"
 msgstr "名前"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:4
+#: panels/keyboard/shortcut-editor.ui:168
 msgid "Command"
 msgstr "コマンド"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:5
+#: panels/keyboard/shortcut-editor.ui:180
 msgid "Shortcut"
 msgstr "ショートカット"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:6
+#: panels/keyboard/shortcut-editor.ui:259
 msgid "Set Shortcut…"
 msgstr "ショートカットの設定…"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:7
-#: ../panels/network/network-wifi.ui.h:20
+#: panels/keyboard/shortcut-editor.ui:272 panels/network/network-wifi.ui:594
 msgid "None"
 msgstr "何もしない"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:8
+#: panels/keyboard/shortcut-editor.ui:303
 msgid "Enter the new shortcut"
 msgstr "新しいショートカットキーを入力してください"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:10
+#: panels/keyboard/shortcut-editor.ui:357
 msgid "Remove"
 msgstr "削除"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:11
+#: panels/keyboard/shortcut-editor.ui:367
 msgid "Add"
 msgstr "追加"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:12
+#: panels/keyboard/shortcut-editor.ui:382
 msgid "Replace"
 msgstr "入れ替え"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:13
+#: panels/keyboard/shortcut-editor.ui:395
 msgid "Set"
 msgstr "設定"
 
 # Button Label
-#: ../panels/mouse/cc-mouse-panel.c:82 ../panels/wacom/cc-wacom-panel.c:402
+#: panels/mouse/cc-mouse-panel.c:82 panels/wacom/cc-wacom-panel.c:441
 msgid "Test Your _Settings"
 msgstr "設定を確認する(_S)"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2
-msgid "Mouse & Touch­pad"
+#: panels/mouse/gnome-mouse-panel.desktop.in.in:3
+msgid "Mouse & Touchpad"
 msgstr "マウスとタッチパッド"
 
-#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3
+#: panels/mouse/gnome-mouse-panel.desktop.in.in:4
 msgid ""
 "Change your mouse or touchpad sensitivity and select right or left-handed"
 msgstr "マウスやタッチパッドの感度の変更、利き手の選択をします"
 
-#. Translators: those are keywords for the mouse and touchpad control-center panel
-#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/mouse/gnome-mouse-panel.desktop.in.in:7
+msgid "input-mouse"
+msgstr "input-mouse"
+
+#. 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;トラックパッド;ポインター;"
-"クリック;タップ;ダブル;ボタン;トラックボール;スクロール;Mouse;Touchpad;マウ"
-"ス;タッチパッド;"
+msgstr 
"Trackpad;Pointer;Click;Tap;Double;Button;Trackball;トラックパッド;ポインター;クリック;タップ;ダブル;ボタン;トラックボール;スクロール;Mouse;Touchpad;マウス;タッチパッド;"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:1
+#: panels/mouse/gnome-mouse-properties.ui:45
 msgid "General"
 msgstr "全般"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:2
+#: panels/mouse/gnome-mouse-properties.ui:83
 msgid "Primary Button"
 msgstr "主ボタン"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:3
+#: panels/mouse/gnome-mouse-properties.ui:102
 msgid "Sets the order of physical buttons on mice and touchpads."
 msgstr "マウス、タッチパッドのボタンの順位を設定します。"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:4
+#: panels/mouse/gnome-mouse-properties.ui:131
 msgid "Left"
 msgstr "左"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:5
+#: panels/mouse/gnome-mouse-properties.ui:141
 msgid "Right"
 msgstr "右"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:6
+#: panels/mouse/gnome-mouse-properties.ui:177
 msgid "Mouse"
 msgstr "マウス"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:7
+#: panels/mouse/gnome-mouse-properties.ui:216
 msgid "Mouse Speed"
 msgstr "マウスの速度"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:8
+#: panels/mouse/gnome-mouse-properties.ui:238
+#: panels/mouse/gnome-mouse-properties.ui:543
 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/gnome-mouse-properties.ui.h:10
+#: panels/mouse/gnome-mouse-properties.ui:275
+#: panels/mouse/gnome-mouse-properties.ui:451
 msgid "Natural Scrolling"
 msgstr "ナチュラルスクロール"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:11
+#: panels/mouse/gnome-mouse-properties.ui:291
+#: panels/mouse/gnome-mouse-properties.ui:467
 msgid "Scrolling moves the content, not the view."
 msgstr "スクロールする方向にコンテンツが移動します。"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:12
+#: panels/mouse/gnome-mouse-properties.ui:341
+#: panels/mouse/gnome-mouse-properties.ui:386
 msgid "Touchpad"
 msgstr "タッチパッド"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:13
+#: panels/mouse/gnome-mouse-properties.ui:522
 msgid "Touchpad Speed"
 msgstr "タッチパッドの速度"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:14
+#: panels/mouse/gnome-mouse-properties.ui:581
 msgid "Tap to Click"
 msgstr "タップでクリックする"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:15
+#: panels/mouse/gnome-mouse-properties.ui:634
 msgid "Two-finger Scrolling"
 msgstr "2本指でのスクロール"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:16
+#: panels/mouse/gnome-mouse-properties.ui:687
 msgid "Edge Scrolling"
 msgstr "エッジスクロール"
 
-#: ../panels/mouse/gnome-mouse-test.c:130
-#: ../panels/mouse/gnome-mouse-test.ui.h:1
+#: panels/mouse/gnome-mouse-test.c:130 panels/mouse/gnome-mouse-test.ui:23
 msgid "Try clicking, double clicking, scrolling"
 msgstr "クリック、ダブルクリック、スクロールを試してください"
 
-#: ../panels/mouse/gnome-mouse-test.c:135
+#: panels/mouse/gnome-mouse-test.c:135
 msgid "Five clicks, GEGL time!"
 msgstr "クリック 5 回、GEGLタイム"
 
-#: ../panels/mouse/gnome-mouse-test.c:140
+#: panels/mouse/gnome-mouse-test.c:140
 msgid "Double click, primary button"
 msgstr "ダブルクリック、主ボタン"
 
-#: ../panels/mouse/gnome-mouse-test.c:140
+#: panels/mouse/gnome-mouse-test.c:140
 msgid "Single click, primary button"
 msgstr "シングルクリック、主ボタン"
 
-#: ../panels/mouse/gnome-mouse-test.c:143
+#: panels/mouse/gnome-mouse-test.c:143
 msgid "Double click, middle button"
 msgstr "ダブルクリック、中央ボタン"
 
-#: ../panels/mouse/gnome-mouse-test.c:143
+#: panels/mouse/gnome-mouse-test.c:143
 msgid "Single click, middle button"
 msgstr "シングルクリック、中央ボタン"
 
-#: ../panels/mouse/gnome-mouse-test.c:146
+#: panels/mouse/gnome-mouse-test.c:146
 msgid "Double click, secondary button"
 msgstr "ダブルクリック、副ボタン"
 
-#: ../panels/mouse/gnome-mouse-test.c:146
+#: panels/mouse/gnome-mouse-test.c:146
 msgid "Single click, secondary button"
 msgstr "シングルクリック、副ボタン"
 
 #. add proxy to device list
-#: ../panels/network/cc-network-panel.c:579
+#: panels/network/cc-network-panel.c:583
 msgid "Network proxy"
 msgstr "ネットワークプロキシ"
 
@@ -2125,598 +2297,610 @@ msgstr "ネットワークプロキシ"
 #. * window for vpn connections, it is also used to display
 #. * vpn connections in the device list.
 #.
-#: ../panels/network/cc-network-panel.c:715 ../panels/network/net-vpn.c:192
-#: ../panels/network/net-vpn.c:321
+#: panels/network/cc-network-panel.c:719 panels/network/net-vpn.c:170
+#: panels/network/net-vpn.c:299
 #, c-format
 msgid "%s VPN"
 msgstr "%s VPN"
 
-#: ../panels/network/cc-network-panel.c:779 ../panels/network/wifi.ui.h:7
+#: panels/network/cc-network-panel.c:810 panels/network/wifi.ui:282
 msgid "Oops, something has gone wrong. Please contact your software vendor."
 msgstr "問題に遭遇しました。ソフトウェアベンダーに報告してください。"
 
-#: ../panels/network/cc-network-panel.c:785
+#: panels/network/cc-network-panel.c:816
 msgid "NetworkManager needs to be running."
 msgstr "NetworkManager が動作している必要があります。"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/network/cc-wifi-panel.c:209
-#: ../panels/network/gnome-wifi-panel.desktop.in.in.h:2
-#: ../panels/network/network-wifi.ui.h:58
+#: panels/network/cc-wifi-panel.c:213
+#: panels/network/gnome-wifi-panel.desktop.in.in:3
+#: panels/network/network-wifi.ui:1769
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../panels/network/connection-editor/8021x-security-page.ui.h:1
+#: panels/network/connection-editor/8021x-security-page.ui:26
 msgid "802.1x _Security"
 msgstr "802.1x セキュリティ(_S)"
 
-#: ../panels/network/connection-editor/8021x-security-page.ui.h:2
-#: ../panels/network/connection-editor/security-page.ui.h:2
-#: ../panels/wacom/wacom-stylus-page.ui.h:8
+#: panels/network/connection-editor/8021x-security-page.ui:73
+#: panels/network/connection-editor/security-page.ui:72
+#: panels/wacom/wacom-stylus-page.ui:108
 msgid "page 1"
 msgstr "ページ1"
 
-#: ../panels/network/connection-editor/8021x-security-page.ui.h:3
-#: ../panels/network/connection-editor/security-page.ui.h:3
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:4
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:4
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h: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.h:4
-#: ../panels/network/connection-editor/security-page.ui.h:4
+#: 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.h:5
-#: ../panels/network/connection-editor/security-page.ui.h:5
-#: ../panels/wacom/wacom-stylus-page.ui.h:16
+#: panels/network/connection-editor/8021x-security-page.ui:281
+#: panels/network/connection-editor/security-page.ui:280
+#: panels/wacom/wacom-stylus-page.ui:426
 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.h:3
-#: ../panels/network/network-wifi.ui.h:6
+#: 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
 msgid "Security"
 msgstr "セキュリティ"
 
-#: ../panels/network/connection-editor/ce-page.c:481
+#: panels/network/connection-editor/ce-page.c:481
 msgid "automatic"
 msgstr "自動"
 
-#: ../panels/network/connection-editor/ce-page.c:521
+#: panels/network/connection-editor/ce-page.c:521
 #, 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:231
-#: ../panels/network/net-device-wifi.c:407
+#: panels/network/connection-editor/ce-page-details.c:56
+#: panels/network/net-device-wifi.c:235 panels/network/net-device-wifi.c:468
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:60
-#: ../panels/network/net-device-wifi.c:235
-#: ../panels/network/net-device-wifi.c:412
-#: ../panels/network/network-wifi.ui.h:19
+#: panels/network/connection-editor/ce-page-details.c:60
+#: panels/network/net-device-wifi.c:239 panels/network/net-device-wifi.c:473
+#: panels/network/network-wifi.ui:593
 msgid "WPA"
 msgstr "WPA"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:64
-#: ../panels/network/net-device-wifi.c:239
+#: panels/network/connection-editor/ce-page-details.c:64
+#: panels/network/net-device-wifi.c:243
 msgid "WPA2"
 msgstr "WPA2"
 
 #. TRANSLATORS: this Enterprise WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:69
-#: ../panels/network/net-device-wifi.c:244
+#: panels/network/connection-editor/ce-page-details.c:69
+#: panels/network/net-device-wifi.c:248
 msgid "Enterprise"
 msgstr "Enterprise"
 
-#: ../panels/network/connection-editor/ce-page-details.c:74
-#: ../panels/network/net-device-wifi.c:249
-#: ../panels/network/net-device-wifi.c:397
+#: panels/network/connection-editor/ce-page-details.c:74
+#: panels/network/net-device-wifi.c:253 panels/network/net-device-wifi.c:458
 msgctxt "Wifi security"
 msgid "None"
 msgstr "なし"
 
-#: ../panels/network/connection-editor/ce-page-details.c:95
-#: ../panels/power/power.ui.h:17
+#: panels/network/connection-editor/ce-page-details.c:95
+#: panels/power/power.ui:99
 msgid "Never"
 msgstr "しない"
 
-#: ../panels/network/connection-editor/ce-page-details.c:110
-#: ../panels/network/net-device-ethernet.c:120
-#: ../panels/network/net-device-wifi.c:505
+#: panels/network/connection-editor/ce-page-details.c:110
+#: panels/network/net-device-ethernet.c:121
+#: panels/network/net-device-wifi.c:567
 #, c-format
 msgid "%i day ago"
 msgid_plural "%i days ago"
 msgstr[0] "%i 日前"
 
 #. Translators: network device speed
-#: ../panels/network/connection-editor/ce-page-details.c:176
-#: ../panels/network/net-device-ethernet.c:50
-#: ../panels/network/net-device-wifi.c:561
+#: panels/network/connection-editor/ce-page-details.c:225
+#: panels/network/net-device-ethernet.c:50 panels/network/net-device-wifi.c:646
 #, c-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: ../panels/network/connection-editor/ce-page-details.c:202
-#: ../panels/network/net-device-wifi.c:590
+#: panels/network/connection-editor/ce-page-details.c:251
+#: panels/network/net-device-wifi.c:675
 msgctxt "Signal strength"
 msgid "None"
 msgstr "なし"
 
-#: ../panels/network/connection-editor/ce-page-details.c:204
-#: ../panels/network/net-device-wifi.c:592
+#: panels/network/connection-editor/ce-page-details.c:253
+#: panels/network/net-device-wifi.c:677
 msgctxt "Signal strength"
 msgid "Weak"
 msgstr "弱い"
 
-#: ../panels/network/connection-editor/ce-page-details.c:206
-#: ../panels/network/net-device-wifi.c:594
+#: panels/network/connection-editor/ce-page-details.c:255
+#: panels/network/net-device-wifi.c:679
 msgctxt "Signal strength"
 msgid "Ok"
 msgstr "OK"
 
-#: ../panels/network/connection-editor/ce-page-details.c:208
-#: ../panels/network/net-device-wifi.c:596
+#: panels/network/connection-editor/ce-page-details.c:257
+#: panels/network/net-device-wifi.c:681
 msgctxt "Signal strength"
 msgid "Good"
 msgstr "良い"
 
-#: ../panels/network/connection-editor/ce-page-details.c:210
-#: ../panels/network/net-device-wifi.c:598
+#: panels/network/connection-editor/ce-page-details.c:259
+#: panels/network/net-device-wifi.c:683
 msgctxt "Signal strength"
 msgid "Excellent"
 msgstr "非常に良い"
 
-#: ../panels/network/connection-editor/ce-page-details.c:248
+#: panels/network/connection-editor/ce-page-details.c:302
 msgid "Forget Connection"
 msgstr "接続情報を破棄"
 
-#: ../panels/network/connection-editor/ce-page-details.c:250
+#: panels/network/connection-editor/ce-page-details.c:304
 msgid "Remove Connection Profile"
 msgstr "接続プロファイルを削除"
 
-#: ../panels/network/connection-editor/ce-page-details.c:252
+#: panels/network/connection-editor/ce-page-details.c:306
 msgid "Remove VPN"
 msgstr "VPNを削除"
 
-#: ../panels/network/connection-editor/ce-page-details.c:280
-#: ../panels/network/network-wifi.ui.h:46 ../shell/cc-window.c:243
-#: ../shell/panel-list.ui.h:2
+#: panels/network/connection-editor/ce-page-details.c:334
+#: panels/network/network-wifi.ui:1456 shell/cc-window.c:212
+#: shell/panel-list.ui:103
 msgid "Details"
 msgstr "詳細"
 
-#: ../panels/network/connection-editor/ce-page-ethernet.c:173
-#: ../panels/network/connection-editor/ce-page-vpn.c:188
-#: ../panels/network/connection-editor/ce-page-wifi.c:194
-#: ../panels/network/network-wifi.ui.h:47
+#: panels/network/connection-editor/ce-page-ethernet.c:174
+#: panels/network/connection-editor/ce-page-vpn.c:188
+#: panels/network/connection-editor/ce-page-wifi.c:194
+#: panels/network/network-wifi.ui:1460
 msgid "Identity"
 msgstr "Identity"
 
-#: ../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:251
+#: panels/network/connection-editor/ce-page-ip6.c:230
 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:422
+#: panels/network/connection-editor/ce-page-ip6.c:390
 msgid "Delete Route"
 msgstr "ルートを削除"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:896
-#: ../panels/network/network-wifi.ui.h:48
+#: panels/network/connection-editor/ce-page-ip4.c:899
+#: panels/network/network-wifi.ui:1464
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:827
-#: ../panels/network/network-wifi.ui.h:49
+#: panels/network/connection-editor/ce-page-ip6.c:831
+#: panels/network/network-wifi.ui:1468
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../panels/network/connection-editor/ce-page-security.c:245
+#: panels/network/connection-editor/ce-page-security.c:245
 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:268
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit キー (HEX または ASCII)"
 
-#: ../panels/network/connection-editor/ce-page-security.c:278
+#: panels/network/connection-editor/ce-page-security.c:278
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit パスフレーズ"
 
-#: ../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:291
+#: panels/network/wireless-security/wireless-security.c:465
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../panels/network/connection-editor/ce-page-security.c:304
+#: panels/network/connection-editor/ce-page-security.c:304
 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:318
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: ../panels/network/connection-editor/ce-page-security.c:332
+#: panels/network/connection-editor/ce-page-security.c:332
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: ../panels/network/connection-editor/details-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:4
+#: 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.h:2
-#: ../panels/network/network-wifi.ui.h:5
+#: panels/network/connection-editor/details-page.ui:52
+#: panels/network/network-wifi.ui:207
 msgid "Link speed"
 msgstr "リンクの速度"
 
-#: ../panels/network/connection-editor/details-page.ui.h:4
-#: ../panels/network/net-device-ethernet.c:153
-#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644
+#: panels/network/connection-editor/details-page.ui:104
+#: panels/network/net-device-ethernet.c:154 panels/network/network-wifi.ui:256
+#: panels/network/panel-common.c:644
 msgid "IPv4 Address"
 msgstr "IPv4 アドレス"
 
-#: ../panels/network/connection-editor/details-page.ui.h:5
-#: ../panels/network/net-device-ethernet.c:154
-#: ../panels/network/net-device-ethernet.c:158
-#: ../panels/network/network-mobile.ui.h:4
-#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645
+#: panels/network/connection-editor/details-page.ui:122
+#: panels/network/net-device-ethernet.c:155
+#: panels/network/net-device-ethernet.c:159
+#: 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.h:6
-#: ../panels/network/net-device-ethernet.c:161
-#: ../panels/network/network-wifi.ui.h:9
+#: panels/network/connection-editor/details-page.ui:140
+#: panels/network/net-device-ethernet.c:162 panels/network/network-wifi.ui:290
 msgid "Hardware Address"
 msgstr "ハードウェアアドレス"
 
-#: ../panels/network/connection-editor/details-page.ui.h:7
-#: ../panels/network/net-device-ethernet.c:165
-#: ../panels/network/network-mobile.ui.h:5
-#: ../panels/network/network-wifi.ui.h:10
+#: panels/network/connection-editor/details-page.ui:158
+#: panels/network/net-device-ethernet.c:166
+#: panels/network/network-mobile.ui:206 panels/network/network-wifi.ui:307
 msgid "Default Route"
 msgstr "デフォルトルート"
 
-#: ../panels/network/connection-editor/details-page.ui.h:8
-#: ../panels/network/connection-editor/ip4-page.ui.h:10
-#: ../panels/network/connection-editor/ip6-page.ui.h:11
-#: ../panels/network/net-device-ethernet.c:167
-#: ../panels/network/network-mobile.ui.h:6
-#: ../panels/network/network-wifi.ui.h:11
+#: 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:168
+#: panels/network/network-mobile.ui:224 panels/network/network-wifi.ui:325
+#: panels/network/network-wifi.ui:832 panels/network/network-wifi.ui:1109
 msgid "DNS"
 msgstr "DNS"
 
-#: ../panels/network/connection-editor/details-page.ui.h:9
+#: panels/network/connection-editor/details-page.ui:195
 msgid "Last Used"
 msgstr "前回の使用"
 
-#: ../panels/network/connection-editor/details-page.ui.h:10
+#: panels/network/connection-editor/details-page.ui:324
 msgid "Connect _automatically"
 msgstr "自動接続する(_A)"
 
-#: ../panels/network/connection-editor/details-page.ui.h:11
+#: panels/network/connection-editor/details-page.ui:343
 msgid "Make available to _other users"
 msgstr "他のユーザーも利用可能(_O)"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:1
-#: ../panels/network/connection-editor/ip4-page.ui.h:11
-#: ../panels/network/connection-editor/ip6-page.ui.h:2
-#: ../panels/network/net-proxy.c:58 ../panels/network/network-proxy.ui.h:2
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:1
-#: ../panels/privacy/cc-privacy-panel.c:217
+#: 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:217
 msgid "Automatic"
 msgstr "自動"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:2
+#: panels/network/connection-editor/ethernet-page.ui:19
 msgid "Twisted Pair (TP)"
 msgstr "ツイストペア (TP)"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:3
+#: panels/network/connection-editor/ethernet-page.ui:22
 msgid "Attachment Unit Interface (AUI)"
 msgstr "Attachment Unit Interface (AUI)"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:4
+#: panels/network/connection-editor/ethernet-page.ui:25
 msgid "BNC"
 msgstr "BNC"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:5
+#: panels/network/connection-editor/ethernet-page.ui:28
 msgid "Media Independent Interface (MII)"
 msgstr "Media Independent Interface (MII)"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:6
+#: panels/network/connection-editor/ethernet-page.ui:42
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:7
+#: panels/network/connection-editor/ethernet-page.ui:45
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:8
+#: panels/network/connection-editor/ethernet-page.ui:48
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:9
+#: panels/network/connection-editor/ethernet-page.ui:51
 msgid "10 Gb/s"
 msgstr "10 Gb/s"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:10
-#: ../panels/network/connection-editor/vpn-page.ui.h:1
+#: 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.h:11
-#: ../panels/network/connection-editor/wifi-page.ui.h:4
-#: ../panels/network/network-wifi.ui.h:38
+#: panels/network/connection-editor/ethernet-page.ui:100
+#: panels/network/connection-editor/wifi-page.ui:68
+#: panels/network/network-wifi.ui:1261
 msgid "_MAC Address"
 msgstr "MAC アドレス(_M)"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:12
+#: panels/network/connection-editor/ethernet-page.ui:146
 msgid "M_TU"
 msgstr "MTU(_T)"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:13
-#: ../panels/network/connection-editor/wifi-page.ui.h:5
+#: panels/network/connection-editor/ethernet-page.ui:163
+#: panels/network/connection-editor/wifi-page.ui:98
 msgid "_Cloned Address"
 msgstr "クローンしたアドレス(_C)"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:14
+#: panels/network/connection-editor/ethernet-page.ui:178
 msgid "bytes"
 msgstr "バイト"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:1
+#: panels/network/connection-editor/ip4-page.ui:27
 msgid "IPv_4 Method"
 msgstr "IPv4 メソッド(_4)"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:2
-#: ../panels/network/network-wifi.ui.h:27
+#: panels/network/connection-editor/ip4-page.ui:42
+#: panels/network/network-wifi.ui:778 panels/network/network-wifi.ui:1055
 msgid "Automatic (DHCP)"
 msgstr "自動 (DHCP)"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:3
-#: ../panels/network/connection-editor/ip6-page.ui.h:4
+#: panels/network/connection-editor/ip4-page.ui:55
+#: panels/network/connection-editor/ip6-page.ui:69
 msgid "Link-Local Only"
 msgstr "リンクローカルのみ"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:5
-#: ../panels/network/connection-editor/ip6-page.ui.h:6
+#: panels/network/connection-editor/ip4-page.ui:83
+#: panels/network/connection-editor/ip6-page.ui:97
 msgid "Disable"
 msgstr "無効"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:6
-#: ../panels/network/connection-editor/ip6-page.ui.h:7
+#: panels/network/connection-editor/ip4-page.ui:111
+#: panels/network/connection-editor/ip6-page.ui:125
 msgid "Addresses"
 msgstr "アドレス"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:7
-#: ../panels/network/connection-editor/ip6-page.ui.h:8
-#: ../panels/printers/details-dialog.ui.h:3
+#: 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:87
 msgid "Address"
 msgstr "アドレス"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:8
+#: panels/network/connection-editor/ip4-page.ui:143
+#: panels/network/connection-editor/ip4-page.ui:327
 msgid "Netmask"
 msgstr "ネットマスク"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:9
-#: ../panels/network/connection-editor/ip6-page.ui.h:10
+#: 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
 msgid "Gateway"
 msgstr "ゲートウェイ"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:12
-#: ../panels/network/connection-editor/ip6-page.ui.h:12
+#: panels/network/connection-editor/ip4-page.ui:220
+#: panels/network/connection-editor/ip6-page.ui:234
 msgid "Automatic DNS"
 msgstr "自動 DNS"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:13
-#: ../panels/network/connection-editor/ip6-page.ui.h:13
+#: panels/network/connection-editor/ip4-page.ui:244
+#: panels/network/connection-editor/ip6-page.ui:258
 msgid "Separate IP addresses with commas"
 msgstr "複数の IP アドレスを指定する場合はそれぞれコンマで区切ってください"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:14
-#: ../panels/network/connection-editor/ip6-page.ui.h:14
-#: ../panels/network/network-wifi.ui.h:32
+#: panels/network/connection-editor/ip4-page.ui:265
+#: panels/network/connection-editor/ip6-page.ui:279
+#: panels/network/network-wifi.ui:877 panels/network/network-wifi.ui:1154
 msgid "Routes"
 msgstr "ルート"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:15
-#: ../panels/network/connection-editor/ip6-page.ui.h:15
+#: panels/network/connection-editor/ip4-page.ui:288
+#: panels/network/connection-editor/ip6-page.ui:302
 msgid "Automatic Routes"
 msgstr "自動ルート"
 
 #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking)
-#: ../panels/network/connection-editor/ip4-page.ui.h:17
-#: ../panels/network/connection-editor/ip6-page.ui.h:17
+#: panels/network/connection-editor/ip4-page.ui:354
+#: panels/network/connection-editor/ip6-page.ui:368
 msgid "Metric"
 msgstr "メトリック"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:18
-#: ../panels/network/connection-editor/ip6-page.ui.h:18
-#: ../panels/network/network-wifi.ui.h:34
+#: panels/network/connection-editor/ip4-page.ui:384
+#: panels/network/connection-editor/ip6-page.ui:398
+#: panels/network/network-wifi.ui:933 panels/network/network-wifi.ui:1210
 msgid "Use this connection _only for resources on its network"
 msgstr "この接続はネットワーク上のリソースのためだけに使用(_O)"
 
-#: ../panels/network/connection-editor/ip6-page.ui.h:1
+#: panels/network/connection-editor/ip6-page.ui:27
 msgid "IPv_6 Method"
 msgstr "IPv6 メソッド(_6)"
 
-#: ../panels/network/connection-editor/ip6-page.ui.h:3
+#: panels/network/connection-editor/ip6-page.ui:55
 msgid "Automatic, DHCP only"
 msgstr "自動、DHCP のみ"
 
-#: ../panels/network/connection-editor/ip6-page.ui.h:9
+#: panels/network/connection-editor/ip6-page.ui:157
+#: panels/network/connection-editor/ip6-page.ui:341
 msgid "Prefix"
 msgstr "プレフィックス"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:273
+#: panels/network/connection-editor/net-connection-editor.c:273
 msgid "Unable to open connection editor"
 msgstr "接続エディターを起動できません"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:291
+#: panels/network/connection-editor/net-connection-editor.c:291
 msgid "New Profile"
 msgstr "新規プロファイル"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:603
-#: ../panels/network/network.ui.h:2
+#: panels/network/connection-editor/net-connection-editor.c:603
+#: panels/network/network.ui:142
 msgid "VPN"
 msgstr "VPN"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:751
+#: panels/network/connection-editor/net-connection-editor.c:751
 msgid "Import from file…"
 msgstr "ファイルからインポート…"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:785
+#: panels/network/connection-editor/net-connection-editor.c:785
 msgid "Add VPN"
 msgstr "VPNの追加"
 
-#: ../panels/network/connection-editor/security-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:16
+#: panels/network/connection-editor/security-page.ui:26
+#: panels/network/network-wifi.ui:529
 msgid "S_ecurity"
 msgstr "セキュリティ(_E)"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:141
+#: panels/network/connection-editor/vpn-helpers.c:141
 msgid "Cannot import VPN connection"
 msgstr "VPN 接続をインポートできません"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:143
+#: panels/network/connection-editor/vpn-helpers.c:143
 #, c-format
 msgid ""
 "The file “%s” could not be read or does not contain recognized VPN "
 "connection information\n"
 "\n"
 "Error: %s."
-msgstr ""
-"ファイル “%s” は読み込めなかったか、または処理できる VPN 接続情報がありませ"
-"ん\n"
+msgstr "ファイル “%s” は読み込めなかったか、または処理できる VPN 接続情報がありません\n"
 "\n"
 "エラー: %s"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:178
+#: panels/network/connection-editor/vpn-helpers.c:178
 msgid "Select file to import"
 msgstr "インポートするファイルを選択する"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:182
-#: ../panels/printers/pp-details-dialog.c:320
-#: ../panels/sharing/cc-sharing-panel.c:383
-#: ../panels/user-accounts/um-photo-dialog.c:222
+#: panels/network/connection-editor/vpn-helpers.c:182
+#: panels/printers/pp-details-dialog.c:332
+#: panels/sharing/cc-sharing-panel.c:393
+#: panels/user-accounts/um-photo-dialog.c:231
 msgid "_Open"
 msgstr "開く(_O)"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:230
+#: panels/network/connection-editor/vpn-helpers.c:230
 #, 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:232
 msgid "_Replace"
 msgstr "入れ替え(_R)"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:234
+#: panels/network/connection-editor/vpn-helpers.c:234
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "%s を、保存している VPN 接続に入れ替えますか?"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:270
+#: panels/network/connection-editor/vpn-helpers.c:270
 msgid "Cannot export VPN connection"
 msgstr "VPN 接続をエクスポートできません"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:272
+#: panels/network/connection-editor/vpn-helpers.c:272
 #, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
 "\n"
 "Error: %s."
-msgstr ""
-"VPN 接続 \"%s\" は %s にエクスポートできませんでした。\n"
+msgstr "VPN 接続 \"%s\" は %s にエクスポートできませんでした。\n"
 "\n"
 "エラー: %s"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:307
+#: panels/network/connection-editor/vpn-helpers.c:307
 msgid "Export VPN connection"
 msgstr "VPN 接続をエクスポートする"
 
-#: ../panels/network/connection-editor/vpn-page.ui.h:2
+#: panels/network/connection-editor/vpn-page.ui:58
 msgid "(Error: unable to load VPN connection editor)"
 msgstr "(エラー: VPN 接続エディターを読み込めません)"
 
-#: ../panels/network/connection-editor/wifi-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:14
+#: panels/network/connection-editor/wifi-page.ui:20
+#: panels/network/network-wifi.ui:497
 msgid "_SSID"
 msgstr "SSID(_S)"
 
-#: ../panels/network/connection-editor/wifi-page.ui.h:2
-#: ../panels/network/network-wifi.ui.h:15
+#: panels/network/connection-editor/wifi-page.ui:36
+#: panels/network/network-wifi.ui:513
 msgid "_BSSID"
 msgstr "BSSID(_B)"
 
-#: ../panels/network/connection-editor/wifi-page.ui.h:3
-#: ../panels/network/network-wifi.ui.h:18
+#: panels/network/connection-editor/wifi-page.ui:53
+#: panels/network/network-wifi.ui:562
 msgid "My Home Network"
 msgstr "マイホームネットワーク"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:2
-msgid "Net­work"
+#: panels/network/gnome-network-panel.desktop.in.in:3
+#: panels/network/network-mobile.ui:241
+msgid "Network"
 msgstr "ネットワーク"
 
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:3
+#: panels/network/gnome-network-panel.desktop.in.in:4
 msgid "Control how you connect to the Internet"
 msgstr "ネットワークへの接続方法を設定します。"
 
-#. Translators: those are keywords for the network control-center panel
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/network/gnome-network-panel.desktop.in.in:7
+msgid "network-workgroup"
+msgstr "network-workgroup"
+
+#. Translators: Search terms to find the Network panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#: panels/network/gnome-network-panel.desktop.in.in:19
 msgid ""
 "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;"
 "DNS;"
-msgstr ""
-"Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;"
-"DNS;ネットワーク;インターネット;無線;ワイヤレス;有線;プロキシー;プロキシ;ブ"
-"ロードバンド;モデム;ブルートゥース;VPN;ドメイン名;ドメインネームサーバー;"
+msgstr 
"Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;DNS;ネットワーク;インターネット;無線;ワイヤレス;有線;プロキシー;プロキシ;ブロードバンド;モデム;ブルートゥース;VPN;ドメイン名;ドメインネームサーバー;"
 
-#: ../panels/network/gnome-wifi-panel.desktop.in.in.h:3
+#: panels/network/gnome-wifi-panel.desktop.in.in:4
 msgid "Control how you connect to Wi-Fi networks"
 msgstr "Wi-Fi ネットワークへの接続方法を設定します。"
 
-#. Translators: those are keywords for the wi-fi control-center panel
-#: ../panels/network/gnome-wifi-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/network/gnome-wifi-panel.desktop.in.in:7
+msgid "network-wireless"
+msgstr "network-wireless"
+
+#. Translators: Search terms to find the Wi-Fi panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+#: panels/network/gnome-wifi-panel.desktop.in.in:19
 msgid "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Broadband;DNS;"
-msgstr ""
-"Network;Wireless;Wi-Fi;Wifi;IP;LAN;Broadband;DNS;ネットワーク;無線;ワイヤレ"
-"ス;ブロードバンド;"
+msgstr "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Broadband;DNS;ネットワーク;無線;ワイヤレス;ブロードバンド;"
 
-#: ../panels/network/net-device-ethernet.c:106
-#: ../panels/network/net-device-wifi.c:491
+#: panels/network/net-device-ethernet.c:107
+#: panels/network/net-device-wifi.c:553
 msgid "never"
 msgstr "未接続"
 
-#: ../panels/network/net-device-ethernet.c:116
-#: ../panels/network/net-device-wifi.c:501
+#: panels/network/net-device-ethernet.c:117
+#: panels/network/net-device-wifi.c:563
 msgid "today"
 msgstr "今日"
 
-#: ../panels/network/net-device-ethernet.c:118
-#: ../panels/network/net-device-wifi.c:503
+#: panels/network/net-device-ethernet.c:119
+#: panels/network/net-device-wifi.c:565
 msgid "yesterday"
 msgstr "昨日"
 
-#: ../panels/network/net-device-ethernet.c:156
-#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647
-#: ../panels/network/panel-common.c:649
+#: panels/network/net-device-ethernet.c:157
+#: 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:172
-#: ../panels/network/network-wifi.ui.h:12
+#: panels/network/net-device-ethernet.c:173 panels/network/network-wifi.ui:342
 msgid "Last used"
 msgstr "最後の利用"
 
@@ -2725,1143 +2909,1095 @@ msgstr "最後の利用"
 #. * profile. It is also used to display ethernet in the
 #. * device list.
 #.
-#: ../panels/network/net-device-ethernet.c:275
-#: ../panels/network/network-ethernet.ui.h:1
-#: ../panels/network/network-simple.ui.h:1
+#: panels/network/net-device-ethernet.c:277
+#: panels/network/network-ethernet.ui:19 panels/network/network-simple.ui:39
 msgid "Wired"
 msgstr "有線"
 
-#: ../panels/network/net-device-ethernet.c:343
-#: ../panels/network/net-device-wifi.c:1792
-#: ../panels/network/network-ethernet.ui.h:2
-#: ../panels/network/network-mobile.ui.h:8
-#: ../panels/network/network-simple.ui.h:3 ../panels/network/network-vpn.ui.h:2
+#: panels/network/net-device-ethernet.c:345
+#: panels/network/net-device-wifi.c:1895 panels/network/network-ethernet.ui:120
+#: panels/network/network-mobile.ui:394 panels/network/network-simple.ui:75
+#: panels/network/network-vpn.ui:79
 msgid "Options…"
 msgstr "オプション…"
 
-#: ../panels/network/net-device-mobile.c:238
+#: panels/network/net-device-mobile.c:238
 msgid "Add new connection"
 msgstr "新規の接続を追加"
 
-#: ../panels/network/net-device-wifi.c:1275
+#: panels/network/net-device-wifi.c:1368
 #, c-format
 msgid "Switching on the wireless hotspot will disconnect you from <b>%s</b>."
-msgstr ""
-"ワイヤレスホットスポットをオンにすると <b>%s</b> の接続が切断されます。"
+msgstr "ワイヤレスホットスポットをオンにすると <b>%s</b> の接続が切断されます。"
 
-#: ../panels/network/net-device-wifi.c:1279
+#: panels/network/net-device-wifi.c:1372
 msgid ""
 "It is not possible to access the Internet through your wireless while the "
 "hotspot is active."
-msgstr ""
-"ホットスポットがアクティブな場合、ワイヤレスによるインターネット接続はできま"
-"せん。"
+msgstr "ホットスポットがアクティブな場合、ワイヤレスによるインターネット接続はできません。"
 
-#: ../panels/network/net-device-wifi.c:1286
+#: panels/network/net-device-wifi.c:1379
 msgid "Turn On Wi-Fi Hotspot?"
 msgstr "Wi-Fi アクセスポイントをオンにしますか?"
 
-#: ../panels/network/net-device-wifi.c:1308
+#: panels/network/net-device-wifi.c:1401
 msgid ""
 "Wi-Fi hotspots are usually used to share an additional Internet connection "
 "over Wi-Fi."
-msgstr ""
-"Wi-Fi アクセスポイント機能は、追加のインターネット接続を Wi-Fi 経由で共有する"
-"ために使用されます。"
+msgstr "Wi-Fi アクセスポイント機能は、追加のインターネット接続を Wi-Fi 経由で共有するために使用されます。"
 
-#: ../panels/network/net-device-wifi.c:1319
+#: panels/network/net-device-wifi.c:1412
 msgid "_Turn On"
 msgstr "オン(_T)"
 
-#: ../panels/network/net-device-wifi.c:1396
+#: panels/network/net-device-wifi.c:1489
 msgid "Stop hotspot and disconnect any users?"
 msgstr "アクセスポイントを停止し、ユーザーを切断しますか?"
 
-#: ../panels/network/net-device-wifi.c:1399
+#: panels/network/net-device-wifi.c:1492
 msgid "_Stop Hotspot"
 msgstr "停止(_S)"
 
-#: ../panels/network/net-device-wifi.c:1496
+#: panels/network/net-device-wifi.c:1592
 msgid "System policy prohibits use as a Hotspot"
 msgstr "システムのポリシーによりホットスポットとしての利用は禁止されています"
 
-#: ../panels/network/net-device-wifi.c:1499
+#: panels/network/net-device-wifi.c:1595
 msgid "Wireless device does not support Hotspot mode"
 msgstr "ワイヤレスデバイスがホットスポットモードに対応していません"
 
-#: ../panels/network/net-device-wifi.c:1630
+#: panels/network/net-device-wifi.c:1733
 msgid ""
 "Network details for the selected networks, including passwords and any "
 "custom configuration will be lost."
 msgstr "パスワードや独自の設定など、 選択したネットワークの詳細は失われます。"
 
-#: ../panels/network/net-device-wifi.c:1634
-#: ../panels/network/network-wifi.ui.h:42
+#: panels/network/net-device-wifi.c:1737 panels/network/network-wifi.ui:1362
 msgid "_Forget"
 msgstr "破棄(_F)"
 
-#: ../panels/network/net-device-wifi.c:1943
-#: ../panels/network/net-device-wifi.c:1950
+#: panels/network/net-device-wifi.c:2046 panels/network/net-device-wifi.c:2053
 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:1983
+#: panels/network/net-device-wifi.c:2086
 msgctxt "Wi-Fi Network"
 msgid "_Forget"
 msgstr "破棄(_F)"
 
 #. TRANSLATORS: this is when the use leaves the PAC textbox blank
-#: ../panels/network/net-proxy.c:102
+#: panels/network/net-proxy.c:102
 msgid ""
 "Web Proxy Autodiscovery is used when a Configuration URL is not provided."
-msgstr ""
-"設定ファイルの URL が指定されていない場合 Web Proxy Autodiscovery が使用され"
-"ます。"
+msgstr "設定ファイルの URL が指定されていない場合 Web Proxy Autodiscovery が使用されます。"
 
 #. TRANSLATORS: WPAD is bad: if you enable it on an untrusted
 #. * 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:110
 msgid "This is not recommended for untrusted public networks."
 msgstr "信頼できない公衆ネットワークでは推奨されません。"
 
-#: ../panels/network/network-mobile.ui.h:1
+#: panels/network/network-mobile.ui:30
 msgid "IMEI"
 msgstr "IMEI"
 
-#: ../panels/network/network-mobile.ui.h:2
+#: panels/network/network-mobile.ui:48
 msgid "Provider"
 msgstr "プロバイダー"
 
-#: ../panels/network/network-mobile.ui.h:7
-msgid "Network"
-msgstr "ネットワーク"
-
-#: ../panels/network/network-proxy.ui.h:1
+#: panels/network/network-proxy.ui:47 panels/network/network-proxy.ui:92
 msgid "Network Proxy"
 msgstr "ネットワークプロキシ"
 
-#: ../panels/network/network-proxy.ui.h:5
+#: panels/network/network-proxy.ui:173
 msgid "_HTTP Proxy"
 msgstr "HTTP プロキシ(_H)"
 
-#: ../panels/network/network-proxy.ui.h:6
+#: panels/network/network-proxy.ui:192
 msgid "H_TTPS Proxy"
 msgstr "HTTPS プロキシ(_T)"
 
-#: ../panels/network/network-proxy.ui.h:7
+#: panels/network/network-proxy.ui:211
 msgid "_FTP Proxy"
 msgstr "FTP プロキシ(_F)"
 
-#: ../panels/network/network-proxy.ui.h:8
+#: panels/network/network-proxy.ui:230
 msgid "_Socks Host"
 msgstr "Socks ホスト(_S)"
 
-#: ../panels/network/network-proxy.ui.h:9
+#: panels/network/network-proxy.ui:249
 msgid "_Ignore Hosts"
 msgstr "次のホストを無視する(_I)"
 
-#: ../panels/network/network-proxy.ui.h:10
+#: panels/network/network-proxy.ui:287
 msgid "HTTP proxy port"
 msgstr "HTTP プロキシポート"
 
-#: ../panels/network/network-proxy.ui.h:11
+#: panels/network/network-proxy.ui:364
 msgid "HTTPS proxy port"
 msgstr "HTTPS プロキシポート"
 
-#: ../panels/network/network-proxy.ui.h:12
+#: panels/network/network-proxy.ui:385
 msgid "FTP proxy port"
 msgstr "FTP プロキシポート"
 
-#: ../panels/network/network-proxy.ui.h:13
+#: panels/network/network-proxy.ui:406
 msgid "Socks proxy port"
 msgstr "Socks プロキシポート"
 
-#: ../panels/network/network-proxy.ui.h:14
+#: panels/network/network-proxy.ui:435
 msgid "_Configuration URL"
 msgstr "設定 URL(_C)"
 
-#: ../panels/network/network-simple.ui.h:2
+#: panels/network/network-simple.ui:50
 msgid "Turn device off"
 msgstr "デバイスをオフにする"
 
-#. Translators: The found device is a printer connected via Bluetooth
-#: ../panels/network/network.ui.h:1
-#: ../panels/printers/pp-new-printer-dialog.c:1816
-msgid "Bluetooth"
-msgstr "Bluetooth"
-
-#: panels/network/network.ui:68
+#: panels/network/network.ui:101
 msgid "Other Devices"
 msgstr "その他のデバイス"
 
-#: ../panels/network/network.ui.h:3
+#: panels/network/network.ui:194
 msgid "Not set up"
 msgstr "未設定"
 
-#: ../panels/network/network-vpn.ui.h:1
+#: panels/network/network-vpn.ui:56
 msgid "Turn VPN connection off"
 msgstr "VPN 接続をオフにする"
 
-#: ../panels/network/network-wifi.ui.h:3
+#: panels/network/network-wifi.ui:127
 msgid "Automatic _Connect"
 msgstr "自動接続(_C)"
 
-#: ../panels/network/network-wifi.ui.h:13
+#: panels/network/network-wifi.ui:474
 msgid "details"
 msgstr "詳細"
 
-#: ../panels/network/network-wifi.ui.h:17
-#: ../panels/network/wireless-security/eap-method-leap.ui.h:2
-#: ../panels/network/wireless-security/eap-method-simple.ui.h:2
-#: ../panels/network/wireless-security/ws-leap.ui.h:2
-#: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1
-#: ../panels/sharing/sharing.ui.h:9
-#: ../panels/user-accounts/data/account-dialog.ui.h:12
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
-msgid "_Password"
-msgstr "パスワード(_P)"
-
-#: ../panels/network/network-wifi.ui.h:21
+#: panels/network/network-wifi.ui:622
 msgid "Show P_assword"
 msgstr "パスワードを表示(_A)"
 
-#: ../panels/network/network-wifi.ui.h:22
+#: panels/network/network-wifi.ui:652
 msgid "Make available to other users"
 msgstr "他のユーザーに利用可能にする"
 
-#: ../panels/network/network-wifi.ui.h:23
+#: panels/network/network-wifi.ui:680
 msgid "identity"
 msgstr "識別情報"
 
-#: ../panels/network/network-wifi.ui.h:24
+#: panels/network/network-wifi.ui:714
 msgid "IPv_4"
 msgstr "IPv4(_4)"
 
-#: ../panels/network/network-wifi.ui.h:25
+#: panels/network/network-wifi.ui:755 panels/network/network-wifi.ui:1032
 msgid "_Addresses"
 msgstr "アドレス(_A)"
 
-#: ../panels/network/network-wifi.ui.h:28
+#: panels/network/network-wifi.ui:779 panels/network/network-wifi.ui:1056
 msgid "Automatic (DHCP) addresses only"
 msgstr "自動 (DHCP) アドレスのみ"
 
-#: ../panels/network/network-wifi.ui.h:29
+#: panels/network/network-wifi.ui:780 panels/network/network-wifi.ui:1057
 msgid "Link-local only"
 msgstr "リンクローカルのみ"
 
-#: ../panels/network/network-wifi.ui.h:30
+#: panels/network/network-wifi.ui:781 panels/network/network-wifi.ui:1058
 msgid "Shared with other computers"
 msgstr "他のコンピューターと共有する"
 
-#: ../panels/network/network-wifi.ui.h:33
+#: panels/network/network-wifi.ui:917 panels/network/network-wifi.ui:1194
 msgid "_Ignore automatically obtained routes"
 msgstr "自動的に得られたルートを無視する(_I)"
 
-#: ../panels/network/network-wifi.ui.h:35
+#: panels/network/network-wifi.ui:960
 msgid "ipv4"
 msgstr "ipv4"
 
-#: ../panels/network/network-wifi.ui.h:36
+#: panels/network/network-wifi.ui:991
 msgid "IPv_6"
 msgstr "IPv6(_6)"
 
-#: ../panels/network/network-wifi.ui.h:37
+#: panels/network/network-wifi.ui:1237
 msgid "ipv6"
 msgstr "ipv6"
 
-#: ../panels/network/network-wifi.ui.h:39
+#: panels/network/network-wifi.ui:1277
 msgid "_Cloned MAC Address"
 msgstr "クローンしたMACアドレス(_C)"
 
-#: ../panels/network/network-wifi.ui.h:40
+#: panels/network/network-wifi.ui:1327
 msgid "hardware"
 msgstr "ハードウェア"
 
-#: ../panels/network/network-wifi.ui.h:41
+#: panels/network/network-wifi.ui:1346
 msgid "_Reset"
 msgstr "リセット(_R)"
 
-#: ../panels/network/network-wifi.ui.h:43
+#: panels/network/network-wifi.ui:1382
 msgid ""
 "Reset the settings for this connection to their defaults, but remember as a "
 "preferred connection."
-msgstr ""
-"この接続の設定をデフォルトにリセットしますが、推奨接続であることは記憶しま"
-"す。"
+msgstr "この接続の設定をデフォルトにリセットしますが、推奨接続であることは記憶します。"
 
-#: ../panels/network/network-wifi.ui.h:44
+#: panels/network/network-wifi.ui:1399
 msgid ""
 "Remove all details relating to this network and do not try to automatically "
 "connect to it."
-msgstr ""
-"このネットワークに関する詳細はすべて削除して、自動的に接続しないようにしま"
-"す。"
+msgstr "このネットワークに関する詳細はすべて削除して、自動的に接続しないようにします。"
 
-#: ../panels/network/network-wifi.ui.h:45
+#: panels/network/network-wifi.ui:1419
 msgid "reset"
 msgstr "リセット"
 
-#: ../panels/network/network-wifi.ui.h:50
+#: panels/network/network-wifi.ui:1472
 msgid "Hardware"
 msgstr "ハードウェア"
 
-#: ../panels/network/network-wifi.ui.h:51
+#: panels/network/network-wifi.ui:1476
 msgctxt "tab"
 msgid "Reset"
 msgstr "リセット"
 
-#: ../panels/network/network-wifi.ui.h:52
+#: panels/network/network-wifi.ui:1537
 msgid "Wi-Fi Hotspot"
 msgstr "Wi-Fi アクセスポイント"
 
-#: ../panels/network/network-wifi.ui.h:53
+#: panels/network/network-wifi.ui:1554
 msgid "Switch off to connect to a Wi-Fi network"
 msgstr "Wi-Fiネットワークへ接続するためスイッチをオフ"
 
-#: ../panels/network/network-wifi.ui.h:54
+#: panels/network/network-wifi.ui:1603
 msgid "Network Name"
 msgstr "ネットワーク名"
 
-#: ../panels/network/network-wifi.ui.h:55
+#: panels/network/network-wifi.ui:1621
 msgid "Connected Devices"
 msgstr "接続しているデバイス"
 
-#: ../panels/network/network-wifi.ui.h:56
+#: panels/network/network-wifi.ui:1639
 msgid "Security type"
 msgstr "セキュリティタイプ"
 
-#: ../panels/network/network-wifi.ui.h:57
-#: ../panels/printers/authentication-dialog.ui.h:5
-#: ../panels/printers/new-printer-dialog.ui.h:14
-#: ../panels/user-accounts/data/account-dialog.ui.h:9
+#: panels/network/network-wifi.ui:1702
+msgctxt "Wi-Fi passkey"
 msgid "Password"
 msgstr "パスワード"
 
-#: ../panels/network/network-wifi.ui.h:59
+#: panels/network/network-wifi.ui:1799
 msgid "Turn Wi-Fi off"
 msgstr "Wi-Fi をオフにする"
 
-#: ../panels/network/network-wifi.ui.h:60
+#: panels/network/network-wifi.ui:1831
 msgid "_Connect to Hidden Network…"
 msgstr "非表示のネットワークに接続(_C)…"
 
-#: ../panels/network/network-wifi.ui.h:61
+#: panels/network/network-wifi.ui:1841
 msgid "_Turn On Wi-Fi Hotspot…"
 msgstr "Wi-Fi アクセスポイントをオンにする(_T)"
 
-#: ../panels/network/network-wifi.ui.h:62
+#: panels/network/network-wifi.ui:1851
 msgid "_Known Wi-Fi Networks"
 msgstr "既知の Wi-Fi ネットワーク(_K)"
 
-#: ../panels/network/wifi.ui.h:1
-msgid "Make sure you have a Wi-Fi adapter plugged and turned on"
-msgstr "Wi-Fi アダプターが装着されオンになっていることを確認してください"
-
-#: ../panels/network/wifi.ui.h:2
+#: panels/network/wifi.ui:40
 msgid "No Wi-Fi Adapter Found"
 msgstr "Wi-Fi アダプターが見つかりません"
 
-#: ../panels/network/wifi.ui.h:3
+#: panels/network/wifi.ui:52
+msgid "Make sure you have a Wi-Fi adapter plugged and turned on"
+msgstr "Wi-Fi アダプターが装着されオンになっていることを確認してください"
+
+#: panels/network/wifi.ui:127
 msgid "Airplane Mode"
 msgstr "機内モード(_P)"
 
-#: ../panels/network/wifi.ui.h:4
+#: panels/network/wifi.ui:142
 msgid "Disables Wi-Fi, Bluetooth and mobile broadband"
 msgstr "Wi-Fi, Bluetooth および モバイルブロードバンドを無効にします"
 
-#: ../panels/network/wifi.ui.h:5
+#: panels/network/wifi.ui:192
 msgid "Visible Networks"
 msgstr "ネットワーク一覧"
 
-#: ../panels/network/wifi.ui.h:6
+#: panels/network/wifi.ui:271
 msgid "NetworkManager needs to be running"
 msgstr "NetworkManager が動作している必要があります"
 
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:127
+#: panels/network/panel-common.c:127
 msgid "Ad-hoc"
 msgstr "アドホック"
 
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:131
+#: 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:147 panels/network/panel-common.c:201
 msgid "Status unknown"
 msgstr "ステータス不明"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:151
+#: panels/network/panel-common.c:151
 msgid "Unmanaged"
 msgstr "管理対象外"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:155
+#: panels/network/panel-common.c:155
 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:165 panels/network/panel-common.c:207
 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:169 panels/network/panel-common.c:211
 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:173 panels/network/panel-common.c:215
 msgid "Connected"
 msgstr "接続済み"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:177
+#: panels/network/panel-common.c:177
 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:181 panels/network/panel-common.c:219
 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:185 panels/network/panel-common.c:227
 msgid "Status unknown (missing)"
 msgstr "ステータス不明 (見つからない)"
 
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:223
+#: 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:248
 msgid "Configuration failed"
 msgstr "設定に失敗しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:252
+#: panels/network/panel-common.c:252
 msgid "IP configuration failed"
 msgstr "IP設定に失敗しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:256
+#: panels/network/panel-common.c:256
 msgid "IP configuration expired"
 msgstr "IP設定の期限切れ"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:260
+#: panels/network/panel-common.c:260
 msgid "Secrets were required, but not provided"
 msgstr "秘密の情報が必要でしたが入力されませんでした"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:264
+#: panels/network/panel-common.c:264
 msgid "802.1x supplicant disconnected"
 msgstr "802.1x サプリカントが切断されました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:268
+#: panels/network/panel-common.c:268
 msgid "802.1x supplicant configuration failed"
 msgstr "802.1x サプリカントの設定に失敗しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:272
+#: panels/network/panel-common.c:272
 msgid "802.1x supplicant failed"
 msgstr "802.1x サプリカントが失敗しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:276
+#: panels/network/panel-common.c:276
 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:280
 msgid "PPP service failed to start"
 msgstr "PPPサービスの起動に失敗しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:284
+#: panels/network/panel-common.c:284
 msgid "PPP service disconnected"
 msgstr "PPPサービスの接続を切断しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:288
+#: panels/network/panel-common.c:288
 msgid "PPP failed"
 msgstr "PPP が失敗しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:292
+#: panels/network/panel-common.c:292
 msgid "DHCP client failed to start"
 msgstr "DHCPクライアントの起動に失敗しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:296
+#: panels/network/panel-common.c:296
 msgid "DHCP client error"
 msgstr "DHCPクライアントにエラーが発生しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:300
+#: panels/network/panel-common.c:300
 msgid "DHCP client failed"
 msgstr "DHCPクライアントが失敗しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:304
+#: panels/network/panel-common.c:304
 msgid "Shared connection service failed to start"
 msgstr "共有接続サービスの起動に失敗しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:308
+#: panels/network/panel-common.c:308
 msgid "Shared connection service failed"
 msgstr "共有接続サービスが失敗しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:312
+#: panels/network/panel-common.c:312
 msgid "AutoIP service failed to start"
 msgstr "AutoIP サービスの起動に失敗しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:316
+#: panels/network/panel-common.c:316
 msgid "AutoIP service error"
 msgstr "AutoIP サービスにエラーが発生しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:320
+#: panels/network/panel-common.c:320
 msgid "AutoIP service failed"
 msgstr "AutoIP サービスが失敗しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:324
+#: panels/network/panel-common.c:324
 msgid "Line busy"
 msgstr "回線が使用中です"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:328
+#: panels/network/panel-common.c:328
 msgid "No dial tone"
 msgstr "発信音がありません"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:332
+#: panels/network/panel-common.c:332
 msgid "No carrier could be established"
 msgstr "キャリアの確立ができませんでした"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:336
+#: panels/network/panel-common.c:336
 msgid "Dialing request timed out"
 msgstr "発信要求がタイムアウトしました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:340
+#: panels/network/panel-common.c:340
 msgid "Dialing attempt failed"
 msgstr "発信の試行に失敗しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:344
+#: panels/network/panel-common.c:344
 msgid "Modem initialization failed"
 msgstr "モデムの初期化に失敗しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:348
+#: panels/network/panel-common.c:348
 msgid "Failed to select the specified APN"
 msgstr "指定されたAPNの選択に失敗しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:352
+#: panels/network/panel-common.c:352
 msgid "Not searching for networks"
 msgstr "ネットワーク検索をしていません"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:356
+#: panels/network/panel-common.c:356
 msgid "Network registration denied"
 msgstr "ネットワーク登録が拒否されました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:360
+#: panels/network/panel-common.c:360
 msgid "Network registration timed out"
 msgstr "ネットワーク登録がタイムアウトしました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:364
+#: panels/network/panel-common.c:364
 msgid "Failed to register with the requested network"
 msgstr "要求されたネットワークへの登録に失敗しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:368
+#: panels/network/panel-common.c:368
 msgid "PIN check failed"
 msgstr "PINチェックに失敗しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:372
+#: panels/network/panel-common.c:372
 msgid "Firmware for the device may be missing"
 msgstr "このデバイスのファームウェアがないようです"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:376
+#: panels/network/panel-common.c:376
 msgid "Connection disappeared"
 msgstr "接続が消失しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:380
+#: panels/network/panel-common.c:380
 msgid "Existing connection was assumed"
 msgstr "既存の接続とみなされました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:384
+#: panels/network/panel-common.c:384
 msgid "Modem not found"
 msgstr "モデムが見つかりませんでした"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:388
+#: panels/network/panel-common.c:388
 msgid "Bluetooth connection failed"
 msgstr "Bluetooth接続に失敗しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:392
+#: panels/network/panel-common.c:392
 msgid "SIM Card not inserted"
 msgstr "SIMカードが挿入されていません"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:396
+#: panels/network/panel-common.c:396
 msgid "SIM Pin required"
 msgstr "SIMのPIN番号が必要です"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:400
+#: panels/network/panel-common.c:400
 msgid "SIM Puk required"
 msgstr "SIMのPUKが必要です"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:404
+#: panels/network/panel-common.c:404
 msgid "SIM wrong"
 msgstr "SIMが違います"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:408
+#: panels/network/panel-common.c:408
 msgid "Connection dependency failed"
 msgstr "接続が依存するデバイス等の準備ができません"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:433
+#: panels/network/panel-common.c:433
 msgid "Firmware missing"
 msgstr "ファームウェア未検出"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:437
+#: panels/network/panel-common.c:437
 msgid "Cable unplugged"
 msgstr "ケーブル抜け"
 
-#: ../panels/network/wireless-security/eap-method.c:57
+#: panels/network/wireless-security/eap-method.c:69
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr "802.1X セキュリティ(wpa-eap)で未定義のエラー"
 
-#: ../panels/network/wireless-security/eap-method.c:233
+#: panels/network/wireless-security/eap-method.c:245
 msgid "no file selected"
 msgstr "ファイルが選択されていません"
 
-#: ../panels/network/wireless-security/eap-method.c:264
+#: panels/network/wireless-security/eap-method.c:276
 msgid "unspecified error validating eap-method file"
 msgstr "EAPメソッドファイルの検証中に特定できないエラー"
 
-#: ../panels/network/wireless-security/eap-method.c:439
+#: panels/network/wireless-security/eap-method.c:451
 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:442
+#: panels/network/wireless-security/eap-method.c:454
 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:72
 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:351
+#: 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:351
 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:289
+#: 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:289
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:406
+#: panels/network/wireless-security/eap-method-fast.c:406
 msgid "Choose a PAC file"
 msgstr "PAC ファイルを選択"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:413
+#: panels/network/wireless-security/eap-method-fast.c:413
 msgid "PAC files (*.pac)"
 msgstr "PAC ファイル (*.pac)"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:1
+#: panels/network/wireless-security/eap-method-fast.ui:22
 msgid "Anonymous"
 msgstr "匿名"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:2
+#: panels/network/wireless-security/eap-method-fast.ui:25
 msgid "Authenticated"
 msgstr "認証"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:3
+#: panels/network/wireless-security/eap-method-fast.ui:28
 msgid "Both"
 msgstr "両方"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:5
+#: panels/network/wireless-security/eap-method-fast.ui:76
 msgid "PAC _file"
 msgstr "PAC ファイル(_F)"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:6
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:7
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4
+#: 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:97
 msgid "_Inner authentication"
 msgstr "内部認証(_I)"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:7
+#: panels/network/wireless-security/eap-method-fast.ui:156
 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:65
 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:74
 msgid "missing EAP-LEAP password"
 msgstr "EAP-LEAPパスワードが見つかりません"
 
-#: ../panels/network/wireless-security/eap-method-leap.ui.h:1
-#: ../panels/network/wireless-security/eap-method-simple.ui.h:1
-#: ../panels/network/wireless-security/ws-leap.ui.h:1
-#: ../panels/user-accounts/data/account-dialog.ui.h:4
+#: 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/user-accounts/data/account-dialog.ui:142
+#: panels/user-accounts/data/account-dialog.ui:505
 msgid "_Username"
 msgstr "ユーザー名(_U)"
 
-#: ../panels/network/wireless-security/eap-method-leap.ui.h:3
-#: ../panels/network/wireless-security/eap-method-simple.ui.h:3
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:7
-#: ../panels/network/wireless-security/ws-leap.ui.h:3
-#: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3
+#: 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
 msgid "Sho_w password"
 msgstr "パスワードを表示(_W)"
 
-#: ../panels/network/wireless-security/eap-method-peap.c:63
+#: panels/network/wireless-security/eap-method-peap.c:63
 #, c-format
 msgid "invalid EAP-PEAP CA certificate: %s"
 msgstr "無効なEAP-LEAP CA証明書: %s"
 
-#: ../panels/network/wireless-security/eap-method-peap.c:68
+#: panels/network/wireless-security/eap-method-peap.c:68
 msgid "invalid EAP-PEAP CA certificate: no certificate specified"
 msgstr "無効なEAP-LEAP CA証明書: 認証書が指定されていない"
 
-#: ../panels/network/wireless-security/eap-method-peap.c:287
-#: ../panels/network/wireless-security/eap-method-ttls.c:336
-#: ../panels/network/wireless-security/wireless-security.c:441
+#: panels/network/wireless-security/eap-method-peap.c:287
+#: panels/network/wireless-security/eap-method-ttls.c:336
+#: 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:501
-#: ../panels/network/wireless-security/eap-method-ttls.c:430
+#: 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:430
 msgid "Choose a Certificate Authority certificate"
 msgstr "認証局(CA)証明書を選択"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:2
+#: panels/network/wireless-security/eap-method-peap.ui:25
 msgid "Version 0"
 msgstr "バージョン 0"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:3
+#: panels/network/wireless-security/eap-method-peap.ui:28
 msgid "Version 1"
 msgstr "バージョン 1"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:5
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:3
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:2
+#: 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:57
 msgid "C_A certificate"
 msgstr "CA証明書(_A)"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:6
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:4
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:3
+#: 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:79
 msgid "No CA certificate is _required"
 msgstr "CA証明書が要求されましたが存在しません(_R)"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:8
+#: panels/network/wireless-security/eap-method-peap.ui:114
 msgid "PEAP _version"
 msgstr "PEAPバージョン(_V)"
 
-#: ../panels/network/wireless-security/eap-method-simple.c:74
+#: panels/network/wireless-security/eap-method-simple.c:74
 msgid "missing EAP username"
 msgstr "EAPユーザー名が見つかりません"
 
-#: ../panels/network/wireless-security/eap-method-simple.c:87
+#: panels/network/wireless-security/eap-method-simple.c:87
 msgid "missing EAP password"
 msgstr "EAPパスワードが見つかりません"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:68
+#: panels/network/wireless-security/eap-method-tls.c:68
 msgid "missing EAP-TLS identity"
 msgstr "EAP-ELS認証"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:77
+#: panels/network/wireless-security/eap-method-tls.c:77
 #, c-format
 msgid "invalid EAP-TLS CA certificate: %s"
 msgstr "EAP-TLSユーザー名が見つかりません: %s"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:84
+#: panels/network/wireless-security/eap-method-tls.c:84
 msgid "invalid EAP-TLS CA certificate: no certificate specified"
 msgstr "無効なEAP-TLS CA証明書: 認証書が指定されていない"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:95
-msgid "invalid EAP-TLS password: missing"
-msgstr "無効なEAP-TLSパスワード: 見つかりません"
-
-#: ../panels/network/wireless-security/eap-method-tls.c:109
+#: panels/network/wireless-security/eap-method-tls.c:100
 #, c-format
 msgid "invalid EAP-TLS private-key: %s"
 msgstr "無効なEAP-TLS秘密鍵: %s"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:119
+#: panels/network/wireless-security/eap-method-tls.c:110
 #, c-format
 msgid "invalid EAP-TLS user-certificate: %s"
 msgstr "無効なEAP-TLSユーザー証明書: %s"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:316
+#: panels/network/wireless-security/eap-method-tls.c:307
 msgid "Unencrypted private keys are insecure"
 msgstr "暗号化のないプライベートキーは安全ではありません"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:319
+#: panels/network/wireless-security/eap-method-tls.c:310
 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 "
 "password-protected private key.\n"
 "\n"
 "(You can password-protect your private key with openssl)"
-msgstr ""
-"選択したプライベートキーはパスワードで保護されていないようです。この状態は 信"
-"用情報の侵害を許してしまいます。パスワード保護のあるプライベートキーを選択し"
-"てください。\n"
+msgstr "選択したプライベートキーはパスワードで保護されていないようです。この状態は 信用情報の侵害を許してしまいます。パスワード保護のあるプライベートキーを選択してください。\n"
 "\n"
 "(プライベートキーは openssl を使用してパスワード保護ができます)"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:495
+#: panels/network/wireless-security/eap-method-tls.c:486
 msgid "Choose your personal certificate"
 msgstr "個人用証明書を選択する"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:507
+#: panels/network/wireless-security/eap-method-tls.c:498
 msgid "Choose your private key"
 msgstr "プライベートキーを選択する"
 
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:1
+#: panels/network/wireless-security/eap-method-tls.ui:24
 msgid "I_dentity"
 msgstr "アイデンティティ(_D)"
 
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:2
+#: panels/network/wireless-security/eap-method-tls.ui:50
 msgid "_User certificate"
 msgstr "ユーザー証明書(_U)"
 
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:5
+#: panels/network/wireless-security/eap-method-tls.ui:115
 msgid "Private _key"
 msgstr "プライベートキー(_K)"
 
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:6
+#: panels/network/wireless-security/eap-method-tls.ui:140
 msgid "_Private key password"
 msgstr "プライベートキーのパスワード(_P)"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:63
+#: panels/network/wireless-security/eap-method-ttls.c:63
 #, 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:68
 msgid "invalid EAP-TTLS CA certificate: no certificate specified"
 msgstr "無効なEAP-TTLS CA証明書: 証明書が指定されていない"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:259
+#: panels/network/wireless-security/eap-method-ttls.c:259
 msgid "PAP"
 msgstr "PAP"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:274
+#: panels/network/wireless-security/eap-method-ttls.c:274
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:305
+#: panels/network/wireless-security/eap-method-ttls.c:305
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (no EAP)"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:321
+#: panels/network/wireless-security/eap-method-ttls.c:321
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../panels/network/wireless-security/wireless-security.c:87
+#: panels/network/wireless-security/wireless-security.c:87
 msgid "Unknown error validating 802.1X security"
 msgstr "802.1X セキュリティを検証中に未知のエラー"
 
-#: ../panels/network/wireless-security/wireless-security.c:453
+#: panels/network/wireless-security/wireless-security.c:453
 msgid "TLS"
 msgstr "TLS"
 
-#: ../panels/network/wireless-security/wireless-security.c:477
+#: panels/network/wireless-security/wireless-security.c:477
 msgid "PWD"
 msgstr "PWD"
 
-#: ../panels/network/wireless-security/wireless-security.c:488
+#: panels/network/wireless-security/wireless-security.c:488
 msgid "FAST"
 msgstr "FAST"
 
-#: ../panels/network/wireless-security/wireless-security.c:499
+#: panels/network/wireless-security/wireless-security.c:499
 msgid "Tunneled TLS"
 msgstr "トンネル化 TLS"
 
-#: ../panels/network/wireless-security/wireless-security.c:510
+#: panels/network/wireless-security/wireless-security.c:510
 msgid "Protected EAP (PEAP)"
 msgstr "保護つき EAP (PEAP)"
 
-#: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:6
-#: ../panels/network/wireless-security/ws-wpa-eap.ui.h:1
+#: 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
 msgid "Au_thentication"
 msgstr "認証(_T)"
 
-#: ../panels/network/wireless-security/ws-leap.c:63
+#: panels/network/wireless-security/ws-leap.c:63
 msgid "missing leap-username"
 msgstr "LEAPユーザー名が指定されていません"
 
-#: ../panels/network/wireless-security/ws-leap.c:74
+#: panels/network/wireless-security/ws-leap.c:74
 msgid "missing leap-password"
 msgstr "LEAPパスワードが指定されていません"
 
-#: ../panels/network/wireless-security/ws-wep-key.c:107
+#: panels/network/wireless-security/ws-wep-key.c:107
 msgid "missing wep-key"
 msgstr "WEPキーが指定されていません"
 
-#: ../panels/network/wireless-security/ws-wep-key.c:116
+#: panels/network/wireless-security/ws-wep-key.c:116
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
-msgstr ""
-"無効なWEPキー: キーの長さが%zu文字の場合、十六進数字以外は使用できません"
+msgstr "無効なWEPキー: キーの長さが%zu文字の場合、十六進数字以外は使用できません"
 
-#: ../panels/network/wireless-security/ws-wep-key.c:124
+#: panels/network/wireless-security/ws-wep-key.c:124
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
-msgstr ""
-"無効なWEPキー: キーの長さが%zu文字の場合、アスキー文字以外は使用できません"
+msgstr "無効なWEPキー: キーの長さが%zu文字の場合、アスキー文字以外は使用できません"
 
-#: ../panels/network/wireless-security/ws-wep-key.c:130
+#: panels/network/wireless-security/ws-wep-key.c:130
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
-msgstr ""
-"無効なWEPキー: キーの長さ %zu は使用できません。WEPキーは長さ5文字か13文字の"
-"アスキー文字、または10文字か26文字の十六進数字のどちらかでなければなりません"
+msgstr "無効なWEPキー: キーの長さ %zu は使用できません。WEPキーは長さ5文字か13文字のアスキー文字、または10文字か26文字の十六進数字のどちらかでなければなりません"
 
-#: ../panels/network/wireless-security/ws-wep-key.c:137
+#: panels/network/wireless-security/ws-wep-key.c:137
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "無効なWEPキー: パスフレーズには必ず何か入力してください"
 
-#: ../panels/network/wireless-security/ws-wep-key.c:139
+#: panels/network/wireless-security/ws-wep-key.c:139
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "無効なWEPキー: パスフレーズは64文字未満でなければなりません"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:1
+#: panels/network/wireless-security/ws-wep-key.ui:11
 msgid "1 (Default)"
 msgstr "1 (デフォルト)"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:2
+#: panels/network/wireless-security/ws-wep-key.ui:31
 msgid "Open System"
 msgstr "オープンシステム"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:3
+#: panels/network/wireless-security/ws-wep-key.ui:34
 msgid "Shared Key"
 msgstr "共有鍵"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:4
+#: panels/network/wireless-security/ws-wep-key.ui:56
 msgid "_Key"
 msgstr "キー(_K)"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:5
+#: panels/network/wireless-security/ws-wep-key.ui:94
 msgid "Sho_w key"
 msgstr "キーを表示(_W)"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:7
+#: panels/network/wireless-security/ws-wep-key.ui:152
 msgid "WEP inde_x"
 msgstr "WEPインデックス(_X)"
 
-#: ../panels/network/wireless-security/ws-wpa-psk.c:70
+#: panels/network/wireless-security/ws-wpa-psk.c:70
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
-msgstr ""
-"無効なWPA PSK: キーの長さ %zu は無効です。8文字以上〜63文字以下、もしくは十六"
-"進数表記で64文字でなければなりません"
+msgstr "無効なWPA PSK: キーの長さ %zu は無効です。8文字以上〜63文字以下、もしくは十六進数表記で64文字でなければなりません"
 
-#: ../panels/network/wireless-security/ws-wpa-psk.c:79
+#: panels/network/wireless-security/ws-wpa-psk.c:79
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr "無効なWPA PSK: キーが64文字の場合、十六進数字以外は使用できません"
 
-#: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2
+#: panels/network/wireless-security/ws-wpa-psk.ui:50
 msgid "_Type"
 msgstr "種類(_T)"
 
 #. This is the per application switch for message tray usage.
-#: ../panels/notifications/edit-dialog.ui.h:2
+#: panels/notifications/edit-dialog.ui:64
 msgctxt "notifications"
 msgid "_Notifications"
 msgstr "通知(_N)"
 
 #. This is the setting to configure sounds associated with notifications.
-#: ../panels/notifications/edit-dialog.ui.h:4
+#: panels/notifications/edit-dialog.ui:116
 msgctxt "notifications"
 msgid "Sound _Alerts"
 msgstr "サウンドアラート(_A)"
 
-#: ../panels/notifications/edit-dialog.ui.h:5
+#: panels/notifications/edit-dialog.ui:172
 msgctxt "notifications"
 msgid "Notification _Popups"
 msgstr "通知ポップアップ(_P)"
 
-#: ../panels/notifications/edit-dialog.ui.h:6
+#: panels/notifications/edit-dialog.ui:188
 msgid ""
 "Notifications will continue to appear in the notification list when popups "
 "are disabled."
 msgstr "ポップアップを無効にすると、通知リストに通知が表示され続けます。"
 
 #. Popups here refers to message tray notifications in the middle of the screen.
-#: ../panels/notifications/edit-dialog.ui.h:8
+#: panels/notifications/edit-dialog.ui:253
 msgctxt "notifications"
 msgid "Show Message _Content in Popups"
 msgstr "ポップアップにメッセージの内容を表示する(_C)"
 
-#: ../panels/notifications/edit-dialog.ui.h:9
+#: panels/notifications/edit-dialog.ui:304
 msgctxt "notifications"
 msgid "_Lock Screen Notifications"
 msgstr "ロック画面での通知(_L)"
 
-#: ../panels/notifications/edit-dialog.ui.h:10
+#: panels/notifications/edit-dialog.ui:355
 msgctxt "notifications"
 msgid "Show Message C_ontent on Lock Screen"
 msgstr "ロック画面にメッセージの内容を表示する(_O)"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2
-msgid "No­ti­fi­ca­tions"
+#: panels/notifications/gnome-notifications-panel.desktop.in.in:3
+msgid "Notifications"
 msgstr "通知"
 
-#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3
+#: panels/notifications/gnome-notifications-panel.desktop.in.in:4
 msgid "Control which notifications are displayed and what they show"
 msgstr "表示する通知およびその表示方法について設定します"
 
-#. Translators: those are keywords for the notifications control-center panel
-#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/notifications/gnome-notifications-panel.desktop.in.in:7
+msgid "preferences-system-notifications"
+msgstr "preferences-system-notifications"
+
+#. Translators: Search terms to find the Notifications panel. Do NOT translate or localize the semicolons! 
The list MUST also end with a semicolon!
+#: panels/notifications/gnome-notifications-panel.desktop.in.in:20
 msgid "Notifications;Banner;Message;Tray;Popup;"
-msgstr ""
-"Notifications;Banner;Message;Tray;Popup;通知;バナー;メッセージ;トレイ;ポップ"
-"アップ;"
+msgstr "Notifications;Banner;Message;Tray;Popup;通知;バナー;メッセージ;トレイ;ポップアップ;"
 
-#: ../panels/notifications/notifications.ui.h:1
+#: panels/notifications/notifications.ui:84
 msgid "Notification _Popups"
 msgstr "通知ポップアップ(_P)"
 
-#: ../panels/notifications/notifications.ui.h:2
+#: panels/notifications/notifications.ui:134
 msgid "_Lock Screen Notifications"
 msgstr "ロック画面での通知(_L)"
 
 #. List of applications.
-#: ../panels/notifications/notifications.ui.h:4
-#: ../panels/privacy/privacy.ui.h:45 ../panels/sound/gvc-mixer-dialog.c:1781
+#: panels/notifications/notifications.ui:180 panels/privacy/privacy.ui:875
+#: panels/sound/gvc-mixer-dialog.c:1768
 msgid "Applications"
 msgstr "アプリケーション"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:148
+#: panels/online-accounts/cc-online-accounts-panel.c:148
 msgctxt "Online Account"
 msgid "Other"
 msgstr "その他"
 
 #. 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:603
+#: panels/online-accounts/cc-online-accounts-panel.c:612
 #, c-format
 msgid "%s Account"
 msgstr "%s アカウント"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:895
+#: panels/online-accounts/cc-online-accounts-panel.c:904
 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:960
+#: panels/online-accounts/cc-online-accounts-panel.c:969
 #, c-format
 msgid "<b>%s</b> removed"
 msgstr "<b>%s</b> 削除しました"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2
-msgid "On­line Accounts"
+#: panels/online-accounts/gnome-online-accounts-panel.desktop.in.in:3
+msgid "Online Accounts"
 msgstr "オンラインアカウント"
 
-#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3
+#: panels/online-accounts/gnome-online-accounts-panel.desktop.in.in:4
 msgid "Connect to your online accounts and decide what to use them for"
 msgstr "オンラインアカウントへの接続や利用方法を設定します。"
 
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/online-accounts/gnome-online-accounts-panel.desktop.in.in:7
+msgid "goa-panel"
+msgstr "ゴアパネル"
+
+#. Translators: Search terms to find the Online Accounts panel.
+#. Do NOT translate or localize the semicolons!
+#. The list MUST also end with a semicolon!
 #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application)
-#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5
+#: panels/online-accounts/gnome-online-accounts-panel.desktop.in.in:22
 msgid ""
 "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;"
 "Kerberos;IMAP;SMTP;Pocket;ReadItLater;"
-msgstr ""
-"Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;"
-"Kerberos;IMAP;SMTP;Pocket;ReadItLater;グーグル;フェイスブック;ツイッター;ヤ"
-"フー;ウェブ;オンライン;チャット;カレンダー;メール;連絡先;Flickr;"
-"OnlineAccounts;"
+msgstr 
"Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;Kerberos;IMAP;SMTP;Pocket;ReadItLater;グーグル;フェイスブック;ツイッター;ヤフー;ウェブ;オンライン;チャット;カレンダー;メール;連絡先;Flickr;OnlineAccounts;"
 
 #. Translators: This is the button which allows undoing the removal of the printer.
-#: ../panels/online-accounts/online-accounts.ui.h:1
-#: ../panels/printers/printers.ui.h:4
+#: panels/online-accounts/online-accounts.ui:38 panels/printers/printers.ui:71
 msgid "Undo"
 msgstr "元に戻す"
 
-#: ../panels/online-accounts/online-accounts.ui.h:2
+#: panels/online-accounts/online-accounts.ui:125
 msgid "Connect to your data in the cloud"
 msgstr "クラウド上のあなたのデータと接続する"
 
-#: ../panels/online-accounts/online-accounts.ui.h:3
+#: panels/online-accounts/online-accounts.ui:137
 msgid "No internet connection — connect to set up new online accounts"
-msgstr ""
-"インターネット接続がありません — 新しいオンラインアカウントのセットアップのた"
-"めに接続"
+msgstr "インターネット接続がありません — 新しいオンラインアカウントのセットアップのために接続"
 
-#: ../panels/online-accounts/online-accounts.ui.h:4
+#: panels/online-accounts/online-accounts.ui:159
 msgid "Add an account"
 msgstr "アカウントの追加"
 
-#: ../panels/online-accounts/online-accounts.ui.h:5
+#: panels/online-accounts/online-accounts.ui:264
 msgid "Remove Account"
 msgstr "アカウントの削除"
 
-#: ../panels/power/cc-power-panel.c:253
+#: panels/power/cc-power-panel.c:253
 msgid "Unknown time"
 msgstr "不明"
 
-#: ../panels/power/cc-power-panel.c:259
+#: panels/power/cc-power-panel.c:259
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i 分"
 
-#: ../panels/power/cc-power-panel.c:271
+#: panels/power/cc-power-panel.c:271
 #, c-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -3869,1165 +4005,1218 @@ msgstr[0] "%i 時間"
 
 #. 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:279
+#: panels/power/cc-power-panel.c:279
 #, c-format
 msgid "%i %s %i %s"
 msgstr "%i %s %i %s"
 
-#: ../panels/power/cc-power-panel.c:280
+#: panels/power/cc-power-panel.c:280
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "時間"
 
-#: ../panels/power/cc-power-panel.c:281
+#: panels/power/cc-power-panel.c:281
 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:300
+#: panels/power/cc-power-panel.c:300
 #, 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:307
+#: panels/power/cc-power-panel.c:307
 #, 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:312
+#: panels/power/cc-power-panel.c:312
 #, c-format
 msgid "%s remaining"
 msgstr "残り %s"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:317 ../panels/power/cc-power-panel.c:345
+#: panels/power/cc-power-panel.c:317 panels/power/cc-power-panel.c:345
 msgid "Fully charged"
 msgstr "フル充電"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:321 ../panels/power/cc-power-panel.c:349
+#: panels/power/cc-power-panel.c:321 panels/power/cc-power-panel.c:349
 msgid "Empty"
 msgstr "空"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:336
+#: panels/power/cc-power-panel.c:336
 msgid "Charging"
 msgstr "充電中"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:341
+#: panels/power/cc-power-panel.c:341
 msgid "Discharging"
 msgstr "放電中"
 
-#: ../panels/power/cc-power-panel.c:464
+#: panels/power/cc-power-panel.c:464
 msgctxt "Battery name"
 msgid "Main"
 msgstr "主"
 
-#: ../panels/power/cc-power-panel.c:466
+#: panels/power/cc-power-panel.c:466
 msgctxt "Battery name"
 msgid "Extra"
 msgstr "予備"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:537
+#: panels/power/cc-power-panel.c:537
 msgid "Wireless mouse"
 msgstr "ワイヤレスマウス"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:540
+#: panels/power/cc-power-panel.c:540
 msgid "Wireless keyboard"
 msgstr "ワイヤレスキーボード"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:543
+#: panels/power/cc-power-panel.c:543
 msgid "Uninterruptible power supply"
 msgstr "無停電電源装置"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:546
+#: panels/power/cc-power-panel.c:546
 msgid "Personal digital assistant"
 msgstr "携帯情報端末"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:549
+#: panels/power/cc-power-panel.c:549
 msgid "Cellphone"
 msgstr "携帯電話"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:552
+#: panels/power/cc-power-panel.c:552
 msgid "Media player"
 msgstr "音楽プレイヤー"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:555 ../panels/wacom/cc-wacom-panel.c:793
+#: panels/power/cc-power-panel.c:555 panels/wacom/cc-wacom-panel.c:837
 msgid "Tablet"
 msgstr "タブレット"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:558
+#: panels/power/cc-power-panel.c:558
 msgid "Computer"
 msgstr "コンピューター"
 
+#. TRANSLATORS: secondary battery
+#: panels/power/cc-power-panel.c:561
+msgid "Gaming input device"
+msgstr "ゲーミング入力装置"
+
 #. TRANSLATORS: secondary battery, misc
-#: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801
-#: ../panels/power/cc-power-panel.c:2356
+#: panels/power/cc-power-panel.c:564 panels/power/cc-power-panel.c:804
+#: panels/power/cc-power-panel.c:2380
 msgid "Battery"
 msgstr "バッテリー"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:615
+#: panels/power/cc-power-panel.c:618
 msgctxt "Battery power"
 msgid "Charging"
 msgstr "充電中"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:622
+#: panels/power/cc-power-panel.c:625
 msgctxt "Battery power"
 msgid "Caution"
 msgstr "注意"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:627
+#: panels/power/cc-power-panel.c:630
 msgctxt "Battery power"
 msgid "Low"
 msgstr "少ない"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:632
+#: panels/power/cc-power-panel.c:635
 msgctxt "Battery power"
 msgid "Good"
 msgstr "充分"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:637
+#: panels/power/cc-power-panel.c:640
 msgctxt "Battery power"
 msgid "Fully charged"
 msgstr "フル充電"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:641
+#: panels/power/cc-power-panel.c:644
 msgctxt "Battery power"
 msgid "Empty"
 msgstr "空"
 
-#: ../panels/power/cc-power-panel.c:799
+#: panels/power/cc-power-panel.c:802
 msgid "Batteries"
 msgstr "バッテリー"
 
-#: ../panels/power/cc-power-panel.c:1227
+#: panels/power/cc-power-panel.c:1242
 msgid "When _idle"
 msgstr "アイドル時(_I)"
 
-#: ../panels/power/cc-power-panel.c:1681
+#: panels/power/cc-power-panel.c:1696
 msgid "Power Saving"
 msgstr "省電力"
 
-#: ../panels/power/cc-power-panel.c:1712
+#: panels/power/cc-power-panel.c:1727
 msgid "_Screen brightness"
 msgstr "画面の明るさ(_S)"
 
-#: ../panels/power/cc-power-panel.c:1731
+#: panels/power/cc-power-panel.c:1746
 msgid "Automatic brightness"
 msgstr "明るさ自動調整"
 
-#: ../panels/power/cc-power-panel.c:1751
+#: panels/power/cc-power-panel.c:1766
 msgid "_Keyboard brightness"
 msgstr "キーボードの明るさ(_K)"
 
-#: ../panels/power/cc-power-panel.c:1761
+#: panels/power/cc-power-panel.c:1776
 msgid "_Dim screen when inactive"
 msgstr "操作していないときに画面を暗くする(_D)"
 
-#: ../panels/power/cc-power-panel.c:1786
+#: panels/power/cc-power-panel.c:1801
 msgid "_Blank screen"
 msgstr "ブランクスクリーン(_B)"
 
-#: ../panels/power/cc-power-panel.c:1823
+#: panels/power/cc-power-panel.c:1838
 msgid "_Wi-Fi"
 msgstr "Wi-Fi(_W)"
 
-#: ../panels/power/cc-power-panel.c:1828
+#: panels/power/cc-power-panel.c:1843
 msgid "Turn off Wi-Fi to save power."
 msgstr "Wi-Fi をオフにして節電します。"
 
-#: ../panels/power/cc-power-panel.c:1853
+#: panels/power/cc-power-panel.c:1868
 msgid "_Mobile broadband"
 msgstr "モバイルブロードバンド(_M)"
 
-#: ../panels/power/cc-power-panel.c:1858
+#: panels/power/cc-power-panel.c:1873
 msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power."
 msgstr "モバイルブロードバンド (3G、4G、LTE など) をオフにして節電します。"
 
-#: ../panels/power/cc-power-panel.c:1903
+#: panels/power/cc-power-panel.c:1926
 msgid "_Bluetooth"
 msgstr "Bluetooth(_B)"
 
-#: ../panels/power/cc-power-panel.c:1966
+#: panels/power/cc-power-panel.c:1931
+msgid "Turn off Bluetooth to save power."
+msgstr "Bluetooth をオフにして節電します。"
+
+#: panels/power/cc-power-panel.c:1990
 msgid "When on battery power"
 msgstr "バッテリー動作時"
 
-#: ../panels/power/cc-power-panel.c:1968
+#: panels/power/cc-power-panel.c:1992
 msgid "When plugged in"
 msgstr "電源接続時"
 
-#: ../panels/power/cc-power-panel.c:2063
+#: panels/power/cc-power-panel.c:2087
 msgid "Suspend"
 msgstr "サスペンド"
 
-#: ../panels/power/cc-power-panel.c:2064
+#: panels/power/cc-power-panel.c:2088
 msgid "Power Off"
 msgstr "電源オフ"
 
-#: ../panels/power/cc-power-panel.c:2065
+#: panels/power/cc-power-panel.c:2089
 msgid "Hibernate"
 msgstr "ハイバーネート"
 
-#: ../panels/power/cc-power-panel.c:2066
+#: panels/power/cc-power-panel.c:2090
 msgid "Nothing"
 msgstr "なにもしない"
 
 #. Frame header
-#: ../panels/power/cc-power-panel.c:2180
+#: panels/power/cc-power-panel.c:2204
 msgid "Suspend & Power Button"
 msgstr "サスペンド, 電源ボタン"
 
-#: ../panels/power/cc-power-panel.c:2219
+#: panels/power/cc-power-panel.c:2243
 msgid "_Automatic suspend"
 msgstr "自動サスペンド(_A)"
 
-#: ../panels/power/cc-power-panel.c:2220
+#: panels/power/cc-power-panel.c:2244
 msgid "Automatic suspend"
 msgstr "自動サスペンド"
 
-#: ../panels/power/cc-power-panel.c:2287
+#: panels/power/cc-power-panel.c:2311
 msgid "_When the Power Button is pressed"
 msgstr "電源ボタンを押した時の動作(_W)"
 
-#: ../panels/power/cc-power-panel.c:2406 ../shell/cc-window.c:247
-#: ../shell/panel-list.ui.h:1
+#: panels/power/cc-power-panel.c:2430 shell/cc-window.c:216
+#: shell/panel-list.ui:45
 msgid "Devices"
 msgstr "デバイス"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/power/gnome-power-panel.desktop.in.in.h:2
-msgid "Po­wer"
-msgstr "電源管理"
+#: panels/power/gnome-power-panel.desktop.in.in:3
+msgid "Power"
+msgstr "電源"
 
-#: ../panels/power/gnome-power-panel.desktop.in.in.h:3
+#: panels/power/gnome-power-panel.desktop.in.in:4
 msgid "View your battery status and change power saving settings"
 msgstr "バッテリー状態の表示、省電力の設定をします"
 
-#. Translators: those are keywords for the power control-center panel
-#: ../panels/power/gnome-power-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/power/gnome-power-panel.desktop.in.in:7
+msgid "gnome-power-manager"
+msgstr "gnome-power-manager"
+
+#. Translators: Search terms to find the Power panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+#: panels/power/gnome-power-panel.desktop.in.in:19
 msgid ""
 "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;"
-msgstr ""
-"Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;"
-"電源;スリープ;サスペンド;ハイバネート;バッテリー;明るさ;ブランクスクリーン;モ"
-"ニター;画面;ディスプレイ;アイドル;待機;"
+msgstr 
"Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;電源;スリープ;サスペンド;ハイバネート;バッテリー;明るさ;ブランクスクリーン;モニター;画面;ディスプレイ;アイドル;待機;"
+
+#: panels/power/power.ui:17
+msgid "20 minutes"
+msgstr "20 分"
+
+#: panels/power/power.ui:21
+msgid "25 minutes"
+msgstr "25 分"
 
-#: ../panels/power/power.ui.h:3
+#: panels/power/power.ui:29
 msgid "45 minutes"
 msgstr "45 分"
 
-#: ../panels/power/power.ui.h:4 ../panels/privacy/privacy.ui.h:8
+#: panels/power/power.ui:33 panels/privacy/privacy.ui:42
+#: panels/privacy/privacy.ui:56
 msgid "1 hour"
 msgstr "1 時間"
 
-#: ../panels/power/power.ui.h:5
+#: panels/power/power.ui:37
 msgid "80 minutes"
 msgstr "80 分"
 
-#: ../panels/power/power.ui.h:6
+#: panels/power/power.ui:41
 msgid "90 minutes"
 msgstr "90 分"
 
-#: ../panels/power/power.ui.h:7
+#: panels/power/power.ui:45
 msgid "100 minutes"
 msgstr "100 分"
 
-#: ../panels/power/power.ui.h:8
+#: panels/power/power.ui:49
 msgid "2 hours"
 msgstr "2 時間"
 
-#: ../panels/power/power.ui.h:9 ../panels/privacy/privacy.ui.h:3
+#: panels/power/power.ui:63 panels/privacy/privacy.ui:22
 msgid "1 minute"
 msgstr "1 分"
 
-#: ../panels/power/power.ui.h:10 ../panels/privacy/privacy.ui.h:4
+#: panels/power/power.ui:67 panels/privacy/privacy.ui:26
 msgid "2 minutes"
 msgstr "2 分"
 
-#: ../panels/power/power.ui.h:11 ../panels/privacy/privacy.ui.h:5
+#: panels/power/power.ui:71 panels/privacy/privacy.ui:30
 msgid "3 minutes"
 msgstr "3 分"
 
-#: ../panels/power/power.ui.h:12
+#: panels/power/power.ui:75
 msgid "4 minutes"
 msgstr "4 分"
 
-#: ../panels/power/power.ui.h:13 ../panels/privacy/privacy.ui.h:6
+#: panels/power/power.ui:79 panels/privacy/privacy.ui:34
 msgid "5 minutes"
 msgstr "5 分"
 
-#: ../panels/power/power.ui.h:14
+#: panels/power/power.ui:83
 msgid "8 minutes"
 msgstr "8 分"
 
-#: ../panels/power/power.ui.h:15
+#: panels/power/power.ui:87
 msgid "10 minutes"
 msgstr "10 分"
 
-#: ../panels/power/power.ui.h:16
+#: panels/power/power.ui:91
 msgid "12 minutes"
 msgstr "12 分"
 
-#: ../panels/power/power.ui.h:18
+#: panels/power/power.ui:155
 msgid "Automatic Suspend"
 msgstr "自動サスペンド"
 
-#: ../panels/power/power.ui.h:19
+#: panels/power/power.ui:180
 msgid "_Plugged In"
 msgstr "電源接続時(_P)"
 
-#: ../panels/power/power.ui.h:20
+#: panels/power/power.ui:196
 msgid "On _Battery Power"
 msgstr "バッテリー動作時(_B)"
 
-#: ../panels/power/power.ui.h:21 ../panels/universal-access/uap.ui.h:36
+#: panels/power/power.ui:241 panels/power/power.ui:301
+#: panels/universal-access/uap.ui:1501
 msgid "Delay"
 msgstr "時間"
 
-#: ../panels/printers/authentication-dialog.ui.h:1
+#: panels/printers/authentication-dialog.ui:11
 msgid " "
 msgstr " "
 
-#: ../panels/printers/authentication-dialog.ui.h:3
+#: panels/printers/authentication-dialog.ui:42
 msgid "Authenticate"
 msgstr "認証"
 
-#: ../panels/printers/authentication-dialog.ui.h:4
-#: ../panels/printers/new-printer-dialog.ui.h:13
+#. 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:361
 msgid "Username"
 msgstr "ユーザー名"
 
-#: ../panels/printers/authentication-dialog.ui.h:6
-#: ../panels/printers/new-printer-dialog.ui.h:11
+#. 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:382
+#: panels/user-accounts/data/account-dialog.ui:240
+msgid "Password"
+msgstr "パスワード"
+
+#: panels/printers/authentication-dialog.ui:139
+#: panels/printers/new-printer-dialog.ui:336
 msgid "Authentication Required"
 msgstr "認証が要求されました"
 
 #. Translators: %s is the printer name
-#: ../panels/printers/cc-printers-panel.c:718
+#: panels/printers/cc-printers-panel.c:842
 #, c-format
 msgid "Printer “%s” has been deleted"
 msgstr "プリンター“%s”を削除しました"
 
 #. Translators: Addition of the new printer failed.
-#: ../panels/printers/cc-printers-panel.c:909
+#: panels/printers/cc-printers-panel.c:1142
 msgid "Failed to add new printer."
 msgstr "新しいプリンターを追加できませんでした。"
 
 #. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:1221
+#: panels/printers/cc-printers-panel.c:1514
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "ui ファイルを読み込めませんでした: %s"
 
-#: ../panels/printers/details-dialog.ui.h:2
-#: ../panels/printers/printer-entry.ui.h:9
+#: panels/printers/details-dialog.ui:63 panels/printers/printer-entry.ui:223
 msgid "Location"
 msgstr "場所"
 
 #. Translators: Name of column showing printer drivers
-#: ../panels/printers/details-dialog.ui.h:4
-#: ../panels/printers/pp-ppd-selection-dialog.c:250
+#: panels/printers/details-dialog.ui:111
+#: panels/printers/pp-ppd-selection-dialog.c:250
 msgid "Driver"
 msgstr "ドライバー"
 
-#: ../panels/printers/details-dialog.ui.h:5
+#: panels/printers/details-dialog.ui:147
 msgid "Searching for preferred drivers…"
 msgstr "推奨ドライバーの検索中…"
 
-#: ../panels/printers/details-dialog.ui.h:6
+#: panels/printers/details-dialog.ui:169
 msgid "Search for Drivers"
 msgstr "ドライバーを検索する"
 
-#: ../panels/printers/details-dialog.ui.h:7
+#: panels/printers/details-dialog.ui:177
 msgid "Select from Database…"
 msgstr "データベースから選択…"
 
-#: ../panels/printers/details-dialog.ui.h:8
+#: panels/printers/details-dialog.ui:185
 msgid "Install PPD File…"
 msgstr "PPDファイルのインストール…"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2
-msgid "Prin­ters"
+#: panels/printers/gnome-printers-panel.desktop.in.in:3
+msgid "Printers"
 msgstr "プリンター"
 
-#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3
+#: panels/printers/gnome-printers-panel.desktop.in.in:4
 msgid "Add printers, view printer jobs and decide how you want to print"
 msgstr "プリンターの追加、プリンタージョブの表示、印刷方法の設定を行います。"
 
-#. Translators: those are keywords for the printing control-center panel
-#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/printers/gnome-printers-panel.desktop.in.in:7
+msgid "printer"
+msgstr "プリンター"
+
+#. Translators: Search terms to find the Printers panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#: panels/printers/gnome-printers-panel.desktop.in.in:16
 msgid "Printer;Queue;Print;Paper;Ink;Toner;"
-msgstr ""
-"Printer;Queue;Print;Paper;Ink;Toner;プリンター;キュー;印刷;紙;インク;トナー;"
+msgstr "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.h:2
+#: 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.h:4
+#: 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.h:2
-#: ../panels/printers/pp-new-printer-dialog.c:384
-#: ../panels/printers/pp-new-printer-dialog.c:456
+#: panels/printers/new-printer-dialog.ui:29
+#: panels/printers/pp-new-printer-dialog.c:384
+#: panels/printers/pp-new-printer-dialog.c:456
 msgid "Add Printer"
 msgstr "プリンターの追加"
 
+#. Translators: This button opens authentication dialog for selected server.
 #. Translators: This buttons submits the credentials for the selected server.
-#: ../panels/printers/new-printer-dialog.ui.h:6
+#: panels/printers/new-printer-dialog.ui:96
+#: panels/printers/new-printer-dialog.ui:111
 msgid "_Unlock"
 msgstr "アンロック(_U)"
 
 #. Translators: No printers were detected
-#: ../panels/printers/new-printer-dialog.ui.h:8
+#: panels/printers/new-printer-dialog.ui:210
 msgid "No Printers Found"
 msgstr "プリンターが見つかりません"
 
 #. Translators: The entered text should contain network address of a printer or a text which will filter 
found devices (their names and locations)
-#: ../panels/printers/new-printer-dialog.ui.h:10
+#: panels/printers/new-printer-dialog.ui:283
 msgid "Enter a network address or search for a printer"
 msgstr "ネットワークアドレスを入力するかプリンターを検索してください"
 
-#: ../panels/printers/new-printer-dialog.ui.h:12
+#: panels/printers/new-printer-dialog.ui:352
 msgid "Enter username and password to view printers on Print Server."
-msgstr ""
-"プリンターサーバーで利用可能なプリンターを表示するにはユーザー名とパスワード"
-"を入力してください。"
+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.h:2
-#: ../panels/printers/pp-options-dialog.c:893
+#: panels/printers/options-dialog.ui:22 panels/printers/pp-options-dialog.c:893
 msgid "Test Page"
 msgstr "テストページ"
 
 #. Translators: This is the title of the dialog. %s is the printer name.
-#: ../panels/printers/pp-details-dialog.c:123
-#: ../panels/printers/pp-details-dialog.c:415
+#: panels/printers/pp-details-dialog.c:135
+#: panels/printers/pp-details-dialog.c:435
 #, c-format
 msgid "%s Details"
 msgstr "%s の詳細"
 
-#: ../panels/printers/pp-details-dialog.c:172
+#: panels/printers/pp-details-dialog.c:184
 msgid "No suitable driver found"
 msgstr "適切なドライバーが見つかりませんでした"
 
-#: ../panels/printers/pp-details-dialog.c:316
+#: panels/printers/pp-details-dialog.c:328
 msgid "Select PPD File"
 msgstr "PPDファイルの選択"
 
-#: ../panels/printers/pp-details-dialog.c:325
+#: panels/printers/pp-details-dialog.c:337
 msgid ""
 "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
 "PPD.GZ)"
-msgstr ""
-"PostScript Printer Description ファイル(*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
-"PPD.GZ)"
+msgstr "PostScript Printer Description ファイル(*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD.GZ)"
 
-#: ../panels/printers/ppd-selection-dialog.ui.h:1
+#: panels/printers/ppd-selection-dialog.ui:10
 msgid "Select Printer Driver"
 msgstr "プリンタードライバーの選択"
 
-#: ../panels/printers/ppd-selection-dialog.ui.h:3
-#: ../panels/user-accounts/um-photo-dialog.c:96
+#: panels/printers/ppd-selection-dialog.ui:40
+#: panels/user-accounts/um-photo-dialog.c:105
 msgid "Select"
 msgstr "選択"
 
-#: ../panels/printers/ppd-selection-dialog.ui.h:4
+#: panels/printers/ppd-selection-dialog.ui:73
 msgid "Loading drivers database…"
 msgstr "ドライバーのデータベースをロード中..."
 
 #. Translators: The found device is a JetDirect printer
-#: ../panels/printers/pp-host.c:539
+#: panels/printers/pp-host.c:539
 msgid "JetDirect Printer"
 msgstr "JetDirect プリンター"
 
 #. Translators: The found device is a Line Printer Daemon printer
-#: ../panels/printers/pp-host.c:795
+#: panels/printers/pp-host.c:795
 msgid "LPD Printer"
 msgstr "LPD プリンター"
 
 #. Translators: this is an option of "Two Sided"
-#: ../panels/printers/pp-ipp-option-widget.c:66
-#: ../panels/printers/pp-ppd-option-widget.c:70
+#: panels/printers/pp-ipp-option-widget.c:66
+#: panels/printers/pp-ppd-option-widget.c:70
 msgid "One Sided"
 msgstr "片面"
 
 #. Translators: this is an option of "Two Sided"
-#: ../panels/printers/pp-ipp-option-widget.c:68
-#: ../panels/printers/pp-ppd-option-widget.c:72
+#: panels/printers/pp-ipp-option-widget.c:68
+#: panels/printers/pp-ppd-option-widget.c:72
 msgid "Long Edge (Standard)"
 msgstr "長辺とじ(標準)"
 
 #. Translators: this is an option of "Two Sided"
-#: ../panels/printers/pp-ipp-option-widget.c:70
-#: ../panels/printers/pp-ppd-option-widget.c:74
+#: panels/printers/pp-ipp-option-widget.c:70
+#: panels/printers/pp-ppd-option-widget.c:74
 msgid "Short Edge (Flip)"
 msgstr "短辺とじ(フリップ)"
 
 #. Translators: this is an option of "Orientation"
-#: ../panels/printers/pp-ipp-option-widget.c:72
+#: panels/printers/pp-ipp-option-widget.c:72
 msgid "Portrait"
 msgstr "縦方向"
 
 #. Translators: this is an option of "Orientation"
-#: ../panels/printers/pp-ipp-option-widget.c:74
+#: panels/printers/pp-ipp-option-widget.c:74
 msgid "Landscape"
 msgstr "横方向"
 
 #. Translators: this is an option of "Orientation"
-#: ../panels/printers/pp-ipp-option-widget.c:76
+#: panels/printers/pp-ipp-option-widget.c:76
 msgid "Reverse landscape"
 msgstr "横方向(逆向き)"
 
 #. Translators: this is an option of "Orientation"
-#: ../panels/printers/pp-ipp-option-widget.c:78
+#: panels/printers/pp-ipp-option-widget.c:78
 msgid "Reverse portrait"
 msgstr "縦方向(逆向き)"
 
 #. Translators: Job's state (job is waiting to be printed)
-#: ../panels/printers/pp-jobs-dialog.c:104
+#: panels/printers/pp-jobs-dialog.c:234
 msgctxt "print job"
 msgid "Pending"
 msgstr "待機中"
 
 #. Translators: Job's state (job is held for printing)
-#: ../panels/printers/pp-jobs-dialog.c:108
+#: panels/printers/pp-jobs-dialog.c:240
 msgctxt "print job"
 msgid "Paused"
 msgstr "一時停止"
 
+#. Translators: Job's state (job needs authentication to proceed further)
+#: panels/printers/pp-jobs-dialog.c:245
+msgctxt "print job"
+msgid "Authentication required"
+msgstr "認証が必要です"
+
 #. Translators: Job's state (job is currently printing)
-#: ../panels/printers/pp-jobs-dialog.c:112
+#: panels/printers/pp-jobs-dialog.c:250
 msgctxt "print job"
 msgid "Processing"
 msgstr "印刷中"
 
 #. Translators: Job's state (job has been stopped)
-#: ../panels/printers/pp-jobs-dialog.c:116
+#: panels/printers/pp-jobs-dialog.c:254
 msgctxt "print job"
 msgid "Stopped"
 msgstr "停止"
 
 #. Translators: Job's state (job has been canceled)
-#: ../panels/printers/pp-jobs-dialog.c:120
+#: panels/printers/pp-jobs-dialog.c:258
 msgctxt "print job"
 msgid "Canceled"
 msgstr "キャンセル"
 
 #. Translators: Job's state (job has aborted due to error)
-#: ../panels/printers/pp-jobs-dialog.c:124
+#: panels/printers/pp-jobs-dialog.c:262
 msgctxt "print job"
 msgid "Aborted"
 msgstr "中止"
 
 #. Translators: Job's state (job has completed successfully)
-#: ../panels/printers/pp-jobs-dialog.c:128
+#: panels/printers/pp-jobs-dialog.c:266
 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
+#, 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:310
+#: panels/printers/pp-jobs-dialog.c:620
 #, c-format
 msgctxt "Printer jobs dialog title"
 msgid "%s — Active Jobs"
 msgstr "%s — アクティブなジョブ"
 
-#: ../panels/printers/pp-new-printer-dialog.c:402
+#. Translators: The printer needs authentication info to print.
+#: panels/printers/pp-jobs-dialog.c:625
+#, c-format
+msgid "Enter credentials to print from %s."
+msgstr "%s から印刷するために認証情報を入力します。"
+
+#: panels/printers/pp-new-printer-dialog.c:402
 msgid "Unlock Print Server"
 msgstr "プリンターサーバーのロックを解除"
 
 #. Translators: Samba server needs authentication of the user to show list of its printers.
-#: ../panels/printers/pp-new-printer-dialog.c:406
+#: panels/printers/pp-new-printer-dialog.c:406
 #, c-format
 msgid "Unlock %s."
 msgstr "ロック解除 %s"
 
 #. Translators: Samba server needs authentication of the user to show list of its printers.
-#: ../panels/printers/pp-new-printer-dialog.c:411
+#: panels/printers/pp-new-printer-dialog.c:411
 #, c-format
 msgid "Enter username and password to view printers on %s."
-msgstr ""
-"%s で利用可能なプリンターを表示するにはユーザー名とパスワードを入力してくださ"
-"い。"
+msgstr "%s で利用可能なプリンターを表示するにはユーザー名とパスワードを入力してください。"
 
-#: ../panels/printers/pp-new-printer-dialog.c:876
+#: panels/printers/pp-new-printer-dialog.c:876
 msgid "Searching for Printers"
 msgstr "プリンターの検索"
 
 #. Translators: The found device is a printer connected via USB
-#: ../panels/printers/pp-new-printer-dialog.c:1799
+#: panels/printers/pp-new-printer-dialog.c:1799
 msgid "USB"
 msgstr "USB"
 
 #. Translators: The found device is a printer connected via serial port
-#: ../panels/printers/pp-new-printer-dialog.c:1804
+#: panels/printers/pp-new-printer-dialog.c:1804
 msgid "Serial Port"
 msgstr "シリアルポート"
 
 #. Translators: The found device is a printer connected via parallel port
-#: ../panels/printers/pp-new-printer-dialog.c:1811
+#: panels/printers/pp-new-printer-dialog.c:1811
 msgid "Parallel Port"
 msgstr "パラレルポート"
 
 #. Translators: Location of found network printer (e.g. Kitchen, Reception)
-#: ../panels/printers/pp-new-printer-dialog.c:1853
+#: panels/printers/pp-new-printer-dialog.c:1853
 #, c-format
 msgid "Location: %s"
 msgstr "場所: %s"
 
 #. Translators: Network address of found printer
-#: ../panels/printers/pp-new-printer-dialog.c:1858
+#: panels/printers/pp-new-printer-dialog.c:1858
 #, 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:1887
+#: panels/printers/pp-new-printer-dialog.c:1887
 msgid "Server requires authentication"
 msgstr "サーバーが認証を要求しています"
 
-#: ../panels/printers/pp-options-dialog.c:83
+#: panels/printers/pp-options-dialog.c:83
 msgid "Two Sided"
 msgstr "両面"
 
-#: ../panels/printers/pp-options-dialog.c:84
+#: panels/printers/pp-options-dialog.c:84
 msgid "Paper Type"
 msgstr "用紙の種類"
 
-#: ../panels/printers/pp-options-dialog.c:85
+#: panels/printers/pp-options-dialog.c:85
 msgid "Paper Source"
 msgstr "給紙元"
 
-#: ../panels/printers/pp-options-dialog.c:86
+#: panels/printers/pp-options-dialog.c:86
 msgid "Output Tray"
 msgstr "出力トレイ"
 
-#: ../panels/printers/pp-options-dialog.c:88
+#: panels/printers/pp-options-dialog.c:88
 msgid "GhostScript pre-filtering"
 msgstr "GhostScriptのプレフィルタリング"
 
 #. Translators: This option sets number of pages printed on one sheet
-#: ../panels/printers/pp-options-dialog.c:534
+#: 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:546
+#: panels/printers/pp-options-dialog.c:546
 msgid "Two-sided"
 msgstr "両面"
 
 #. Translators: "General" tab contains general printer options
-#: ../panels/printers/pp-options-dialog.c:655
+#: 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:658
+#: 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:661
+#: 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:664
+#: 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:667
+#: 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:670
+#: 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:673
+#: 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:676
+#: 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:908
+#: panels/printers/pp-options-dialog.c:908
 msgid "Test page"
 msgstr "テストページ"
 
 #. Translators: this is an option of "Paper Source"
-#: ../panels/printers/pp-ppd-option-widget.c:76
-#: ../panels/printers/pp-ppd-option-widget.c:78
-#: ../panels/printers/pp-ppd-option-widget.c:86
+#: panels/printers/pp-ppd-option-widget.c:76
+#: panels/printers/pp-ppd-option-widget.c:78
+#: panels/printers/pp-ppd-option-widget.c:86
 msgid "Auto Select"
 msgstr "自動選択"
 
 #. Translators: this is an option of "Paper Source"
 #. Translators: this is an option of "Resolution"
-#: ../panels/printers/pp-ppd-option-widget.c:80
-#: ../panels/printers/pp-ppd-option-widget.c:82
-#: ../panels/printers/pp-ppd-option-widget.c:84
-#: ../panels/printers/pp-ppd-option-widget.c:88
+#: panels/printers/pp-ppd-option-widget.c:80
+#: panels/printers/pp-ppd-option-widget.c:82
+#: panels/printers/pp-ppd-option-widget.c:84
+#: panels/printers/pp-ppd-option-widget.c:88
 msgid "Printer Default"
 msgstr "プリンターのデフォルト"
 
 #. Translators: this is an option of "GhostScript"
-#: ../panels/printers/pp-ppd-option-widget.c:90
+#: panels/printers/pp-ppd-option-widget.c:90
 msgid "Embed GhostScript fonts only"
 msgstr "内蔵GhostScriptフォントのみ"
 
 #. Translators: this is an option of "GhostScript"
-#: ../panels/printers/pp-ppd-option-widget.c:92
+#: panels/printers/pp-ppd-option-widget.c:92
 msgid "Convert to PS level 1"
 msgstr "PSレベル1に変換"
 
 #. Translators: this is an option of "GhostScript"
-#: ../panels/printers/pp-ppd-option-widget.c:94
+#: panels/printers/pp-ppd-option-widget.c:94
 msgid "Convert to PS level 2"
 msgstr "PSレベル2に変換"
 
 #. Translators: this is an option of "GhostScript"
-#: ../panels/printers/pp-ppd-option-widget.c:96
+#: panels/printers/pp-ppd-option-widget.c:96
 msgid "No pre-filtering"
 msgstr "プレフィルタリングなし"
 
 #. Translators: Name of column showing printer manufacturers
-#: ../panels/printers/pp-ppd-selection-dialog.c:233
+#: panels/printers/pp-ppd-selection-dialog.c:233
 msgid "Manufacturer"
 msgstr "製造元"
 
 #. Translators: This is the label of the button that opens the Jobs Dialog.
-#: ../panels/printers/pp-printer-entry.c:577
+#: panels/printers/pp-printer-entry.c:613 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:582
+#: panels/printers/pp-printer-entry.c:618
 #, c-format
 msgid "%u Job"
 msgid_plural "%u Jobs"
 msgstr[0] "%u ジョブ"
 
+#. Translators: Name of job which makes printer to clean its heads
+#: panels/printers/pp-printer-entry.c:752
+msgid "Clean print heads"
+msgstr "ヘッドクリーニング"
+
 #. Translators: The printer is low on toner
-#: ../panels/printers/pp-printer-entry.c:730
+#: panels/printers/pp-printer-entry.c:804
 msgid "Low on toner"
 msgstr "トナーの残量が少ないです"
 
 #. Translators: The printer has no toner left
-#: ../panels/printers/pp-printer-entry.c:732
+#: panels/printers/pp-printer-entry.c:806
 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:735
+#: panels/printers/pp-printer-entry.c:809
 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:738
+#: panels/printers/pp-printer-entry.c:812
 msgid "Out of developer"
 msgstr "現像液が空です"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/pp-printer-entry.c:740
+#: panels/printers/pp-printer-entry.c:814
 msgid "Low on a marker supply"
 msgstr "インクが少なくなっています"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/pp-printer-entry.c:742
+#: panels/printers/pp-printer-entry.c:816
 msgid "Out of a marker supply"
 msgstr "インクが切れています"
 
 #. Translators: One or more covers on the printer are open
-#: ../panels/printers/pp-printer-entry.c:744
+#: panels/printers/pp-printer-entry.c:818
 msgid "Open cover"
 msgstr "カバーが開いています"
 
 #. Translators: One or more doors on the printer are open
-#: ../panels/printers/pp-printer-entry.c:746
+#: panels/printers/pp-printer-entry.c:820
 msgid "Open door"
 msgstr "扉が開いています"
 
 #. Translators: At least one input tray is low on media
-#: ../panels/printers/pp-printer-entry.c:748
+#: panels/printers/pp-printer-entry.c:822
 msgid "Low on paper"
 msgstr "紙が少なくなっています"
 
 #. Translators: At least one input tray is empty
-#: ../panels/printers/pp-printer-entry.c:750
+#: panels/printers/pp-printer-entry.c:824
 msgid "Out of paper"
 msgstr "紙が空です"
 
 #. Translators: The printer is offline
-#: ../panels/printers/pp-printer-entry.c:752
+#: panels/printers/pp-printer-entry.c:826
 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:754
-#: ../panels/printers/pp-printer-entry.c:884
+#: panels/printers/pp-printer-entry.c:828
+#: panels/printers/pp-printer-entry.c:971
 msgctxt "printer state"
 msgid "Stopped"
 msgstr "停止中"
 
 #. Translators: The printer marker supply waste receptacle is almost full
-#: ../panels/printers/pp-printer-entry.c:756
+#: panels/printers/pp-printer-entry.c:830
 msgid "Waste receptacle almost full"
 msgstr "廃インクタンクがもう少しでいっぱいです"
 
 #. Translators: The printer marker supply waste receptacle is full
-#: ../panels/printers/pp-printer-entry.c:758
+#: panels/printers/pp-printer-entry.c:832
 msgid "Waste receptacle full"
 msgstr "廃インクタンクがいっぱいです"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/pp-printer-entry.c:760
+#: panels/printers/pp-printer-entry.c:834
 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:762
+#: panels/printers/pp-printer-entry.c:836
 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:870
+#: panels/printers/pp-printer-entry.c:957
 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:875
+#: panels/printers/pp-printer-entry.c:962
 msgctxt "printer state"
 msgid "Does not accept jobs"
 msgstr "ジョブ受付不可"
 
 #. Translators: Printer's state (jobs are processing)
-#: ../panels/printers/pp-printer-entry.c:880
+#: panels/printers/pp-printer-entry.c:967
 msgctxt "printer state"
 msgid "Processing"
 msgstr "処理中"
 
-#. Translators: Name of job which makes printer to clean its heads
-#: ../panels/printers/pp-printer-entry.c:904
-msgid "Clean print heads"
-msgstr "ヘッドクリーニング"
-
-#: ../panels/printers/printer-entry.ui.h:1
+#: panels/printers/printer-entry.ui:14
 msgid "Printing Options"
 msgstr "プリンターのオプション"
 
-#: ../panels/printers/printer-entry.ui.h:2
+#: panels/printers/printer-entry.ui:26
 msgid "Printer Details"
 msgstr "プリンターの詳細"
 
 #. Set this printer as default
-#: ../panels/printers/printer-entry.ui.h:4
+#: panels/printers/printer-entry.ui:38
 msgid "Use Printer by Default"
 msgstr "デフォルトプリンター"
 
 #. Translators: This button executes command which cleans print heads of the printer.
-#: ../panels/printers/printer-entry.ui.h:6
+#: panels/printers/printer-entry.ui:50
 msgid "Clean Print Heads"
 msgstr "ヘッドクリーニング"
 
-#: ../panels/printers/printer-entry.ui.h:7
+#: panels/printers/printer-entry.ui:61
 msgid "Remove Printer"
 msgstr "プリンターの削除"
 
-#: ../panels/printers/printer-entry.ui.h:8
+#: panels/printers/printer-entry.ui:193
 msgid "Model"
 msgstr "型式"
 
-#: ../panels/printers/printer-entry.ui.h:10
+#: panels/printers/printer-entry.ui:251
 msgid "Ink Level"
 msgstr "インクの量"
 
 #. Translators: This is the message which follows the printer error.
-#: ../panels/printers/printer-entry.ui.h:12
+#: panels/printers/printer-entry.ui:312
 msgid "Please restart when the problem is resolved."
 msgstr "問題が解決した場合、再起動してください。"
 
 #. Translators: This is the button which restarts the printer.
-#: ../panels/printers/printer-entry.ui.h:14
+#: panels/printers/printer-entry.ui:319
 msgid "Restart"
 msgstr "再起動"
 
 #. Translators: This button adds new printer.
-#: ../panels/printers/printers.ui.h:2
+#: panels/printers/printers.ui:20
 msgid "Add…"
 msgstr "追加…"
 
-#: ../panels/printers/printers.ui.h:5
+#: panels/printers/printers.ui:186
 msgid "No printers"
 msgstr "プリンターが見つかりません"
 
 #. Translators: This button adds new printer.
-#: ../panels/printers/printers.ui.h:7
+#: panels/printers/printers.ui:200
 msgid "Add a Printer…"
 msgstr "プリンターの追加…"
 
 #. Translators: The CUPS server is not running (we can not connect to it).
-#: ../panels/printers/printers.ui.h:9
+#: panels/printers/printers.ui:232
 msgid ""
 "Sorry! The system printing service\n"
 "doesn’t seem to be available."
-msgstr ""
-"申し訳ありません! システムの印刷サービスは\n"
+msgstr "申し訳ありません! システムの印刷サービスは\n"
 "現在、利用できないようです。"
 
-#: ../panels/privacy/cc-privacy-panel.c:387 ../panels/privacy/privacy.ui.h:24
+#: panels/privacy/cc-privacy-panel.c:387 panels/privacy/privacy.ui:280
 msgid "Screen Lock"
 msgstr "画面ロック"
 
-#: ../panels/privacy/cc-privacy-panel.c:438
+#: panels/privacy/cc-privacy-panel.c:438
 msgid "In use"
 msgstr "使用中"
 
-#: ../panels/privacy/cc-privacy-panel.c:443
+#: panels/privacy/cc-privacy-panel.c:443
 msgctxt "Location services status"
 msgid "On"
 msgstr "オン"
 
-#: ../panels/privacy/cc-privacy-panel.c:444
+#: panels/privacy/cc-privacy-panel.c:444
 msgctxt "Location services status"
 msgid "Off"
 msgstr "オフ"
 
-#: ../panels/privacy/cc-privacy-panel.c:823 ../panels/privacy/privacy.ui.h:42
+#: panels/privacy/cc-privacy-panel.c:823 panels/privacy/privacy.ui:745
 msgid "Location Services"
 msgstr "位置情報サービス"
 
-#: ../panels/privacy/cc-privacy-panel.c:942 ../panels/privacy/privacy.ui.h:19
+#: panels/privacy/cc-privacy-panel.c:946 panels/privacy/privacy.ui:127
 msgid "Usage & History"
 msgstr "使用と履歴"
 
-#: ../panels/privacy/cc-privacy-panel.c:1071
+#: panels/privacy/cc-privacy-panel.c:1075
 msgid "Empty all items from Trash?"
 msgstr "ゴミ箱からすべてのアイテムを削除してもよろしいですか?"
 
-#: ../panels/privacy/cc-privacy-panel.c:1072
+#: panels/privacy/cc-privacy-panel.c:1076
 msgid "All items in the Trash will be permanently deleted."
 msgstr "ここでアイテムを削除すると元に戻すことはできません。"
 
-#: ../panels/privacy/cc-privacy-panel.c:1073
+#: panels/privacy/cc-privacy-panel.c:1077
 msgid "_Empty Trash"
 msgstr "ゴミ箱を空にする(_E)"
 
-#: ../panels/privacy/cc-privacy-panel.c:1096
+#: panels/privacy/cc-privacy-panel.c:1100
 msgid "Delete all the temporary files?"
 msgstr "一時ファイルをすべて削除しますか?"
 
-#: ../panels/privacy/cc-privacy-panel.c:1097
+#: panels/privacy/cc-privacy-panel.c:1101
 msgid "All the temporary files will be permanently deleted."
 msgstr "一時ファイルは完全に削除されます。"
 
-#: ../panels/privacy/cc-privacy-panel.c:1098
+#: panels/privacy/cc-privacy-panel.c:1102
 msgid "_Purge Temporary Files"
 msgstr "一時ファイルを削除する(_P)"
 
-#: ../panels/privacy/cc-privacy-panel.c:1120 ../panels/privacy/privacy.ui.h:29
+#: panels/privacy/cc-privacy-panel.c:1124 panels/privacy/privacy.ui:432
 msgid "Purge Trash & Temporary Files"
 msgstr "ゴミ箱と一時ファイルの削除"
 
-#: ../panels/privacy/cc-privacy-panel.c:1160 ../panels/privacy/privacy.ui.h:36
+#: panels/privacy/cc-privacy-panel.c:1164 panels/privacy/privacy.ui:637
 msgid "Software Usage"
 msgstr "ソフトウェアの使用状況"
 
-#: ../panels/privacy/cc-privacy-panel.c:1201 ../panels/privacy/privacy.ui.h:46
+#: panels/privacy/cc-privacy-panel.c:1205 panels/privacy/privacy.ui:959
 msgid "Problem Reporting"
 msgstr "問題報告"
 
 #. translators: '%s' is the distributor's name, such as 'Fedora'
-#: ../panels/privacy/cc-privacy-panel.c:1215
+#: panels/privacy/cc-privacy-panel.c:1219
 #, c-format
 msgid ""
 "Sending reports of technical problems helps us improve %s. Reports are sent "
 "anonymously and are scrubbed of personal data."
-msgstr ""
-"技術的な問題に遭遇した場合、問題に関するレポートを送信することで %s の改善に"
-"役立てることができます。レポートは匿名で送信され、個人データは取り除かれま"
-"す。"
+msgstr "技術的な問題に遭遇した場合、問題に関するレポートを送信することで %s の改善に役立てることができます。レポートは匿名で送信され、個人データは取り除かれます。"
 
-#: ../panels/privacy/cc-privacy-panel.c:1227 ../panels/privacy/privacy.ui.h:41
+#: panels/privacy/cc-privacy-panel.c:1231 panels/privacy/privacy.ui:719
 msgid "Privacy Policy"
 msgstr "プライバシーポリシー"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2
-msgid "Pri­va­cy"
+#: panels/privacy/gnome-privacy-panel.desktop.in.in:3
+msgid "Privacy"
 msgstr "プライバシー"
 
-#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3
+#: panels/privacy/gnome-privacy-panel.desktop.in.in:4
 msgid "Protect your personal information and control what others might see"
 msgstr "個人情報の保護と外部からの見え方を設定します"
 
-#. Translators: those are keywords for the privacy control-center panel
-#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5
+#. FIXME
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/privacy/gnome-privacy-panel.desktop.in.in:8
+msgid "preferences-system-privacy"
+msgstr "preferences-system-privacy"
+
+#. 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;画面;スクリーン;ロック;診断;クラッシュ;プライベート;最近;テ"
-"ンポラリー;一時;インデックス;索引;名前;ネットワーク;Privacy;プライバシー;"
+msgstr 
"screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;network;identity;画面;スクリーン;ロック;診断;クラッシュ;プライベート;最近;テンポラリー;一時;インデックス;索引;名前;ネットワーク;Privacy;プライバシー;"
 
-#: ../panels/privacy/privacy.ui.h:1
+#: panels/privacy/privacy.ui:14
 msgid "Screen Turns Off"
 msgstr "画面オフのとき"
 
-#: ../panels/privacy/privacy.ui.h:2
+#: panels/privacy/privacy.ui:18
 msgid "30 seconds"
 msgstr "30 秒"
 
-#: ../panels/privacy/privacy.ui.h:9
+#: panels/privacy/privacy.ui:60 panels/privacy/privacy.ui:106
 msgid "1 day"
 msgstr "1 日"
 
-#: ../panels/privacy/privacy.ui.h:10
+#: panels/privacy/privacy.ui:64
 msgid "2 days"
 msgstr "2 日"
 
-#: ../panels/privacy/privacy.ui.h:11
+#: panels/privacy/privacy.ui:68
 msgid "3 days"
 msgstr "3 日"
 
-#: ../panels/privacy/privacy.ui.h:12
+#: panels/privacy/privacy.ui:72
 msgid "4 days"
 msgstr "4 日"
 
-#: ../panels/privacy/privacy.ui.h:13
+#: panels/privacy/privacy.ui:76
 msgid "5 days"
 msgstr "5 日"
 
-#: ../panels/privacy/privacy.ui.h:14
+#: panels/privacy/privacy.ui:80
 msgid "6 days"
 msgstr "6 日"
 
-#: ../panels/privacy/privacy.ui.h:15
+#: panels/privacy/privacy.ui:84 panels/privacy/privacy.ui:110
 msgid "7 days"
 msgstr "7 日"
 
-#: ../panels/privacy/privacy.ui.h:16
+#: panels/privacy/privacy.ui:88
 msgid "14 days"
 msgstr "14 日"
 
-#: ../panels/privacy/privacy.ui.h:17
+#: panels/privacy/privacy.ui:92 panels/privacy/privacy.ui:114
 msgid "30 days"
 msgstr "30 日"
 
-#: ../panels/privacy/privacy.ui.h:18
+#: panels/privacy/privacy.ui:118
 msgid "Forever"
 msgstr "無期限"
 
-#: ../panels/privacy/privacy.ui.h:20
+#: panels/privacy/privacy.ui:148
 msgid ""
 "Remembering your history makes things easier to find again. These items are "
 "never shared over the network."
-msgstr ""
-"履歴を記憶しておくと、以前の作業を探し出すのが簡単になります。これらの項目は"
-"ネットワークを越えて共有されることはありません。"
+msgstr "履歴を記憶しておくと、以前の作業を探し出すのが簡単になります。これらの項目はネットワークを越えて共有されることはありません。"
 
-#: ../panels/privacy/privacy.ui.h:21
+#: panels/privacy/privacy.ui:176
 msgid "_Recently Used"
 msgstr "最近使用したファイル(_R)"
 
-#: ../panels/privacy/privacy.ui.h:22
+#: panels/privacy/privacy.ui:207
 msgid "Retain _History"
 msgstr "記憶する期間(_H)"
 
-#: ../panels/privacy/privacy.ui.h:23
+#: panels/privacy/privacy.ui:247
 msgid "Cl_ear Recent History"
 msgstr "履歴をクリアする(_E)"
 
-#: ../panels/privacy/privacy.ui.h:25
+#: panels/privacy/privacy.ui:301
 msgid "The Screen Lock protects your privacy when you are away."
 msgstr "画面をロックして離席中もプライバシーを保護します。"
 
-#: ../panels/privacy/privacy.ui.h:26
+#: panels/privacy/privacy.ui:328
 msgid "Automatic Screen _Lock"
 msgstr "自動画面ロック(_L)"
 
-#: ../panels/privacy/privacy.ui.h:27
+#: panels/privacy/privacy.ui:362
 msgid "Lock screen _after blank for"
 msgstr "画面オフ後にロックするまでの時間(_A)"
 
-#: ../panels/privacy/privacy.ui.h:28
+#: panels/privacy/privacy.ui:394
 msgid "Show _Notifications"
 msgstr "ロック画面に通知を表示する(_N)"
 
-#: ../panels/privacy/privacy.ui.h:30
+#: panels/privacy/privacy.ui:454
 msgid ""
 "Automatically purge the Trash and temporary files to help keep your computer "
 "free of unnecessary sensitive information."
-msgstr ""
-"ゴミ箱や一時ファイルを自動的に削除することで、不要になった機密情報が残ったま"
-"まにならないようにします。"
+msgstr "ゴミ箱や一時ファイルを自動的に削除することで、不要になった機密情報が残ったままにならないようにします。"
 
-#: ../panels/privacy/privacy.ui.h:31
+#: panels/privacy/privacy.ui:483
 msgid "Automatically empty _Trash"
 msgstr "ゴミ箱を自動で空にする(_T)"
 
-#: ../panels/privacy/privacy.ui.h:32
+#: panels/privacy/privacy.ui:515
 msgid "Automatically purge Temporary _Files"
 msgstr "一時ファイルを自動で削除する(_F)"
 
-#: ../panels/privacy/privacy.ui.h:33
+#: panels/privacy/privacy.ui:546
 msgid "Purge _After"
 msgstr "次の時間経過後に削除する(_A)"
 
-#: ../panels/privacy/privacy.ui.h:34
+#: panels/privacy/privacy.ui:590
 msgid "_Empty Trash…"
 msgstr "ゴミ箱を空にする(_E)…"
 
-#: ../panels/privacy/privacy.ui.h:35
+#: panels/privacy/privacy.ui:606
 msgid "_Purge Temporary Files…"
 msgstr "一時ファイルを削除する(_P)v"
 
-#: ../panels/privacy/privacy.ui.h:37
+#: panels/privacy/privacy.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 "
@@ -5035,836 +5224,794 @@ msgid ""
 "\n"
 "All the information we collect is made anonymous, and we will never share "
 "your data with third parties."
-msgstr ""
-"利用しているソフトウェアについての情報を私たちに送ることで、より適切な提案を"
-"私たちができるようになります。また、ソフトウェアの改善にも役立てられます。\n"
+msgstr "利用しているソフトウェアについての情報を私たちに送ることで、より適切な提案を私たちができるようになります。また、ソフトウェアの改善にも役立てられます。\n"
 "\n"
-"私たちが収集する情報はすべて匿名であり、また収集したデータを第三者と共有する"
-"ことはありません。"
+"私たちが収集する情報はすべて匿名であり、また収集したデータを第三者と共有することはありません。"
 
-#: ../panels/privacy/privacy.ui.h:40
+#: panels/privacy/privacy.ui:681
 msgid "_Send software usage statistics"
 msgstr "ソフトウェアの使用統計情報を送信する(_S)"
 
-#: ../panels/privacy/privacy.ui.h:43
+#: panels/privacy/privacy.ui:764
 msgid ""
 "Location services allow applications to know your location. Using Wi-Fi and "
 "mobile broadband increases accuracy."
-msgstr ""
-"位置情報サービスを有効にすると、アプリケーションが現在の位置情報を取得できる"
-"ようになります。Wi-Fi やモバイルブロードバンドを使用している場合、より正確な"
-"位置を取得できます。"
+msgstr "位置情報サービスを有効にすると、アプリケーションが現在の位置情報を取得できるようになります。Wi-Fi やモバイルブロードバンドを使用している場合、より正確な位置を取得できます。"
 
-#: ../panels/privacy/privacy.ui.h:44
+#: panels/privacy/privacy.ui:778
+msgid ""
+"Uses Mozilla Location Service: <a href='https://location.services.mozilla.";
+"com/privacy'>Privacy Policy</a>"
+msgstr "Mozilla Location Service を使用します。<a 
href='https://location.services.mozilla.com/privacy'>プライバシーポリシー</a>"
+
+#: panels/privacy/privacy.ui:828
 msgid "_Location Services"
 msgstr "位置情報サービス(_L)"
 
-#: ../panels/privacy/privacy.ui.h:47
+#: panels/privacy/privacy.ui:1026
 msgid "_Automatic Problem Reporting"
 msgstr "問題のレポートを自動で送信する(_A)"
 
-#: ../panels/region/cc-format-chooser.c:118
+#: panels/region/cc-format-chooser.c:118
 msgctxt "measurement format"
 msgid "Imperial"
 msgstr "ヤード・ポンド法"
 
-#: ../panels/region/cc-format-chooser.c:120
+#: panels/region/cc-format-chooser.c:120
 msgctxt "measurement format"
 msgid "Metric"
 msgstr "メートル法"
 
-#: ../panels/region/cc-format-chooser.c:285
+#: panels/region/cc-format-chooser.c:285
 msgid "No regions found"
 msgstr "地域が見つかりません"
 
-#: ../panels/region/cc-input-chooser.c:182
+#: panels/region/cc-input-chooser.c:182
 msgid "No input sources found"
 msgstr "入力ソースが見つかりません"
 
-#: ../panels/region/cc-input-chooser.c:1012
+#: panels/region/cc-input-chooser.c:1012
 msgctxt "Input Source"
 msgid "Other"
 msgstr "その他"
 
-#: ../panels/region/cc-region-panel.c:881
+#: panels/region/cc-region-panel.c:881
 msgid "No input source selected"
 msgstr "入力ソースが選択されていません"
 
-#: ../panels/region/cc-region-panel.c:1773
+#: panels/region/cc-region-panel.c:1773
 msgid "Login _Screen"
 msgstr "ログイン画面(_S)"
 
-#: ../panels/region/format-chooser.ui.h:1
+#: panels/region/format-chooser.ui:7
 msgid "Formats"
 msgstr "フォーマット"
 
-#: ../panels/region/format-chooser.ui.h:4
+#: panels/region/format-chooser.ui:120
 msgid "Preview"
 msgstr "プレビュー"
 
-#: ../panels/region/format-chooser.ui.h:5
+#: panels/region/format-chooser.ui:137
 msgid "Dates"
 msgstr "日付"
 
-#: ../panels/region/format-chooser.ui.h:6
+#: panels/region/format-chooser.ui:168
 msgid "Times"
 msgstr "時刻"
 
-#: ../panels/region/format-chooser.ui.h:7
+#: panels/region/format-chooser.ui:199
 msgid "Dates & Times"
 msgstr "日付と時刻"
 
-#: ../panels/region/format-chooser.ui.h:8
+#: panels/region/format-chooser.ui:230
 msgid "Numbers"
 msgstr "数字"
 
-#: ../panels/region/format-chooser.ui.h:9
+#: panels/region/format-chooser.ui:247
 msgid "Measurement"
 msgstr "計量単位"
 
-#: ../panels/region/format-chooser.ui.h:10
+#: panels/region/format-chooser.ui:264
 msgid "Paper"
 msgstr "用紙サイズ"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:2
-msgid "Re­gion & Lan­guage"
+#: panels/region/gnome-region-panel.desktop.in.in:3
+msgid "Region & Language"
 msgstr "地域と言語"
 
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:3
+#: panels/region/gnome-region-panel.desktop.in.in:4
 msgid ""
 "Select your display language, formats, keyboard layouts and input sources"
 msgstr "表示言語、フォーマット、キーボードレイアウト、入力ソースを設定します"
 
-#. Translators: those are keywords for the region control-center panel
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/region/gnome-region-panel.desktop.in.in:7
+msgid "preferences-desktop-locale"
+msgstr "preferences-desktop-locale"
+
+#. 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;言語;レイアウト;キーボード;入力;インプット;"
-"Region;地域;"
+msgstr "Language;Layout;Keyboard;Input;言語;レイアウト;キーボード;入力;インプット;Region;地域;"
 
-#: ../panels/region/input-chooser.ui.h:1
+#: panels/region/input-chooser.ui:5
 msgid "Add an Input Source"
 msgstr "入力ソースの追加"
 
-#: ../panels/region/input-chooser.ui.h:4
+#: panels/region/input-chooser.ui:76
 msgid "Input methods can’t be used on the login screen"
 msgstr "インプットメソッドはログイン画面で使用できません"
 
-#: ../panels/region/input-options.ui.h:1
+#: panels/region/input-options.ui:7
 msgid "Input Source Options"
 msgstr "入力ソースのオプション"
 
-#: ../panels/region/input-options.ui.h:2
+#: panels/region/input-options.ui:27
 msgid "Use the _same source for all windows"
 msgstr "すべてのウィンドウで同じソースを使う(_S)"
 
-#: ../panels/region/input-options.ui.h:3
+#: panels/region/input-options.ui:45
 msgid "Allow _different sources for each window"
 msgstr "ウィンドウ毎に別のソースを使用可能にする(_D)"
 
-#: ../panels/region/input-options.ui.h:5
+#: panels/region/input-options.ui:85
 msgid "Switch to previous source"
 msgstr "前のソースへ切り替える"
 
-#: ../panels/region/input-options.ui.h:6
+#: panels/region/input-options.ui:102
 msgid "Super+Shift+Space"
 msgstr "Super+Shift+Space"
 
-#: ../panels/region/input-options.ui.h:7
+#: panels/region/input-options.ui:116
 msgid "Switch to next source"
 msgstr "次のソースへ切り替える"
 
-#: ../panels/region/input-options.ui.h:8
+#: panels/region/input-options.ui:133
 msgid "Super+Space"
 msgstr "Super+Space"
 
-#: ../panels/region/input-options.ui.h:9
+#: panels/region/input-options.ui:147
 msgid "You can change these shortcuts in the keyboard settings"
 msgstr "キーボード設定でショートカットを変更できます"
 
-#: ../panels/region/input-options.ui.h:10
+#: panels/region/input-options.ui:164
 msgid "Alternative switch to next source"
 msgstr "次のソースへ切り替える (代替)"
 
-#: ../panels/region/input-options.ui.h:11
+#: panels/region/input-options.ui:181
 msgid "Left+Right Alt"
 msgstr "左Alt+右Alt"
 
-#: ../panels/region/region.ui.h:1
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
+#: panels/region/region.ui:67
+#: panels/user-accounts/data/user-accounts-dialog.ui:348
 msgid "_Language"
 msgstr "言語(_L)"
 
-#: ../panels/region/region.ui.h:2
+#: panels/region/region.ui:85
 msgid "English (United Kingdom)"
 msgstr "英語 (UK)"
 
-#: ../panels/region/region.ui.h:3
+#: panels/region/region.ui:112
 msgid "Restart the session for changes to take effect"
 msgstr "変更内容を反映させるにはログインしなおす必要があります"
 
-#: ../panels/region/region.ui.h:4
+#: panels/region/region.ui:134
 msgid "Restart…"
 msgstr "再起動…"
 
-#: ../panels/region/region.ui.h:5
+#: panels/region/region.ui:169
 msgid "_Formats"
 msgstr "フォーマット(_F)"
 
-#: ../panels/region/region.ui.h:6
+#: panels/region/region.ui:187
 msgid "United Kingdom"
 msgstr "UK"
 
-#: ../panels/region/region.ui.h:7
+#: panels/region/region.ui:229
 msgid "Input Sources"
 msgstr "入力ソース"
 
-#: ../panels/region/region.ui.h:8
+#: panels/region/region.ui:245
 msgid "_Options"
 msgstr "オプション(_O)"
 
-#: ../panels/region/region.ui.h:9
+#: panels/region/region.ui:311
 msgid "Add input source"
 msgstr "入力ソースを追加する"
 
-#: ../panels/region/region.ui.h:10
+#: panels/region/region.ui:336
 msgid "Remove input source"
 msgstr "入力ソースを削除する"
 
-#: ../panels/region/region.ui.h:11
+#: panels/region/region.ui:386
 msgid "Move input source up"
 msgstr "入力ソースを上に移動する"
 
-#: ../panels/region/region.ui.h:12
+#: panels/region/region.ui:411
 msgid "Move input source down"
 msgstr "入力ソースを下に移動する"
 
-#: ../panels/region/region.ui.h:13
+#: panels/region/region.ui:461
 msgid "Configure input source"
 msgstr "入力ソースの設定を行う"
 
-#: ../panels/region/region.ui.h:14
+#: panels/region/region.ui:486
 msgid "Show input source keyboard layout"
 msgstr "入力ソースのキーボードレイアウトを表示する"
 
-#: ../panels/region/region.ui.h:15
+#: panels/region/region.ui:530
 msgid "Login settings are used by all users when logging into the system"
 msgstr "ログイン画面の設定はすべてのユーザーがログイン時に使用します"
 
-#: ../panels/search/cc-search-locations-dialog.c:639
+#: panels/search/cc-search-locations-dialog.c:639
 msgid "Select Location"
 msgstr "場所の選択"
 
-#: ../panels/search/cc-search-locations-dialog.c:643
+#: panels/search/cc-search-locations-dialog.c:643
 msgid "_OK"
 msgstr "OK(_O)"
 
-#: ../panels/search/cc-search-panel.c:178
+#: panels/search/cc-search-panel.c:178
 msgid "No applications found"
 msgstr "アプリケーションが見つかりません"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/search/gnome-search-panel.desktop.in.in.h:2
-msgid "Search"
-msgstr "検索"
-
-#: ../panels/search/gnome-search-panel.desktop.in.in.h:3
+#: panels/search/gnome-search-panel.desktop.in.in:4
 msgid ""
 "Control which applications show search results in the Activities Overview"
 msgstr "アクティビティ画面で検索結果を表示するアプリケーションを設定します"
 
-#. Translators: those are keywords for the search control-center panel
-#: ../panels/search/gnome-search-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/search/gnome-search-panel.desktop.in.in:7
+msgid "preferences-system-search"
+msgstr "preferences-system-search"
+
+#. Translators: Search terms to find the Search panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+#: panels/search/gnome-search-panel.desktop.in.in:19
 msgid "Search;Find;Index;Hide;Privacy;Results;"
-msgstr ""
-"Search;Find;Index;Hide;Privacy;Results;サーチ;検索;インデックス;索引;非表示;"
-"プライバシー;結果;"
+msgstr "Search;Find;Index;Hide;Privacy;Results;サーチ;検索;インデックス;索引;非表示;プライバシー;結果;"
 
-#: ../panels/search/search-locations-dialog.ui.h:1
+#: panels/search/search-locations-dialog.ui:9
 msgid "Search Locations"
 msgstr "検索する場所"
 
-#: ../panels/search/search-locations-dialog.ui.h:2
+#: panels/search/search-locations-dialog.ui:43
 msgid "Places"
 msgstr "場所"
 
-#: ../panels/search/search-locations-dialog.ui.h:3
+#: panels/search/search-locations-dialog.ui:73
 msgid "Bookmarks"
 msgstr "ブックマーク"
 
-#: ../panels/search/search-locations-dialog.ui.h:4
+#: panels/search/search-locations-dialog.ui:130
 msgid "Other"
 msgstr "その他"
 
-#: ../panels/search/search.ui.h:1
+#: panels/search/search.ui:66
 msgid "Move Up"
 msgstr "上へ"
 
-#: ../panels/search/search.ui.h:2
+#: panels/search/search.ui:83
 msgid "Move Down"
 msgstr "下へ"
 
-#: ../panels/search/search.ui.h:3
+#: panels/search/search.ui:119
 msgid "Preferences"
 msgstr "設定"
 
 #. Label
-#: ../panels/sharing/cc-sharing-networks.c:303
+#: panels/sharing/cc-sharing-networks.c:305
 msgid "No networks selected for sharing"
 msgstr "共有するネットワークが選択されていません"
 
-#: ../panels/sharing/cc-sharing-panel.c:273
+#: panels/sharing/cc-sharing-panel.c:283
 msgctxt "service is enabled"
 msgid "On"
 msgstr "オン"
 
-#: ../panels/sharing/cc-sharing-panel.c:275
-#: ../panels/sharing/cc-sharing-panel.c:302
+#: panels/sharing/cc-sharing-panel.c:285 panels/sharing/cc-sharing-panel.c:312
 msgctxt "service is disabled"
 msgid "Off"
 msgstr "オフ"
 
-#: ../panels/sharing/cc-sharing-panel.c:305
+#: panels/sharing/cc-sharing-panel.c:315
 msgctxt "service is enabled"
 msgid "Enabled"
 msgstr "有効"
 
-#: ../panels/sharing/cc-sharing-panel.c:308
+#: panels/sharing/cc-sharing-panel.c:318
 msgctxt "service is active"
 msgid "Active"
 msgstr "アクティブ"
 
-#: ../panels/sharing/cc-sharing-panel.c:379
+#: panels/sharing/cc-sharing-panel.c:389
 msgid "Choose a Folder"
 msgstr "フォルダーの選択"
 
-#: ../panels/sharing/cc-sharing-panel.c:690
+#: panels/sharing/cc-sharing-panel.c:701
 #, c-format
 msgid ""
-"Personal File Sharing allows you to share your Public folder with others on "
-"your current network using: <a href=\"dav://%s\">dav://%s</a>"
-msgstr ""
-"パーソナルファイル共有を利用して、現在のネットワークの他ユーザーが次の URI に"
-"接続し、あなたの公開フォルダーを共有できるようにします: <a href=\"dav://%s"
-"\">dav://%s</a>"
+"File Sharing allows you to share your Public folder with others on your "
+"current network using: <a href=\"dav://%s\">dav://%s</a>"
+msgstr "File Sharing では、<a href=\"dav://%s\">dav://%s</a> を使用して現在のネットワーク上の他のユーザーと Public フォルダーを共有できます。"
 
-#: ../panels/sharing/cc-sharing-panel.c:692
+#: panels/sharing/cc-sharing-panel.c:703
 #, c-format
 msgid ""
 "When remote login is enabled, remote users can connect using the Secure "
 "Shell command:\n"
 "<a href=\"ssh %s\">ssh %s</a>"
-msgstr ""
-"リモートログインを有効化した場合、リモートユーザーによる Secure Shell コマン"
-"ドを使用した接続を許可します:\n"
+msgstr "リモートログインを有効化した場合、リモートユーザーによる Secure Shell コマンドを使用した接続を許可します:\n"
 "<a href=\"ssh %s\">ssh %s</a>"
 
-#: ../panels/sharing/cc-sharing-panel.c:694
+#: panels/sharing/cc-sharing-panel.c:705
 #, c-format
 msgid ""
 "Screen sharing allows remote users to view or control your screen by "
 "connecting to <a href=\"vnc://%s\">vnc://%s</a>"
-msgstr ""
-"スクリーン共有を許可した場合、リモートユーザーが次の URI に接続して画面の表示"
-"または操作を行うことを許可します: <a href=\"vnc://%s\">vnc://%s</a>"
+msgstr "スクリーン共有を許可した場合、リモートユーザーが次の URI に接続して画面の表示または操作を行うことを許可します: <a href=\"vnc://%s\">vnc://%s</a>"
 
-#: ../panels/sharing/cc-sharing-panel.c:806
+#: panels/sharing/cc-sharing-panel.c:817
 msgid "Copy"
 msgstr "コピー"
 
-#: ../panels/sharing/cc-sharing-panel.c:1233
+#: panels/sharing/cc-sharing-panel.c:1294
+#: panels/sharing/gnome-sharing-panel.desktop.in.in:3
 msgid "Sharing"
 msgstr "共有"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2
-msgid "Sha­ring"
-msgstr "共有"
-
-#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3
+#: panels/sharing/gnome-sharing-panel.desktop.in.in:4
 msgid "Control what you want to share with others"
 msgstr "他のユーザーと共有するものを設定します"
 
-#. Translators: those are keywords for the sharing control-center panel
-#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/sharing/gnome-sharing-panel.desktop.in.in:7
+msgid "preferences-system-sharing"
+msgstr "preferences-system-sharing"
+
+#. Translators: Search terms to find the Sharing panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#: panels/sharing/gnome-sharing-panel.desktop.in.in:16
 msgid ""
 "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;"
 "movies;server;renderer;"
-msgstr ""
-"share;sharing;ssh;host;name;remote;desktop;bluetooth;obex;media;audio;video;"
-"pictures;photos;movies;server;renderer;共有;シェアリング;セキュアシェル;ホス"
-"ト;名前;リモート;遠隔;デスクトップ;ブルートゥース;メディア;コンテンツ;オー"
-"ディオ;音声;音楽;楽曲;ミュージック;ビデオ;動画;映像;画像;静止画;写真;フォト;"
-"ムービー;映画;サーバー;レンダラー;"
+msgstr 
"share;sharing;ssh;host;name;remote;desktop;bluetooth;obex;media;audio;video;pictures;photos;movies;server;renderer;共有;シェアリング;セキュアシェル;ホスト;名前;リモート;遠隔;デスクトップ;ブルートゥース;メディア;コンテンツ;オーディオ;音声;音楽;楽曲;ミュージック;ビデオ;動画;映像;画像;静止画;写真;フォト;ムービー;映画;サーバー;レンダラー;"
 
-#: ../panels/sharing/networks.ui.h:1
+#: panels/sharing/networks.ui:19
 msgid "Networks"
 msgstr "ネットワーク"
 
-#: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1
+#: panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in:11
 msgid "Enable or disable remote login"
 msgstr "リモートログインの有効化/無効化"
 
-#: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:2
+#: panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in:12
 msgid "Authentication is required to enable or disable remote login"
 msgstr "リモートログインを有効化または無効化するには認証が必要になります"
 
-#: ../panels/sharing/sharing.ui.h:1
+#: panels/sharing/sharing.ui:46
 msgid "_Computer Name"
 msgstr "コンピューター名(_C)"
 
-#: ../panels/sharing/sharing.ui.h:2
+#: panels/sharing/sharing.ui:104
 msgid "_File Sharing"
 msgstr "ファイル共有(_F)"
 
-#: ../panels/sharing/sharing.ui.h:3
+#: panels/sharing/sharing.ui:147
 msgid "_Screen Sharing"
 msgstr "画面共有(_S)"
 
-#: ../panels/sharing/sharing.ui.h:4
+#: panels/sharing/sharing.ui:190
 msgid "_Media Sharing"
 msgstr "メディア共有(_M)"
 
-#: ../panels/sharing/sharing.ui.h:5
+#: panels/sharing/sharing.ui:233
 msgid "_Remote Login"
 msgstr "リモートログイン(_R)"
 
-#: ../panels/sharing/sharing.ui.h:6
+#: panels/sharing/sharing.ui:272
 msgid "Some services are disabled because of no network access."
 msgstr "ネットワークに接続していないため無効となっているサービスがあります。"
 
-#: ../panels/sharing/sharing.ui.h:7
+#: panels/sharing/sharing.ui:286 panels/sharing/sharing.ui:413
 msgid "File Sharing"
 msgstr "ファイル共有"
 
-#: ../panels/sharing/sharing.ui.h:8
+#: panels/sharing/sharing.ui:333
 msgid "_Require Password"
 msgstr "パスワードを要求する(_R)"
 
-#: ../panels/sharing/sharing.ui.h:10
+#: panels/sharing/sharing.ui:424 panels/sharing/sharing.ui:496
 msgid "Remote Login"
 msgstr "リモートログイン"
 
-#: ../panels/sharing/sharing.ui.h:11
+#: panels/sharing/sharing.ui:519 panels/sharing/sharing.ui:765
 msgid "Screen Sharing"
 msgstr "画面共有"
 
-#: ../panels/sharing/sharing.ui.h:12
+#: panels/sharing/sharing.ui:577
 msgid "_Allow connections to control the screen"
 msgstr "このスクリーンの操作する接続を許可する(_A)"
 
-#: ../panels/sharing/sharing.ui.h:13
+#: panels/sharing/sharing.ui:622
 msgid "_Password:"
 msgstr "パスワード(_P):"
 
-#: ../panels/sharing/sharing.ui.h:14
+#: panels/sharing/sharing.ui:652
 msgid "_Show Password"
 msgstr "パスワードを表示(_S)"
 
-#: ../panels/sharing/sharing.ui.h:15
+#: panels/sharing/sharing.ui:683
 msgid "Access Options"
 msgstr "アクセスオプション"
 
-#: ../panels/sharing/sharing.ui.h:16
+#: panels/sharing/sharing.ui:697
 msgid "_New connections must ask for access"
 msgstr "新規接続の場合アクセス要求を必要とする(_N)"
 
-#: ../panels/sharing/sharing.ui.h:17
+#: panels/sharing/sharing.ui:715
 msgid "_Require a password"
 msgstr "パスワードを要求する(_R)"
 
-#: ../panels/sharing/sharing.ui.h:18
+#: panels/sharing/sharing.ui:776 panels/sharing/sharing.ui:870
 msgid "Media Sharing"
 msgstr "メディア共有"
 
-#: ../panels/sharing/sharing.ui.h:19
+#: panels/sharing/sharing.ui:809
 msgid "Share music, photos and videos over the network."
 msgstr "音楽や写真、ビデオをネットワーク上で共有できます。"
 
-#: ../panels/sharing/sharing.ui.h:20
+#: panels/sharing/sharing.ui:824
 msgid "Folders"
 msgstr "フォルダー"
 
-#: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:1
+#: panels/sound/data/gnome-sound-panel.desktop.in.in:3
 msgid "Sound"
 msgstr "サウンド"
 
-#: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:2
+#: panels/sound/data/gnome-sound-panel.desktop.in.in:4
 msgid "Change sound levels, inputs, outputs, and alert sounds"
 msgstr "サウンドレベルや入力、出力、アラート音を設定します"
 
-#. Translators: those are keywords for the sound control-center panel
-#: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:4
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/sound/data/gnome-sound-panel.desktop.in.in:7
+msgid "multimedia-volume-control"
+msgstr "multimedia-volume-control"
+
+#. Translators: Search terms to find the Sound panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+#: panels/sound/data/gnome-sound-panel.desktop.in.in:20
 msgid "Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;Audio;"
-msgstr ""
-"Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;Audio;カード;マイク;音"
-"量;フェード;バランス;ブルートゥース;ヘッドセット;オーディオ;Sound;サウンド;"
+msgstr 
"Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;Audio;カード;マイク;音量;フェード;バランス;ブルートゥース;ヘッドセット;オーディオ;Sound;サウンド;"
 
 #. Translators: This is the name of an audio file that sounds like the bark of a dog.
 #. You might want to translate it into the equivalent words of your language.
-#: ../panels/sound/data/sounds/gnome-sounds-default.xml.in.in.h:3
+#: panels/sound/data/sounds/gnome-sounds-default.xml.in.in:6
 msgid "Bark"
 msgstr "犬が吠える音"
 
 #. Translators: This is the name of an audio file that sounds like a water drip.
 #. You might want to translate it into the equivalent words of your language.
-#: ../panels/sound/data/sounds/gnome-sounds-default.xml.in.in.h:6
+#: panels/sound/data/sounds/gnome-sounds-default.xml.in.in:12
 msgid "Drip"
 msgstr "水が滴る音"
 
 #. Translators: This is the name of an audio file that sounds like tapping glass.
 #. You might want to translate it into the equivalent words of your language.
-#: ../panels/sound/data/sounds/gnome-sounds-default.xml.in.in.h:9
+#: panels/sound/data/sounds/gnome-sounds-default.xml.in.in:18
 msgid "Glass"
 msgstr "ガラスを叩く音"
 
 #. Translators: This is the name of an audio file that sounds sort of like a submarine sonar ping.
 #. You might want to translate it into the equivalent words of your language.
-#: ../panels/sound/data/sounds/gnome-sounds-default.xml.in.in.h:12
+#: panels/sound/data/sounds/gnome-sounds-default.xml.in.in:24
 msgid "Sonar"
 msgstr "ソナーのピング音"
 
-#: ../panels/sound/gvc-balance-bar.c:105
+#: panels/sound/gvc-balance-bar.c:104
 msgctxt "balance"
 msgid "Left"
 msgstr "左"
 
-#: ../panels/sound/gvc-balance-bar.c:106
+#: panels/sound/gvc-balance-bar.c:105
 msgctxt "balance"
 msgid "Right"
 msgstr "右"
 
-#: ../panels/sound/gvc-balance-bar.c:109
+#: panels/sound/gvc-balance-bar.c:108
 msgctxt "balance"
 msgid "Rear"
 msgstr "リア"
 
-#: ../panels/sound/gvc-balance-bar.c:110
+#: panels/sound/gvc-balance-bar.c:109
 msgctxt "balance"
 msgid "Front"
 msgstr "フロント"
 
-#: ../panels/sound/gvc-balance-bar.c:113
+#: panels/sound/gvc-balance-bar.c:112
 msgctxt "balance"
 msgid "Minimum"
 msgstr "最小"
 
-#: ../panels/sound/gvc-balance-bar.c:114
+#: panels/sound/gvc-balance-bar.c:113
 msgctxt "balance"
 msgid "Maximum"
 msgstr "最大"
 
-#: ../panels/sound/gvc-balance-bar.c:289
+#: panels/sound/gvc-balance-bar.c:288
 msgid "_Balance:"
 msgstr "バランス(_B):"
 
-#: ../panels/sound/gvc-balance-bar.c:292
+#: panels/sound/gvc-balance-bar.c:291
 msgid "_Fade:"
 msgstr "フェード(_F):"
 
-#: ../panels/sound/gvc-balance-bar.c:295
+#: panels/sound/gvc-balance-bar.c:294
 msgid "_Subwoofer:"
 msgstr "サブウーファー(_S):"
 
-#: ../panels/sound/gvc-channel-bar.c:611 ../panels/sound/gvc-channel-bar.c:620
+#: panels/sound/gvc-channel-bar.c:610 panels/sound/gvc-channel-bar.c:619
 msgctxt "volume"
 msgid "100%"
 msgstr "100%"
 
-#: ../panels/sound/gvc-channel-bar.c:615
+#: panels/sound/gvc-channel-bar.c:614
 msgctxt "volume"
 msgid "Unamplified"
 msgstr "非増幅"
 
-#: ../panels/sound/gvc-combo-box.c:166 ../panels/sound/gvc-mixer-dialog.c:249
-#: ../panels/sound/gvc-mixer-dialog.c:515
+#: panels/sound/gvc-combo-box.c:166 panels/sound/gvc-mixer-dialog.c:253
+#: panels/sound/gvc-mixer-dialog.c:520
 msgid "_Profile:"
 msgstr "プロファイル(_P):"
 
-#. translators:
-#. * The number of sound outputs on a particular device
-#: ../panels/sound/gvc/gvc-mixer-control.c:1873
-#, c-format
-msgid "%u Output"
-msgid_plural "%u Outputs"
-msgstr[0] "%u 出力"
-
-#. translators:
-#. * The number of sound inputs on a particular device
-#: ../panels/sound/gvc/gvc-mixer-control.c:1883
-#, c-format
-msgid "%u Input"
-msgid_plural "%u Inputs"
-msgstr[0] "%u 入力"
-
-#: ../panels/sound/gvc/gvc-mixer-control.c:2738
-msgid "System Sounds"
-msgstr "システムのサウンド"
-
-#: ../panels/sound/gvc-mixer-dialog.c:251
+#: panels/sound/gvc-mixer-dialog.c:255
 msgid "_Test Speakers"
 msgstr "スピーカーのテスト(_T)"
 
-#: ../panels/sound/gvc-mixer-dialog.c:420
+#: panels/sound/gvc-mixer-dialog.c:424
 msgid "Peak detect"
 msgstr "ピークの検出"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1512
+#: panels/sound/gvc-mixer-dialog.c:1499
 msgid "Device"
 msgstr "デバイス"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1575
+#: panels/sound/gvc-mixer-dialog.c:1562
 #, c-format
 msgid "Speaker Testing for %s"
 msgstr "%s のスピーカーテスト"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1631
+#: panels/sound/gvc-mixer-dialog.c:1617
 msgid "_Output volume:"
 msgstr "出力の音量(_O):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1645
+#: panels/sound/gvc-mixer-dialog.c:1631
 msgid "Output"
 msgstr "出力"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1650
+#: panels/sound/gvc-mixer-dialog.c:1636
 msgid "C_hoose a device for sound output:"
 msgstr "サウンド出力デバイスの選択(_H):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1672
+#: panels/sound/gvc-mixer-dialog.c:1658
 msgid "Settings for the selected device:"
 msgstr "選択したデバイスの設定:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1683
+#: panels/sound/gvc-mixer-dialog.c:1669
 msgid "Input"
 msgstr "入力"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1690
+#: panels/sound/gvc-mixer-dialog.c:1676
 msgid "_Input volume:"
 msgstr "入力の音量(_I):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1711
+#: panels/sound/gvc-mixer-dialog.c:1697
 msgid "Input level:"
 msgstr "入力レベル:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1737
+#: panels/sound/gvc-mixer-dialog.c:1723
 msgid "C_hoose a device for sound input:"
 msgstr "サウンド入力デバイスの選択(_H):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1761
+#: panels/sound/gvc-mixer-dialog.c:1747
 msgid "Sound Effects"
 msgstr "音響効果"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1768
+#: panels/sound/gvc-mixer-dialog.c:1754
 msgid "_Alert volume:"
 msgstr "警告音の音量(_A):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1785
+#: panels/sound/gvc-mixer-dialog.c:1775
 msgid "No application is currently playing or recording audio."
 msgstr "音声の再生または録音を実行しているアプリケーションはありません。"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:188
+#: panels/sound/gvc-sound-theme-chooser.c:187
 msgid "Built-in"
 msgstr "組み込み"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:454
-#: ../panels/sound/gvc-sound-theme-chooser.c:466
-#: ../panels/sound/gvc-sound-theme-chooser.c:478
+#: panels/sound/gvc-sound-theme-chooser.c:446
+#: panels/sound/gvc-sound-theme-chooser.c:458
+#: panels/sound/gvc-sound-theme-chooser.c:470
 msgid "Sound Preferences"
 msgstr "サウンドの設定"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:457
-#: ../panels/sound/gvc-sound-theme-chooser.c:468
-#: ../panels/sound/gvc-sound-theme-chooser.c:480
+#: panels/sound/gvc-sound-theme-chooser.c:449
+#: panels/sound/gvc-sound-theme-chooser.c:460
+#: panels/sound/gvc-sound-theme-chooser.c:472
 msgid "Testing event sound"
 msgstr "イベント音のテスト中"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:554
-#: ../panels/wacom/wacom-stylus-page.ui.h:1
+#: panels/sound/gvc-sound-theme-chooser.c:544
+#: panels/wacom/wacom-stylus-page.ui:25
 msgid "Default"
 msgstr "デフォルト"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:555
+#: panels/sound/gvc-sound-theme-chooser.c:545
 msgid "From theme"
 msgstr "テーマから"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:740
+#: panels/sound/gvc-sound-theme-chooser.c:720
 msgid "C_hoose an alert sound:"
 msgstr "警告音の選択(_H):"
 
-#: ../panels/sound/gvc-speaker-test.c:231
+#: panels/sound/gvc-speaker-test.c:229
 msgid "Stop"
 msgstr "停止"
 
-#: ../panels/sound/gvc-speaker-test.c:231
-#: ../panels/sound/gvc-speaker-test.c:343
+#: panels/sound/gvc-speaker-test.c:229 panels/sound/gvc-speaker-test.c:341
 msgid "Test"
 msgstr "テスト"
 
-#: ../panels/sound/gvc-speaker-test.c:239
+#: panels/sound/gvc-speaker-test.c:237
 msgid "Subwoofer"
 msgstr "サブウーファー"
 
-#: ../panels/sound/sound-theme-file-utils.c:304
+#: panels/sound/sound-theme-file-utils.c:288
 msgid "Custom"
 msgstr "その他"
 
 #. translators: the labels will read:
 #. * Cursor Size: Default
-#: ../panels/universal-access/cc-ua-panel.c:351
+#: panels/universal-access/cc-ua-panel.c:353
 msgctxt "cursor size"
 msgid "Default"
 msgstr "デフォルト"
 
-#: ../panels/universal-access/cc-ua-panel.c:354
+#: panels/universal-access/cc-ua-panel.c:356
 msgctxt "cursor size"
 msgid "Medium"
 msgstr "中"
 
-#: ../panels/universal-access/cc-ua-panel.c:357
+#: panels/universal-access/cc-ua-panel.c:359
 msgctxt "cursor size"
 msgid "Large"
 msgstr "大"
 
-#: ../panels/universal-access/cc-ua-panel.c:360
+#: panels/universal-access/cc-ua-panel.c:362
 msgctxt "cursor size"
 msgid "Larger"
 msgstr "特大"
 
-#: ../panels/universal-access/cc-ua-panel.c:363
+#: panels/universal-access/cc-ua-panel.c:365
 msgctxt "cursor size"
 msgid "Largest"
 msgstr "最大"
 
-#: ../panels/universal-access/cc-ua-panel.c:367
+#: panels/universal-access/cc-ua-panel.c:369
 #, c-format
 msgid "%d pixel"
 msgid_plural "%d pixels"
 msgstr[0] "%d ピクセル"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2
-msgid "Uni­ver­sal Access"
-msgstr "ユニバーサルアクセス"
-
-#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3
+#: panels/universal-access/gnome-universal-access-panel.desktop.in.in:4
 msgid "Make it easier to see, hear, type, point and click"
-msgstr ""
-"見る、聞く、タイピング、クリック操作など、コンピューターを簡単に使えるように"
-"します"
+msgstr "見る、聞く、タイピング、クリック操作など、コンピューターを簡単に使えるようにします"
 
-#. Translators: those are keywords for the universal access control-center panel
-#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/universal-access/gnome-universal-access-panel.desktop.in.in:7
+msgid "preferences-desktop-accessibility"
+msgstr "preferences-desktop-accessibility"
+
+#. Translators: Search terms to find the Universal Access panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
+#: panels/universal-access/gnome-universal-access-panel.desktop.in.in:19
 msgid ""
 "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;"
 "AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;click;Delay;Assist;Repeat;Blink;"
-msgstr ""
-"Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;"
-"AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;click;Delay;Assist;Repeat;Blink;"
-"キーボード;マウス;アクセシビリティ;コントラスト;ズーム;拡大鏡;スクリーンリー"
-"ダー;テキスト;文字;フォント;サイズ;大きさ;固定;キー;スロー;バウンス;マウス;ダ"
-"ブルクリック;ディレイ;ユーザー支援;リピート;点滅;Universal;ユニバーサルアクセ"
-"ス;"
+msgstr 
"Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;click;Delay;Assist;Repeat;Blink;キーボード;マウス;アクセシビリティ;コントラスト;ズーム;拡大鏡;スクリーンリーダー;テキスト;文字;フォント;サイズ;大きさ;固定;キー;スロー;バウンス;マウス;ダブルクリック;ディレイ;ユーザー支援;リピート;点滅;Universal;ユニバーサルアクセス;"
 
-#: ../panels/universal-access/uap.ui.h:1
+#: panels/universal-access/uap.ui:89
 msgid "_Always Show Universal Access Menu"
 msgstr "ユニバーサルアクセスメニューを常に表示する(_A)"
 
-#: ../panels/universal-access/uap.ui.h:2
+#: panels/universal-access/uap.ui:131
 msgid "Seeing"
 msgstr "見る"
 
-#: ../panels/universal-access/uap.ui.h:3
+#: panels/universal-access/uap.ui:177
 msgid "_High Contrast"
 msgstr "ハイコントラスト(_H)"
 
-#: ../panels/universal-access/uap.ui.h:4
+#: panels/universal-access/uap.ui:224
 msgid "_Large Text"
 msgstr "大きな文字(_L)"
 
-#: ../panels/universal-access/uap.ui.h:5
+#: panels/universal-access/uap.ui:269
 msgid "C_ursor Size"
 msgstr "カーソルの大きさ(_U)"
 
-#: ../panels/universal-access/uap.ui.h:6
-#: ../panels/universal-access/zoom-options.ui.h:7
+#: panels/universal-access/uap.ui:316
+#: panels/universal-access/zoom-options.ui:98
 msgid "_Zoom"
 msgstr "ズーム(_Z)"
 
-#: ../panels/universal-access/uap.ui.h:8
+#: panels/universal-access/uap.ui:362
 msgid "Screen _Reader"
 msgstr "スクリーンリーダー(_R)"
 
-#: ../panels/universal-access/uap.ui.h:9
+#: panels/universal-access/uap.ui:408 panels/universal-access/uap.ui:1237
 msgid "_Sound Keys"
 msgstr "切り替えキー(_S)"
 
-#: ../panels/universal-access/uap.ui.h:10
+#: panels/universal-access/uap.ui:470
 msgid "Hearing"
 msgstr "聞く"
 
-#: ../panels/universal-access/uap.ui.h:11
+#: panels/universal-access/uap.ui:514 panels/universal-access/uap.ui:1340
 msgid "_Visual Alerts"
 msgstr "視覚警告(_V)"
 
-#: ../panels/universal-access/uap.ui.h:13
+#: panels/universal-access/uap.ui:622
 msgid "Screen _Keyboard"
 msgstr "スクリーンキーボード(_K)"
 
-#: ../panels/universal-access/uap.ui.h:14
+#: panels/universal-access/uap.ui:667
 msgid "R_epeat Keys"
 msgstr "リピートキー(_E)"
 
-#: ../panels/universal-access/uap.ui.h:15
+#: panels/universal-access/uap.ui:713
 msgid "Cursor _Blinking"
 msgstr "カーソルの点滅(_B)"
 
-#: ../panels/universal-access/uap.ui.h:16
+#: panels/universal-access/uap.ui:759
 msgid "_Typing Assist (AccessX)"
 msgstr "タイピング支援 [AccessX](_T)"
 
-#: ../panels/universal-access/uap.ui.h:17
+#: panels/universal-access/uap.ui:820
 msgid "Pointing & Clicking"
 msgstr "ポインター操作とクリック"
 
-#: ../panels/universal-access/uap.ui.h:18
+#: panels/universal-access/uap.ui:866
 msgid "_Mouse Keys"
 msgstr "マウスキー(_M)"
 
-#: ../panels/universal-access/uap.ui.h:19
+#: panels/universal-access/uap.ui:911
 msgid "_Click Assist"
 msgstr "クリック支援(_C)"
 
-#: ../panels/universal-access/uap.ui.h:20
+#: panels/universal-access/uap.ui:957
 msgid "_Double-Click Delay"
 msgstr "ダブルクリックと認識する間隔(_D)"
 
-#: ../panels/universal-access/uap.ui.h:21
+#: panels/universal-access/uap.ui:977
 msgid "Double-Click Delay"
 msgstr "ダブルクリックと認識する間隔"
 
-#: ../panels/universal-access/uap.ui.h:22
+#: panels/universal-access/uap.ui:1042
 msgid "Cursor Size"
 msgstr "カーソルの大きさ"
 
-#: ../panels/universal-access/uap.ui.h:23
+#: panels/universal-access/uap.ui:1069
 msgid ""
 "Cursor size can be combined with zoom to make it easier to see the cursor."
-msgstr ""
-"ズーム機能と組み合わせてカーソルの大きさを設定することでカーソルがより見やす"
-"くなります。"
+msgstr "ズーム機能と組み合わせてカーソルの大きさを設定することでカーソルがより見やすくなります。"
 
-#: ../panels/universal-access/uap.ui.h:24
+#: panels/universal-access/uap.ui:1105
 msgid "Screen Reader"
 msgstr "スクリーンリーダー"
 
-#: ../panels/universal-access/uap.ui.h:25
+#: panels/universal-access/uap.ui:1122
 msgid "The screen reader reads displayed text as you move the focus."
-msgstr ""
-"スクリーンリーダーを有効にすると、フォーカスのある画面のテキストを音声で読み"
-"上げます。"
+msgstr "スクリーンリーダーを有効にすると、フォーカスのある画面のテキストを音声で読み上げます。"
 
-#: ../panels/universal-access/uap.ui.h:26
+#: panels/universal-access/uap.ui:1155
 msgid "_Screen Reader"
 msgstr "スクリーンリーダー(_S)"
 
@@ -5873,886 +6020,890 @@ msgstr "スクリーンリーダー(_S)"
 # 
「切り替えキー」もわかりやすいとは言いづらいが、Windows側の機能を知っているユーザーには類推できること、またWeb検索などで機能を特定しやすいこと、「サウンドキー」よりかは幾分ましであること、などを考慮し「切り替えキー」を採用する。
 # [1] http://windows.microsoft.com/en-us/Windows7/Make-the-keyboard-easier-to-use
 # [2] http://windows.microsoft.com/ja-JP/Windows7/Make-the-keyboard-easier-to-use
-#: ../panels/universal-access/uap.ui.h:27
+#: panels/universal-access/uap.ui:1194
 msgid "Sound Keys"
 msgstr "切り替えキー"
 
-#: ../panels/universal-access/uap.ui.h:28
+#: panels/universal-access/uap.ui:1212
 msgid "Beep when Num Lock or Caps Lock are turned on or off."
 msgstr "Caps Lock と Num Lock のON/OFFが切り替わるとビープ音を鳴らします。"
 
-#: ../panels/universal-access/uap.ui.h:29
+#: panels/universal-access/uap.ui:1282
 msgid "Visual Alerts"
 msgstr "視覚警告"
 
-#: ../panels/universal-access/uap.ui.h:30
+#: panels/universal-access/uap.ui:1286
 msgid "_Test flash"
 msgstr "動作確認(_T)"
 
-#: ../panels/universal-access/uap.ui.h:31
+#: panels/universal-access/uap.ui:1315
 msgid "Use a visual indication when an alert sound occurs."
 msgstr "警告音が鳴った場合に視覚的に警告を表示します。"
 
-#: ../panels/universal-access/uap.ui.h:32
+#: panels/universal-access/uap.ui:1366
 msgid "Flash the _window title"
 msgstr "ウィンドウのタイトルバーをひらめかせる(_W)"
 
-#: ../panels/universal-access/uap.ui.h:33
+#: panels/universal-access/uap.ui:1384
 msgid "Flash the entire _screen"
 msgstr "画面全体をひらめかせる(_S)"
 
-#: ../panels/universal-access/uap.ui.h:34
+#: panels/universal-access/uap.ui:1429
 msgid "Repeat Keys"
 msgstr "リピートキー"
 
-#: ../panels/universal-access/uap.ui.h:35
+#: panels/universal-access/uap.ui:1459
 msgid "Key presses repeat when key is held down."
 msgstr "キーを長押しすると繰り返しキー入力を行う"
 
-#: ../panels/universal-access/uap.ui.h:37
+#: panels/universal-access/uap.ui:1538
 msgid "Repeat keys delay"
 msgstr "リピートキーが行われるまでの時間です"
 
-#: ../panels/universal-access/uap.ui.h:38
+#: panels/universal-access/uap.ui:1586 panels/universal-access/uap.ui:1719
 msgid "Speed"
 msgstr "速度"
 
-#: ../panels/universal-access/uap.ui.h:39
+#: panels/universal-access/uap.ui:1623
 msgid "Repeat keys speed"
 msgstr "押したキーをリピートする際の速さです"
 
-#: ../panels/universal-access/uap.ui.h:40
+#: panels/universal-access/uap.ui:1647
 msgid "Cursor Blinking"
 msgstr "カーソルの点滅"
 
-#: ../panels/universal-access/uap.ui.h:41
+#: panels/universal-access/uap.ui:1677
 msgid "Cursor blinks in text fields."
 msgstr "テキストフィールドでカーソルを点滅させる"
 
-#: ../panels/universal-access/uap.ui.h:42
+#: panels/universal-access/uap.ui:1756
 msgid "Cursor blinking speed"
 msgstr "カーソルが点滅する速さです"
 
-#: ../panels/universal-access/uap.ui.h:43
+#: panels/universal-access/uap.ui:1792
 msgid "Typing Assist"
 msgstr "タイピング支援"
 
-#: ../panels/universal-access/uap.ui.h:44
+#: panels/universal-access/uap.ui:1831
 msgid "_Sticky Keys"
 msgstr "固定キー(_S)"
 
-#: ../panels/universal-access/uap.ui.h:45
+#: panels/universal-access/uap.ui:1848
 msgid "Treats a sequence of modifier keys as a key combination"
-msgstr ""
-"修飾キーに続いてキーを押したらそのキーと修飾キーを同時に押したものと扱う"
+msgstr "修飾キーに続いてキーを押したらそのキーと修飾キーを同時に押したものと扱う"
 
-#: ../panels/universal-access/uap.ui.h:46
+#: panels/universal-access/uap.ui:1872
 msgid "_Disable if two keys are pressed together"
 msgstr "同時に 2 つのキーを押したら無効にする(_D)"
 
-#: ../panels/universal-access/uap.ui.h:47
+#: panels/universal-access/uap.ui:1890
 msgid "Beep when a _modifier key is pressed"
 msgstr "修飾キーを押したらビープ音を鳴らす(_M)"
 
-#: ../panels/universal-access/uap.ui.h:48
+#: panels/universal-access/uap.ui:1938
 msgid "S_low Keys"
 msgstr "スローキー(_L)"
 
-#: ../panels/universal-access/uap.ui.h:49
+#: panels/universal-access/uap.ui:1955
 msgid "Puts a delay between when a key is pressed and when it is accepted"
 msgstr "キーを押下してから入力と認識されるまでに一定の間隔を設定する"
 
-#: ../panels/universal-access/uap.ui.h:50
+#: panels/universal-access/uap.ui:1988 panels/universal-access/uap.ui:2201
+#: panels/universal-access/uap.ui:2538
 msgid "A_cceptance delay:"
 msgstr "認識するまでの間隔(_C):"
 
-#: ../panels/universal-access/uap.ui.h:51
+#: panels/universal-access/uap.ui:2010
 msgctxt "slow keys delay"
 msgid "Short"
 msgstr "短い"
 
-#: ../panels/universal-access/uap.ui.h:52
+#: panels/universal-access/uap.ui:2029
 msgid "Slow keys typing delay"
 msgstr "スローキーの入力間隔"
 
-#: ../panels/universal-access/uap.ui.h:53
+#: panels/universal-access/uap.ui:2044
 msgctxt "slow keys delay"
 msgid "Long"
 msgstr "長い"
 
-#: ../panels/universal-access/uap.ui.h:54
+#: panels/universal-access/uap.ui:2071
 msgid "Beep when a key is pr_essed"
 msgstr "キーが押されたらビープ音を鳴らす(_E)"
 
-#: ../panels/universal-access/uap.ui.h:55
+#: panels/universal-access/uap.ui:2088
 msgid "Beep when a key is _accepted"
 msgstr "キー入力が受け付けられたらビープ音を鳴らす(_A)"
 
-#: ../panels/universal-access/uap.ui.h:56
+#: panels/universal-access/uap.ui:2105 panels/universal-access/uap.ui:2284
 msgid "Beep when a key is _rejected"
 msgstr "キー入力が拒否されたらビープ音を鳴らす(_R)"
 
-#: ../panels/universal-access/uap.ui.h:57
+#: panels/universal-access/uap.ui:2151
 msgid "_Bounce Keys"
 msgstr "バウンスキー(_B)"
 
-#: ../panels/universal-access/uap.ui.h:58
+#: panels/universal-access/uap.ui:2168
 msgid "Ignores fast duplicate keypresses"
 msgstr "同じキーを繰り返し押した場合は無視する"
 
-#: ../panels/universal-access/uap.ui.h:59
+#: panels/universal-access/uap.ui:2223
 msgctxt "bounce keys delay"
 msgid "Short"
 msgstr "短い"
 
-#: ../panels/universal-access/uap.ui.h:60
+#: panels/universal-access/uap.ui:2242
 msgid "Bounce keys typing delay"
 msgstr "バウンスキーの入力間隔"
 
-#: ../panels/universal-access/uap.ui.h:61
+#: panels/universal-access/uap.ui:2257
 msgctxt "bounce keys delay"
 msgid "Long"
 msgstr "長い"
 
-#: ../panels/universal-access/uap.ui.h:62
+#: panels/universal-access/uap.ui:2370
 msgid "_Enable by Keyboard"
 msgstr "キーボードから有効化できるようにする(_E)"
 
-#: ../panels/universal-access/uap.ui.h:63
+#: panels/universal-access/uap.ui:2387
 msgid "Turn accessibility features on and off using the keyboard"
 msgstr "アクセシビリティ機能のオン/オフをキーボードで切り替える"
 
-#: ../panels/universal-access/uap.ui.h:64
+#: panels/universal-access/uap.ui:2451
 msgid "Click Assist"
 msgstr "クリック支援"
 
-#: ../panels/universal-access/uap.ui.h:65
+#: panels/universal-access/uap.ui:2487
 msgid "_Simulated Secondary Click"
 msgstr "副ボタンのクリックの代替(_S)"
 
-#: ../panels/universal-access/uap.ui.h:66
+#: panels/universal-access/uap.ui:2505
 msgid "Trigger a secondary click by holding down the primary button"
 msgstr "主ボタンを押したままにすると副ボタンのクリックとみなす"
 
-#: ../panels/universal-access/uap.ui.h:67
+#: panels/universal-access/uap.ui:2559
 msgctxt "secondary click"
 msgid "Short"
 msgstr "短い"
 
-#: ../panels/universal-access/uap.ui.h:68
+#: panels/universal-access/uap.ui:2578
 msgid "Secondary click delay"
 msgstr "副ボタンのクリックの間隔"
 
-#: ../panels/universal-access/uap.ui.h:69
+#: panels/universal-access/uap.ui:2593
 msgctxt "secondary click delay"
 msgid "Long"
 msgstr "長い"
 
 # See also ja.po of mousetweak
-#: ../panels/universal-access/uap.ui.h:70
+#: panels/universal-access/uap.ui:2650
 msgid "_Hover Click"
 msgstr "ホバークリック(_H)"
 
-#: ../panels/universal-access/uap.ui.h:71
+#: panels/universal-access/uap.ui:2668
 msgid "Trigger a click when the pointer hovers"
 msgstr "ポインターの移動を停止したらクリック動作を行う"
 
-#: ../panels/universal-access/uap.ui.h:72
+#: panels/universal-access/uap.ui:2701
 msgid "D_elay:"
 msgstr "認識するまでの間隔(_E):"
 
-#: ../panels/universal-access/uap.ui.h:73
+#: panels/universal-access/uap.ui:2723
 msgctxt "dwell click delay"
 msgid "Short"
 msgstr "短い"
 
-#: ../panels/universal-access/uap.ui.h:74
+#: panels/universal-access/uap.ui:2754
 msgctxt "dwell click delay"
 msgid "Long"
 msgstr "長い"
 
-#: ../panels/universal-access/uap.ui.h:75
+#: panels/universal-access/uap.ui:2790
 msgid "Motion _threshold:"
 msgstr "ジェスチャーのしきい値(_T):"
 
-#: ../panels/universal-access/uap.ui.h:76
+#: panels/universal-access/uap.ui:2812
 msgctxt "dwell click threshold"
 msgid "Small"
 msgstr "小"
 
-#: ../panels/universal-access/uap.ui.h:77
+#: panels/universal-access/uap.ui:2843
 msgctxt "dwell click threshold"
 msgid "Large"
 msgstr "大"
 
-#: ../panels/universal-access/zoom-options.c:333
+#: panels/universal-access/zoom-options.c:333
 msgctxt "Distance"
 msgid "Short"
 msgstr "短い"
 
-#: ../panels/universal-access/zoom-options.c:334
+#: panels/universal-access/zoom-options.c:334
 msgctxt "Distance"
 msgid "¼ Screen"
 msgstr "画面の¼"
 
-#: ../panels/universal-access/zoom-options.c:335
+#: panels/universal-access/zoom-options.c:335
 msgctxt "Distance"
 msgid "½ Screen"
 msgstr "画面の½"
 
-#: ../panels/universal-access/zoom-options.c:336
+#: panels/universal-access/zoom-options.c:336
 msgctxt "Distance"
 msgid "¾ Screen"
 msgstr "画面の¾"
 
-#: ../panels/universal-access/zoom-options.c:337
+#: panels/universal-access/zoom-options.c:337
 msgctxt "Distance"
 msgid "Long"
 msgstr "長い"
 
-#: ../panels/universal-access/zoom-options.ui.h:1
+#: panels/universal-access/zoom-options.ui:48
 msgid "Full Screen"
 msgstr "フルスクリーン"
 
-#: ../panels/universal-access/zoom-options.ui.h:2
+#: panels/universal-access/zoom-options.ui:53
 msgid "Top Half"
 msgstr "上半分"
 
-#: ../panels/universal-access/zoom-options.ui.h:3
+#: panels/universal-access/zoom-options.ui:58
 msgid "Bottom Half"
 msgstr "下半分"
 
-#: ../panels/universal-access/zoom-options.ui.h:4
+#: panels/universal-access/zoom-options.ui:63
 msgid "Left Half"
 msgstr "左半分"
 
-#: ../panels/universal-access/zoom-options.ui.h:5
+#: panels/universal-access/zoom-options.ui:68
 msgid "Right Half"
 msgstr "右半分"
 
-#: ../panels/universal-access/zoom-options.ui.h:6
+#: panels/universal-access/zoom-options.ui:77
 msgid "Zoom Options"
 msgstr "ズームオプション"
 
-#: ../panels/universal-access/zoom-options.ui.h:8
+#: panels/universal-access/zoom-options.ui:186
 msgid "_Magnification:"
 msgstr "拡大率(_M):"
 
-#: ../panels/universal-access/zoom-options.ui.h:9
+#: panels/universal-access/zoom-options.ui:250
 msgid "_Follow mouse cursor"
 msgstr "マウスカーソルの動きを追う(_F)"
 
-#: ../panels/universal-access/zoom-options.ui.h:10
+#: panels/universal-access/zoom-options.ui:270
 msgid "_Screen part:"
 msgstr "拡大部分(_S):"
 
-#: ../panels/universal-access/zoom-options.ui.h:11
+#: panels/universal-access/zoom-options.ui:332
 msgid "Magnifier _extends outside of screen"
 msgstr "画面の外側も表示する(_E)"
 
 # 旧来のユーザーのために旧Orcaでの名称を括弧内に併記
-#: ../panels/universal-access/zoom-options.ui.h:12
+#: panels/universal-access/zoom-options.ui:351
 msgid "_Keep magnifier cursor centered"
 msgstr "カーソルを画面中央にキープする(中央)(_K)"
 
 # 旧来のユーザーのために旧Orcaでの名称を括弧内に併記
-#: ../panels/universal-access/zoom-options.ui.h:13
+#: panels/universal-access/zoom-options.ui:370
 msgid "Magnifier cursor _pushes contents around"
 msgstr "拡大領域を押し出すように移動する(プッシュ)(_P)"
 
 # 旧来のユーザーのために旧Orcaでの名称を括弧内に併記
-#: ../panels/universal-access/zoom-options.ui.h:14
+#: panels/universal-access/zoom-options.ui:389
 msgid "Magnifier cursor moves with _contents"
 msgstr "カーソルの動きに拡大領域を移動する (プロポーショナル)(_C)"
 
-#: ../panels/universal-access/zoom-options.ui.h:15
+#: panels/universal-access/zoom-options.ui:423
 msgid "Magnifier Position:"
 msgstr "拡大領域の位置:"
 
-#: ../panels/universal-access/zoom-options.ui.h:16
+#: panels/universal-access/zoom-options.ui:444
 msgid "Magnifier"
 msgstr "拡大鏡"
 
-#: ../panels/universal-access/zoom-options.ui.h:17
+#: panels/universal-access/zoom-options.ui:490
 msgid "_Thickness:"
 msgstr "太さ(_T):"
 
-#: ../panels/universal-access/zoom-options.ui.h:18
+#: panels/universal-access/zoom-options.ui:516
 msgctxt "universal access, thickness"
 msgid "Thin"
 msgstr "細い"
 
-#: ../panels/universal-access/zoom-options.ui.h:19
+#: panels/universal-access/zoom-options.ui:548
 msgctxt "universal access, thickness"
 msgid "Thick"
 msgstr "太い"
 
-#: ../panels/universal-access/zoom-options.ui.h:20
+#: panels/universal-access/zoom-options.ui:574
 msgid "_Length:"
 msgstr "長さ(_L):"
 
 #. The color of the accessibility crosshair
-#: ../panels/universal-access/zoom-options.ui.h:22
+#: panels/universal-access/zoom-options.ui:626
 msgid "Co_lor:"
 msgstr "色(_L):"
 
-#: ../panels/universal-access/zoom-options.ui.h:23
+#: panels/universal-access/zoom-options.ui:690
 msgid "_Crosshairs:"
 msgstr "照準線(_C):"
 
-#: ../panels/universal-access/zoom-options.ui.h:24
+#: panels/universal-access/zoom-options.ui:741
 msgid "_Overlaps mouse cursor"
 msgstr "マウスカーソルに重ねる(_O)"
 
-#: ../panels/universal-access/zoom-options.ui.h:25
+#: panels/universal-access/zoom-options.ui:779
 msgid "Crosshairs"
 msgstr "照準線"
 
-#: ../panels/universal-access/zoom-options.ui.h:26
+#: panels/universal-access/zoom-options.ui:827
 msgid "_White on black:"
 msgstr "反転(_W):"
 
-#: ../panels/universal-access/zoom-options.ui.h:27
+#: panels/universal-access/zoom-options.ui:850
 msgid "_Brightness:"
 msgstr "明るさ(_B):"
 
-#: ../panels/universal-access/zoom-options.ui.h:28
+#: panels/universal-access/zoom-options.ui:874
 msgid "_Contrast:"
 msgstr "コントラスト(_C):"
 
 #. The contrast scale goes from Color to None (grayscale)
-#: ../panels/universal-access/zoom-options.ui.h:30
+#: panels/universal-access/zoom-options.ui:897
 msgctxt "universal access, contrast"
 msgid "Co_lor"
 msgstr "色(_L)"
 
-#: ../panels/universal-access/zoom-options.ui.h:31
+#: panels/universal-access/zoom-options.ui:925
 msgctxt "universal access, color"
 msgid "None"
 msgstr "白黒"
 
-#: ../panels/universal-access/zoom-options.ui.h:32
+#: panels/universal-access/zoom-options.ui:957
 msgctxt "universal access, color"
 msgid "Full"
 msgstr "カラー"
 
-#: ../panels/universal-access/zoom-options.ui.h:33
+#: panels/universal-access/zoom-options.ui:1023
 msgctxt "universal access, brightness"
 msgid "Low"
 msgstr "暗い"
 
-#: ../panels/universal-access/zoom-options.ui.h:34
+#: panels/universal-access/zoom-options.ui:1056
 msgctxt "universal access, brightness"
 msgid "High"
 msgstr "明るい"
 
-#: ../panels/universal-access/zoom-options.ui.h:35
+#: panels/universal-access/zoom-options.ui:1087
 msgctxt "universal access, contrast"
 msgid "Low"
 msgstr "低い"
 
-#: ../panels/universal-access/zoom-options.ui.h:36
+#: panels/universal-access/zoom-options.ui:1120
 msgctxt "universal access, contrast"
 msgid "High"
 msgstr "高い"
 
-#: ../panels/universal-access/zoom-options.ui.h:37
+#: panels/universal-access/zoom-options.ui:1156
 msgid "Color Effects:"
 msgstr "色の設定:"
 
-#: ../panels/universal-access/zoom-options.ui.h:38
+#: panels/universal-access/zoom-options.ui:1181
 msgid "Color Effects"
 msgstr "色の設定"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:1
-#: ../panels/user-accounts/data/join-dialog.ui.h:1
+#: panels/user-accounts/data/account-dialog.ui:18
+#: panels/user-accounts/data/join-dialog.ui:11
 msgid "Add User"
 msgstr "ユーザーの追加"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:5
+#: panels/user-accounts/data/account-dialog.ui:171
 msgid "_Full Name"
 msgstr "フルネーム(_F)"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:6
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
+#: panels/user-accounts/data/account-dialog.ui:197
+#: panels/user-accounts/data/user-accounts-dialog.ui:146
 msgid "Standard"
 msgstr "標準"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:7
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
+#: panels/user-accounts/data/account-dialog.ui:207
+#: panels/user-accounts/data/user-accounts-dialog.ui:155
 msgid "Administrator"
 msgstr "管理者"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:8
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
+#: panels/user-accounts/data/account-dialog.ui:223
+#: panels/user-accounts/data/user-accounts-dialog.ui:173
 msgid "Account _Type"
 msgstr "アカウントの種類(_T)"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:10
+#: panels/user-accounts/data/account-dialog.ui:260
 msgid "Allow user to set a password when they next _login"
 msgstr "次回ログイン時にユーザー自身でパスワードを設定させる(_L)"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:11
+#: panels/user-accounts/data/account-dialog.ui:274
 msgid "Set a password _now"
 msgstr "いまパスワードを設定する(_N)"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:13
+#: panels/user-accounts/data/account-dialog.ui:387
 msgid "_Confirm"
 msgstr "確認(_C)"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:14
+#: panels/user-accounts/data/account-dialog.ui:463
+#: panels/user-accounts/data/account-dialog.ui:667
 msgid ""
 "Enterprise login allows an existing centrally managed user account to be "
 "used on this device. You can also use this account to access company "
 "resources on the internet."
-msgstr ""
-"エンタープライズログインでは、中央管理された既存のユーザーアカウントをこのデ"
-"バイスで使用できます。このアカウントを使用して、インターネット上の企業内の各"
-"種リソースにアクセスすることができます。"
+msgstr "エンタープライズログインでは、中央管理された既存のユーザーアカウントをこのデバイスで使用できます。このアカウントを使用して、インターネット上の企業内の各種リソースにアクセスすることができます。"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:15
-#: ../panels/user-accounts/data/join-dialog.ui.h:9
+#: panels/user-accounts/data/account-dialog.ui:485
+#: panels/user-accounts/data/join-dialog.ui:116
 msgid "_Domain"
 msgstr "ドメイン(_D)"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:16
+#: panels/user-accounts/data/account-dialog.ui:707
 msgid "You are Offline"
 msgstr "現在オフラインです"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:17
+#: panels/user-accounts/data/account-dialog.ui:726
 msgid "You must be online in order to add enterprise users."
-msgstr ""
-"エンタープライズユーザーを追加するには、システムをオンラインにする必要があり"
-"ます。"
+msgstr "エンタープライズユーザーを追加するには、システムをオンラインにする必要があります。"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:18
+#: panels/user-accounts/data/account-dialog.ui:760
 msgid "_Enterprise Login"
 msgstr "エンタープライズのログイン(_E)"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:1
+#: panels/user-accounts/data/account-fingerprint.ui:12
 msgid "Left thumb"
 msgstr "左の親指"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:2
+#: panels/user-accounts/data/account-fingerprint.ui:15
 msgid "Left middle finger"
 msgstr "左の中指"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:3
+#: panels/user-accounts/data/account-fingerprint.ui:18
 msgid "Left ring finger"
 msgstr "左の薬指"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:4
+#: panels/user-accounts/data/account-fingerprint.ui:21
 msgid "Left little finger"
 msgstr "左の小指"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:5
+#: panels/user-accounts/data/account-fingerprint.ui:24
 msgid "Right thumb"
 msgstr "右の親指"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:6
+#: panels/user-accounts/data/account-fingerprint.ui:27
 msgid "Right middle finger"
 msgstr "右の中指"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:7
+#: panels/user-accounts/data/account-fingerprint.ui:30
 msgid "Right ring finger"
 msgstr "右の薬指"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:8
+#: panels/user-accounts/data/account-fingerprint.ui:33
 msgid "Right little finger"
 msgstr "右の小指"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:9
-#: ../panels/user-accounts/um-fingerprint-dialog.c:680
+#: panels/user-accounts/data/account-fingerprint.ui:39
+#: panels/user-accounts/um-fingerprint-dialog.c:677
 msgid "Enable Fingerprint Login"
 msgstr "指紋認証を有効にする"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:10
+#: panels/user-accounts/data/account-fingerprint.ui:89
 msgid "_Right index finger"
 msgstr "右の人差し指(_R)"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:11
+#: panels/user-accounts/data/account-fingerprint.ui:105
 msgid "_Left index finger"
 msgstr "左の人差し指(_L)"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:12
+#: panels/user-accounts/data/account-fingerprint.ui:126
 msgid "_Other finger:"
 msgstr "別の指(_O):"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:13
+#: panels/user-accounts/data/account-fingerprint.ui:324
 msgid ""
 "Your fingerprint was successfully saved. You should now be able to log in "
 "using your fingerprint reader."
-msgstr ""
-"指紋を登録しました。今から指紋リーダーを使ってログインできるようになりまし"
-"た。"
+msgstr "指紋を登録しました。今から指紋リーダーを使ってログインできるようになりました。"
+
+#: panels/user-accounts/data/avatar-chooser.ui:27
+msgid "Take a Picture…"
+msgstr "写真の撮影..."
 
-#: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:1
+#: panels/user-accounts/data/avatar-chooser.ui:34
+msgid "Select a File…"
+msgstr "ファイルの選択..."
+
+#: panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in:3
 msgid "Users"
 msgstr "ユーザー"
 
-#: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:2
+#: panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in:4
 msgid "Add or remove users and change your password"
 msgstr "ユーザーの追加と削除、パスワードの変更を行います"
 
-#. Translators: those are keywords for the user accounts control-center panel
-#: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:4
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in:7
+msgid "system-users"
+msgstr "system-users"
+
+#. Translators: Search terms to find the Users panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+#: panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in:20
 msgid "Login;Name;Fingerprint;Avatar;Logo;Face;Password;"
-msgstr ""
-"Login;Name;Fingerprint;Avatar;Logo;Face;Password;ログイン;名前;指紋;アバター;"
-"ロゴ;顔;パスワード;Users;ユーザー;"
+msgstr "Login;Name;Fingerprint;Avatar;Logo;Face;Password;ログイン;名前;指紋;アバター;ロゴ;顔;パスワード;Users;ユーザー;"
 
 #. Translators: This button enrolls the computer in the domain in order to use enterprise logins.
-#: ../panels/user-accounts/data/join-dialog.ui.h:4
+#: panels/user-accounts/data/join-dialog.ui:39
 msgid "_Enroll"
 msgstr "登録(_E)"
 
-#: ../panels/user-accounts/data/join-dialog.ui.h:5
+#: panels/user-accounts/data/join-dialog.ui:75
 msgid "Domain Administrator Login"
 msgstr "ドメイン管理者のログイン"
 
-#: ../panels/user-accounts/data/join-dialog.ui.h:6
+#: panels/user-accounts/data/join-dialog.ui:93
 msgid ""
 "In order to use enterprise logins, this computer needs to be\n"
 "enrolled in the domain. Please have your network administrator\n"
 "type their domain password here."
-msgstr ""
-"エンタープライズのログインを使用するには、 このコンピューターを\n"
+msgstr "エンタープライズのログインを使用するには、 このコンピューターを\n"
 "ドメインに登録する必要があります。ネットワーク管理者にドメインの\n"
 "パスワード入力を行ってもらってください。"
 
-#: ../panels/user-accounts/data/join-dialog.ui.h:10
+#: panels/user-accounts/data/join-dialog.ui:150
 msgid "Administrator _Name"
 msgstr "管理者名(_N)"
 
-#: ../panels/user-accounts/data/join-dialog.ui.h:11
+#: panels/user-accounts/data/join-dialog.ui:185
 msgid "Administrator Password"
 msgstr "管理者のパスワード"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:1
+#: panels/user-accounts/data/password-dialog.ui:7
 msgid "Change Password"
 msgstr "パスワードの変更"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:3
+#: panels/user-accounts/data/password-dialog.ui:38
 msgid "Ch_ange"
 msgstr "変更(_A)"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:4
+#: panels/user-accounts/data/password-dialog.ui:142
 msgid "_Verify New Password"
 msgstr "新しいパスワードの確認(_V)"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:5
+#: panels/user-accounts/data/password-dialog.ui:159
 msgid "_New Password"
 msgstr "新しいパスワード(_N)"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:6
+#: panels/user-accounts/data/password-dialog.ui:208
 msgid "Current _Password"
 msgstr "現在のパスワード(_P)"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:7
+#: panels/user-accounts/data/password-dialog.ui:243
 msgid "Allow user to change their password on next login"
 msgstr "次回ログイン時にユーザー自身でパスワードを設定させる"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:8
+#: panels/user-accounts/data/password-dialog.ui:256
 msgid "Set a password now"
 msgstr "いまパスワードを設定する"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1
+#: panels/user-accounts/data/user-accounts-dialog.ui:20
 msgid "_Add User…"
 msgstr "ユーザーの追加(_A)"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2
+#: panels/user-accounts/data/user-accounts-dialog.ui:69
 msgid "Your session needs to be restarted for changes to take effect"
 msgstr "変更内容を反映させるにはログインしなおす必要があります"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
+#: panels/user-accounts/data/user-accounts-dialog.ui:77
 msgid "Restart Now"
 msgstr "ログアウト"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
+#: panels/user-accounts/data/user-accounts-dialog.ui:244
 msgid "A_utomatic Login"
 msgstr "自動ログイン(_U)"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
+#: panels/user-accounts/data/user-accounts-dialog.ui:285
 msgid "_Fingerprint Login"
 msgstr "指紋認証ログイン(_F)"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
+#: panels/user-accounts/data/user-accounts-dialog.ui:311
+#: panels/user-accounts/data/user-accounts-dialog.ui:324
 msgid "User Icon"
 msgstr "ユーザーアイコン"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
+#: panels/user-accounts/data/user-accounts-dialog.ui:387
 msgid "Last Login"
 msgstr "最終ログイン"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
+#: panels/user-accounts/data/user-accounts-dialog.ui:434
 msgid "Remove User…"
 msgstr "ユーザーの削除…"
 
-#: ../panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in.h:1
+#. Translators: This is the empty state page label which states that there are no users to show in the panel.
+#: panels/user-accounts/data/user-accounts-dialog.ui:466
+msgid "No Users Found"
+msgstr "ユーザーが見つかりません"
+
+#: panels/user-accounts/data/user-accounts-dialog.ui:476
+msgid "Unlock to add a user account."
+msgstr "ユーザーアカウントの追加を解除します。"
+
+#: panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in:11
 msgid "Manage user accounts"
 msgstr "ユーザーアカウントの管理"
 
-#: ../panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in.h:2
+#: panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in:12
 msgid "Authentication is required to change user data"
 msgstr "ユーザーのデータを変更するには認証が必要になります"
 
-#: ../panels/user-accounts/pw-utils.c:81
+#: panels/user-accounts/pw-utils.c:81
 msgctxt "Password hint"
 msgid "The new password needs to be different from the old one."
-msgstr ""
-"新しいパスワードは、現在のパスワードとは異なるものを指定する必要があります。"
+msgstr "新しいパスワードは、現在のパスワードとは異なるものを指定する必要があります。"
 
-#: ../panels/user-accounts/pw-utils.c:83
+#: panels/user-accounts/pw-utils.c:83
 msgctxt "Password hint"
 msgid "Try changing some letters and numbers."
 msgstr "いくつかの文字や数字を変更してください。"
 
-#: ../panels/user-accounts/pw-utils.c:85 ../panels/user-accounts/pw-utils.c:93
+#: panels/user-accounts/pw-utils.c:85 panels/user-accounts/pw-utils.c:93
 msgctxt "Password hint"
 msgid "Try changing the password a bit more."
-msgstr ""
-"新しいパスワードが現在のものと似すぎています。もう少し異なるものを使用してく"
-"ださい。"
+msgstr "新しいパスワードが現在のものと似すぎています。もう少し異なるものを使用してください。"
 
-#: ../panels/user-accounts/pw-utils.c:87
+#: panels/user-accounts/pw-utils.c:87
 msgctxt "Password hint"
 msgid "A password without your user name would be stronger."
 msgstr "パスワードからユーザー名を取り除くともっと強くなるでしょう。"
 
-#: ../panels/user-accounts/pw-utils.c:89
+#: panels/user-accounts/pw-utils.c:89
 msgctxt "Password hint"
 msgid "Try to avoid using your name in the password."
 msgstr "パスワード中にユーザーの氏名を使うのは避けるようにしてください。"
 
-#: ../panels/user-accounts/pw-utils.c:91
+#: panels/user-accounts/pw-utils.c:91
 msgctxt "Password hint"
 msgid "Try to avoid some of the words included in the password."
 msgstr "パスワードにある一部の単語を使わないようにしてください。"
 
-#: ../panels/user-accounts/pw-utils.c:95
+#: panels/user-accounts/pw-utils.c:95
 msgctxt "Password hint"
 msgid "Try to avoid common words."
 msgstr "一般的な単語は避けるようにしてください。"
 
-#: ../panels/user-accounts/pw-utils.c:97
+#: panels/user-accounts/pw-utils.c:97
 msgctxt "Password hint"
 msgid "Try to avoid reordering existing words."
 msgstr "既存の単語の文字を並べ替えたものは使わないようにしてください。"
 
-#: ../panels/user-accounts/pw-utils.c:99
+#: panels/user-accounts/pw-utils.c:99
 msgctxt "Password hint"
 msgid "Try to use more numbers."
 msgstr "数字をもっと使うようにしてください。"
 
-#: ../panels/user-accounts/pw-utils.c:101
+#: panels/user-accounts/pw-utils.c:101
 msgctxt "Password hint"
 msgid "Try to use more uppercase letters."
 msgstr "大文字をもっと使うようにしてください。"
 
-#: ../panels/user-accounts/pw-utils.c:103
+#: panels/user-accounts/pw-utils.c:103
 msgctxt "Password hint"
 msgid "Try to use more lowercase letters."
 msgstr "小文字をもっと使うようにください。"
 
-#: ../panels/user-accounts/pw-utils.c:105
+#: panels/user-accounts/pw-utils.c:105
 msgctxt "Password hint"
 msgid "Try to use more special characters, like punctuation."
 msgstr "記号など特殊文字をもっと使うようにしてください。"
 
-#: ../panels/user-accounts/pw-utils.c:107
+#: panels/user-accounts/pw-utils.c:107
 msgctxt "Password hint"
 msgid "Try to use a mixture of letters, numbers and punctuation."
 msgstr "アルファベット、数字、記号を混在させるようにしてください。"
 
-#: ../panels/user-accounts/pw-utils.c:109
+#: panels/user-accounts/pw-utils.c:109
 msgctxt "Password hint"
 msgid "Try to avoid repeating the same character."
 msgstr "同じ文字を連続して使わないようにしてください。"
 
-#: ../panels/user-accounts/pw-utils.c:111
+#: panels/user-accounts/pw-utils.c:111
 msgctxt "Password hint"
 msgid ""
 "Try to avoid repeating the same type of character: you need to mix up "
 "letters, numbers and punctuation."
-msgstr ""
-"同じ種類の文字を繰り返しは避けるようにしてください。アルファベット、数字、記"
-"号を混ぜてください。"
+msgstr "同じ種類の文字を繰り返しは避けるようにしてください。アルファベット、数字、記号を混ぜてください。"
 
-#: ../panels/user-accounts/pw-utils.c:113
+#: panels/user-accounts/pw-utils.c:113
 msgctxt "Password hint"
 msgid "Try to avoid sequences like 1234 or abcd."
 msgstr "1234 や abcd などの連続した並びは避けるようにしてください。"
 
-#: ../panels/user-accounts/pw-utils.c:115
+#: panels/user-accounts/pw-utils.c:115
 msgctxt "Password hint"
 msgid ""
 "Password needs to be longer. Try to add more letters, numbers and "
 "punctuation."
-msgstr ""
-"パスワードが短すぎます。アルファベット、数字、記号をもっと追加するようにして"
-"ください。"
+msgstr "パスワードが短すぎます。アルファベット、数字、記号をもっと追加するようにしてください。"
 
-#: ../panels/user-accounts/pw-utils.c:117
+#: panels/user-accounts/pw-utils.c:117
 msgctxt "Password hint"
 msgid "Mix uppercase and lowercase and try to use a number or two."
 msgstr "大文字、小文字を混在させ、さらに数字を 1 つか 2 つは使用してください。"
 
-#: ../panels/user-accounts/pw-utils.c:119
+#: panels/user-accounts/pw-utils.c:119
 msgctxt "Password hint"
 msgid ""
 "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:422
 msgid "Authentication failed"
 msgstr "認証に失敗しました"
 
-#: ../panels/user-accounts/run-passwd.c:502
+#: panels/user-accounts/run-passwd.c:502
 #, c-format
 msgid "The new password is too short"
 msgstr "新しいパスワードは短すぎます"
 
-#: ../panels/user-accounts/run-passwd.c:508
+#: panels/user-accounts/run-passwd.c:508
 #, c-format
 msgid "The new password is too simple"
 msgstr "新しいパスワードは単純すぎます"
 
-#: ../panels/user-accounts/run-passwd.c:514
+#: panels/user-accounts/run-passwd.c:514
 #, 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:517
 #, 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:520
 #, 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:524
 #, 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:528
 #, 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:532
 #, 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:536
 #, c-format
 msgid "Unknown error"
 msgstr "原因不明のエラー"
 
-#: ../panels/user-accounts/um-account-dialog.c:34
+#: panels/user-accounts/um-account-dialog.c:34
 msgid "Should match the web address of your login provider."
 msgstr "ログイン提供者のウェブアドレスと一致させる必要があります。"
 
-#: ../panels/user-accounts/um-account-dialog.c:229
+#: panels/user-accounts/um-account-dialog.c:229
 msgid "Failed to add account"
 msgstr "アカウントの追加に失敗しました"
 
-#: ../panels/user-accounts/um-account-dialog.c:462
+#: panels/user-accounts/um-account-dialog.c:462
 msgid "Passwords do not match."
 msgstr "パスワードが一致しません。"
 
-#: ../panels/user-accounts/um-account-dialog.c:717
-#: ../panels/user-accounts/um-account-dialog.c:763
-#: ../panels/user-accounts/um-account-dialog.c:784
+#: panels/user-accounts/um-account-dialog.c:717
+#: panels/user-accounts/um-account-dialog.c:763
+#: panels/user-accounts/um-account-dialog.c:784
 msgid "Failed to register account"
 msgstr "アカウントの登録に失敗しました"
 
-#: ../panels/user-accounts/um-account-dialog.c:907
+#: panels/user-accounts/um-account-dialog.c:907
 msgid "No supported way to authenticate with this domain"
 msgstr "このドメインで認証を行う方法はサポートされていません"
 
-#: ../panels/user-accounts/um-account-dialog.c:980
+#: panels/user-accounts/um-account-dialog.c:980
 msgid "Failed to join domain"
 msgstr "ドメインの参加に失敗しました"
 
-#: ../panels/user-accounts/um-account-dialog.c:1041
+#: panels/user-accounts/um-account-dialog.c:1041
 msgid ""
 "That login name didn’t work.\n"
 "Please try again."
-msgstr ""
-"ログイン名に問題がありました。\n"
+msgstr "ログイン名に問題がありました。\n"
 "やり直してください。"
 
-#: ../panels/user-accounts/um-account-dialog.c:1048
+#: panels/user-accounts/um-account-dialog.c:1048
 msgid ""
 "That login password didn’t work.\n"
 "Please try again."
-msgstr ""
-"パスワードに問題がありました。\n"
+msgstr "パスワードに問題がありました。\n"
 "やり直してください。"
 
-#: ../panels/user-accounts/um-account-dialog.c:1056
+#: panels/user-accounts/um-account-dialog.c:1056
 msgid "Failed to log into domain"
 msgstr "ドメインへのログインに失敗しました"
 
-#: ../panels/user-accounts/um-account-dialog.c:1114
+#: panels/user-accounts/um-account-dialog.c:1114
 msgid "Unable to find the domain. Maybe you misspelled it?"
 msgstr "ドメインを見つけられません。スペルミスがないか確認してください。"
 
-#: ../panels/user-accounts/um-account-type.c:34
+#: panels/user-accounts/um-account-type.c:34
 msgctxt "Account type"
 msgid "Standard"
 msgstr "標準"
 
-#: ../panels/user-accounts/um-account-type.c:36
+#: panels/user-accounts/um-account-type.c:36
 msgctxt "Account type"
 msgid "Administrator"
 msgstr "管理者"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:142
+#: panels/user-accounts/um-fingerprint-dialog.c:139
 msgid ""
 "You are not allowed to access the device. Contact your system administrator."
-msgstr ""
-"デバイスへのアクセスが許可されていません。システム管理者に連絡してください。"
+msgstr "デバイスへのアクセスが許可されていません。システム管理者に連絡してください。"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:144
+#: panels/user-accounts/um-fingerprint-dialog.c:141
 msgid "The device is already in use."
 msgstr "そのデバイスは使用中です。"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:146
+#: panels/user-accounts/um-fingerprint-dialog.c:143
 msgid "An internal error occurred."
 msgstr "システム内部のエラーが発生しました。"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:217
+#: panels/user-accounts/um-fingerprint-dialog.c:214
 msgid "Enabled"
 msgstr "有効"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:263
+#: panels/user-accounts/um-fingerprint-dialog.c:260
 msgid "Delete registered fingerprints?"
 msgstr "登録した指紋情報を削除しますか?"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:267
+#: panels/user-accounts/um-fingerprint-dialog.c:264
 msgid "_Delete Fingerprints"
 msgstr "削除する(_D)"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:273
+#: panels/user-accounts/um-fingerprint-dialog.c:270
 msgid ""
 "Do you want to delete your registered fingerprints so fingerprint login is "
 "disabled?"
 msgstr "登録済みの指紋情報を削除して指紋認証を無効にしますか?"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:443
+#: panels/user-accounts/um-fingerprint-dialog.c:440
 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:504
-#: ../panels/user-accounts/um-fingerprint-dialog.c:546
+#: panels/user-accounts/um-fingerprint-dialog.c:501
+#: panels/user-accounts/um-fingerprint-dialog.c:543
 #, c-format
 msgid "Could not access “%s” device"
 msgstr "“%s” というデバイスにアクセスできません"
@@ -6760,16 +6911,16 @@ msgstr "“%s” というデバイスにアクセスできません"
 #. 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:587
+#: panels/user-accounts/um-fingerprint-dialog.c:584
 #, c-format
 msgid "Could not start finger capture on “%s” device"
 msgstr "“%s” デバイスで指紋を読み取れませんでした"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:631
+#: panels/user-accounts/um-fingerprint-dialog.c:628
 msgid "Could not access any fingerprint readers"
 msgstr "指紋リーダーにアクセスできませんでした"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:632
+#: panels/user-accounts/um-fingerprint-dialog.c:629
 msgid "Please contact your system administrator for help."
 msgstr "システム管理者に連絡してください。"
 
@@ -6778,28 +6929,26 @@ msgstr "システム管理者に連絡してください。"
 #. * "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:714
+#: panels/user-accounts/um-fingerprint-dialog.c:711
 #, c-format
 msgid ""
 "To enable fingerprint login, you need to save one of your fingerprints, "
 "using the “%s” device."
-msgstr ""
-"指紋認証を有効にするには、“%s” のデバイスを使って、指紋を登録する必要がありま"
-"す。"
+msgstr "指紋認証を有効にするには、“%s” のデバイスを使って、指紋を登録する必要があります。"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:721
+#: panels/user-accounts/um-fingerprint-dialog.c:718
 msgid "Selecting finger"
 msgstr "指の選択"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:722
+#: panels/user-accounts/um-fingerprint-dialog.c:719
 msgid "Enrolling fingerprints"
 msgstr "指紋の登録"
 
-#: ../panels/user-accounts/um-history-dialog.c:70
+#: panels/user-accounts/um-history-dialog.c:70
 msgid "This Week"
 msgstr "今週"
 
-#: ../panels/user-accounts/um-history-dialog.c:73
+#: panels/user-accounts/um-history-dialog.c:73
 msgid "Last Week"
 msgstr "先週"
 
@@ -6807,22 +6956,22 @@ msgstr "先週"
 #. shown as the first day of a week on login history dialog.
 #. Translators: This is a date format string in the style of "Feb 24",
 #. shown as the last day of a week on login history dialog.
-#: ../panels/user-accounts/um-history-dialog.c:79
-#: ../panels/user-accounts/um-history-dialog.c:83
+#: panels/user-accounts/um-history-dialog.c:79
+#: panels/user-accounts/um-history-dialog.c:83
 msgctxt "login history week label"
 msgid "%b %e"
 msgstr "%m月%d日"
 
 #. Translators: This is a date format string in the style of "Feb 24, 2013",
 #. shown as the last day of a week on login history dialog.
-#: ../panels/user-accounts/um-history-dialog.c:88
+#: panels/user-accounts/um-history-dialog.c:88
 msgctxt "login history week label"
 msgid "%b %e, %Y"
 msgstr "%Y年%m月%d日"
 
 #. Translators: This indicates a week label on a login history.
 #. The first %s is the first day of a week, and the second %s the last day.
-#: ../panels/user-accounts/um-history-dialog.c:93
+#: panels/user-accounts/um-history-dialog.c:93
 #, c-format
 msgctxt "login history week label"
 msgid "%s — %s"
@@ -6830,596 +6979,660 @@ msgstr "%s — %s"
 
 #. 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/um-history-dialog.c:177
-#: ../panels/user-accounts/um-user-panel.c:776
+#: panels/user-accounts/um-history-dialog.c:177
+#: panels/user-accounts/um-user-panel.c:766
 msgctxt "login date-time"
 msgid "%k:%M"
 msgstr "%H:%M"
 
 #. Translators: This indicates a login date-time.
 #. The first %s is a date, and the second %s a time.
-#: ../panels/user-accounts/um-history-dialog.c:180
-#: ../panels/user-accounts/um-user-panel.c:780
+#: panels/user-accounts/um-history-dialog.c:180
+#: panels/user-accounts/um-user-panel.c:770
 #, c-format
 msgctxt "login date-time"
 msgid "%s, %s"
 msgstr "%s %s"
 
-#: ../panels/user-accounts/um-history-dialog.c:250
+#: panels/user-accounts/um-history-dialog.c:250
 msgid "Session Ended"
 msgstr "セッション終了"
 
-#: ../panels/user-accounts/um-history-dialog.c:256
+#: panels/user-accounts/um-history-dialog.c:256
 msgid "Session Started"
 msgstr "セッション開始"
 
 #. Translators: This is the title of the "Account Activity" dialog.
 #. The %s is the user real name.
-#: ../panels/user-accounts/um-history-dialog.c:299
+#: panels/user-accounts/um-history-dialog.c:299
 #, c-format
 msgid "%s — Account Activity"
 msgstr "%s — アカウントのアクティビティ"
 
-#: ../panels/user-accounts/um-password-dialog.c:144
+#: panels/user-accounts/um-password-dialog.c:144
 msgid "Please choose another password."
 msgstr "別のパスワードを選択してください。"
 
-#: ../panels/user-accounts/um-password-dialog.c:153
+#: panels/user-accounts/um-password-dialog.c:153
 msgid "Please type your current password again."
 msgstr "現在のパスワードを再度入力してください。"
 
-#: ../panels/user-accounts/um-password-dialog.c:159
+#: panels/user-accounts/um-password-dialog.c:159
 msgid "Password could not be changed"
 msgstr "パスワードが変更できません"
 
-#: ../panels/user-accounts/um-password-dialog.c:285
+#: panels/user-accounts/um-password-dialog.c:285
 msgid "The passwords do not match."
 msgstr "パスワードが一致しません。"
 
-#: ../panels/user-accounts/um-photo-dialog.c:218
+#: panels/user-accounts/um-photo-dialog.c:227
 msgid "Browse for more pictures"
 msgstr "他の画像も参照"
 
-#: ../panels/user-accounts/um-photo-dialog.c:452
-msgid "Disable image"
-msgstr "画像を無効にする"
-
-#: ../panels/user-accounts/um-photo-dialog.c:470
-msgid "Take a photo…"
-msgstr "写真を撮る…"
-
-#: ../panels/user-accounts/um-photo-dialog.c:488
-msgid "Browse for more pictures…"
-msgstr "他の画像も参照…"
-
-#: ../panels/user-accounts/um-photo-dialog.c:714
-#, c-format
-msgid "Used by %s"
-msgstr "%s に使用されています"
-
-#: ../panels/user-accounts/um-realm-manager.c:350
+#: panels/user-accounts/um-realm-manager.c:350
 msgid "Cannot automatically join this type of domain"
 msgstr "このタイプのドメインは自動で参加できません"
 
-#: ../panels/user-accounts/um-realm-manager.c:413
+#: panels/user-accounts/um-realm-manager.c:413
 #, c-format
 msgid "No such domain or realm found"
 msgstr "そのようなドメインやレルムは見つかりませんでした"
 
-#: ../panels/user-accounts/um-realm-manager.c:815
-#: ../panels/user-accounts/um-realm-manager.c:829
+#: panels/user-accounts/um-realm-manager.c:815
+#: panels/user-accounts/um-realm-manager.c:829
 #, c-format
 msgid "Cannot log in as %s at the %s domain"
 msgstr "%2$s ドメインに %1$s としてログインできません"
 
-#: ../panels/user-accounts/um-realm-manager.c:821
+#: panels/user-accounts/um-realm-manager.c:821
 msgid "Invalid password, please try again"
 msgstr "無効なパスワードです、やり直してください"
 
-#: ../panels/user-accounts/um-realm-manager.c:834
+#: panels/user-accounts/um-realm-manager.c:834
 #, c-format
 msgid "Couldn’t connect to the %s domain: %s"
 msgstr "%sドメインに接続できませんでした: %s"
 
-#: ../panels/user-accounts/um-user-panel.c:195
+#: panels/user-accounts/um-user-panel.c:200
 msgid "Your account"
 msgstr "あなたのアカウント"
 
-#: ../panels/user-accounts/um-user-panel.c:390
+#: panels/user-accounts/um-user-panel.c:380
 msgid "Failed to delete user"
 msgstr "ユーザーの削除に失敗しました"
 
-#: ../panels/user-accounts/um-user-panel.c:448
-#: ../panels/user-accounts/um-user-panel.c:507
-#: ../panels/user-accounts/um-user-panel.c:559
+#: panels/user-accounts/um-user-panel.c:438
+#: panels/user-accounts/um-user-panel.c:497
+#: panels/user-accounts/um-user-panel.c:549
 msgid "Failed to revoke remotely managed user"
 msgstr "リモート管理ユーザーの削除に失敗しました"
 
-#: ../panels/user-accounts/um-user-panel.c:613
+#: panels/user-accounts/um-user-panel.c:603
 msgid "You cannot delete your own account."
 msgstr "自分自身のアカウントは削除できません。"
 
-#: ../panels/user-accounts/um-user-panel.c:622
+#: panels/user-accounts/um-user-panel.c:612
 #, c-format
 msgid "%s is still logged in"
 msgstr "%s はまだログインしています"
 
-#: ../panels/user-accounts/um-user-panel.c:626
+#: panels/user-accounts/um-user-panel.c:616
 msgid ""
 "Deleting a user while they are logged in can leave the system in an "
 "inconsistent state."
-msgstr ""
-"ログイン中のユーザーを削除すると、システムが不整合な状態になることがありま"
-"す。"
+msgstr "ログイン中のユーザーを削除すると、システムが不整合な状態になることがあります。"
 
-#: ../panels/user-accounts/um-user-panel.c:635
+#: panels/user-accounts/um-user-panel.c:625
 #, c-format
 msgid "Do you want to keep %s’s files?"
 msgstr "%s のファイルを残しますか?"
 
-#: ../panels/user-accounts/um-user-panel.c:639
+#: panels/user-accounts/um-user-panel.c:629
 msgid ""
 "It is possible to keep the home directory, mail spool and temporary files "
 "around when deleting a user account."
-msgstr ""
-"ユーザーアカウントを削除するときに、ユーザーのホームディレクトリ、メールス"
-"プールおよび一時ファイルを残しておくことができます。"
+msgstr "ユーザーアカウントを削除するときに、ユーザーのホームディレクトリ、メールスプールおよび一時ファイルを残しておくことができます。"
 
-#: ../panels/user-accounts/um-user-panel.c:642
+#: panels/user-accounts/um-user-panel.c:632
 msgid "_Delete Files"
 msgstr "ファイルを削除(_D)"
 
-#: ../panels/user-accounts/um-user-panel.c:643
+#: panels/user-accounts/um-user-panel.c:633
 msgid "_Keep Files"
 msgstr "ファイルを残す(_K)"
 
-#: ../panels/user-accounts/um-user-panel.c:657
+#: panels/user-accounts/um-user-panel.c:647
 #, c-format
 msgid "Are you sure you want to revoke remotely managed %s’s account?"
 msgstr "リモート管理の %s のアカウントを削除してもよろしいですか?"
 
-#: ../panels/user-accounts/um-user-panel.c:661
+#: panels/user-accounts/um-user-panel.c:651
 msgid "_Delete"
 msgstr "削除(_D)"
 
-#: ../panels/user-accounts/um-user-panel.c:711
+#: panels/user-accounts/um-user-panel.c:701
 msgctxt "Password mode"
 msgid "Account disabled"
 msgstr "無効アカウント"
 
-#: ../panels/user-accounts/um-user-panel.c:719
+#: panels/user-accounts/um-user-panel.c:709
 msgctxt "Password mode"
 msgid "To be set at next login"
 msgstr "次のログイン時に設定"
 
-#: ../panels/user-accounts/um-user-panel.c:722
+#: panels/user-accounts/um-user-panel.c:712
 msgctxt "Password mode"
 msgid "None"
 msgstr "なし"
 
-#: ../panels/user-accounts/um-user-panel.c:769
+#: panels/user-accounts/um-user-panel.c:759
 msgid "Logged in"
 msgstr "ログイン中"
 
-#: ../panels/user-accounts/um-user-panel.c:1117
+#: panels/user-accounts/um-user-panel.c:1106
 msgid "Failed to contact the accounts service"
 msgstr "アカウントサービスの接続に失敗しました"
 
-#: ../panels/user-accounts/um-user-panel.c:1119
+#: panels/user-accounts/um-user-panel.c:1108
 msgid "Please make sure that the AccountService is installed and enabled."
-msgstr ""
-"AccountService がインストールされ、有効になっているか確認してください。"
+msgstr "AccountService がインストールされ、有効になっているか確認してください。"
 
 #. Translator comments:
 #. * 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/um-user-panel.c:1155
+#: panels/user-accounts/um-user-panel.c:1140
 msgid ""
 "To make changes,\n"
 "click the * icon first"
-msgstr "変更するには、まず * アイコンをクリックしてください"
+msgstr "変更するには、\n"
+"まず * アイコンをクリックしてください"
 
-#: ../panels/user-accounts/um-user-panel.c:1195
+#: panels/user-accounts/um-user-panel.c:1180
 msgid "Create a user account"
 msgstr "ユーザーアカウントを作成します"
 
-#: ../panels/user-accounts/um-user-panel.c:1206
-#: ../panels/user-accounts/um-user-panel.c:1385
+#: panels/user-accounts/um-user-panel.c:1191
+#: panels/user-accounts/um-user-panel.c:1370
 msgid ""
 "To create a user account,\n"
 "click the * icon first"
-msgstr ""
-"ユーザーアカウントを作成するには、\n"
+msgstr "ユーザーアカウントを作成するには、\n"
 "まず * アイコンをクリックしてください"
 
-#: ../panels/user-accounts/um-user-panel.c:1216
+#: panels/user-accounts/um-user-panel.c:1201
 msgid "Delete the selected user account"
 msgstr "選択したユーザーアカウントを削除します"
 
-#: ../panels/user-accounts/um-user-panel.c:1228
-#: ../panels/user-accounts/um-user-panel.c:1390
+#: panels/user-accounts/um-user-panel.c:1213
+#: panels/user-accounts/um-user-panel.c:1375
 msgid ""
 "To delete the selected user account,\n"
 "click the * icon first"
-msgstr ""
-"選択したユーザーアカウントを削除するには、\n"
+msgstr "選択したユーザーアカウントを削除するには、\n"
 "まず * アイコンをクリックしてください"
 
-#: ../panels/user-accounts/um-utils.c:507
+#: panels/user-accounts/um-utils.c:496
 msgid "Sorry, that user name isn’t available. Please try another."
-msgstr ""
-"申し訳ありませんが、そのユーザー名は使用できません。 もう一度お試しください。"
+msgstr "申し訳ありませんが、そのユーザー名は使用できません。 もう一度お試しください。"
 
-#: ../panels/user-accounts/um-utils.c:510
+#: panels/user-accounts/um-utils.c:499
 #, c-format
 msgid "The username is too long."
 msgstr "ユーザー名が長すぎます。"
 
-#: ../panels/user-accounts/um-utils.c:513
+#: panels/user-accounts/um-utils.c:502
 msgid "The username cannot start with a “-”."
 msgstr "ユーザー名の先頭文字に “-” は使えません。"
 
-#: ../panels/user-accounts/um-utils.c:516
+#: panels/user-accounts/um-utils.c:505
 msgid ""
 "The username should only consist of upper and lower case letters from a-z, "
 "digits and the following characters: . - _"
-msgstr ""
-"ユーザー名には次の文字だけを使用してください。a から z の大文字・小文字、数"
-"字、'.'、'-'、および '_'。"
+msgstr "ユーザー名には次の文字だけを使用してください。a から z の大文字・小文字、数字、'.'、'-'、および '_'。"
 
-#: ../panels/user-accounts/um-utils.c:520
+#: panels/user-accounts/um-utils.c:509
 msgid "This will be used to name your home folder and can’t be changed."
-msgstr ""
-"ユーザー名はホームフォルダーの名前に使用されます。これは変更できません。"
+msgstr "ユーザー名はホームフォルダーの名前に使用されます。これは変更できません。"
 
-#: ../panels/wacom/button-mapping.ui.h:1
+#: panels/wacom/button-mapping.ui:9
 msgid "Map Buttons"
 msgstr "ボタン割り当て"
 
-#: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:547
-#: ../panels/wacom/gnome-wacom-properties.ui.h:5
+#: panels/wacom/button-mapping.ui:37 panels/wacom/cc-wacom-page.c:547
+#: panels/wacom/gnome-wacom-properties.ui:60
 msgid "_Close"
 msgstr "閉じる(_C)"
 
-#: ../panels/wacom/button-mapping.ui.h:3
+#: panels/wacom/button-mapping.ui:71
 msgid "Map buttons to functions"
 msgstr "ボタンへ機能を割り当て"
 
-#: ../panels/wacom/button-mapping.ui.h:4
+#: panels/wacom/button-mapping.ui:119
 msgid ""
 "To edit a shortcut, choose the “Send Keystroke” action, press the keyboard "
 "shortcut button and hold down the new keys or press Backspace to clear."
-msgstr ""
-"ショートカットを編集するには、“キー入力の送信”を選択し、キーボードショート"
-"カットボタンを押して、新しいキー組み合わせを入力するか、[BS] キーで取り消して"
-"ください。"
+msgstr "ショートカットを編集するには、“キー入力の送信”を選択し、キーボードショートカットボタンを押して、新しいキー組み合わせを入力するか、[BS] キーで取り消してください。"
 
-#: ../panels/wacom/calibrator/calibrator-gui.c:83
+#: panels/wacom/calibrator/calibrator-gui.c:83
 msgid ""
 "Please tap the target markers as they appear on screen to calibrate the "
 "tablet."
-msgstr ""
-"タブレットの位置調整を行いますので、画面に出現するマーカーをタップしてくださ"
-"い。"
+msgstr "タブレットの位置調整を行いますので、画面に出現するマーカーをタップしてください。"
 
-#: ../panels/wacom/calibrator/calibrator-gui.c:87
+#: panels/wacom/calibrator/calibrator-gui.c:87
 msgid "Mis-click detected, restarting…"
 msgstr "誤クリックを検出しました。再起動します..."
 
-#: ../panels/wacom/cc-wacom-button-row.c:266
+#: panels/wacom/cc-wacom-button-row.c:266
 #, c-format
 msgid "Button %d"
 msgstr "ボタン %d"
 
-#: ../panels/wacom/cc-wacom-button-row.h:53
+#: panels/wacom/cc-wacom-button-row.h:53
 msgctxt "Wacom action-type"
 msgid "Application defined"
 msgstr "アプリケーション定義"
 
-#: ../panels/wacom/cc-wacom-button-row.h:54
+#: panels/wacom/cc-wacom-button-row.h:54
 msgctxt "Wacom action-type"
 msgid "Send Keystroke"
 msgstr "キー入力の送信"
 
-#: ../panels/wacom/cc-wacom-button-row.h:55
+#: panels/wacom/cc-wacom-button-row.h:55
 msgctxt "Wacom action-type"
 msgid "Switch Monitor"
 msgstr "モニターの切り替え"
 
-#: ../panels/wacom/cc-wacom-button-row.h:56
+#: panels/wacom/cc-wacom-button-row.h:56
 msgctxt "Wacom action-type"
 msgid "Show On-Screen Help"
 msgstr "オンスクリーンヘルプの表示"
 
-#: ../panels/wacom/cc-wacom-mapping-panel.c:260
+#: panels/wacom/cc-wacom-mapping-panel.c:260
 msgid "Output:"
 msgstr "出力:"
 
 #. Keep ratio switch
-#: ../panels/wacom/cc-wacom-mapping-panel.c:272
+#: panels/wacom/cc-wacom-mapping-panel.c:272
 msgid "Keep aspect ratio (letterbox):"
 msgstr "縦横比を保持 (レターボックス):"
 
 # 参考: intuos 5 のマニュアル p.57
 #. Whole-desktop checkbox
-#: ../panels/wacom/cc-wacom-mapping-panel.c:283
+#: panels/wacom/cc-wacom-mapping-panel.c:283
 msgid "Map to single monitor"
 msgstr "単一画面にマッピング"
 
-#: ../panels/wacom/cc-wacom-nav-button.c:86
+#: panels/wacom/cc-wacom-nav-button.c:86
 #, c-format
 msgid "%d of %d"
 msgstr "%d / %d"
 
-#: ../panels/wacom/cc-wacom-page.c:544
+#: panels/wacom/cc-wacom-page.c:544
 msgid "Display Mapping"
 msgstr "画面のマッピング"
 
-#: ../panels/wacom/cc-wacom-panel.c:790
-#: ../panels/wacom/wacom-stylus-page.ui.h:9
+#: panels/wacom/cc-wacom-panel.c:834 panels/wacom/wacom-stylus-page.ui:127
 msgid "Stylus"
 msgstr "ペン"
 
-#: ../panels/wacom/cc-wacom-stylus-page.c:347
+#: panels/wacom/cc-wacom-stylus-page.c:362
 msgid "Button"
 msgstr "ボタン"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2
-msgid "Wa­com Tab­let"
+#: panels/wacom/gnome-wacom-panel.desktop.in.in:3
+#: panels/wacom/gnome-wacom-properties.ui:198
+msgid "Wacom Tablet"
 msgstr "ワコムタブレット"
 
-#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3
+#: panels/wacom/gnome-wacom-panel.desktop.in.in:4
 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets"
-msgstr ""
-"グラフィックスタブレットのボタン割り当てやスタイラスの感度の設定をします。"
+msgstr "グラフィックスタブレットのボタン割り当てやスタイラスの感度の設定をします。"
 
-#. Translators: those are keywords for the wacom tablet control-center panel
-#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/wacom/gnome-wacom-panel.desktop.in.in:7
+msgid "input-tablet"
+msgstr "input-tablet"
+
+#. Translators: Search terms to find the Wacom Tablet panel. Do NOT translate or localize the semicolons! 
The list MUST also end with a semicolon!
+#: panels/wacom/gnome-wacom-panel.desktop.in.in:19
 msgid "Tablet;Wacom;Stylus;Eraser;Mouse;"
-msgstr ""
-"Tablet;Wacom;Stylus;Eraser;Mouse;タブレット;スタイラスペン;ペン;消しゴム;マウ"
-"ス;"
+msgstr "Tablet;Wacom;Stylus;Eraser;Mouse;タブレット;スタイラスペン;ペン;消しゴム;マウス;"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:1
+#: panels/wacom/gnome-wacom-properties.ui:15
 msgid "Tablet (absolute)"
 msgstr "タブレット(絶対座標)"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:2
+#: panels/wacom/gnome-wacom-properties.ui:19
 msgid "Touchpad (relative)"
 msgstr "タッチパッド(相対座標)"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:3
+#: panels/wacom/gnome-wacom-properties.ui:27
 msgid "Tablet Preferences"
 msgstr "タブレット設定"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:4
+#: panels/wacom/gnome-wacom-properties.ui:44
 msgid "_Help"
 msgstr "ヘルプ(_H)"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:6
+#: panels/wacom/gnome-wacom-properties.ui:123
 msgid "No tablet detected"
 msgstr "タブレットを検出できません"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:7
+#: panels/wacom/gnome-wacom-properties.ui:139
 msgid "Please plug in or turn on your Wacom tablet"
 msgstr "ワコムタブレットを接続するか、電源を入れてください"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:8
+#: panels/wacom/gnome-wacom-properties.ui:159
 msgid "Bluetooth Settings"
 msgstr "Bluetooth の設定"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:9
-msgid "Wacom Tablet"
-msgstr "ワコムタブレット"
-
 # 参考: intuos 5 のマニュアル p.57
-#: ../panels/wacom/gnome-wacom-properties.ui.h:10
+#: panels/wacom/gnome-wacom-properties.ui:231
 msgid "Map to Monitor…"
 msgstr "画面にマッピング…"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:11
+#: panels/wacom/gnome-wacom-properties.ui:247
 msgid "Map Buttons…"
 msgstr "ボタン割り当て…"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:12
+#: panels/wacom/gnome-wacom-properties.ui:263
 msgid "Calibrate…"
 msgstr "キャリブレート…"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:13
+#: panels/wacom/gnome-wacom-properties.ui:284
 msgid "Adjust display resolution"
 msgstr "ディスプレイの解像度を調整"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:14
+#: panels/wacom/gnome-wacom-properties.ui:300
 msgid "Adjust mouse settings"
 msgstr "マウス設定の調整"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:15
+#: panels/wacom/gnome-wacom-properties.ui:328
 msgid "Tracking Mode"
 msgstr "検出モード"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:16
+#: panels/wacom/gnome-wacom-properties.ui:356
 msgid "Left-Handed Orientation"
 msgstr "左手用"
 
-#: ../panels/wacom/gsd-wacom-key-shortcut-button.c:263
+#: panels/wacom/gsd-wacom-key-shortcut-button.c:263
 msgid "New shortcut…"
 msgstr "新しいショートカット…"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:2
+#: panels/wacom/wacom-stylus-page.ui:29
 msgid "Middle Mouse Button Click"
 msgstr "マウスの中ボタンクリック"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:3
+#: panels/wacom/wacom-stylus-page.ui:33
 msgid "Right Mouse Button Click"
 msgstr "マウスの右ボタンクリック"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:4
+#: panels/wacom/wacom-stylus-page.ui:37
 msgid "Back"
 msgstr "戻る"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:5
+#: panels/wacom/wacom-stylus-page.ui:41
 msgid "Forward"
 msgstr "進む"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:6
+#: panels/wacom/wacom-stylus-page.ui:77
 msgid "No stylus found"
 msgstr "スタイラスペンが見つかりません"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:7
+#: panels/wacom/wacom-stylus-page.ui:91
 msgid "Please move your stylus to the proximity of the tablet to configure it"
 msgstr "スタイラスペンをタブレットの近くに移動して設定を行ってください"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:10
+#: panels/wacom/wacom-stylus-page.ui:167
 msgid "Eraser Pressure Feel"
 msgstr "消しゴムの感触"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:11
+#: panels/wacom/wacom-stylus-page.ui:188 panels/wacom/wacom-stylus-page.ui:348
 msgid "Soft"
 msgstr "柔らかい"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:12
+#: panels/wacom/wacom-stylus-page.ui:218 panels/wacom/wacom-stylus-page.ui:378
 msgid "Firm"
 msgstr "硬い"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:13
+#: panels/wacom/wacom-stylus-page.ui:241
 msgid "Top Button"
 msgstr "上のサイドスイッチ"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:14
+#: panels/wacom/wacom-stylus-page.ui:270
 msgid "Lower Button"
 msgstr "下のサイドスイッチ"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:15
+#: panels/wacom/wacom-stylus-page.ui:299
+msgid "Lowest Button"
+msgstr "下のサイドスイッチ"
+
+#: panels/wacom/wacom-stylus-page.ui:328
 msgid "Tip Pressure Feel"
 msgstr "ペン先の感触"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:17
+#: panels/wacom/wacom-stylus-page.ui:440
 msgid "page 3"
 msgstr "ページ3"
 
-#: ../shell/alt/cc-window.c:53 ../shell/alt/cc-window.c:1484
-#: ../shell/cc-window.c:730
-msgid "All Settings"
-msgstr "すべての設定"
-
-#. Add categories
-#: ../shell/alt/cc-window.c:875
-msgctxt "category"
-msgid "Personal"
-msgstr "パーソナル"
-
-#: ../shell/alt/cc-window.c:876
-msgctxt "category"
-msgid "Hardware"
-msgstr "ハードウェア"
-
-#: ../shell/alt/cc-window.c:877
-msgctxt "category"
-msgid "System"
-msgstr "システム"
-
-#: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1
+#: shell/appdata/gnome-control-center.appdata.xml.in:7
 msgid "GNOME Control Center"
 msgstr "GNOME コントロールセンター"
 
-#: ../shell/appdata/gnome-control-center.appdata.xml.in.h:2
+#: shell/appdata/gnome-control-center.appdata.xml.in:8
 msgid "Utilities to configure the GNOME desktop"
 msgstr "GNOME デスクトップの設定ユーティリティー"
 
-#: ../shell/appdata/gnome-control-center.appdata.xml.in.h:3
+#: shell/appdata/gnome-control-center.appdata.xml.in:10
 msgid ""
 "The control center is GNOME’s main interface for configuration of various "
 "aspects of your desktop."
-msgstr ""
-"コントロールセンターは、デスクトップの各種設定を行う GNOME のメインインター"
-"フェースです。"
+msgstr "コントロールセンターは、デスクトップの各種設定を行う GNOME のメインインターフェースです。"
 
-#: ../shell/cc-application.c:45
+#: shell/cc-application.c:47
 msgid "Display version number"
 msgstr "バージョン番号を表示する"
 
-#: ../shell/cc-application.c:46
+#: shell/cc-application.c:48
 msgid "Enable verbose mode"
 msgstr "冗長モードを有効にする"
 
-#: ../shell/cc-application.c:47
+#: shell/cc-application.c:49
 msgid "Show the overview"
 msgstr "全体を表示する"
 
-#: ../shell/cc-application.c:48
+#: shell/cc-application.c:50
 msgid "Search for the string"
 msgstr "キーワードで検索する"
 
-#: ../shell/cc-application.c:49
+#: shell/cc-application.c:51
 msgid "List possible panel names and exit"
 msgstr "利用可能なパネル名をリスト表示して終了する"
 
-#: ../shell/cc-application.c:50
+#: shell/cc-application.c:52
 msgid "Panel to display"
 msgstr "表示するパネル"
 
-#: ../shell/cc-application.c:50
+#: shell/cc-application.c:52
 msgid "[PANEL] [ARGUMENT…]"
 msgstr "[PANEL] [ARGUMENT…]"
 
-#: ../shell/cc-application.c:113
+#: shell/cc-application.c:117
 msgid "Available panels:"
 msgstr "利用可能なパネル:"
 
-#: ../shell/cc-application.c:252
+#: shell/cc-application.c:256
 msgid "Help"
 msgstr "ヘルプ"
 
-#: ../shell/cc-application.c:253
+#: shell/cc-application.c:257
 msgid "Quit"
 msgstr "終了"
 
-#: ../shell/gnome-control-center.desktop.in.in.h:2
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: shell/gnome-control-center.desktop.in.in:5
+msgid "gnome-control-center"
+msgstr "gnome-control-center"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+#: shell/gnome-control-center.desktop.in.in:17
 msgid "Preferences;Settings;"
 msgstr "Preferences;Settings;設定;"
 
-#: ../shell/help-overlay.ui.h:1
+#: shell/help-overlay.ui:15
 msgctxt "shortcut window"
 msgid "General"
 msgstr "全般"
 
-#: ../shell/help-overlay.ui.h:2
+#: shell/help-overlay.ui:20
 msgctxt "shortcut window"
 msgid "Quit"
 msgstr "終了"
 
-#: ../shell/help-overlay.ui.h:3
+#: shell/help-overlay.ui:27 shell/help-overlay.ui:48
 msgctxt "shortcut window"
 msgid "Search"
 msgstr "検索"
 
-#: ../shell/help-overlay.ui.h:4
+#: shell/help-overlay.ui:35
 msgctxt "shortcut window"
 msgid "Panels"
 msgstr "パネル"
 
-#: ../shell/help-overlay.ui.h:5
+#: shell/help-overlay.ui:40
 msgctxt "shortcut window"
 msgid "Go back to the overview"
 msgstr "一覧画面に戻る"
 
-#: ../shell/help-overlay.ui.h:6
+#: shell/help-overlay.ui:53
 msgctxt "shortcut window"
 msgid "Cancel search"
 msgstr "検索をキャンセルする"
 
 #. translators: This is the default hotspot name, need to be less than 32-bytes
-#: ../shell/hostname-helper.c:189
+#: shell/hostname-helper.c:189
 msgctxt "hotspot"
 msgid "Hotspot"
 msgstr "ホットスポット"
 
-#: ../shell/panel-list.ui.h:3
+#: shell/org.gnome.ControlCenter.gschema.xml:5
+msgid "The identifier for the last Settings panel to be opened"
+msgstr "最後に開く設定パネルの識別子"
+
+#: 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 "最後に開く設定パネルの識別子。認識されていない値は無視され、リストの最初のパネルが選択されます。"
+
+#: shell/panel-list.ui:195
 msgid "No results found"
 msgstr "結果がありません"
 
+#: shell/window.ui:141
+msgid "All Settings"
+msgstr "すべての設定"
+
+#. translators:
+#. * The number of sound outputs on a particular device
+#: subprojects/gvc/gvc-mixer-control.c:1873
+#, c-format
+msgid "%u Output"
+msgid_plural "%u Outputs"
+msgstr[0] "%u 出力"
+
+#. translators:
+#. * The number of sound inputs on a particular device
+#: subprojects/gvc/gvc-mixer-control.c:1883
+#, c-format
+msgid "%u Input"
+msgid_plural "%u Inputs"
+msgstr[0] "%u 入力"
+
+#: subprojects/gvc/gvc-mixer-control.c:2738
+msgid "System Sounds"
+msgstr "システムのサウンド"
+
+#~ msgid "Back­ground"
+#~ msgstr "背景"
+
+#~ msgid "Blue­tooth"
+#~ msgstr "Blue­tooth"
+
+#~ msgid "Co­lor"
+#~ msgstr "色管理"
+
+#~ msgid "Section"
+#~ msgstr "セクション"
+
+#~ msgid "Overview"
+#~ msgstr "概要"
+
+#~ msgid "Defa­ult Applications"
+#~ msgstr "既定のアプリケーション"
+
+#~ msgid "Ab­out"
+#~ msgstr "情報"
+
+#~ msgid "De­tails"
+#~ msgstr "詳細"
+
+#~ msgid "Remo­vable Media"
+#~ msgstr "リムーバブルメディア"
+
+#~ msgid "OS name"
+#~ msgstr "OS 名"
+
+#~ msgid "Check for updates"
+#~ msgstr "更新の確認"
+
+#~ msgid "Net­work"
+#~ msgstr "ネットワーク"
+
+#~ msgid "invalid EAP-TLS password: missing"
+#~ msgstr "無効なEAP-TLSパスワード: 見つかりません"
+
+#~ msgid "No­ti­fi­ca­tions"
+#~ msgstr "通知"
+
+#~ msgid "Po­wer"
+#~ msgstr "電源管理"
+
+#~ msgid "Pri­va­cy"
+#~ msgstr "プライバシー"
+
+#~ msgid "Sha­ring"
+#~ msgstr "共有"
+
+#~ msgid "Uni­ver­sal Access"
+#~ msgstr "ユニバーサルアクセス"
+
+#~ msgid "Disable image"
+#~ msgstr "画像を無効にする"
+
+#~ msgid "Browse for more pictures…"
+#~ msgstr "他の画像も参照…"
+
+#~ msgid "Used by %s"
+#~ msgstr "%s に使用されています"
+
+#~ msgid "Wa­com Tab­let"
+#~ msgstr "ワコムタブレット"
+
+#~ msgctxt "category"
+#~ msgid "Personal"
+#~ msgstr "パーソナル"
+
+#~ msgctxt "category"
+#~ msgid "Hardware"
+#~ msgstr "ハードウェア"
+
+#~ msgctxt "category"
+#~ msgid "System"
+#~ msgstr "システム"
+
 #~ msgid "Lid Closed"
 #~ msgstr "蓋が閉じています"
 
@@ -7519,9 +7732,6 @@ msgstr "結果がありません"
 #~ msgid "VPN Type"
 #~ msgstr "VPN の種類"
 
-#~ msgid "Group Name"
-#~ msgstr "グループ名"
-
 #~ msgid "Group Password"
 #~ msgstr "グループのパスワード"
 
@@ -7625,9 +7835,6 @@ msgstr "結果がありません"
 #~ msgid "<small>Your account</small>"
 #~ msgstr "<small>あなたのアカウント</small>"
 
-#~ msgid "Color"
-#~ msgstr "色"
-
 #~ msgid "Wayland"
 #~ msgstr "Wayland"
 
@@ -7756,9 +7963,6 @@ msgstr "結果がありません"
 #~ msgid "Notification _Banners"
 #~ msgstr "通知バナー(_B)"
 
-#~ msgid "Add Account"
-#~ msgstr "アカウントの追加"
-
 #~ msgid "Mail"
 #~ msgstr "メール"
 
@@ -7820,12 +8024,6 @@ msgstr "結果がありません"
 #~ msgid "Add a New Printer"
 #~ msgstr "新しいプリンターの追加"
 
-#~ msgid "A_uthenticate"
-#~ msgstr "認証(_U)"
-
-#~ msgid "No printers detected."
-#~ msgstr "プリンターを検出できません"
-
 #~ msgid "Supply"
 #~ msgstr "サプライ"
 
@@ -7847,9 +8045,6 @@ msgstr "結果がありません"
 #~ msgid "Print _Test Page"
 #~ msgstr "テストページを印刷(_T)"
 
-#~ msgid "Privacy"
-#~ msgstr "プライバシー"
-
 #~ msgctxt "Search Location"
 #~ msgid "Other"
 #~ msgstr "その他"
@@ -7964,5 +8159,3 @@ msgstr "結果がありません"
 #~ msgid "Scroll Right"
 #~ msgstr "右にスクロール"
 
-#~ msgid "Used to determine your geographical location"
-#~ msgstr "あなたの地理的位置を特定するのに使用されます"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c3153b1a6..9755999a2 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -30,9 +30,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center 3.22\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
-"control-center&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-10-27 16:38+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-02-12 14:19+0100\n"
 "PO-Revision-Date: 2016-10-30 20:32+0800\n"
 "Last-Translator: Dingzhong Chen <wsxy162 gmail com>\n"
 "Language-Team: Chinese (China) <i18n-zh googlegroups com>\n"
@@ -43,378 +42,386 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 1.8.11\n"
 
-#: ../panels/background/background.ui.h:1
+#: panels/background/background.ui:49
 msgid "_Background"
-msgstr "背景(_B)"
+msgstr "(_B)背景"
 
 #. This refers to a slideshow background
-#: ../panels/background/background.ui.h:3
+#: panels/background/background.ui:99 panels/background/background.ui:212
 msgid "Changes throughout the day"
 msgstr "在一天内按时切换"
 
 #. To translators: This is a noun, not a verb
-#: ../panels/background/background.ui.h:5
+#: panels/background/background.ui:162
 msgid "_Lock Screen"
-msgstr "锁定屏幕(_L)"
+msgstr "(_L)锁定屏幕"
 
-#: ../panels/background/background.ui.h:6
+#: panels/background/background.ui:268
 msgctxt "background, style"
 msgid "Tile"
 msgstr "平铺"
 
-#: ../panels/background/background.ui.h:7
+#: panels/background/background.ui:272
 msgctxt "background, style"
 msgid "Zoom"
 msgstr "缩放"
 
-#: ../panels/background/background.ui.h:8
+#: panels/background/background.ui:276
 msgctxt "background, style"
 msgid "Center"
 msgstr "居中"
 
-#: ../panels/background/background.ui.h:9
+#: panels/background/background.ui:280
 msgctxt "background, style"
 msgid "Scale"
 msgstr "比例放大"
 
-#: ../panels/background/background.ui.h:10
+#: panels/background/background.ui:284
 msgctxt "background, style"
 msgid "Fill"
 msgstr "填充"
 
-#: ../panels/background/background.ui.h:11
+#: panels/background/background.ui:288
 msgctxt "background, style"
 msgid "Span"
 msgstr "适合宽度"
 
-#: ../panels/background/cc-background-chooser-dialog.c:437
+#: panels/background/cc-background-chooser-dialog.c:424
 msgid "Wallpapers"
 msgstr "壁纸"
 
-#: ../panels/background/cc-background-chooser-dialog.c:446
+#: panels/background/cc-background-chooser-dialog.c:433
 msgid "Colors"
 msgstr "色彩"
 
 #. translators: This is the title of the wallpaper chooser dialog.
-#: ../panels/background/cc-background-chooser-dialog.c:483
+#: panels/background/cc-background-chooser-dialog.c:468
 msgid "Select Background"
 msgstr "选择背景"
 
-#: ../panels/background/cc-background-chooser-dialog.c:511
+#: panels/background/cc-background-chooser-dialog.c:496
 msgid "Pictures"
 msgstr "图片"
 
 #. translators: No pictures were found
-#: ../panels/background/cc-background-chooser-dialog.c:543
+#: panels/background/cc-background-chooser-dialog.c:528
 msgid "No Pictures Found"
 msgstr "无图片"
 
 #. translators: "Home" is used in place of the Pictures
 #. * directory in the string below when XDG_PICTURES_DIR is
 #. * undefined
-#: ../panels/background/cc-background-chooser-dialog.c:561
-#: ../panels/search/cc-search-locations-dialog.c:302
+#: panels/background/cc-background-chooser-dialog.c:545
+#: panels/search/cc-search-locations-dialog.c:302
 msgid "Home"
 msgstr "主目录"
 
 #. translators: %s here is the name of the Pictures directory, the string should be translated in
 #. * the context "You can add images to your Pictures folder and they will show up here"
-#: ../panels/background/cc-background-chooser-dialog.c:573
+#: panels/background/cc-background-chooser-dialog.c:555
 #, c-format
 msgid "You can add images to your %s folder and they will show up here"
 msgstr "您添加到 %s 文件夹的图片将在此显示"
 
-#: ../panels/background/cc-background-chooser-dialog.c:580
-#: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963
-#: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30
-#: ../panels/common/language-chooser.ui.h:3
-#: ../panels/display/cc-display-panel.c:1561
-#: ../panels/display/cc-display-panel.c:2207
-#: ../panels/network/connection-editor/connection-editor.ui.h:1
-#: ../panels/network/connection-editor/vpn-helpers.c:181
-#: ../panels/network/connection-editor/vpn-helpers.c:310
-#: ../panels/network/net-device-wifi.c:1298
-#: ../panels/network/net-device-wifi.c:1535
-#: ../panels/network/network-wifi.ui.h:1
-#: ../panels/printers/cc-printers-panel.c:2077
-#: ../panels/printers/new-printer-dialog.ui.h:2
-#: ../panels/privacy/cc-privacy-panel.c:1048
-#: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2
-#: ../panels/search/cc-search-locations-dialog.c:637
-#: ../panels/sharing/cc-sharing-panel.c:372
-#: ../panels/user-accounts/data/account-dialog.ui.h:2
-#: ../panels/user-accounts/data/join-dialog.ui.h:2
-#: ../panels/user-accounts/data/password-dialog.ui.h:2
-#: ../panels/user-accounts/um-fingerprint-dialog.c:265
-#: ../panels/user-accounts/um-photo-dialog.c:94
-#: ../panels/user-accounts/um-photo-dialog.c:217
-#: ../panels/user-accounts/um-user-panel.c:705
-#: ../panels/user-accounts/um-user-panel.c:723
+#: panels/background/cc-background-chooser-dialog.c:560
+#: panels/color/cc-color-panel.c:225 panels/color/cc-color-panel.c:963
+#: panels/color/color-calibrate.ui:25 panels/color/color.ui:657
+#: panels/common/language-chooser.ui:23 panels/display/cc-display-panel.c:2597
+#: panels/info/cc-subscription-register-dialog.ui:18
+#: panels/network/connection-editor/connection-editor.ui:15
+#: panels/network/connection-editor/vpn-helpers.c:181
+#: panels/network/connection-editor/vpn-helpers.c:310
+#: panels/network/net-device-wifi.c:1411 panels/network/net-device-wifi.c:1491
+#: panels/network/net-device-wifi.c:1736 panels/network/network-wifi.ui:24
+#: panels/printers/new-printer-dialog.ui:45
+#: panels/printers/pp-details-dialog.c:331
+#: panels/privacy/cc-privacy-panel.c:1053 panels/region/format-chooser.ui:25
+#: panels/region/input-chooser.ui:13
+#: panels/search/cc-search-locations-dialog.c:642
+#: panels/sharing/cc-sharing-panel.c:392
+#: panels/user-accounts/data/account-dialog.ui:28
+#: panels/user-accounts/data/join-dialog.ui:20
+#: panels/user-accounts/data/password-dialog.ui:21
+#: panels/user-accounts/um-fingerprint-dialog.c:261
+#: panels/user-accounts/um-photo-dialog.c:103
+#: panels/user-accounts/um-photo-dialog.c:230
+#: panels/user-accounts/um-user-panel.c:634
+#: panels/user-accounts/um-user-panel.c:652
 msgid "_Cancel"
-msgstr "取消(_C)"
+msgstr "(_C)取消"
 
-#: ../panels/background/cc-background-chooser-dialog.c:581
+#: panels/background/cc-background-chooser-dialog.c:561
 msgid "_Select"
-msgstr "选择(_S)"
+msgstr "(_S)选择"
 
-#: ../panels/background/cc-background-item.c:203
+#: panels/background/cc-background-item.c:192
 msgid "multiple sizes"
 msgstr "多个尺寸"
 
 #. translators: 100 × 100px
 #. * Note that this is not an "x", but U+00D7 MULTIPLICATION SIGN
-#: ../panels/background/cc-background-item.c:207
+#: panels/background/cc-background-item.c:196
 #, c-format
 msgid "%d × %d"
 msgstr "%d × %d"
 
-#: ../panels/background/cc-background-item.c:333
+#: panels/background/cc-background-item.c:321
 msgid "No Desktop Background"
 msgstr "无桌面背景"
 
-#: ../panels/background/cc-background-panel.c:493
+#: panels/background/cc-background-panel.c:291
 msgid "Current background"
 msgstr "当前背景"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/background/gnome-background-panel.desktop.in.in.h:2
-msgid "Back­ground"
+#: panels/background/gnome-background-panel.desktop.in.in:3
+msgid "Background"
 msgstr "背景"
 
-#: ../panels/background/gnome-background-panel.desktop.in.in.h:3
+#: panels/background/gnome-background-panel.desktop.in.in:4
 msgid "Change your background image to a wallpaper or photo"
 msgstr "将背景图片改为一张壁纸或照片"
 
-#. Translators: those are keywords for the background control-center panel
-#: ../panels/background/gnome-background-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/background/gnome-background-panel.desktop.in.in:7
+msgid "preferences-desktop-wallpaper"
+msgstr "preferences-desktop-wallpaper"
+
+#. Translators: Search terms to find the Background panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#: panels/background/gnome-background-panel.desktop.in.in:15
 msgid "Wallpaper;Screen;Desktop;"
 msgstr "Wallpaper;Screen;Desktop;壁纸;墙纸;屏幕;桌面;背景;"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:264
+#: panels/bluetooth/cc-bluetooth-panel.c:265
 msgid "Turn Off Airplane Mode"
 msgstr "关闭飞行模式"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:330
+#: panels/bluetooth/cc-bluetooth-panel.c:330
 msgid "No Bluetooth Found"
 msgstr "未找到蓝牙"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:330
+#: panels/bluetooth/cc-bluetooth-panel.c:330
 msgid "Plug in a dongle to use Bluetooth."
 msgstr "插入蓝牙适配器以使用蓝牙。"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:331
+#: panels/bluetooth/cc-bluetooth-panel.c:331
 msgid "Bluetooth Turned Off"
 msgstr "蓝牙已经关闭"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:331
+#: panels/bluetooth/cc-bluetooth-panel.c:331
 msgid "Turn on to connect devices and receive file transfers."
 msgstr "打开以连接设备和接收文件传送。"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:332
+#: panels/bluetooth/cc-bluetooth-panel.c:332
 msgid "Airplane Mode is on"
 msgstr "飞行模式已打开"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:332
+#: panels/bluetooth/cc-bluetooth-panel.c:332
 msgid "Bluetooth is disabled when airplane mode is on."
 msgstr "蓝牙已禁用当开启飞行模式时。"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:333
+#: panels/bluetooth/cc-bluetooth-panel.c:333
 msgid "Hardware Airplane Mode is on"
 msgstr "硬件飞行模式已打开"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:333
+#: panels/bluetooth/cc-bluetooth-panel.c:333
 msgid "Turn off the Airplane mode switch to enable Bluetooth."
 msgstr "关闭飞行模式开关以开启蓝牙。"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2
-msgid "Blue­tooth"
+#. 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:1816
+msgid "Bluetooth"
 msgstr "蓝牙"
 
-#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3
+#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:4
 msgid "Turn Bluetooth on and off and connect your devices"
 msgstr "开关蓝牙及连接您的设备"
 
-#. Translators: those are keywords for the bluetooth control-center panel
-#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:6
+msgid "bluetooth"
+msgstr "蓝牙"
+
+#. Translators: Search terms to find the Bluetooth panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:19
 msgid "share;sharing;bluetooth;obex;"
 msgstr "share;sharing;bluetooth;obex;分享;共享;蓝牙;"
 
 #. TRANSLATORS: The user has to attach the sensor to the screen
-#: ../panels/color/cc-color-calibrate.c:361
-msgid "Place your calibration device over the square and press 'Start'"
+#: panels/color/cc-color-calibrate.c:361
+msgid "Place your calibration device over the square and press “Start”"
 msgstr "将您的校准设备放在方块上并按“开始”"
 
 #. TRANSLATORS: Some calibration devices need the user to move a
 #. * dial or switch manually. We also show a picture showing them
 #. * what to do...
-#: ../panels/color/cc-color-calibrate.c:367
+#: panels/color/cc-color-calibrate.c:367
 msgid ""
-"Move your calibration device to the calibrate position and press 'Continue'"
+"Move your calibration device to the calibrate position and press “Continue”"
 msgstr "将您的校准器移动到校准位置并按“继续”"
 
 #. TRANSLATORS: Some calibration devices need the user to move a
 #. * dial or switch manually. We also show a picture showing them
 #. * what to do...
-#: ../panels/color/cc-color-calibrate.c:373
+#: panels/color/cc-color-calibrate.c:373
 msgid ""
-"Move your calibration device to the surface position and press 'Continue'"
+"Move your calibration device to the surface position and press “Continue”"
 msgstr "将您的校准器移动到表面位置并按“继续”"
 
 #. TRANSLATORS: on some hardware e.g. Lenovo W700 the sensor
 #. * is built into the palmrest and we need to fullscreen the
 #. * sample widget and shut the lid.
-#: ../panels/color/cc-color-calibrate.c:379
+#: panels/color/cc-color-calibrate.c:379
 msgid "Shut the laptop lid"
 msgstr "合上笔记本盖子"
 
 #. TRANSLATORS: We suck, the calibation failed and we have no
 #. * good idea why or any suggestions
-#: ../panels/color/cc-color-calibrate.c:410
+#: panels/color/cc-color-calibrate.c:410
 msgid "An internal error occurred that could not be recovered."
 msgstr "发生了一个无法恢复的内部错误。"
 
 #. TRANSLATORS: Some required-at-runtime tools were not
 #. * installed, which should only affect insane distros
-#: ../panels/color/cc-color-calibrate.c:415
+#: panels/color/cc-color-calibrate.c:415
 msgid "Tools required for calibration are not installed."
 msgstr "未安装校准所需的工具。"
 
 #. TRANSLATORS: The profile failed for some reason
-#: ../panels/color/cc-color-calibrate.c:421
+#: panels/color/cc-color-calibrate.c:421
 msgid "The profile could not be generated."
 msgstr "无法生成配置。"
 
 #. TRANSLATORS: The user specified a whitepoint that was
 #. * unobtainable with the hardware they've got -- see
 #. * https://en.wikipedia.org/wiki/White_point for details
-#: ../panels/color/cc-color-calibrate.c:427
+#: panels/color/cc-color-calibrate.c:427
 msgid "The target whitepoint was not obtainable."
 msgstr "无法获取目标白点。"
 
 #. TRANSLATORS: the display calibration process is finished
-#: ../panels/color/cc-color-calibrate.c:467
+#: panels/color/cc-color-calibrate.c:467
 msgid "Complete!"
 msgstr "完成!"
 
 #. TRANSLATORS: the display calibration failed, and we also show
 #. * the translated (or untranslated) error string after this
-#: ../panels/color/cc-color-calibrate.c:475
+#: panels/color/cc-color-calibrate.c:475
 msgid "Calibration failed!"
 msgstr "校准失败!"
 
 #. TRANSLATORS: The user can now remove the sensor from the screen
-#: ../panels/color/cc-color-calibrate.c:482
+#: panels/color/cc-color-calibrate.c:482
 msgid "You can remove the calibration device."
 msgstr "您现在可以移除校准设备。"
 
 #. TRANSLATORS: The user has to be careful not to knock the
 #. * display off the screen (although we do cope if this is
 #. * detected early enough)
-#: ../panels/color/cc-color-calibrate.c:553
+#: panels/color/cc-color-calibrate.c:553
 msgid "Do not disturb the calibration device while in progress"
 msgstr "校准过程中不要干扰校准设备"
 
 #. TRANSLATORS: This refers to the TFT display on a laptop
-#: ../panels/color/cc-color-common.c:41
+#: panels/color/cc-color-common.c:41
 msgid "Laptop Screen"
 msgstr "笔记本屏幕"
 
 #. TRANSLATORS: This refers to the embedded webcam on a laptop
-#: ../panels/color/cc-color-common.c:50
+#: panels/color/cc-color-common.c:50
 msgid "Built-in Webcam"
 msgstr "内置摄像头"
 
 #. TRANSLATORS: an externally connected display, where %s is either the
 #. * model, vendor or ID, e.g. 'LP2480zx Monitor'
-#: ../panels/color/cc-color-common.c:65
+#: panels/color/cc-color-common.c:65
 #, c-format
 msgid "%s Monitor"
 msgstr "%s 显示器"
 
 #. TRANSLATORS: a flatbed scanner device, e.g. 'Epson Scanner'
-#: ../panels/color/cc-color-common.c:69
+#: panels/color/cc-color-common.c:69
 #, c-format
 msgid "%s Scanner"
 msgstr "%s 扫描仪"
 
 #. TRANSLATORS: a camera device, e.g. 'Nikon D60 Camera'
-#: ../panels/color/cc-color-common.c:73
+#: panels/color/cc-color-common.c:73
 #, c-format
 msgid "%s Camera"
 msgstr "%s 相机"
 
 #. TRANSLATORS: a printer device, e.g. 'Epson Photosmart Printer'
-#: ../panels/color/cc-color-common.c:77
+#: panels/color/cc-color-common.c:77
 #, c-format
 msgid "%s Printer"
 msgstr "%s 打印机"
 
 #. TRANSLATORS: a webcam device, e.g. 'Philips HiDef Camera'
-#: ../panels/color/cc-color-common.c:81
+#: panels/color/cc-color-common.c:81
 #, c-format
 msgid "%s Webcam"
 msgstr "%s 摄像头"
 
-#: ../panels/color/cc-color-device.c:89
+#: panels/color/cc-color-device.c:89
 #, c-format
 msgid "Enable color management for %s"
 msgstr "为 %s 启用色彩管理"
 
-#: ../panels/color/cc-color-device.c:93
+#: panels/color/cc-color-device.c:93
 #, c-format
 msgid "Show color profiles for %s"
 msgstr "为 %s 显示颜色管理"
 
 #. not calibrated
-#: ../panels/color/cc-color-device.c:323
+#: panels/color/cc-color-device.c:323
 msgid "Not calibrated"
 msgstr "未校准"
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile has been auto-generated for this hardware
-#: ../panels/color/cc-color-panel.c:141
+#: panels/color/cc-color-panel.c:141
 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:149
+#: panels/color/cc-color-panel.c:149
 msgid "Colorspace: "
 msgstr "色彩空间:"
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile is a test profile
-#: ../panels/color/cc-color-panel.c:156
+#: panels/color/cc-color-panel.c:156
 msgid "Test profile: "
 msgstr "测试配置:"
 
 #. TRANSLATORS: an ICC profile is a file containing colorspace data
-#: ../panels/color/cc-color-panel.c:223
+#: panels/color/cc-color-panel.c:223
 msgid "Select ICC Profile File"
 msgstr "选择 ICC 配置文件"
 
-#: ../panels/color/cc-color-panel.c:226
+#: panels/color/cc-color-panel.c:226
 msgid "_Import"
 msgstr "导入(_I)"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: ../panels/color/cc-color-panel.c:237
+#: panels/color/cc-color-panel.c:237
 msgid "Supported ICC profiles"
 msgstr "支持的 ICC 配置"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: ../panels/color/cc-color-panel.c:244
-#: ../panels/network/wireless-security/eap-method-fast.c:417
+#: panels/color/cc-color-panel.c:244
+#: panels/network/wireless-security/eap-method-fast.c:417
 msgid "All files"
 msgstr "所有文件"
 
-#: ../panels/color/cc-color-panel.c:583
+#: panels/color/cc-color-panel.c:583
 msgid "Screen"
 msgstr "屏幕"
 
 #. TRANSLATORS: this is when the upload of the profile failed
-#: ../panels/color/cc-color-panel.c:908
+#: panels/color/cc-color-panel.c:908
 #, c-format
 msgid "Failed to upload file: %s"
 msgstr "上传文件失败:%s"
@@ -422,63 +429,63 @@ msgstr "上传文件失败:%s"
 #. 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:922
+#: panels/color/cc-color-panel.c:922
 msgid "The profile has been uploaded to:"
 msgstr "配置已上传到:"
 
-#: ../panels/color/cc-color-panel.c:924
+#: panels/color/cc-color-panel.c:924
 msgid "Write down this URL."
 msgstr "请记下此 URL。"
 
-#: ../panels/color/cc-color-panel.c:925
+#: panels/color/cc-color-panel.c:925
 msgid "Restart this computer and boot your normal operating system."
 msgstr "重启计算机并引导您日常使用的操作系统。"
 
-#: ../panels/color/cc-color-panel.c:926
+#: panels/color/cc-color-panel.c:926
 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:960
+#: panels/color/cc-color-panel.c:960
 msgid "Save Profile"
 msgstr "保存配置"
 
-#: ../panels/color/cc-color-panel.c:964
-#: ../panels/network/connection-editor/vpn-helpers.c:311
+#: panels/color/cc-color-panel.c:964
+#: panels/network/connection-editor/vpn-helpers.c:311
 msgid "_Save"
 msgstr "保存(_S)"
 
 #. TRANSLATORS: this is when the button is sensitive
-#: ../panels/color/cc-color-panel.c:1324
+#: panels/color/cc-color-panel.c:1325
 msgid "Create a color profile for the selected device"
 msgstr "为选中的设备创建一份色彩配置"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:1339 ../panels/color/cc-color-panel.c:1363
+#: panels/color/cc-color-panel.c:1340 panels/color/cc-color-panel.c:1364
 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:1373
+#: panels/color/cc-color-panel.c:1374
 msgid "The measuring instrument does not support printer profiling."
 msgstr "测量仪器不支持打印机校正。"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:1384
+#: panels/color/cc-color-panel.c:1385
 msgid "The device type is not currently supported."
 msgstr "目前不支持此设备类型。"
 
 #. TRANSLATORS: standard spaces are well known colorspaces like
 #. * sRGB, AdobeRGB and ProPhotoRGB
-#: ../panels/color/cc-color-profile.c:103
+#: panels/color/cc-color-profile.c:103
 msgid "Standard Space"
 msgstr "标准空间"
 
 #. TRANSLATORS: test profiles do things like changing the screen
 #. * a different color, or swap the red and green channels
-#: ../panels/color/cc-color-profile.c:109
+#: panels/color/cc-color-profile.c:109
 msgid "Test Profile"
 msgstr "测试配置"
 
@@ -486,7 +493,7 @@ msgstr "测试配置"
 #. * by the color management system based on manufacturing data,
 #. * for instance the default monitor profile is created from the
 #. * primaries specified in the monitor EDID
-#: ../panels/color/cc-color-profile.c:117
+#: panels/color/cc-color-profile.c:117
 msgctxt "Automatically generated profile"
 msgid "Automatic"
 msgstr "自动"
@@ -494,13 +501,13 @@ msgstr "自动"
 #. TRANSLATORS: the profile quality - low quality profiles take
 #. * much less time to generate but may be a poor reflection of the
 #. * device capability
-#: ../panels/color/cc-color-profile.c:127
+#: panels/color/cc-color-profile.c:127
 msgctxt "Profile quality"
 msgid "Low Quality"
 msgstr "低质量"
 
 #. TRANSLATORS: the profile quality
-#: ../panels/color/cc-color-profile.c:132
+#: panels/color/cc-color-profile.c:132
 msgctxt "Profile quality"
 msgid "Medium Quality"
 msgstr "中等质量"
@@ -508,62 +515,61 @@ msgstr "中等质量"
 #. TRANSLATORS: the profile quality - high quality profiles take
 #. * a *long* time, and have the best calibration and
 #. * characterisation data.
-#: ../panels/color/cc-color-profile.c:139
+#: panels/color/cc-color-profile.c:139
 msgctxt "Profile quality"
 msgid "High Quality"
 msgstr "高质量"
 
 #. TRANSLATORS: this default RGB space is used for printers that
 #. * do not have additional printer profiles specified in the PPD
-#: ../panels/color/cc-color-profile.c:156
+#: panels/color/cc-color-profile.c:156
 msgctxt "Colorspace fallback"
 msgid "Default RGB"
 msgstr "默认 RGB"
 
 #. TRANSLATORS: this default CMYK space is used for printers that
 #. * do not have additional printer profiles specified in the PPD
-#: ../panels/color/cc-color-profile.c:163
+#: panels/color/cc-color-profile.c:163
 msgctxt "Colorspace fallback"
 msgid "Default CMYK"
 msgstr "默认 CMYK"
 
 #. TRANSLATORS: this default gray space is used for printers that
 #. * do not have additional printer profiles specified in the PPD
-#: ../panels/color/cc-color-profile.c:170
+#: panels/color/cc-color-profile.c:170
 msgctxt "Colorspace fallback"
 msgid "Default Gray"
 msgstr "默认灰度"
 
-#: ../panels/color/cc-color-profile.c:194
+#: panels/color/cc-color-profile.c:194
 msgid "Vendor supplied factory calibration data"
 msgstr "生产商提供的工厂校准数据"
 
-#: ../panels/color/cc-color-profile.c:203
+#: panels/color/cc-color-profile.c:203
 msgid "Full-screen display correction not possible with this profile"
 msgstr "无法使用此配置进行全屏显示校准"
 
-#: ../panels/color/cc-color-profile.c:225
+#: panels/color/cc-color-profile.c:225
 msgid "This profile may no longer be accurate"
 msgstr "此配置可能已不准确"
 
-#: ../panels/color/color-calibrate.ui.h:1
+#: panels/color/color-calibrate.ui:7
 msgid "Display Calibration"
 msgstr "显示校准"
 
 #. This starts the calibration process
-#: ../panels/color/color-calibrate.ui.h:4
+#: panels/color/color-calibrate.ui:40
 msgid "_Start"
 msgstr "开始(_S)"
 
 #. This resumes the calibration process
-#: ../panels/color/color-calibrate.ui.h:6
+#: 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.h:8
-#: ../panels/common/language-chooser.ui.h:2
-#: ../panels/region/format-chooser.ui.h:2
+#: panels/color/color-calibrate.ui:67 panels/common/language-chooser.ui:12
+#: panels/region/format-chooser.ui:14
 msgid "_Done"
 msgstr "完成(_D)"
 
@@ -571,367 +577,364 @@ msgstr "完成(_D)"
 #. 15000 = 15 sec
 #. 750 = 0.75 sec
 #. Text printed on screen
-#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:82
+#: panels/color/color.ui:6 panels/wacom/calibrator/calibrator-gui.c:82
 msgid "Screen Calibration"
 msgstr "屏幕校准"
 
-#: ../panels/color/color.ui.h:2
+#: panels/color/color.ui:23
 msgid ""
 "Calibration will produce a profile that you can use to color manage your "
 "screen. The longer you spend on calibration, the better the quality of the "
 "color profile."
 msgstr "校准将生成用于屏幕色彩管理的配置。校准时花费的时间越多效果越好。"
 
-#: ../panels/color/color.ui.h:3
+#: panels/color/color.ui:38
 msgid ""
 "You will not be able to use your computer while calibration takes place."
 msgstr "校准进行时您将不能使用您的计算机。"
 
 #. This is the approximate time it takes to calibrate the display.
-#: ../panels/color/color.ui.h:5
+#: panels/color/color.ui:58
 msgid "Quality"
 msgstr "质量"
 
 #. This is the approximate time it takes to calibrate the display.
-#: ../panels/color/color.ui.h:7
+#: panels/color/color.ui:75
 msgid "Approximate Time"
 msgstr "预计耗时"
 
-#: ../panels/color/color.ui.h:8
+#: panels/color/color.ui:121
 msgid "Calibration Quality"
 msgstr "校准质量"
 
-#: ../panels/color/color.ui.h:9
+#: panels/color/color.ui:137
 msgid "Select the sensor device you want to use for calibration."
 msgstr "选择校准所使用的传感器设备。"
 
-#: ../panels/color/color.ui.h:10
+#: panels/color/color.ui:174
 msgid "Calibration Device"
 msgstr "校准设备"
 
-#: ../panels/color/color.ui.h:11
+#: panels/color/color.ui:189
 msgid "Select the type of display that is connected."
 msgstr "选择连接的显示类型"
 
-#: ../panels/color/color.ui.h:12
+#: panels/color/color.ui:226
 msgid "Display Type"
 msgstr "显示类型"
 
-#: ../panels/color/color.ui.h:13
+#: panels/color/color.ui:241
 msgid ""
 "Select a display target white point. Most displays should be calibrated to a "
 "D65 illuminant."
 msgstr "选择显示目标白点。多数显示器应该校准到 D65 光源。"
 
-#: ../panels/color/color.ui.h:14
+#: panels/color/color.ui:278
 msgid "Profile Whitepoint"
 msgstr "配置参考白点"
 
-#: ../panels/color/color.ui.h:15
+#: panels/color/color.ui:293
 msgid ""
 "Please set the display to a brightness that is typical for you. Color "
 "management will be most accurate at this brightness level."
 msgstr "请选择通常使用的显示亮度。色彩管理在此亮度下将最准确。"
 
-#: ../panels/color/color.ui.h:16
+#: panels/color/color.ui:307
 msgid ""
 "Alternatively, you can use the brightness level used with one of the other "
 "profiles for this device."
 msgstr "或者,也可以使用亮度配合此设备的其他配置使用。"
 
-#: ../panels/color/color.ui.h:17
+#: panels/color/color.ui:318
 msgid "Display Brightness"
 msgstr "显示亮度"
 
-#: ../panels/color/color.ui.h:18
+#: panels/color/color.ui:333
 msgid ""
 "You can use a color profile on different computers, or even create profiles "
 "for different lighting conditions."
-msgstr ""
-"您可以对不同的计算机使用同一个配置,或者甚至可以对不同的光照条件创建配置。"
+msgstr "您可以对不同的计算机使用同一个配置,或者甚至可以对不同的光照条件创建配置。"
 
-#: ../panels/color/color.ui.h:19
+#: panels/color/color.ui:348
 msgid "Profile Name:"
 msgstr "配置名称:"
 
-#: ../panels/color/color.ui.h:20
+#: panels/color/color.ui:377
 msgid "Profile Name"
 msgstr "配置名称"
 
-#: ../panels/color/color.ui.h:21
+#: panels/color/color.ui:392
 msgid "Profile successfully created!"
 msgstr "创建配置成功!"
 
-#: ../panels/color/color.ui.h:22
+#: panels/color/color.ui:443
 msgid "Copy profile"
 msgstr "复制配置"
 
-#: ../panels/color/color.ui.h:23
+#: panels/color/color.ui:456
 msgid "Requires writable media"
 msgstr "需要可写媒体"
 
-#: ../panels/color/color.ui.h:24
+#: panels/color/color.ui:519
 msgid "Upload profile"
 msgstr "上传配置"
 
-#: ../panels/color/color.ui.h:25
+#: panels/color/color.ui:532
 msgid "Requires Internet connection"
 msgstr "需要互联网连接"
 
-#: ../panels/color/color.ui.h:26
+#: panels/color/color.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."
-msgstr ""
-"有关如何在 <a href=\"linux\">GNU/Linux</a>、<a href=\"osx\">Apple OS X</a> "
-"和 <a href=\"windows\">Microsoft Windows</a> 系统中使用配置的这些说明可能对您"
-"有所帮助。"
+msgstr "有关如何在 <a href=\"linux\">GNU/Linux</a>、<a href=\"osx\">Apple OS X</a> 和 <a href=\"windows\">Microsoft 
Windows</a> 系统中使用配置的这些说明可能对您有所帮助。"
 
-#: ../panels/color/color.ui.h:27
-#: ../panels/user-accounts/um-fingerprint-dialog.c:730
+#: panels/color/color.ui:607 panels/user-accounts/um-fingerprint-dialog.c:720
 msgid "Summary"
 msgstr "摘要"
 
-#: ../panels/color/color.ui.h:28
-msgid "Add profile"
-msgstr "添加配置"
+#: panels/color/color.ui:621
+msgid "Add Profile"
+msgstr "添加配置集"
 
-#: ../panels/color/color.ui.h:29
+#: panels/color/color.ui:643
 msgid "_Import File…"
 msgstr "导入文件(_I)…"
 
-#: ../panels/color/color.ui.h:31
-#: ../panels/network/connection-editor/net-connection-editor.c:546
-#: ../panels/printers/new-printer-dialog.ui.h:3
-#: ../panels/region/input-chooser.ui.h:3
-#: ../panels/user-accounts/data/account-dialog.ui.h:3
+#: panels/color/color.ui:672
+#: panels/network/connection-editor/net-connection-editor.c:519
+#: panels/printers/new-printer-dialog.ui:80 panels/region/input-chooser.ui:22
+#: panels/user-accounts/data/account-dialog.ui:47
 msgid "_Add"
 msgstr "添加(_A)"
 
-#: ../panels/color/color.ui.h:32
+#: panels/color/color.ui:732
 msgid ""
 "Problems detected. The profile may not work correctly. <a href=\"\">Show "
 "details.</a>"
 msgstr "检测到问题,此配置可能无法正常工作。<a href=\"\">显示详细信息。</a>"
 
-#: ../panels/color/color.ui.h:33
+#: panels/color/color.ui:807
 msgid "Each device needs an up to date color profile to be color managed."
 msgstr "每个设备都需要一份最新色彩配置以进行色彩管理。"
 
-#: ../panels/color/color.ui.h:34
+#: panels/color/color.ui:829
 msgid "Learn more"
 msgstr "了解更多"
 
-#: ../panels/color/color.ui.h:35
+#: panels/color/color.ui:834
 msgid "Learn more about color management"
 msgstr "了解更多有关色彩管理的信息"
 
-#: ../panels/color/color.ui.h:36
+#: panels/color/color.ui:882
 msgid "_Set for all users"
 msgstr "为所有用户设置(_S)"
 
-#: ../panels/color/color.ui.h:37
+#: panels/color/color.ui:886 panels/color/color.ui:901
+#: panels/color/color.ui:902
 msgid "Set this profile for all users on this computer"
 msgstr "为此计算机上的所有用户设置此配置"
 
-#: ../panels/color/color.ui.h:38
+#: panels/color/color.ui:897
 msgid "_Enable"
 msgstr "启用(_E)"
 
-#: ../panels/color/color.ui.h:39
+#: panels/color/color.ui:928
 msgid "_Add profile"
 msgstr "添加配置(_A)"
 
-#: ../panels/color/color.ui.h:40
+#: panels/color/color.ui:941
 msgid "_Calibrate…"
 msgstr "校准(_C)…"
 
-#: ../panels/color/color.ui.h:41
+#: panels/color/color.ui:945
 msgid "Calibrate the device"
 msgstr "校准该设备"
 
-#: ../panels/color/color.ui.h:42
+#: panels/color/color.ui:956
 msgid "_Remove profile"
 msgstr "移除配置(_R)"
 
-#: ../panels/color/color.ui.h:43
+#: panels/color/color.ui:969
 msgid "_View details"
 msgstr "查看详情(_V)"
 
-#: ../panels/color/color.ui.h:44
+#: panels/color/color.ui:1005
 msgid "Unable to detect any devices that can be color managed"
 msgstr "未检测到可以管理颜色的设备"
 
-#: ../panels/color/color.ui.h:45
+#: panels/color/color.ui:1047
 msgid "LCD"
 msgstr "LCD"
 
-#: ../panels/color/color.ui.h:46
+#: panels/color/color.ui:1052
 msgid "LED"
 msgstr "LED"
 
-#: ../panels/color/color.ui.h:47
+#: panels/color/color.ui:1057
 msgid "CRT"
 msgstr "CRT"
 
-#: ../panels/color/color.ui.h:48
+#: panels/color/color.ui:1062
 msgid "Projector"
 msgstr "投影仪"
 
-#: ../panels/color/color.ui.h:49
+#: panels/color/color.ui:1067
 msgid "Plasma"
 msgstr "等离子"
 
-#: ../panels/color/color.ui.h:50
+#: panels/color/color.ui:1072
 msgid "LCD (CCFL backlight)"
 msgstr "LCD (CCFL 背光)"
 
-#: ../panels/color/color.ui.h:51
+#: panels/color/color.ui:1077
 msgid "LCD (RGB LED backlight)"
 msgstr "LCD (RGB LED 背光)"
 
-#: ../panels/color/color.ui.h:52
+#: panels/color/color.ui:1082
 msgid "LCD (white LED backlight)"
 msgstr "LCD (白色 LED 背光)"
 
-#: ../panels/color/color.ui.h:53
+#: panels/color/color.ui:1087
 msgid "Wide gamut LCD (CCFL backlight)"
-msgstr "广色域 LCD(CCFL 背光)"
+msgstr "广色域 LCD (CCFL 背光)"
 
-#: ../panels/color/color.ui.h:54
+#: panels/color/color.ui:1092
 msgid "Wide gamut LCD (RGB LED backlight)"
 msgstr "广色域 LCD(RGB LED 背光)"
 
-#: ../panels/color/color.ui.h:55
+#: panels/color/color.ui:1109
 msgctxt "Calibration quality"
 msgid "High"
 msgstr "高"
 
-#: ../panels/color/color.ui.h:56
+#: panels/color/color.ui:1110
 msgid "40 minutes"
 msgstr "40 分钟"
 
-#: ../panels/color/color.ui.h:57
+#: panels/color/color.ui:1114
 msgctxt "Calibration quality"
 msgid "Medium"
 msgstr "中"
 
-#: ../panels/color/color.ui.h:58 ../panels/power/power.ui.h:2
-#: ../panels/privacy/privacy.ui.h:7
+#: panels/color/color.ui:1115 panels/power/power.ui:25
+#: panels/privacy/privacy.ui:38
 msgid "30 minutes"
 msgstr "30 分钟"
 
-#: ../panels/color/color.ui.h:59
+#: panels/color/color.ui:1119
 msgctxt "Calibration quality"
 msgid "Low"
 msgstr "低"
 
-#: ../panels/color/color.ui.h:60 ../panels/power/power.ui.h:1
+#: panels/color/color.ui:1120 panels/power/power.ui:13 panels/power/power.ui:95
 msgid "15 minutes"
 msgstr "15 分钟"
 
-#: ../panels/color/color.ui.h:61
+#: panels/color/color.ui:1142
 msgid "Native to display"
 msgstr "显示设备原生"
 
-#: ../panels/color/color.ui.h:62
+#: panels/color/color.ui:1146
 msgid "D50 (Printing and publishing)"
 msgstr "D50(打印和出版)"
 
-#: ../panels/color/color.ui.h:63
+#: panels/color/color.ui:1150
 msgid "D55"
 msgstr "D55"
 
-#: ../panels/color/color.ui.h:64
+#: panels/color/color.ui:1154
 msgid "D65 (Photography and graphics)"
 msgstr "D65(摄影及图形)"
 
-#: ../panels/color/color.ui.h:65
+#: panels/color/color.ui:1158
 msgid "D75"
 msgstr "D75"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:2
-msgid "Co­lor"
+#: panels/color/gnome-color-panel.desktop.in.in:3
+msgid "Color"
 msgstr "色彩"
 
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:3
+#: panels/color/gnome-color-panel.desktop.in.in:4
 msgid ""
 "Calibrate the color of your devices, such as displays, cameras or printers"
 msgstr "校准显示器、相机、打印机等设备的色彩"
 
-#. Translators: those are keywords for the color control-center panel
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/color/gnome-color-panel.desktop.in.in:7
+msgid "preferences-color"
+msgstr "preferences-color"
+
+#. Translators: Search terms to find the Color panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+#: panels/color/gnome-color-panel.desktop.in.in:19
 msgid "Color;ICC;Profile;Calibrate;Printer;Display;"
-msgstr ""
-"Color;ICC;Profile;Calibrate;Printer;Display;颜色;色彩;配置;校准;打印机;显示;"
+msgstr "Color;ICC;Profile;Calibrate;Printer;Display;颜色;色彩;配置;校准;打印机;显示;"
 
-#: ../panels/common/cc-common-language.c:323
+#: panels/common/cc-common-language.c:323
 msgid "Other…"
 msgstr "其他…"
 
-#: ../panels/common/cc-language-chooser.c:124
-#: ../panels/region/cc-format-chooser.c:271
-#: ../panels/region/cc-input-chooser.c:169
+#: panels/common/cc-language-chooser.c:124
+#: panels/region/cc-format-chooser.c:269 panels/region/cc-input-chooser.c:169
 msgid "More…"
 msgstr "更多…"
 
-#: ../panels/common/cc-language-chooser.c:140
+#: panels/common/cc-language-chooser.c:140
 msgid "No languages found"
 msgstr "未找到语言"
 
-#: ../panels/common/cc-util.c:127
-#: ../panels/network/connection-editor/ce-page-details.c:100
+#: panels/common/cc-util.c:127
+#: panels/network/connection-editor/ce-page-details.c:106
 msgid "Today"
 msgstr "今天"
 
-#: ../panels/common/cc-util.c:131
-#: ../panels/network/connection-editor/ce-page-details.c:102
+#: panels/common/cc-util.c:131
+#: panels/network/connection-editor/ce-page-details.c:108
 msgid "Yesterday"
 msgstr "昨天"
 
 #. Translators: This is a date format string in the style of "Feb 24".
-#: ../panels/common/cc-util.c:138
+#: panels/common/cc-util.c:138
 msgid "%b %e"
 msgstr "%b %e"
 
 #. Translators: This is a date format string in the style of "Feb 24, 2013".
-#: ../panels/common/cc-util.c:143
+#: panels/common/cc-util.c:143
 msgid "%b %e, %Y"
-msgstr " %Y %b %e"
+msgstr "%b %e, %Y"
 
-#: ../panels/common/language-chooser.ui.h:1
+#: panels/common/language-chooser.ui:5
 msgid "Language"
 msgstr "语言"
 
-#: ../panels/datetime/big.ui.h:1 ../panels/datetime/little.ui.h:1
-#: ../panels/datetime/middle.ui.h:1 ../panels/datetime/ydm.ui.h:1
+#: panels/datetime/big.ui:16 panels/datetime/little.ui:16
+#: panels/datetime/middle.ui:16 panels/datetime/ydm.ui:16
 msgid "Day"
 msgstr "日"
 
-#: ../panels/datetime/big.ui.h:2 ../panels/datetime/little.ui.h:2
-#: ../panels/datetime/middle.ui.h:2 ../panels/datetime/ydm.ui.h:2
+#: panels/datetime/big.ui:32 panels/datetime/little.ui:32
+#: panels/datetime/middle.ui:32 panels/datetime/ydm.ui:32
 msgid "Month"
 msgstr "月"
 
-#: ../panels/datetime/big.ui.h:3 ../panels/datetime/little.ui.h:3
-#: ../panels/datetime/middle.ui.h:3 ../panels/datetime/ydm.ui.h:3
+#: panels/datetime/big.ui:48 panels/datetime/little.ui:48
+#: panels/datetime/middle.ui:48 panels/datetime/ydm.ui:48
 msgid "Year"
 msgstr "年"
 
 #. Translators: This is the full date and time format used in 12-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:340
+#: panels/datetime/cc-datetime-panel.c:333
 msgid "%e %B %Y, %l:%M %p"
-msgstr "%Y年%m月%d日, %p %-l:%M"
+msgstr "%e %B %Y, %l:%M %p"
 
 #. Translators: This is the full date and time format used in 24-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:345
+#: panels/datetime/cc-datetime-panel.c:338
 msgid "%e %B %Y, %R"
-msgstr "%Y年%m月%d日, %R"
+msgstr "%e %B %Y, %R"
 
 #. Translators: "city, country"
-#: ../panels/datetime/cc-datetime-panel.c:523
+#: panels/datetime/cc-datetime-panel.c:503
 #, c-format
 msgctxt "timezone loc"
 msgid "%s, %s"
@@ -939,7 +942,7 @@ msgstr "%s, %s"
 
 #. Update the timezone on the listbow row
 #. Translators: "timezone (details)"
-#: ../panels/datetime/cc-datetime-panel.c:553
+#: panels/datetime/cc-datetime-panel.c:530
 #, c-format
 msgctxt "timezone desc"
 msgid "%s (%s)"
@@ -947,367 +950,429 @@ msgstr "%s (%s)"
 
 #. Translators: UTC here means the Coordinated Universal Time.
 #. * %:::z will be replaced by the offset from UTC e.g. UTC+02
-#: ../panels/datetime/cc-datetime-panel.c:561
+#: panels/datetime/cc-datetime-panel.c:537
 msgid "UTC%:::z"
 msgstr "UTC%:::z"
 
 #. Translators: This is the time format used in 12-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:566
+#: panels/datetime/cc-datetime-panel.c:542
 msgid "%l:%M %p"
-msgstr "%p %-l:%M"
+msgstr "%l:%M %p"
 
 #. Translators: This is the time format used in 24-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:571
+#: panels/datetime/cc-datetime-panel.c:547
 msgid "%R"
 msgstr "%R"
 
 #. Update the text bubble in the timezone map
 #. Translators: "timezone (utc shift)"
-#: ../panels/datetime/cc-datetime-panel.c:576
+#: panels/datetime/cc-datetime-panel.c:552
 #, c-format
 msgctxt "timezone map"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../panels/datetime/datetime.ui.h:1
+#: panels/datetime/datetime.ui:22
 msgid "January"
 msgstr "一月"
 
-#: ../panels/datetime/datetime.ui.h:2
+#: panels/datetime/datetime.ui:25
 msgid "February"
 msgstr "二月"
 
-#: ../panels/datetime/datetime.ui.h:3
+#: panels/datetime/datetime.ui:28
 msgid "March"
 msgstr "三月"
 
-#: ../panels/datetime/datetime.ui.h:4
+#: panels/datetime/datetime.ui:31
 msgid "April"
 msgstr "四月"
 
-#: ../panels/datetime/datetime.ui.h:5
+#: panels/datetime/datetime.ui:34
 msgid "May"
 msgstr "五月"
 
-#: ../panels/datetime/datetime.ui.h:6
+#: panels/datetime/datetime.ui:37
 msgid "June"
 msgstr "六月"
 
-#: ../panels/datetime/datetime.ui.h:7
+#: panels/datetime/datetime.ui:40
 msgid "July"
 msgstr "七月"
 
-#: ../panels/datetime/datetime.ui.h:8
+#: panels/datetime/datetime.ui:43
 msgid "August"
 msgstr "八月"
 
-#: ../panels/datetime/datetime.ui.h:9
+#: panels/datetime/datetime.ui:46
 msgid "September"
 msgstr "九月"
 
-#: ../panels/datetime/datetime.ui.h:10
+#: panels/datetime/datetime.ui:49
 msgid "October"
 msgstr "十月"
 
-#: ../panels/datetime/datetime.ui.h:11
+#: panels/datetime/datetime.ui:52
 msgid "November"
 msgstr "十一月"
 
-#: ../panels/datetime/datetime.ui.h:12
+#: panels/datetime/datetime.ui:55
 msgid "December"
 msgstr "十二月"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/datetime/datetime.ui.h:13
-#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2
+#: panels/datetime/datetime.ui:61
+#: panels/datetime/gnome-datetime-panel.desktop.in.in:3
 msgid "Date & Time"
 msgstr "日期和时间"
 
-#: ../panels/datetime/datetime.ui.h:14
+#: panels/datetime/datetime.ui:106
 msgid "Hour"
 msgstr "时"
 
 #. Translator: this is the separator between hours and minutes, like in HH∶MM
-#: ../panels/datetime/datetime.ui.h:16
+#: panels/datetime/datetime.ui:121
 msgid "∶"
 msgstr ":"
 
-#: ../panels/datetime/datetime.ui.h:17
+#: panels/datetime/datetime.ui:143
 msgid "Minute"
 msgstr "分"
 
-#: ../panels/datetime/datetime.ui.h:18
+#: panels/datetime/datetime.ui:208
 msgid "Time Zone"
 msgstr "时区"
 
-#: ../panels/datetime/datetime.ui.h:19
+#: panels/datetime/datetime.ui:228
 msgid "Search for a city"
 msgstr "搜索城市"
 
-#: ../panels/datetime/datetime.ui.h:20
+#: panels/datetime/datetime.ui:304
 msgid "Automatic _Date & Time"
 msgstr "自动设置日期和时间(_D)"
 
-#: ../panels/datetime/datetime.ui.h:21
+#: panels/datetime/datetime.ui:319 panels/datetime/datetime.ui:397
 msgid "Requires internet access"
 msgstr "需要互联网连接"
 
-#: ../panels/datetime/datetime.ui.h:22
+#: panels/datetime/datetime.ui:382
 msgid "Automatic Time _Zone"
 msgstr "自动设置时区(_Z)"
 
-#: ../panels/datetime/datetime.ui.h:23
+#: panels/datetime/datetime.ui:454
 msgid "Date & _Time"
 msgstr "日期和时间(_T)"
 
-#: ../panels/datetime/datetime.ui.h:24
+#: panels/datetime/datetime.ui:502
 msgid "Time Z_one"
 msgstr "时区(_O)"
 
-#: ../panels/datetime/datetime.ui.h:25
+#: panels/datetime/datetime.ui:570
 msgid "Time _Format"
 msgstr "时间格式(_F)"
 
-#: ../panels/datetime/datetime.ui.h:26
+#: panels/datetime/datetime.ui:588
 msgid "24-hour"
 msgstr "24 小时"
 
-#: ../panels/datetime/datetime.ui.h:27
+#: panels/datetime/datetime.ui:589
 msgid "AM / PM"
 msgstr "上午/下午"
 
-#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3
+#: panels/datetime/gnome-datetime-panel.desktop.in.in:4
 msgid "Change the date and time, including time zone"
 msgstr "改变日期、时间和时区"
 
-#. Translators: those are keywords for the date and time control-center panel
-#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/datetime/gnome-datetime-panel.desktop.in.in:7
+msgid "preferences-system-time"
+msgstr "preferences-system-time"
+
+#. Translators: Search terms to find the Date and Time panel. Do NOT translate or localize the semicolons! 
The list MUST also end with a semicolon!
+#: panels/datetime/gnome-datetime-panel.desktop.in.in:15
 msgid "Clock;Timezone;Location;"
 msgstr "Clock;Timezone;Location;时钟;时区;位置;"
 
-#: ../panels/datetime/org.gnome.controlcenter.datetime.policy.in.h:1
+#: panels/datetime/org.gnome.controlcenter.datetime.policy.in:11
 msgid "Change system time and date settings"
 msgstr "更改系统时间和日期设置"
 
-#: ../panels/datetime/org.gnome.controlcenter.datetime.policy.in.h:2
+#: panels/datetime/org.gnome.controlcenter.datetime.policy.in:12
 msgid "To change time or date settings, you need to authenticate."
 msgstr "修改时间或日期设置需要认证。"
 
-#: ../panels/display/cc-display-panel.c:573
-msgid "Lid Closed"
-msgstr "上盖已合上"
-
-#. translators: "Mirrored" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:576
-msgid "Mirrored"
-msgstr "镜像显示"
-
-#: ../panels/display/cc-display-panel.c:578
-#: ../panels/display/cc-display-panel.c:2430
-msgid "Primary"
-msgstr "主显示器"
-
-#: ../panels/display/cc-display-panel.c:580
-#: ../panels/notifications/cc-notifications-panel.c:257
-#: ../panels/power/cc-power-panel.c:1968 ../panels/power/cc-power-panel.c:1979
-#: ../panels/privacy/cc-privacy-panel.c:190
-#: ../panels/privacy/cc-privacy-panel.c:257
-#: ../panels/universal-access/cc-ua-panel.c:269
-#: ../panels/universal-access/cc-ua-panel.c:590
-#: ../panels/universal-access/cc-ua-panel.c:603
-#: ../panels/universal-access/cc-ua-panel.c:615
-#: ../panels/universal-access/cc-ua-panel.c:786
-#: ../panels/universal-access/uap.ui.h:6
-msgid "Off"
-msgstr "关"
-
-#: ../panels/display/cc-display-panel.c:583
-msgid "Secondary"
-msgstr "副显示器"
-
-#. Title of displays dialog when multiple monitors are present.
-#: ../panels/display/cc-display-panel.c:1558
-msgid "Arrange Combined Displays"
-msgstr "安排多个显示"
-
-#: ../panels/display/cc-display-panel.c:1562
-#: ../panels/display/cc-display-panel.c:2208
-#: ../panels/network/connection-editor/connection-editor.ui.h:2
-#: ../panels/network/network-wifi.ui.h:2
-msgid "_Apply"
-msgstr "应用(_A)"
-
-#: ../panels/display/cc-display-panel.c:1586
-msgid "Drag displays to rearrange them"
-msgstr "拖动以重新排列显示屏拖动以重新排列显示屏"
-
-#. translators: example string is "60 Hz (NTSC)"
-#. * NTSC is https://en.wikipedia.org/wiki/NTSC
-#: ../panels/display/cc-display-panel.c:1793
-#, c-format
-msgid "%d Hz (NTSC)"
-msgstr "%d Hz (NTSC)"
-
-#. translators: example string is "60 Hz"
-#: ../panels/display/cc-display-panel.c:1799
-#, c-format
-msgid "%d Hz"
-msgstr "%d Hz"
-
-#: ../panels/display/cc-display-panel.c:2260
-msgid "Rotate counterclockwise by 90°"
-msgstr "逆时针旋转 90°"
+#: panels/display/cc-display-panel.c:732
+msgctxt "Display rotation"
+msgid "Landscape"
+msgstr "横向"
 
-#: ../panels/display/cc-display-panel.c:2278
-msgid "Rotate by 180°"
-msgstr "旋转 180°"
+#: panels/display/cc-display-panel.c:735
+msgctxt "Display rotation"
+msgid "Portrait Right"
+msgstr "纵向右侧"
 
-#: ../panels/display/cc-display-panel.c:2296
-msgid "Rotate clockwise by 90°"
-msgstr "顺时针旋转 90°"
+#: panels/display/cc-display-panel.c:738
+msgctxt "Display rotation"
+msgid "Portrait Left"
+msgstr "纵向左侧"
 
-#: ../panels/display/cc-display-panel.c:2317
-msgid "Size"
-msgstr "大小"
+#: panels/display/cc-display-panel.c:741
+msgctxt "Display rotation"
+msgid "Landscape (flipped)"
+msgstr "横向(翻转)"
 
-#. aspect ratio
-#: ../panels/display/cc-display-panel.c:2332
-msgid "Aspect Ratio"
-msgstr "宽高比"
+# 左撇子有歧视色彩。
+#. Translators: This option sets orientation of print (portrait, landscape...)
+#: panels/display/cc-display-panel.c:808
+#: panels/printers/pp-options-dialog.c:558
+msgid "Orientation"
+msgstr "方向"
 
-#: ../panels/display/cc-display-panel.c:2355
-#: ../panels/printers/pp-options-dialog.c:85
+#: panels/display/cc-display-panel.c:873 panels/display/cc-display-panel.c:1676
+#: panels/printers/pp-options-dialog.c:87
 msgid "Resolution"
 msgstr "分辨率"
 
-#: ../panels/display/cc-display-panel.c:2375
-msgid "Adjust for TV"
-msgstr "为 TV 调整"
-
-#: ../panels/display/cc-display-panel.c:2399
+#: panels/display/cc-display-panel.c:961
 msgid "Refresh Rate"
 msgstr "刷新频率"
 
-#: ../panels/display/cc-display-panel.c:2431
-msgid "Show the top bar and Activities Overview on this display"
-msgstr "在此显示器上显示顶栏和活动概览"
+#: panels/display/cc-display-panel.c:1098
+msgid "Scale"
+msgstr "缩放比例"
+
+#: panels/display/cc-display-panel.c:1151
+msgid "Adjust for TV"
+msgstr "为 TV 调整"
+
+#: panels/display/cc-display-panel.c:1413
+msgid "Primary Display"
+msgstr "主显示"
 
-#: ../panels/display/cc-display-panel.c:2437
-msgid "Secondary Display"
-msgstr "副显示器"
+#: panels/display/cc-display-panel.c:1442
+msgid "Display Arrangement"
+msgstr "显示安排"
 
-#: ../panels/display/cc-display-panel.c:2438
-msgid "Join this display with another to create an extra workspace"
-msgstr "将该显示器与另一显示器合并以扩展工作空间"
+#: panels/display/cc-display-panel.c:1443
+msgid ""
+"Drag displays to match your setup. The top bar is placed on the primary "
+"display."
+msgstr "拖动显示以匹配您的设置。顶栏放在主显示中。"
 
-# 左撇子有歧视色彩。
-#: ../panels/display/cc-display-panel.c:2445
-msgid "Presentation"
-msgstr "演示"
+#: panels/display/cc-display-panel.c:1866
+msgid "Display Mode"
+msgstr "显示类型"
 
-#: ../panels/display/cc-display-panel.c:2446
-msgid "Show slideshows and media only"
-msgstr "只显示幻灯片和多媒体"
+#: panels/display/cc-display-panel.c:1882
+msgid "Join Displays"
+msgstr "联合显示"
 
-#. translators: "Mirror" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:2451
+#: panels/display/cc-display-panel.c:1885
 msgid "Mirror"
 msgstr "镜像"
 
-#: ../panels/display/cc-display-panel.c:2452
-msgid "Show your existing view on both displays"
-msgstr "在两块显示器上同时显示当前视图"
+#: panels/display/cc-display-panel.c:1888
+msgid "Single Display"
+msgstr "单显示"
 
-#: ../panels/display/cc-display-panel.c:2458
-msgid "Turn Off"
-msgstr "关闭"
+#: panels/display/cc-display-panel.c:2593
+msgid "Apply Changes?"
+msgstr "应用改变?"
+
+#: panels/display/cc-display-panel.c:2607
+#: panels/network/connection-editor/connection-editor.ui:24
+#: panels/network/network-wifi.ui:38
+msgid "_Apply"
+msgstr "应用(_A)"
+
+#: panels/display/cc-display-panel.c:2982
+#, c-format
+msgid "%.2lf Hz"
+msgstr "%.2lf Hz"
+
+#. TRANSLATORS: the state of the night light setting
+#: panels/display/cc-display-panel.c:3198
+#: panels/notifications/cc-notifications-panel.c:292
+#: panels/power/cc-power-panel.c:1994 panels/power/cc-power-panel.c:2001
+#: panels/privacy/cc-privacy-panel.c:190 panels/privacy/cc-privacy-panel.c:257
+#: panels/universal-access/cc-ua-panel.c:333
+#: panels/universal-access/cc-ua-panel.c:714
+#: panels/universal-access/cc-ua-panel.c:727
+#: panels/universal-access/cc-ua-panel.c:739
+#: panels/universal-access/cc-ua-panel.c:910
+msgid "On"
+msgstr "开"
+
+#: panels/display/cc-display-panel.c:3198 panels/network/net-proxy.c:54
+#: panels/notifications/cc-notifications-panel.c:292
+#: panels/power/cc-power-panel.c:1988 panels/power/cc-power-panel.c:1999
+#: panels/privacy/cc-privacy-panel.c:190 panels/privacy/cc-privacy-panel.c:257
+#: panels/universal-access/cc-ua-panel.c:333
+#: panels/universal-access/cc-ua-panel.c:714
+#: panels/universal-access/cc-ua-panel.c:727
+#: panels/universal-access/cc-ua-panel.c:739
+#: panels/universal-access/cc-ua-panel.c:910 panels/universal-access/uap.ui:334
+#: panels/universal-access/uap.ui:380 panels/universal-access/uap.ui:426
+#: panels/universal-access/uap.ui:532 panels/universal-access/uap.ui:685
+#: panels/universal-access/uap.ui:731 panels/universal-access/uap.ui:777
+#: panels/universal-access/uap.ui:929
+msgid "Off"
+msgstr "关"
 
-#: ../panels/display/cc-display-panel.c:2459
-msgid "Don't use this display"
-msgstr "不使用该显示器"
+#: panels/display/cc-display-panel.c:3219
+msgid "_Night Light"
+msgstr "(_N)夜光模式"
 
-#: ../panels/display/cc-display-panel.c:2770
+#: panels/display/cc-display-panel.c:3284
 msgid "Could not get screen information"
 msgstr "无法获取屏幕信息"
 
-#: ../panels/display/cc-display-panel.c:2801
-msgid "_Arrange Combined Displays"
-msgstr "安排多个显示(_A)"
+#. This cancels the redshift inhibit.
+#: panels/display/display.ui:71
+msgid "Restart Filter"
+msgstr "重启过滤"
+
+#. Inhibit the redshift functionality until the next day starts
+#: panels/display/display.ui:103
+msgid "Temporarily Disabled Until Tomorrow"
+msgstr "暂时停用至明天"
+
+#: panels/display/display.ui:144
+msgid ""
+"Night light makes the screen color warmer. This can help to prevent eye "
+"strain and sleeplessness."
+msgstr "夜光使屏幕颜色更加温暖。这可以帮助防止眼睛疲劳和失眠。"
+
+#. This is the redshift functionality where we suppress blue light when the sun has gone down
+#: panels/display/display.ui:171 panels/display/display.ui:567
+msgid "Night Light"
+msgstr "夜光"
+
+#: panels/display/display.ui:187
+msgid "Schedule"
+msgstr "时间表"
+
+#: panels/display/display.ui:215
+msgid "Sunset to Sunrise"
+msgstr "日落到日出"
+
+#: panels/display/display.ui:229
+#: 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:777 panels/network/network-wifi.ui:1054
+#: panels/privacy/cc-privacy-panel.c:217
+msgid "Manual"
+msgstr "手动"
+
+#: panels/display/display.ui:268
+msgid "From"
+msgstr "自"
+
+#: panels/display/display.ui:309 panels/display/display.ui:430
+msgid ":"
+msgstr ":"
+
+#. This is the short form for the time period in the morning
+#: panels/display/display.ui:343 panels/display/display.ui:464
+msgid "AM"
+msgstr "AM"
+
+#. This is the short form for the time period in the afternoon
+#: panels/display/display.ui:359 panels/display/display.ui:480
+msgid "PM"
+msgstr "PM"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/display/gnome-display-panel.desktop.in.in.h:2
-msgid "Dis­plays"
+#: panels/display/display.ui:528
+msgid "To"
+msgstr "到"
+
+#: panels/display/gnome-display-panel.desktop.in.in:3
+msgid "Displays"
 msgstr "显示"
 
-#: ../panels/display/gnome-display-panel.desktop.in.in.h:3
+#: panels/display/gnome-display-panel.desktop.in.in:4
 msgid "Choose how to use connected monitors and projectors"
 msgstr "选择如何使用接入的显示器和投影仪"
 
-#. Translators: those are keywords for the display control-center panel
-#: ../panels/display/gnome-display-panel.desktop.in.in.h:5
-msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;"
-msgstr ""
-"Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;面板;投影仪;屏幕;分"
-"辨率;刷新;"
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/display/gnome-display-panel.desktop.in.in:7
+msgid "preferences-desktop-display"
+msgstr "preferences-desktop-display"
+
+#. Translators: Search terms to find the Displays panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#: panels/display/gnome-display-panel.desktop.in.in:19
+msgid ""
+"Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;Night;Light;Blue;"
+"redshift;color;sunset;sunrise;"
+msgstr 
"Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;Night;Light;Blue;redshift;color;sunset;sunrise;"
 
 #. TRANSLATORS: AP type
-#: ../panels/info/cc-info-panel.c:434 ../panels/network/panel-common.c:123
+#: panels/info/cc-info-overview-panel.c:385
+#: panels/info/cc-info-overview-panel.c:465
+#: panels/info/cc-subscription-details-dialog.c:109
+#: panels/network/panel-common.c:123
 msgid "Unknown"
 msgstr "未知"
 
-#: ../panels/info/cc-info-panel.c:567
+#. translators: This is the name of the OS, followed by the build ID, for
+#. * example:
+#. * "Fedora 25 (Workstation Edition); Build ID: xyz" or
+#. * "Ubuntu 16.04 LTS; Build ID: jki"
+#: panels/info/cc-info-overview-panel.c:473
 #, c-format
-msgid "%s %d-bit (Build ID: %s)"
-msgstr "%s %d 位(构建 ID:%s)"
+msgid "%s; Build ID: %s"
+msgstr "%s; Build ID: %s"
 
-#: ../panels/info/cc-info-panel.c:569
+#. translators: This is the type of architecture for the OS
+#: panels/info/cc-info-overview-panel.c:490
 #, c-format
-msgid "%d-bit (Build ID: %s)"
-msgstr "%d 位(构建 ID:%s)"
+msgid "64-bit"
+msgstr "64 位"
 
-#: ../panels/info/cc-info-panel.c:577
+#. translators: This is the type of architecture for the OS
+#: panels/info/cc-info-overview-panel.c:493
 #, c-format
-msgid "%s %d-bit"
-msgstr "%s %d 位"
+msgid "32-bit"
+msgstr "32 位"
 
-#: ../panels/info/cc-info-panel.c:579
+#: panels/info/cc-info-overview-panel.c:782
 #, c-format
-msgid "%d-bit"
-msgstr "%d 位"
+msgid "Version %s"
+msgstr "版本 %s"
 
-#: ../panels/info/cc-info-panel.c:1260
+#: panels/info/cc-info-removable-media-panel.c:298
 msgid "Ask what to do"
 msgstr "询问如何处理"
 
-#: ../panels/info/cc-info-panel.c:1264
+#: panels/info/cc-info-removable-media-panel.c:302
 msgid "Do nothing"
 msgstr "无动作"
 
-#: ../panels/info/cc-info-panel.c:1268
+#: panels/info/cc-info-removable-media-panel.c:306
 msgid "Open folder"
 msgstr "打开文件夹"
 
-#: ../panels/info/cc-info-panel.c:1359
+#: panels/info/cc-info-removable-media-panel.c:391
 msgid "Other Media"
 msgstr "其他媒体"
 
-#: ../panels/info/cc-info-panel.c:1390
+#: panels/info/cc-info-removable-media-panel.c:424
 msgid "Select an application for audio CDs"
 msgstr "选择播放音频 CD 的应用程序"
 
-#: ../panels/info/cc-info-panel.c:1391
+#: panels/info/cc-info-removable-media-panel.c:425
 msgid "Select an application for video DVDs"
 msgstr "选择播放视频 DVD 的应用程序"
 
-#: ../panels/info/cc-info-panel.c:1392
+#: panels/info/cc-info-removable-media-panel.c:426
 msgid "Select an application to run when a music player is connected"
 msgstr "选择连接音乐播放器后运行的应用程序"
 
-#: ../panels/info/cc-info-panel.c:1393
+#: panels/info/cc-info-removable-media-panel.c:427
 msgid "Select an application to run when a camera is connected"
 msgstr "选择连接相机后运行的应用程序"
 
-#: ../panels/info/cc-info-panel.c:1394
+#: panels/info/cc-info-removable-media-panel.c:428
 msgid "Select an application for software CDs"
 msgstr "选择插入软件 CD 时运行的应用程序"
 
@@ -1316,376 +1381,631 @@ msgstr "选择插入软件 CD 时运行的应用程序"
 #. * If the shared-mime-info translation works for your language,
 #. * simply leave these untranslated.
 #.
-#: ../panels/info/cc-info-panel.c:1406
+#: panels/info/cc-info-removable-media-panel.c:440
 msgid "audio DVD"
 msgstr "音频 DVD"
 
-#: ../panels/info/cc-info-panel.c:1407
+#: panels/info/cc-info-removable-media-panel.c:441
 msgid "blank Blu-ray disc"
 msgstr "空白蓝光光盘"
 
-#: ../panels/info/cc-info-panel.c:1408
+#: panels/info/cc-info-removable-media-panel.c:442
 msgid "blank CD disc"
 msgstr "空白 CD 光盘"
 
-#: ../panels/info/cc-info-panel.c:1409
+#: panels/info/cc-info-removable-media-panel.c:443
 msgid "blank DVD disc"
 msgstr "空白 DVD 光盘"
 
 # 空白 HD DVD 光盘
-#: ../panels/info/cc-info-panel.c:1410
+#: panels/info/cc-info-removable-media-panel.c:444
 msgid "blank HD DVD disc"
 msgstr "空白 HD DVD 光盘"
 
-#: ../panels/info/cc-info-panel.c:1411
+#: panels/info/cc-info-removable-media-panel.c:445
 msgid "Blu-ray video disc"
 msgstr "蓝光视频光盘"
 
-#: ../panels/info/cc-info-panel.c:1412
+#: panels/info/cc-info-removable-media-panel.c:446
 msgid "e-book reader"
 msgstr "电子书阅读器"
 
-#: ../panels/info/cc-info-panel.c:1413
+#: panels/info/cc-info-removable-media-panel.c:447
 msgid "HD DVD video disc"
 msgstr "HD DVD 视频光盘"
 
-#: ../panels/info/cc-info-panel.c:1414
+#: panels/info/cc-info-removable-media-panel.c:448
 msgid "Picture CD"
 msgstr "图片 CD"
 
-#: ../panels/info/cc-info-panel.c:1415
+#: panels/info/cc-info-removable-media-panel.c:449
 msgid "Super Video CD"
-msgstr "超级 VCD "
+msgstr "超级 VCD"
 
-#: ../panels/info/cc-info-panel.c:1416
+#: panels/info/cc-info-removable-media-panel.c:450
 msgid "Video CD"
 msgstr "视频 CD"
 
-#: ../panels/info/cc-info-panel.c:1417
+#: panels/info/cc-info-removable-media-panel.c:451
 msgid "Windows software"
 msgstr "Windows 软件"
 
-#: ../panels/info/cc-info-panel.c:1540
-msgid "Section"
-msgstr "节"
+#: panels/info/cc-subscription-details-dialog.c:125
+msgid "Subscribed"
+msgstr "已订阅"
+
+#: panels/info/cc-subscription-details-dialog.c:127
+msgid "No Specific Subscription"
+msgstr "没有特定的订阅"
+
+#: panels/info/cc-subscription-details-dialog.c:129
+msgid "Not Subscribed"
+msgstr "未订阅"
+
+#: panels/info/cc-subscription-details-dialog.c:138
+msgid "Product Name"
+msgstr "产品名"
+
+#: panels/info/cc-subscription-details-dialog.c:139
+msgid "Product ID"
+msgstr "产品 ID"
+
+#: panels/info/cc-subscription-details-dialog.c:140
+msgid "Version"
+msgstr "版本"
+
+#: panels/info/cc-subscription-details-dialog.c:141
+msgid "Arch"
+msgstr "架构"
+
+#: panels/info/cc-subscription-details-dialog.c:142
+msgid "Status"
+msgstr "状态"
+
+#: panels/info/cc-subscription-details-dialog.c:146
+msgid "Starts"
+msgstr "开始"
+
+#: panels/info/cc-subscription-details-dialog.c:147
+msgid "Ends"
+msgstr "结束"
+
+#: panels/info/cc-subscription-details-dialog.c:175
+#: panels/info/cc-subscription-details-dialog.ui:9
+#: panels/info/cc-subscription-register-dialog.ui:337
+#: panels/info/cc-subscription-register-dialog.ui:470
+msgid "Registration Details"
+msgstr "注册详情。"
+
+#: panels/info/cc-subscription-details-dialog.c:188
+msgid "Subscribe System"
+msgstr "订阅系统"
+
+#: panels/info/cc-subscription-details-dialog.c:201
+msgid "Looking For Available Subscriptions…"
+msgstr "寻找可用的订阅......"
+
+#: panels/info/cc-subscription-details-dialog.c:215
+msgid "Unregister System"
+msgstr "取消注册系统"
+
+#: panels/info/cc-subscription-details-dialog.c:229
+msgid "Unregistering System…"
+msgstr "取消注册系统......"
+
+#. the widgets are duplicate to allow sliding between two stack pages
+#: panels/info/cc-subscription-details-dialog.c:252
+#: panels/info/cc-subscription-details-dialog.c:253
+#: panels/info/cc-subscription-details-dialog.c:254
+msgid "No installed products detected."
+msgstr "未检测到安装的产品。"
+
+#: panels/info/cc-subscription-details-dialog.ui:42
+msgid "_Unregister"
+msgstr "(_U)取消注册"
+
+#: panels/info/cc-subscription-details-dialog.ui:63
+msgid "_Subscribe"
+msgstr "(_S)订阅"
+
+#: panels/info/cc-subscription-details-dialog.ui:138
+msgid "Failed to Unregister System"
+msgstr "注册注册系统失败"
+
+#: panels/info/cc-subscription-details-dialog.ui:197
+msgid "This system is subscribed to receive software updates."
+msgstr "本系统已订阅,可接收软件更新。"
+
+#: panels/info/cc-subscription-details-dialog.ui:215
+msgid ""
+"This system lacks subscriptions to receive updates for some installed "
+"software."
+msgstr "本系统缺少订阅,无法接收部分安装软件的更新。"
+
+#: panels/info/cc-subscription-details-dialog.ui:233
+msgid "This system lacks subscriptions to receive software updates."
+msgstr "本系统缺少订阅,无法接收软件更新。"
+
+#: panels/info/cc-subscription-details-dialog.ui:251
+msgid "This system is registered to receive software updates."
+msgstr "本系统已订阅,可接收软件更新。"
+
+#: panels/info/cc-subscription-details-dialog.ui:269
+msgid "This system has no supported software installed."
+msgstr "本系统没有安装支持的软件。"
 
-#: ../panels/info/cc-info-panel.c:1549 ../panels/info/info.ui.h:14
-msgid "Overview"
-msgstr "总览"
+#: panels/info/cc-subscription-details-dialog.ui:303
+msgid "_Unregister…"
+msgstr "(_U)取消注册......"
 
-#: ../panels/info/cc-info-panel.c:1555 ../panels/info/info.ui.h:21
+#: panels/info/cc-subscription-details-dialog.ui:324
+msgid "_Subscribe…"
+msgstr "(_S)订阅......"
+
+#: panels/info/cc-subscription-details-dialog.ui:357
+msgid ""
+"Subscribing with Red Hat will allow this system to receive software updates."
+msgstr "在红帽订阅将允许本系统接收软件更新。"
+
+#: panels/info/cc-subscription-details-dialog.ui:391
+msgid ""
+"Warning: unregistering this system will result in it no longer receiving "
+"software updates."
+msgstr "警告:取消注册此系统将导致其不会再接收软件更新。"
+
+#: panels/info/cc-subscription-register-dialog.c:81
+#: panels/info/cc-subscription-register-dialog.ui:9
+msgid "Register System"
+msgstr "注册系统"
+
+#: panels/info/cc-subscription-register-dialog.c:88
+msgid "Registering System…"
+msgstr "注册系统......"
+
+#: panels/info/cc-subscription-register-dialog.ui:37
+msgid "_Register"
+msgstr "(_R)注册"
+
+#: panels/info/cc-subscription-register-dialog.ui:107
+msgid "Failed to Register System"
+msgstr "注册系统失败"
+
+#: panels/info/cc-subscription-register-dialog.ui:159
+msgid "Register this system with Red Hat to receive software updates."
+msgstr "在红帽注册本系统以接收软件更新。"
+
+#: panels/info/cc-subscription-register-dialog.ui:179
+msgid "Registration Server"
+msgstr "注册服务器"
+
+#: panels/info/cc-subscription-register-dialog.ui:199
+msgid "Red Hat"
+msgstr "红帽"
+
+#: panels/info/cc-subscription-register-dialog.ui:212
+msgid "Custom Address"
+msgstr "自定义地址"
+
+#: panels/info/cc-subscription-register-dialog.ui:236
+msgid "_URL"
+msgstr "_URL"
+
+#: panels/info/cc-subscription-register-dialog.ui:270
+msgid "Registration Type"
+msgstr "注册类型"
+
+#: panels/info/cc-subscription-register-dialog.ui:289
+msgid "Red Hat Account"
+msgstr "红帽账户"
+
+#: panels/info/cc-subscription-register-dialog.ui:302
+msgid "Activation Keys"
+msgstr "激活码"
+
+#: panels/info/cc-subscription-register-dialog.ui:355
+msgid "_Login"
+msgstr "登录(_L)"
+
+#: panels/info/cc-subscription-register-dialog.ui:388
+#: 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/sharing.ui:351
+#: panels/user-accounts/data/account-dialog.ui:300
+#: panels/user-accounts/data/account-dialog.ui:525
+#: panels/user-accounts/data/user-accounts-dialog.ui:205
+msgid "_Password"
+msgstr "密码(_P)"
+
+#: panels/info/cc-subscription-register-dialog.ui:427
+#: panels/info/cc-subscription-register-dialog.ui:540
+msgid "_Organization"
+msgstr "(_O)机构"
+
+#: panels/info/cc-subscription-register-dialog.ui:487
+msgid ""
+"Enter comma separated activation key(s). If the activation keys have "
+"conflicting settings, the rightmost key takes precedence."
+msgstr "输入以逗号分隔的激活码。如果激活码的设置有冲突,则以最右边的码为准。"
+
+#: panels/info/cc-subscription-register-dialog.ui:508
+msgid "_Activation Keys"
+msgstr "(_A)激活码"
+
+#: panels/info/gnome-default-apps-panel.desktop.in.in:3
 msgid "Default Applications"
 msgstr "默认应用程序"
 
-#: ../panels/info/cc-info-panel.c:1560 ../panels/info/info.ui.h:29
-msgid "Removable Media"
-msgstr "可移动介质"
+#: panels/info/gnome-default-apps-panel.desktop.in.in:4
+msgid "Configure Default Applications"
+msgstr "配置默认应用程序"
 
-#: ../panels/info/cc-info-panel.c:1585
-#, c-format
-msgid "Version %s"
-msgstr "版本 %s"
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/info/gnome-default-apps-panel.desktop.in.in:7
+msgid "starred"
+msgstr "星"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/info/gnome-info-panel.desktop.in.in.h:2
-msgid "De­tails"
-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/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
+msgid "About"
+msgstr "关于"
 
-#: ../panels/info/gnome-info-panel.desktop.in.in.h:3
+#: panels/info/gnome-info-overview-panel.desktop.in.in:4
 msgid "View information about your system"
 msgstr "查看系统信息"
 
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/info/gnome-info-overview-panel.desktop.in.in:7
+msgid "help-about"
+msgstr "help-about"
+
+#. Translators: Search terms to find the About panel.
+#. Do NOT translate or localize the semicolons!
+#. 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-panel.desktop.in.in.h:5
+#: 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;版本;默认;应用程序;首选;回滚;喜好;音频;视频;光盘;光碟;盘片;可"
-"擦写;可移除;媒体;介质;自动运行;"
+msgstr 
"device;system;information;memory;processor;version;default;application;preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;设备;系统;信息;内存;处理器;CPU;版本;默认;应用程序;首选;回滚;喜好;音频;视频;光盘;光碟;盘片;可擦写;可移除;媒体;介质;自动运行;"
 
-#: ../panels/info/info.ui.h:1
-msgid "Select how other media should be handled"
-msgstr "选择如何处理其他介质"
+#: panels/info/gnome-removable-media-panel.desktop.in.in:3
+msgid "Removable Media"
+msgstr "可移动介质"
 
-#: ../panels/info/info.ui.h:2
-msgid "_Action:"
-msgstr "动作(_A):"
+#: panels/info/gnome-removable-media-panel.desktop.in.in:4
+msgid "Configure Removable Media settings"
+msgstr "配置可移动介质"
 
-#: ../panels/info/info.ui.h:3
-msgid "_Type:"
-msgstr "类型(_T):"
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/info/gnome-removable-media-panel.desktop.in.in:7
+msgid "media-removable"
+msgstr "media-removable"
+
+#. 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
+msgid ""
+"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/info/info-default-apps.ui:31
+msgid "_Web"
+msgstr "_Web"
+
+#: panels/info/info-default-apps.ui:43
+msgid "_Mail"
+msgstr "邮件(_M)"
+
+#: panels/info/info-default-apps.ui:59
+msgid "_Calendar"
+msgstr "日历(_C)"
+
+#: panels/info/info-default-apps.ui:75
+msgid "M_usic"
+msgstr "音乐(_U)"
+
+#: panels/info/info-default-apps.ui:91
+msgid "_Video"
+msgstr "视频(_V)"
+
+#: panels/info/info-default-apps.ui:162 panels/info/info-removable-media.ui:161
+msgid "_Photos"
+msgstr "照片(_P)"
 
-#: ../panels/info/info.ui.h:4
+#: panels/info/info-overview.ui:61
 msgid "Device name"
 msgstr "设备名称"
 
-#: ../panels/info/info.ui.h:5
+#: panels/info/info-overview.ui:77
 msgid "Memory"
 msgstr "内存"
 
-#: ../panels/info/info.ui.h:6
+#: panels/info/info-overview.ui:93
 msgid "Processor"
 msgstr "处理器"
 
-#. To translators: this field contains the distro name, version and type
-#: ../panels/info/info.ui.h:8
-msgid "Base system"
-msgstr "基本系统"
+#: panels/info/info-overview.ui:109
+msgid "Graphics"
+msgstr "图形"
+
+#. To translators: this field contains the distro type
+#: panels/info/info-overview.ui:140
+msgid "OS type"
+msgstr "操作系统类型"
 
-#: ../panels/info/info.ui.h:9
+#: panels/info/info-overview.ui:156
+msgid "Virtualization"
+msgstr "虚拟化"
+
+#: panels/info/info-overview.ui:172
 msgid "Disk"
 msgstr "磁盘"
 
-#: ../panels/info/info.ui.h:10
+#: panels/info/info-overview.ui:277
 msgid "Calculating…"
 msgstr "正在计算…"
 
-#: ../panels/info/info.ui.h:11
-msgid "Graphics"
-msgstr "图形"
-
-#: ../panels/info/info.ui.h:12
-msgid "Virtualization"
-msgstr "虚拟化"
+#: panels/info/info-overview.ui:333
+msgid "System Not Registered"
+msgstr "系统未注册"
 
-#: ../panels/info/info.ui.h:13
-msgid "Check for updates"
-msgstr "检查更新"
+#: panels/info/info-overview.ui:345
+msgid "Register this system to receive software updates."
+msgstr "注册本系统以接收软件更新。"
 
-#: ../panels/info/info.ui.h:15
-msgid "_Web"
-msgstr "_Web"
+#: panels/info/info-overview.ui:355
+msgid "_Register…"
+msgstr "(_R)注册......"
 
-#: ../panels/info/info.ui.h:16
-msgid "_Mail"
-msgstr "邮件(_M)"
+#: panels/info/info-overview.ui:388
+msgid "Registered System"
+msgstr "注册的系统"
 
-#: ../panels/info/info.ui.h:17
-msgid "_Calendar"
-msgstr "日历(_C)"
+#: panels/info/info-overview.ui:404
+msgid "System is registered and able to receive software updates."
+msgstr "本系统已注册,可接收软件更新。"
 
-#: ../panels/info/info.ui.h:18
-msgid "M_usic"
-msgstr "音乐(_U)"
+#: panels/info/info-overview.ui:418
+msgid "System is registered but is unable to receive all software updates."
+msgstr "本系统已注册,但无法接收所有的软件更新。"
 
-#: ../panels/info/info.ui.h:19
-msgid "_Video"
-msgstr "视频(_V)"
+#: panels/info/info-overview.ui:433
+msgid "_Details"
+msgstr "(_D)详细信息"
 
-#: ../panels/info/info.ui.h:20
-msgid "_Photos"
-msgstr "照片(_P)"
+#: panels/info/info-overview.ui:457
+msgid "_View Updates"
+msgstr "(_V)查看更新"
 
-#: ../panels/info/info.ui.h:22
+#: panels/info/info-removable-media.ui:43
 msgid "Select how media should be handled"
 msgstr "选择如何处理介质"
 
-#: ../panels/info/info.ui.h:23
+#: panels/info/info-removable-media.ui:74
 msgid "CD _audio"
 msgstr "CD 音频(_A)"
 
-#: ../panels/info/info.ui.h:24
+#: panels/info/info-removable-media.ui:91
 msgid "_DVD video"
 msgstr "_DVD 视频"
 
-#: ../panels/info/info.ui.h:25
+#: panels/info/info-removable-media.ui:132
 msgid "_Music player"
 msgstr "音乐播放器(_M)"
 
-#: ../panels/info/info.ui.h:26
+#: panels/info/info-removable-media.ui:190
 msgid "_Software"
 msgstr "软件(_S)"
 
-#: ../panels/info/info.ui.h:27
+#: panels/info/info-removable-media.ui:228
 msgid "_Other Media…"
 msgstr "其他媒体(_O)…"
 
-#: ../panels/info/info.ui.h:28
+#: panels/info/info-removable-media.ui:272
 msgid "_Never prompt or start programs on media insertion"
 msgstr "介质插入时从不提示或启动程序(_N)"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:1
+#: panels/info/info-removable-media.ui:331
+msgid "Select how other media should be handled"
+msgstr "选择如何处理其他介质"
+
+#: panels/info/info-removable-media.ui:370
+msgid "_Action:"
+msgstr "动作(_A):"
+
+#: panels/info/info-removable-media.ui:393
+msgid "_Type:"
+msgstr "类型(_T):"
+
+#: panels/keyboard/00-multimedia.xml.in:2
 msgid "Sound and Media"
 msgstr "声音和媒体"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:2
+#: panels/keyboard/00-multimedia.xml.in:4
 msgid "Volume mute"
 msgstr "静音"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:3
+#: panels/keyboard/00-multimedia.xml.in:6
 msgid "Volume down"
 msgstr "减小音量"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:4
+#: panels/keyboard/00-multimedia.xml.in:8
 msgid "Volume up"
 msgstr "增大音量"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:5
+#: panels/keyboard/00-multimedia.xml.in:10
 msgid "Launch media player"
 msgstr "启动媒体播放器"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:6
+#: panels/keyboard/00-multimedia.xml.in:12
 msgid "Play (or play/pause)"
 msgstr "播放(或播放/暂停)"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:7
+#: panels/keyboard/00-multimedia.xml.in:14
 msgid "Pause playback"
 msgstr "暂停播放"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:8
+#: panels/keyboard/00-multimedia.xml.in:16
 msgid "Stop playback"
 msgstr "停止播放"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:9
+#: panels/keyboard/00-multimedia.xml.in:18
 msgid "Previous track"
 msgstr "上一音轨"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:10
+#: panels/keyboard/00-multimedia.xml.in:20
 msgid "Next track"
 msgstr "下一音轨"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:11
+#: panels/keyboard/00-multimedia.xml.in:22
 msgid "Eject"
 msgstr "弹出"
 
-#: ../panels/keyboard/01-input-sources.xml.in.h:1
-#: ../panels/universal-access/uap.ui.h:11
+#: panels/keyboard/01-input-sources.xml.in:4 panels/universal-access/uap.ui:576
 msgid "Typing"
 msgstr "打字"
 
-#: ../panels/keyboard/01-input-sources.xml.in.h:2
+#: panels/keyboard/01-input-sources.xml.in:8
 msgid "Switch to next input source"
 msgstr "切换至下个输入源"
 
-#: ../panels/keyboard/01-input-sources.xml.in.h:3
+#: panels/keyboard/01-input-sources.xml.in:13
 msgid "Switch to previous input source"
 msgstr "切换至上个输入源"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:1
+#: panels/keyboard/01-launchers.xml.in:2
 msgid "Launchers"
 msgstr "启动器"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:2
+#: panels/keyboard/01-launchers.xml.in:4
 msgid "Launch help browser"
 msgstr "启动帮助浏览器"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:274
-#: ../shell/alt/cc-window.c:829 ../shell/cc-window.c:1584
-#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1
+#: panels/keyboard/01-launchers.xml.in:6 shell/cc-window.c:220
+#: shell/cc-window.c:756 shell/gnome-control-center.desktop.in.in:3
+#: shell/window.ui:125
 msgid "Settings"
 msgstr "设置"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:4
+#: panels/keyboard/01-launchers.xml.in:8
 msgid "Launch calculator"
 msgstr "启动计算器"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:5
+#: panels/keyboard/01-launchers.xml.in:10
 msgid "Launch email client"
 msgstr "启动邮件客户端"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:6
+#: panels/keyboard/01-launchers.xml.in:12
 msgid "Launch web browser"
 msgstr "启动网页浏览器"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:7
+#: panels/keyboard/01-launchers.xml.in:14
 msgid "Home folder"
 msgstr "主目录"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:8
+#: panels/keyboard/01-launchers.xml.in:16
+#: panels/search/gnome-search-panel.desktop.in.in:3 shell/window.ui:157
+msgid "Search"
+msgstr "搜索"
+
+#: panels/keyboard/01-launchers.xml.in:16
 msgctxt "keybinding"
 msgid "Search"
 msgstr "搜索"
 
-#: ../panels/keyboard/01-screenshot.xml.in.h:1
+#: panels/keyboard/01-screenshot.xml.in:2
 msgid "Screenshots"
 msgstr "截图"
 
 # 与下面的剪贴板“位置”相对。
-#. translators: $PICTURES will be replaced by the name of the XDG Pictures directory
-#: ../panels/keyboard/01-screenshot.xml.in.h:3
+#: panels/keyboard/01-screenshot.xml.in:6
 msgid "Save a screenshot to $PICTURES"
 msgstr "将屏幕截图保存到 $PICTURES 目录"
 
-#. translators: $PICTURES will be replaced by the name of the XDG Pictures directory
-#: ../panels/keyboard/01-screenshot.xml.in.h:5
+#: panels/keyboard/01-screenshot.xml.in:10
 msgid "Save a screenshot of a window to $PICTURES"
 msgstr "将窗口截图保存到 $PICTURES 目录"
 
-#. translators: $PICTURES will be replaced by the name of the XDG Pictures directory
-#: ../panels/keyboard/01-screenshot.xml.in.h:7
+#: panels/keyboard/01-screenshot.xml.in:14
 msgid "Save a screenshot of an area to $PICTURES"
 msgstr "将选区截图保存到 $PICTURES 目录"
 
-#: ../panels/keyboard/01-screenshot.xml.in.h:8
+#: panels/keyboard/01-screenshot.xml.in:17
 msgid "Copy a screenshot to clipboard"
 msgstr "复制截图到剪贴板"
 
-#: ../panels/keyboard/01-screenshot.xml.in.h:9
+#: panels/keyboard/01-screenshot.xml.in:20
 msgid "Copy a screenshot of a window to clipboard"
 msgstr "复制窗口截图到剪贴板"
 
-#: ../panels/keyboard/01-screenshot.xml.in.h:10
+#: panels/keyboard/01-screenshot.xml.in:23
 msgid "Copy a screenshot of an area to clipboard"
 msgstr "复制选区截图到剪贴板"
 
-#: ../panels/keyboard/01-screenshot.xml.in.h:11
+#: panels/keyboard/01-screenshot.xml.in:26
 msgid "Record a short screencast"
 msgstr "记录一小段屏幕录像"
 
-#: ../panels/keyboard/01-system.xml.in.h:1
+#: panels/keyboard/01-system.xml.in:2
 msgid "System"
 msgstr "系统"
 
-#: ../panels/keyboard/01-system.xml.in.h:2
+#: panels/keyboard/01-system.xml.in:4
 msgid "Log out"
 msgstr "注销"
 
-#: ../panels/keyboard/01-system.xml.in.h:3
+#: panels/keyboard/01-system.xml.in:6
 msgid "Lock screen"
 msgstr "锁定屏幕"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:1
+#: panels/keyboard/50-accessibility.xml.in:2
+#: panels/universal-access/gnome-universal-access-panel.desktop.in.in:3
 msgid "Universal Access"
 msgstr "通用辅助功能"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:2
+#: panels/keyboard/50-accessibility.xml.in:4
 msgid "Turn zoom on or off"
 msgstr "开关屏幕缩放"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:3
+#: panels/keyboard/50-accessibility.xml.in:6
 msgid "Zoom in"
 msgstr "放大"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:4
+#: panels/keyboard/50-accessibility.xml.in:8
 msgid "Zoom out"
 msgstr "缩小"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:5
+#: panels/keyboard/50-accessibility.xml.in:10
 msgid "Turn screen reader on or off"
 msgstr "开关屏幕阅读器"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:6
+#: panels/keyboard/50-accessibility.xml.in:12
 msgid "Turn on-screen keyboard on or off"
 msgstr "开关屏幕键盘"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:7
+#: panels/keyboard/50-accessibility.xml.in:14
 msgid "Increase text size"
 msgstr "增大文本字号"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:8
+#: panels/keyboard/50-accessibility.xml.in:16
 msgid "Decrease text size"
 msgstr "减小文本字号"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:9
+#: panels/keyboard/50-accessibility.xml.in:18
 msgid "High contrast on or off"
 msgstr "高对比度开关"
 
-#: ../panels/keyboard/cc-keyboard-manager.c:514
-#: ../panels/keyboard/cc-keyboard-manager.c:522
-#: ../panels/keyboard/cc-keyboard-manager.c:830
+#: panels/keyboard/cc-keyboard-manager.c:506
+#: panels/keyboard/cc-keyboard-manager.c:514
+#: panels/keyboard/cc-keyboard-manager.c:822
 msgid "Custom Shortcuts"
 msgstr "自定义快捷键"
 
@@ -1694,13 +2014,13 @@ msgstr "自定义快捷键"
 #.
 #. translators:
 #. * The device has been disabled
-#: ../panels/keyboard/cc-keyboard-option.c:276
-#: ../panels/keyboard/cc-keyboard-option.c:395
-#: ../panels/keyboard/keyboard-shortcuts.c:440
-#: ../panels/keyboard/shortcut-editor.ui.h:2
-#: ../panels/network/network-wifi.ui.h:31
-#: ../panels/sound/gvc/gvc-mixer-control.c:1830
-#: ../panels/user-accounts/um-fingerprint-dialog.c:213
+#: panels/keyboard/cc-keyboard-option.c:263
+#: panels/keyboard/cc-keyboard-option.c:382
+#: panels/keyboard/keyboard-shortcuts.c:435
+#: panels/keyboard/shortcut-editor.ui:96 panels/network/network-proxy.ui:123
+#: panels/network/network-wifi.ui:782 panels/network/network-wifi.ui:1059
+#: panels/user-accounts/um-fingerprint-dialog.c:211
+#: subprojects/gvc/gvc-mixer-control.c:1866
 msgid "Disabled"
 msgstr "禁用"
 
@@ -1708,7 +2028,7 @@ msgstr "禁用"
 #. * chooser'. AltGr is often used for this purpose. See
 #. * https://live.gnome.org/Design/SystemSettings/RegionAndLanguage
 #.
-#: ../panels/keyboard/cc-keyboard-option.c:354
+#: panels/keyboard/cc-keyboard-option.c:341
 msgid "Alternative Characters Key"
 msgstr "替代的字符键"
 
@@ -1716,243 +2036,273 @@ msgstr "替代的字符键"
 #. * sequences that are combined to form a single character.
 #. * See http://en.wikipedia.org/wiki/Compose_key
 #.
-#: ../panels/keyboard/cc-keyboard-option.c:363
+#: panels/keyboard/cc-keyboard-option.c:350
 msgid "Compose Key"
 msgstr "Compose 键"
 
-#: ../panels/keyboard/cc-keyboard-option.c:368
+#: panels/keyboard/cc-keyboard-option.c:355
 msgid "Modifiers-only switch to next source"
 msgstr "切换至下一输入源的修饰键"
 
-#: ../panels/keyboard/cc-keyboard-panel.c:217
+#: panels/keyboard/cc-keyboard-panel.c:181
+msgid "Reset All Shortcuts?"
+msgstr "重置所有快捷键?"
+
+#: panels/keyboard/cc-keyboard-panel.c:184
+msgid ""
+"Resetting the shortcuts may affect your custom shortcuts. This cannot be "
+"undone."
+msgstr "重新设置快捷方式可能会影响您的自定义快捷方式。这个操作无法被恢复。"
+
+#: panels/keyboard/cc-keyboard-panel.c:188
+#: panels/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:189
+msgid "Reset All"
+msgstr "重置所有"
+
+#: panels/keyboard/cc-keyboard-panel.c:281
 msgid "Reset the shortcut to its default value"
 msgstr "重置快捷键为它的默认值"
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:357
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:413
 #, c-format
 msgid ""
 "%s is already being used for <b>%s</b>. If you replace it, %s will be "
 "disabled"
 msgstr "%s 已被用于 <b>%s</b>。如果您替换了它,%s 将被禁用"
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:583
 msgid "Set Custom Shortcut"
 msgstr "设置自定义快捷键"
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514
-#: ../panels/keyboard/shortcut-editor.ui.h:7
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:583
 msgid "Set Shortcut"
 msgstr "设置快捷键"
 
 #. Setup the top label
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:523
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:592
 #, c-format
 msgid "Enter new shortcut to change <b>%s</b>."
 msgstr "输入新的快捷键以更改<b>%s</b>。"
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:945
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:1019
 msgid "Add Custom Shortcut"
 msgstr "添加自定义快捷键"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2
-msgid "Key­board"
+#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:3
+msgid "Keyboard"
 msgstr "键盘"
 
-#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3
+#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:4
 msgid "View and change keyboard shortcuts and set your typing preferences"
 msgstr "查看和更改快捷并设置打字偏好"
 
-#. Translators: those are keywords for the keyboard control-center panel
-#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5
-msgid "Shortcut;Repeat;Blink;"
-msgstr "Shortcut;Repeat;Blink;快捷键;重复;闪烁;"
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:7
+msgid "input-keyboard"
+msgstr "input-keyboard"
+
+#. 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/gnome-keyboard-panel.ui:67 panels/region/input-options.ui:68
+#: shell/cc-application.c:255
+msgid "Keyboard Shortcuts"
+msgstr "键盘快捷键"
+
+#: panels/keyboard/gnome-keyboard-panel.ui:77
+msgid "Reset All…"
+msgstr "重置所有......"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:1
+#: panels/keyboard/gnome-keyboard-panel.ui:78
+msgid "Reset all shortcuts to their default keybindings"
+msgstr "重置所有快捷键为它们的默认值"
+
+#: panels/keyboard/gnome-keyboard-panel.ui:164
 msgid "No keyboard shortcut found"
 msgstr "未找到键盘快捷键"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 ../shell/panel-list.ui.h:4
+#: panels/keyboard/gnome-keyboard-panel.ui:175 shell/panel-list.ui:206
 msgid "Try a different search"
 msgstr "尝试不同的搜索"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:1
-msgid "Press Esc to cancel."
-msgstr "按 Esc 键取消。"
+#: panels/keyboard/shortcut-editor.ui:68 panels/keyboard/shortcut-editor.ui:318
+msgid "Press Esc to cancel or Backspace to reset the keyboard shortcut."
+msgstr "按 Esc 键取消或按 Backspace 键重置键盘快捷键。"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:3
-#: ../panels/sound/gvc-mixer-dialog.c:1493
-#: ../panels/sound/gvc-sound-theme-chooser.c:564
+#: panels/keyboard/shortcut-editor.ui:156 panels/printers/details-dialog.ui:38
+#: panels/sound/gvc-mixer-dialog.c:1480
+#: panels/sound/gvc-sound-theme-chooser.c:554
 msgid "Name"
 msgstr "名称"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:4
+#: panels/keyboard/shortcut-editor.ui:168
 msgid "Command"
 msgstr "命令"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:5
+#: panels/keyboard/shortcut-editor.ui:180
 msgid "Shortcut"
 msgstr "快捷键"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:6
-msgid "Edit"
-msgstr "编辑"
+#: panels/keyboard/shortcut-editor.ui:259
+msgid "Set Shortcut…"
+msgstr "设置快捷键......"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:8
-#: ../panels/network/network-wifi.ui.h:20
+#: panels/keyboard/shortcut-editor.ui:272 panels/network/network-wifi.ui:594
 msgid "None"
 msgstr "无"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:9
-msgid "Remove"
-msgstr "移除"
-
-#: ../panels/keyboard/shortcut-editor.ui.h:10
+#: panels/keyboard/shortcut-editor.ui:303
 msgid "Enter the new shortcut"
 msgstr "输入新的快捷键"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:11
-#: ../panels/printers/authentication-dialog.ui.h:2
-#: ../panels/printers/ppd-selection-dialog.ui.h:2
-msgid "Cancel"
-msgstr "取消"
+#: panels/keyboard/shortcut-editor.ui:357
+msgid "Remove"
+msgstr "移除"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:12
-#: ../panels/network/connection-editor/ce-page-ip4.c:305
-#: ../panels/network/connection-editor/ce-page-ip6.c:277
+#: panels/keyboard/shortcut-editor.ui:367
 msgid "Add"
 msgstr "添加"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:13
+#: panels/keyboard/shortcut-editor.ui:382
 msgid "Replace"
 msgstr "替换"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:14
+#: panels/keyboard/shortcut-editor.ui:395
 msgid "Set"
 msgstr "设置"
 
-#: ../panels/mouse/cc-mouse-panel.c:82
+#: panels/mouse/cc-mouse-panel.c:82 panels/wacom/cc-wacom-panel.c:441
 msgid "Test Your _Settings"
 msgstr "测试您的设置(_S)"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2
-msgid "Mouse & Touch­pad"
+#: panels/mouse/gnome-mouse-panel.desktop.in.in:3
+msgid "Mouse & Touchpad"
 msgstr "鼠标和触摸板"
 
-#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3
+#: panels/mouse/gnome-mouse-panel.desktop.in.in:4
 msgid ""
 "Change your mouse or touchpad sensitivity and select right or left-handed"
 msgstr "改变鼠标和触摸板灵敏度,并选择右手或左手习惯"
 
-#. Translators: those are keywords for the mouse and touchpad control-center panel
-#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/mouse/gnome-mouse-panel.desktop.in.in:7
+msgid "input-mouse"
+msgstr "input-mouse"
+
+#. 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;触摸板;指针;触摸;单击;双"
-"击;按钮;轨迹球;"
+msgstr "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;触摸板;指针;触摸;单击;双击;按钮;轨迹球;"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:1
+#: panels/mouse/gnome-mouse-properties.ui:45
 msgid "General"
 msgstr "常规"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:2
+#: panels/mouse/gnome-mouse-properties.ui:83
 msgid "Primary Button"
 msgstr "主按钮"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:3
+#: panels/mouse/gnome-mouse-properties.ui:102
 msgid "Sets the order of physical buttons on mice and touchpads."
 msgstr "设置鼠标和触控板上的物理按钮的排列。"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:4
+#: panels/mouse/gnome-mouse-properties.ui:131
 msgid "Left"
 msgstr "左"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:5
+#: panels/mouse/gnome-mouse-properties.ui:141
 msgid "Right"
 msgstr "右"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:6
+#: panels/mouse/gnome-mouse-properties.ui:177
 msgid "Mouse"
 msgstr "鼠标"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:7
+#: panels/mouse/gnome-mouse-properties.ui:216
 msgid "Mouse Speed"
 msgstr "鼠标速度"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:8
+#: panels/mouse/gnome-mouse-properties.ui:238
+#: panels/mouse/gnome-mouse-properties.ui:543
 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/gnome-mouse-properties.ui.h:10
+#: panels/mouse/gnome-mouse-properties.ui:275
+#: panels/mouse/gnome-mouse-properties.ui:451
 msgid "Natural Scrolling"
 msgstr "自然滚动"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:11
+#: panels/mouse/gnome-mouse-properties.ui:291
+#: panels/mouse/gnome-mouse-properties.ui:467
 msgid "Scrolling moves the content, not the view."
 msgstr "滚动移动内容而非视图。"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:12
+#: panels/mouse/gnome-mouse-properties.ui:341
+#: panels/mouse/gnome-mouse-properties.ui:386
 msgid "Touchpad"
 msgstr "触摸板"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:13
+#: panels/mouse/gnome-mouse-properties.ui:522
 msgid "Touchpad Speed"
 msgstr "触摸板速度"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:14
+#: panels/mouse/gnome-mouse-properties.ui:581
 msgid "Tap to Click"
 msgstr "轻拍以点击"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:15
+#: panels/mouse/gnome-mouse-properties.ui:634
 msgid "Two-finger Scrolling"
 msgstr "双指滚动"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:16
+#: panels/mouse/gnome-mouse-properties.ui:687
 msgid "Edge Scrolling"
 msgstr "边缘滚动"
 
-#: ../panels/mouse/gnome-mouse-test.c:130
-#: ../panels/mouse/gnome-mouse-test.ui.h:1
+#: panels/mouse/gnome-mouse-test.c:130 panels/mouse/gnome-mouse-test.ui:23
 msgid "Try clicking, double clicking, scrolling"
 msgstr "尝试单击、双击、滚动"
 
-#: ../panels/mouse/gnome-mouse-test.c:135
+#: panels/mouse/gnome-mouse-test.c:135
 msgid "Five clicks, GEGL time!"
 msgstr "点击五次,开始 GEGL!"
 
-#: ../panels/mouse/gnome-mouse-test.c:140
+#: panels/mouse/gnome-mouse-test.c:140
 msgid "Double click, primary button"
 msgstr "主键双击"
 
-#: ../panels/mouse/gnome-mouse-test.c:140
+#: panels/mouse/gnome-mouse-test.c:140
 msgid "Single click, primary button"
 msgstr "主键单击"
 
-#: ../panels/mouse/gnome-mouse-test.c:143
+#: panels/mouse/gnome-mouse-test.c:143
 msgid "Double click, middle button"
 msgstr "中键双击"
 
-#: ../panels/mouse/gnome-mouse-test.c:143
+#: panels/mouse/gnome-mouse-test.c:143
 msgid "Single click, middle button"
 msgstr "中键单击"
 
-#: ../panels/mouse/gnome-mouse-test.c:146
+#: panels/mouse/gnome-mouse-test.c:146
 msgid "Double click, secondary button"
 msgstr "辅键双击"
 
-#: ../panels/mouse/gnome-mouse-test.c:146
+#: panels/mouse/gnome-mouse-test.c:146
 msgid "Single click, secondary button"
 msgstr "辅键单击"
 
-#. TRANSLATORS: this is to disable the radio hardware in the
-#. * network panel
-#: ../panels/network/cc-network-panel.c:349
-msgid "Air_plane Mode"
-msgstr "飞行模式(_P)"
-
-#: ../panels/network/cc-network-panel.c:953
+#. add proxy to device list
+#: panels/network/cc-network-panel.c:583
 msgid "Network proxy"
 msgstr "网络代理"
 
@@ -1960,638 +2310,610 @@ msgstr "网络代理"
 #. * window for vpn connections, it is also used to display
 #. * vpn connections in the device list.
 #.
-#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283
-#: ../panels/network/net-vpn.c:440
+#: panels/network/cc-network-panel.c:719 panels/network/net-vpn.c:170
+#: panels/network/net-vpn.c:299
 #, c-format
 msgid "%s VPN"
 msgstr "%s VPN"
 
-#: ../panels/network/cc-network-panel.c:1194
+#: panels/network/cc-network-panel.c:810 panels/network/wifi.ui:282
 msgid "Oops, something has gone wrong. Please contact your software vendor."
 msgstr "抱歉,发生错误。请联系软件提供商。"
 
-#: ../panels/network/cc-network-panel.c:1200
+#: panels/network/cc-network-panel.c:816
 msgid "NetworkManager needs to be running."
 msgstr "需要运行 NetworkManager。"
 
-#: ../panels/network/connection-editor/8021x-security-page.ui.h:1
+#: panels/network/cc-wifi-panel.c:213
+#: panels/network/gnome-wifi-panel.desktop.in.in:3
+#: panels/network/network-wifi.ui:1769
+msgid "Wi-Fi"
+msgstr "Wi-Fi"
+
+#: panels/network/connection-editor/8021x-security-page.ui:26
 msgid "802.1x _Security"
 msgstr "802.1X 安全性(_S)"
 
-#: ../panels/network/connection-editor/8021x-security-page.ui.h:2
-#: ../panels/network/connection-editor/security-page.ui.h:3
-#: ../panels/printers/printers.ui.h:14
+#: panels/network/connection-editor/8021x-security-page.ui:73
+#: panels/network/connection-editor/security-page.ui:72
+#: panels/wacom/wacom-stylus-page.ui:108
 msgid "page 1"
 msgstr "第 1 页"
 
-#: ../panels/network/connection-editor/8021x-security-page.ui.h:3
-#: ../panels/network/connection-editor/security-page.ui.h:4
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:5
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:5
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:2
+#: 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.h:4
-#: ../panels/network/connection-editor/security-page.ui.h:5
+#: 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.h:5
-#: ../panels/network/connection-editor/security-page.ui.h:6
-#: ../panels/printers/printers.ui.h:16
+#: panels/network/connection-editor/8021x-security-page.ui:281
+#: panels/network/connection-editor/security-page.ui:280
+#: panels/wacom/wacom-stylus-page.ui:426
 msgid "page 2"
 msgstr "第 2 页"
 
-#: ../panels/network/connection-editor/ce-page-8021x-security.c:101
-#: ../panels/network/connection-editor/ce-page-security.c:459
-#: ../panels/network/connection-editor/details-page.ui.h:3
-#: ../panels/network/network-wifi.ui.h:6
+#: 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
 msgid "Security"
 msgstr "安全"
 
-#: ../panels/network/connection-editor/ce-page.c:481
+#: panels/network/connection-editor/ce-page.c:481
 msgid "automatic"
 msgstr "自动"
 
-#: ../panels/network/connection-editor/ce-page.c:521
+#: panels/network/connection-editor/ce-page.c:521
 #, c-format
 msgid "Profile %d"
 msgstr "配置 %d"
 
 #. TRANSLATORS: this WEP WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:50
-#: ../panels/network/net-device-wifi.c:214
-#: ../panels/network/net-device-wifi.c:390
+#: panels/network/connection-editor/ce-page-details.c:56
+#: panels/network/net-device-wifi.c:235 panels/network/net-device-wifi.c:468
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:54
-#: ../panels/network/net-device-wifi.c:218
-#: ../panels/network/net-device-wifi.c:395
-#: ../panels/network/network-wifi.ui.h:19
+#: panels/network/connection-editor/ce-page-details.c:60
+#: panels/network/net-device-wifi.c:239 panels/network/net-device-wifi.c:473
+#: panels/network/network-wifi.ui:593
 msgid "WPA"
 msgstr "WPA"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:58
-#: ../panels/network/net-device-wifi.c:222
+#: panels/network/connection-editor/ce-page-details.c:64
+#: panels/network/net-device-wifi.c:243
 msgid "WPA2"
 msgstr "WPA2"
 
 #. TRANSLATORS: this Enterprise WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:63
-#: ../panels/network/net-device-wifi.c:227
+#: panels/network/connection-editor/ce-page-details.c:69
+#: panels/network/net-device-wifi.c:248
 msgid "Enterprise"
 msgstr "企业"
 
-#: ../panels/network/connection-editor/ce-page-details.c:68
-#: ../panels/network/net-device-wifi.c:232
-#: ../panels/network/net-device-wifi.c:380
+#: panels/network/connection-editor/ce-page-details.c:74
+#: panels/network/net-device-wifi.c:253 panels/network/net-device-wifi.c:458
 msgctxt "Wifi security"
 msgid "None"
 msgstr "无"
 
-#: ../panels/network/connection-editor/ce-page-details.c:89
-#: ../panels/power/power.ui.h:17
+#: panels/network/connection-editor/ce-page-details.c:95
+#: panels/power/power.ui:99
 msgid "Never"
 msgstr "从不"
 
-#: ../panels/network/connection-editor/ce-page-details.c:104
-#: ../panels/network/net-device-ethernet.c:120
-#: ../panels/network/net-device-wifi.c:485
+#: panels/network/connection-editor/ce-page-details.c:110
+#: panels/network/net-device-ethernet.c:121
+#: panels/network/net-device-wifi.c:567
 #, c-format
 msgid "%i day ago"
 msgid_plural "%i days ago"
 msgstr[0] "%i 天前"
 
 #. Translators: network device speed
-#: ../panels/network/connection-editor/ce-page-details.c:153
-#: ../panels/network/net-device-ethernet.c:50
-#: ../panels/network/net-device-wifi.c:542
+#: panels/network/connection-editor/ce-page-details.c:225
+#: panels/network/net-device-ethernet.c:50 panels/network/net-device-wifi.c:646
 #, c-format
 msgid "%d Mb/s"
 msgstr "%d Mb/秒"
 
-#: ../panels/network/connection-editor/ce-page-details.c:179
-#: ../panels/network/net-device-wifi.c:571
+#: panels/network/connection-editor/ce-page-details.c:251
+#: panels/network/net-device-wifi.c:675
 msgctxt "Signal strength"
 msgid "None"
 msgstr "无"
 
-#: ../panels/network/connection-editor/ce-page-details.c:181
-#: ../panels/network/net-device-wifi.c:573
+#: panels/network/connection-editor/ce-page-details.c:253
+#: panels/network/net-device-wifi.c:677
 msgctxt "Signal strength"
 msgid "Weak"
 msgstr "较弱"
 
-#: ../panels/network/connection-editor/ce-page-details.c:183
-#: ../panels/network/net-device-wifi.c:575
+#: panels/network/connection-editor/ce-page-details.c:255
+#: panels/network/net-device-wifi.c:679
 msgctxt "Signal strength"
 msgid "Ok"
 msgstr "一般"
 
-#: ../panels/network/connection-editor/ce-page-details.c:185
-#: ../panels/network/net-device-wifi.c:577
+#: panels/network/connection-editor/ce-page-details.c:257
+#: panels/network/net-device-wifi.c:681
 msgctxt "Signal strength"
 msgid "Good"
 msgstr "良好"
 
-#: ../panels/network/connection-editor/ce-page-details.c:187
-#: ../panels/network/net-device-wifi.c:579
+#: panels/network/connection-editor/ce-page-details.c:259
+#: panels/network/net-device-wifi.c:683
 msgctxt "Signal strength"
 msgid "Excellent"
 msgstr "非常好"
 
-#: ../panels/network/connection-editor/ce-page-details.c:225
-#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:266
-#: ../shell/panel-list.ui.h:2
+#: panels/network/connection-editor/ce-page-details.c:302
+msgid "Forget Connection"
+msgstr "忘记连接"
+
+#: panels/network/connection-editor/ce-page-details.c:304
+msgid "Remove Connection Profile"
+msgstr "移除连接档案"
+
+#: panels/network/connection-editor/ce-page-details.c:306
+msgid "Remove VPN"
+msgstr "移除 VPN"
+
+#: panels/network/connection-editor/ce-page-details.c:334
+#: panels/network/network-wifi.ui:1456 shell/cc-window.c:212
+#: shell/panel-list.ui:103
 msgid "Details"
 msgstr "详细信息"
 
-#: ../panels/network/connection-editor/ce-page-ethernet.c:215
-#: ../panels/network/connection-editor/ce-page-vpn.c:221
-#: ../panels/network/connection-editor/ce-page-wifi.c:227
-#: ../panels/network/network-wifi.ui.h:47
+#: panels/network/connection-editor/ce-page-ethernet.c:174
+#: panels/network/connection-editor/ce-page-vpn.c:188
+#: panels/network/connection-editor/ce-page-wifi.c:194
+#: panels/network/network-wifi.ui:1460
 msgid "Identity"
 msgstr "身份"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:202
-#: ../panels/network/connection-editor/ce-page-ip4.c:461
-#: ../panels/network/connection-editor/ce-page-ip6.c:180
-#: ../panels/network/connection-editor/ce-page-ip6.c:427
-msgid "Address"
-msgstr "地址"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:215
-#: ../panels/network/connection-editor/ce-page-ip4.c:474
-msgid "Netmask"
-msgstr "子网掩码"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:229
-#: ../panels/network/connection-editor/ce-page-ip4.c:487
-#: ../panels/network/connection-editor/ce-page-ip6.c:206
-#: ../panels/network/connection-editor/ce-page-ip6.c:453
-#: ../panels/network/network-vpn.ui.h:2
-msgid "Gateway"
-msgstr "网关"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:250
-#: ../panels/network/connection-editor/ce-page-ip6.c:223
+#: panels/network/connection-editor/ce-page-ip4.c:251
+#: panels/network/connection-editor/ce-page-ip6.c:230
 msgid "Delete Address"
 msgstr "删除地址"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:368
-#: ../panels/network/connection-editor/ce-page-ip6.c:334
-msgid "Server"
-msgstr "服务器"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:385
-#: ../panels/network/connection-editor/ce-page-ip6.c:351
-msgid "Delete DNS Server"
-msgstr "删除 DNS 服务器"
-
-#. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking)
-#: ../panels/network/connection-editor/ce-page-ip4.c:501
-#: ../panels/network/connection-editor/ce-page-ip6.c:467
-msgctxt "network parameters"
-msgid "Metric"
-msgstr "权重"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:522
-#: ../panels/network/connection-editor/ce-page-ip6.c:484
+#: panels/network/connection-editor/ce-page-ip4.c:422
+#: panels/network/connection-editor/ce-page-ip6.c:390
 msgid "Delete Route"
 msgstr "删除路由"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:626
-#: ../panels/network/network-wifi.ui.h:27
-msgid "Automatic (DHCP)"
-msgstr "自动 (DHCP)"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:630
-#: ../panels/network/connection-editor/ce-page-ip6.c:592
-#: ../panels/network/network-wifi.ui.h:26
-#: ../panels/privacy/cc-privacy-panel.c:217
-msgid "Manual"
-msgstr "手动"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:634
-#: ../panels/network/connection-editor/ce-page-ip6.c:596
-msgid "Link-Local Only"
-msgstr "仅本地链路"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:979
-#: ../panels/network/network-wifi.ui.h:48
+#: panels/network/connection-editor/ce-page-ip4.c:899
+#: panels/network/network-wifi.ui:1464
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:193
-#: ../panels/network/connection-editor/ce-page-ip6.c:440
-msgid "Prefix"
-msgstr "前缀"
-
-#: ../panels/network/connection-editor/ce-page-ip6.c:584
-#: ../panels/network/connection-editor/ethernet-page.ui.h:1
-#: ../panels/network/connection-editor/ip4-page.ui.h:4
-#: ../panels/network/connection-editor/ip6-page.ui.h:4
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:2
-#: ../panels/privacy/cc-privacy-panel.c:217
-msgid "Automatic"
-msgstr "自动"
-
-#: ../panels/network/connection-editor/ce-page-ip6.c:588
-msgid "Automatic, DHCP only"
-msgstr "自动,仅 DHCP"
-
-#: ../panels/network/connection-editor/ce-page-ip6.c:898
-#: ../panels/network/network-wifi.ui.h:49
+#: panels/network/connection-editor/ce-page-ip6.c:831
+#: panels/network/network-wifi.ui:1468
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../panels/network/connection-editor/ce-page-reset.c:78
-#: ../panels/network/network-wifi.ui.h:51
-msgid "Reset"
-msgstr "重置"
-
-#: ../panels/network/connection-editor/ce-page-security.c:248
+#: panels/network/connection-editor/ce-page-security.c:245
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "无"
 
-#: ../panels/network/connection-editor/ce-page-security.c:271
+#: panels/network/connection-editor/ce-page-security.c:268
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128 位密钥(Hex 或 ASCII)"
 
-#: ../panels/network/connection-editor/ce-page-security.c:281
+#: panels/network/connection-editor/ce-page-security.c:278
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128 位密码"
 
-#: ../panels/network/connection-editor/ce-page-security.c:294
-#: ../panels/network/wireless-security/wireless-security.c:463
+#: panels/network/connection-editor/ce-page-security.c:291
+#: panels/network/wireless-security/wireless-security.c:465
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../panels/network/connection-editor/ce-page-security.c:307
+#: panels/network/connection-editor/ce-page-security.c:304
 msgid "Dynamic WEP (802.1x)"
 msgstr "动态 WEP (802.1X)"
 
-#: ../panels/network/connection-editor/ce-page-security.c:321
+#: panels/network/connection-editor/ce-page-security.c:318
 msgid "WPA & WPA2 Personal"
 msgstr "WPA 和 WPA2 个人"
 
-#: ../panels/network/connection-editor/ce-page-security.c:335
+#: panels/network/connection-editor/ce-page-security.c:332
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA 和 WPA2 企业"
 
-#: ../panels/network/connection-editor/details-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:4
+#: 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.h:2
-#: ../panels/network/network-wifi.ui.h:5
+#: panels/network/connection-editor/details-page.ui:52
+#: panels/network/network-wifi.ui:207
 msgid "Link speed"
 msgstr "链路速度"
 
-#: ../panels/network/connection-editor/details-page.ui.h:4
-#: ../panels/network/net-device-ethernet.c:153
-#: ../panels/network/network-simple.ui.h:3
-#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644
+#: panels/network/connection-editor/details-page.ui:104
+#: panels/network/net-device-ethernet.c:154 panels/network/network-wifi.ui:256
+#: panels/network/panel-common.c:644
 msgid "IPv4 Address"
 msgstr "IPv4 地址"
 
-#: ../panels/network/connection-editor/details-page.ui.h:5
-#: ../panels/network/net-device-ethernet.c:154
-#: ../panels/network/net-device-ethernet.c:158
-#: ../panels/network/network-mobile.ui.h:4
-#: ../panels/network/network-simple.ui.h:4
-#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645
+#: panels/network/connection-editor/details-page.ui:122
+#: panels/network/net-device-ethernet.c:155
+#: panels/network/net-device-ethernet.c:159
+#: 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.h:6
-#: ../panels/network/net-device-ethernet.c:161
-#: ../panels/network/network-simple.ui.h:2
-#: ../panels/network/network-wifi.ui.h:9
+#: panels/network/connection-editor/details-page.ui:140
+#: panels/network/net-device-ethernet.c:162 panels/network/network-wifi.ui:290
 msgid "Hardware Address"
 msgstr "硬件地址"
 
-#: ../panels/network/connection-editor/details-page.ui.h:7
-#: ../panels/network/net-device-ethernet.c:165
-#: ../panels/network/network-mobile.ui.h:5
-#: ../panels/network/network-simple.ui.h:5
-#: ../panels/network/network-wifi.ui.h:10
+#: panels/network/connection-editor/details-page.ui:158
+#: panels/network/net-device-ethernet.c:166
+#: panels/network/network-mobile.ui:206 panels/network/network-wifi.ui:307
 msgid "Default Route"
 msgstr "默认路由"
 
-#: ../panels/network/connection-editor/details-page.ui.h:8
-#: ../panels/network/connection-editor/ip4-page.ui.h:3
-#: ../panels/network/connection-editor/ip6-page.ui.h:3
-#: ../panels/network/net-device-ethernet.c:167
-#: ../panels/network/network-mobile.ui.h:6
-#: ../panels/network/network-simple.ui.h:6
-#: ../panels/network/network-wifi.ui.h:11
+#: 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:168
+#: panels/network/network-mobile.ui:224 panels/network/network-wifi.ui:325
+#: panels/network/network-wifi.ui:832 panels/network/network-wifi.ui:1109
 msgid "DNS"
 msgstr "DNS"
 
-#: ../panels/network/connection-editor/details-page.ui.h:9
+#: panels/network/connection-editor/details-page.ui:195
 msgid "Last Used"
 msgstr "上次使用"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:2
+#: panels/network/connection-editor/details-page.ui:324
+msgid "Connect _automatically"
+msgstr "自动连接(_A)"
+
+#: panels/network/connection-editor/details-page.ui:343
+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:217
+msgid "Automatic"
+msgstr "自动"
+
+#: panels/network/connection-editor/ethernet-page.ui:19
 msgid "Twisted Pair (TP)"
 msgstr "双绞线 (TP)"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:3
+#: panels/network/connection-editor/ethernet-page.ui:22
 msgid "Attachment Unit Interface (AUI)"
 msgstr "连接单元接口 (AUI)"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:4
+#: panels/network/connection-editor/ethernet-page.ui:25
 msgid "BNC"
 msgstr "BNC"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:5
+#: panels/network/connection-editor/ethernet-page.ui:28
 msgid "Media Independent Interface (MII)"
 msgstr "媒体独立接口 (MII)"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:6
+#: panels/network/connection-editor/ethernet-page.ui:42
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:7
+#: panels/network/connection-editor/ethernet-page.ui:45
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:8
+#: panels/network/connection-editor/ethernet-page.ui:48
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:9
+#: panels/network/connection-editor/ethernet-page.ui:51
 msgid "10 Gb/s"
 msgstr "10 Gb/s"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:10
-#: ../panels/network/connection-editor/vpn-page.ui.h:1
+#: 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.h:11
-#: ../panels/network/connection-editor/wifi-page.ui.h:4
-#: ../panels/network/network-wifi.ui.h:38
+#: panels/network/connection-editor/ethernet-page.ui:100
+#: panels/network/connection-editor/wifi-page.ui:68
+#: panels/network/network-wifi.ui:1261
 msgid "_MAC Address"
 msgstr "_MAC 地址"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:12
+#: panels/network/connection-editor/ethernet-page.ui:146
 msgid "M_TU"
 msgstr "M_TU"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:13
-#: ../panels/network/connection-editor/wifi-page.ui.h:5
+#: panels/network/connection-editor/ethernet-page.ui:163
+#: panels/network/connection-editor/wifi-page.ui:98
 msgid "_Cloned Address"
 msgstr "克隆的地址(_C)"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:14
+#: panels/network/connection-editor/ethernet-page.ui:178
 msgid "bytes"
 msgstr "字节"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:15
-#: ../panels/network/connection-editor/vpn-page.ui.h:3
-msgid "Make available to other _users"
-msgstr "对其他用户可用(_U)"
+#: panels/network/connection-editor/ip4-page.ui:27
+msgid "IPv_4 Method"
+msgstr "IPv_4 方法"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:16
-#: ../panels/network/connection-editor/wifi-page.ui.h:7
-msgid "Connect _automatically"
-msgstr "自动连接(_A)"
+#: panels/network/connection-editor/ip4-page.ui:42
+#: panels/network/network-wifi.ui:778 panels/network/network-wifi.ui:1055
+msgid "Automatic (DHCP)"
+msgstr "自动 (DHCP)"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:17
-#: ../panels/network/connection-editor/security-page.ui.h:2
-#: ../panels/network/connection-editor/vpn-page.ui.h:2
-msgid "Firewall _Zone"
-msgstr "防火墙区域(_Z)"
+#: panels/network/connection-editor/ip4-page.ui:55
+#: panels/network/connection-editor/ip6-page.ui:69
+msgid "Link-Local Only"
+msgstr "仅本地链路"
 
-#: ../panels/network/connection-editor/firewall-helpers.c:49
-#: ../panels/network/connection-editor/firewall-helpers.c:118
-msgctxt "Firewall zone"
-msgid "Default"
-msgstr "默认"
+#: panels/network/connection-editor/ip4-page.ui:83
+#: panels/network/connection-editor/ip6-page.ui:97
+msgid "Disable"
+msgstr "禁用"
 
-#: ../panels/network/connection-editor/firewall-helpers.c:50
-msgid "The zone defines the trust level of the connection"
-msgstr "此区域定义了对连接的信任级别"
+#: panels/network/connection-editor/ip4-page.ui:111
+#: panels/network/connection-editor/ip6-page.ui:125
+msgid "Addresses"
+msgstr "地址"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:24
-msgid "IPv_4"
-msgstr "IPv_4"
+#: 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:87
+msgid "Address"
+msgstr "地址"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:2
-#: ../panels/network/connection-editor/ip6-page.ui.h:2
-#: ../panels/network/network-wifi.ui.h:25
-msgid "_Addresses"
-msgstr "地址(_A)"
+#: panels/network/connection-editor/ip4-page.ui:143
+#: panels/network/connection-editor/ip4-page.ui:327
+msgid "Netmask"
+msgstr "子网掩码"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:5
-#: ../panels/network/connection-editor/ip6-page.ui.h:5
-msgid "Automatic DNS"
+#: 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
+msgid "Gateway"
+msgstr "网关"
+
+#: panels/network/connection-editor/ip4-page.ui:220
+#: panels/network/connection-editor/ip6-page.ui:234
+msgid "Automatic DNS"
 msgstr "自动 DNS"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:6
-#: ../panels/network/connection-editor/ip6-page.ui.h:6
-#: ../panels/network/network-wifi.ui.h:32
+#: panels/network/connection-editor/ip4-page.ui:244
+#: panels/network/connection-editor/ip6-page.ui:258
+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:877 panels/network/network-wifi.ui:1154
 msgid "Routes"
 msgstr "路由"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:7
-#: ../panels/network/connection-editor/ip6-page.ui.h:7
+#: panels/network/connection-editor/ip4-page.ui:288
+#: panels/network/connection-editor/ip6-page.ui:302
 msgid "Automatic Routes"
 msgstr "自动路由"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:8
-#: ../panels/network/connection-editor/ip6-page.ui.h:8
-#: ../panels/network/network-wifi.ui.h:34
+#. 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
+msgid "Metric"
+msgstr "Metric"
+
+#: panels/network/connection-editor/ip4-page.ui:384
+#: panels/network/connection-editor/ip6-page.ui:398
+#: panels/network/network-wifi.ui:933 panels/network/network-wifi.ui:1210
 msgid "Use this connection _only for resources on its network"
 msgstr "仅对该网络上的资源使用此连接(_O)"
 
-#: ../panels/network/connection-editor/ip6-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:36
-msgid "IPv_6"
-msgstr "IPv_6"
+#: panels/network/connection-editor/ip6-page.ui:27
+msgid "IPv_6 Method"
+msgstr "IPv_6 方法"
+
+#: panels/network/connection-editor/ip6-page.ui:55
+msgid "Automatic, DHCP only"
+msgstr "自动,仅 DHCP"
+
+#: panels/network/connection-editor/ip6-page.ui:157
+#: panels/network/connection-editor/ip6-page.ui:341
+msgid "Prefix"
+msgstr "前缀"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:296
+#: panels/network/connection-editor/net-connection-editor.c:273
 msgid "Unable to open connection editor"
 msgstr "无法打开连接编辑器"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:314
+#: panels/network/connection-editor/net-connection-editor.c:291
 msgid "New Profile"
 msgstr "新配置"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:635
+#: panels/network/connection-editor/net-connection-editor.c:603
+#: panels/network/network.ui:142
 msgid "VPN"
 msgstr "VPN"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:783
+#: panels/network/connection-editor/net-connection-editor.c:751
 msgid "Import from file…"
 msgstr "从文件导入…"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:817
+#: panels/network/connection-editor/net-connection-editor.c:785
 msgid "Add VPN"
 msgstr "添加 VPN"
 
-#: ../panels/network/connection-editor/reset-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:41
-msgid "_Reset"
-msgstr "重置(_R)"
-
-#: ../panels/network/connection-editor/reset-page.ui.h:2
-#: ../panels/network/net-device-wifi.c:1536
-#: ../panels/network/network-wifi.ui.h:42
-msgid "_Forget"
-msgstr "忘记(_F)"
-
-#: ../panels/network/connection-editor/reset-page.ui.h:3
-msgid ""
-"Reset the settings for this network, including passwords, but remember it as "
-"a preferred network"
-msgstr "重置这个网络包括密码在内的设置,但仍作为首选连接"
-
-#: ../panels/network/connection-editor/reset-page.ui.h:4
-msgid ""
-"Remove all details relating to this network and do not try to automatically "
-"connect"
-msgstr "删除关于这个网络的所有细节,不再尝试自动连接"
-
-#: ../panels/network/connection-editor/security-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:16
+#: panels/network/connection-editor/security-page.ui:26
+#: panels/network/network-wifi.ui:529
 msgid "S_ecurity"
 msgstr "安全(_E)"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:141
+#: panels/network/connection-editor/vpn-helpers.c:141
 msgid "Cannot import VPN connection"
 msgstr "无法导入 VPN 连接"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:143
+#: panels/network/connection-editor/vpn-helpers.c:143
 #, c-format
 msgid ""
-"The file '%s' could not be read or does not contain recognized VPN "
+"The file “%s” could not be read or does not contain recognized VPN "
 "connection information\n"
 "\n"
 "Error: %s."
-msgstr ""
-"文件“%s”无法读取或未包含可识别的 VPN 连接信息\n"
+msgstr "文件“%s”无法读取或未包含可识别的 VPN 连接信息\n"
 "\n"
 "错误:%s。"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:178
+#: panels/network/connection-editor/vpn-helpers.c:178
 msgid "Select file to import"
 msgstr "选择要导入的文件"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:182
-#: ../panels/printers/cc-printers-panel.c:2078
-#: ../panels/sharing/cc-sharing-panel.c:373
-#: ../panels/user-accounts/um-photo-dialog.c:218
+#: panels/network/connection-editor/vpn-helpers.c:182
+#: panels/printers/pp-details-dialog.c:332
+#: panels/sharing/cc-sharing-panel.c:393
+#: panels/user-accounts/um-photo-dialog.c:231
 msgid "_Open"
 msgstr "打开(_O)"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:230
+#: panels/network/connection-editor/vpn-helpers.c:230
 #, c-format
-msgid "A file named \"%s\" already exists."
+msgid "A file named “%s” already exists."
 msgstr "名为“%s”的文件已存在。"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:232
+#: panels/network/connection-editor/vpn-helpers.c:232
 msgid "_Replace"
 msgstr "替换(_R)"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:234
+#: panels/network/connection-editor/vpn-helpers.c:234
 #, 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:270
 msgid "Cannot export VPN connection"
 msgstr "无法导入 VPN 连接"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:272
+#: panels/network/connection-editor/vpn-helpers.c:272
 #, c-format
 msgid ""
-"The VPN connection '%s' could not be exported to %s.\n"
+"The VPN connection “%s” could not be exported to %s.\n"
 "\n"
 "Error: %s."
-msgstr ""
-"无法将 VPN 连接“%s”导出到 %s。\n"
+msgstr "无法将 VPN 连接“%s”导出到 %s。\n"
 "\n"
 "错误:%s。"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:307
+#: panels/network/connection-editor/vpn-helpers.c:307
 msgid "Export VPN connection"
 msgstr "导出 VPN 连接"
 
-#: ../panels/network/connection-editor/vpn-page.ui.h:4
+#: panels/network/connection-editor/vpn-page.ui:58
 msgid "(Error: unable to load VPN connection editor)"
 msgstr "(错误:无法载入 VPN 连接编辑器)"
 
-#: ../panels/network/connection-editor/wifi-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:14
+#: 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.h:2
-#: ../panels/network/network-wifi.ui.h:15
+#: panels/network/connection-editor/wifi-page.ui:36
+#: panels/network/network-wifi.ui:513
 msgid "_BSSID"
 msgstr "_BSSID"
 
-#: ../panels/network/connection-editor/wifi-page.ui.h:3
-#: ../panels/network/network-wifi.ui.h:18
+#: panels/network/connection-editor/wifi-page.ui:53
+#: panels/network/network-wifi.ui:562
 msgid "My Home Network"
 msgstr "家庭网络"
 
-#: ../panels/network/connection-editor/wifi-page.ui.h:6
-msgid "Make available to _other users"
-msgstr "对其他用户可用(_O)"
-
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:2
-msgid "Net­work"
+#: panels/network/gnome-network-panel.desktop.in.in:3
+#: panels/network/network-mobile.ui:241
+msgid "Network"
 msgstr "网络"
 
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:3
+#: panels/network/gnome-network-panel.desktop.in.in:4
 msgid "Control how you connect to the Internet"
 msgstr "控制连接到互联网的方式"
 
-#. Translators: those are keywords for the network control-center panel
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/network/gnome-network-panel.desktop.in.in:7
+msgid "network-workgroup"
+msgstr "network-workgroup"
+
+#. Translators: Search terms to find the Network panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#: panels/network/gnome-network-panel.desktop.in.in:19
 msgid ""
 "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;"
 "DNS;"
-msgstr ""
-"Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;"
-"DNS;网络;无线;无线保真;无线;互联网协议;局域网;代理;广域网;宽带;调制解调器;蓝"
-"牙;虚拟专用网;域名系统;"
+msgstr 
"Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;DNS;网络;无线;无线保真;无线;互联网协议;局域网;代理;广域网;宽带;调制解调器;蓝牙;虚拟专用网;域名系统;"
 
-#: ../panels/network/net-device-ethernet.c:106
-#: ../panels/network/net-device-wifi.c:471
+#: panels/network/gnome-wifi-panel.desktop.in.in:4
+msgid "Control how you connect to Wi-Fi networks"
+msgstr "控制如何连接到 Wi-Fi 网络"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/network/gnome-wifi-panel.desktop.in.in:7
+msgid "network-wireless"
+msgstr "network-wireless"
+
+#. Translators: Search terms to find the Wi-Fi panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+#: panels/network/gnome-wifi-panel.desktop.in.in:19
+msgid "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Broadband;DNS;"
+msgstr "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Broadband;DNS;"
+
+#: panels/network/net-device-ethernet.c:107
+#: panels/network/net-device-wifi.c:553
 msgid "never"
 msgstr "从不"
 
-#: ../panels/network/net-device-ethernet.c:116
-#: ../panels/network/net-device-wifi.c:481
+#: panels/network/net-device-ethernet.c:117
+#: panels/network/net-device-wifi.c:563
 msgid "today"
 msgstr "今天"
 
-#: ../panels/network/net-device-ethernet.c:118
-#: ../panels/network/net-device-wifi.c:483
+#: panels/network/net-device-ethernet.c:119
+#: panels/network/net-device-wifi.c:565
 msgid "yesterday"
 msgstr "昨天"
 
-#: ../panels/network/net-device-ethernet.c:156
-#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647
-#: ../panels/network/panel-common.c:649 ../panels/printers/printers.ui.h:13
+#: panels/network/net-device-ethernet.c:157
+#: 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:172
-#: ../panels/network/network-wifi.ui.h:12
+#: panels/network/net-device-ethernet.c:173 panels/network/network-wifi.ui:342
 msgid "Last used"
 msgstr "上次使用"
 
@@ -2600,83 +2922,85 @@ msgstr "上次使用"
 #. * profile. It is also used to display ethernet in the
 #. * device list.
 #.
-#: ../panels/network/net-device-ethernet.c:280
-#: ../panels/network/network-ethernet.ui.h:1
-#: ../panels/network/network-simple.ui.h:1
+#: panels/network/net-device-ethernet.c:277
+#: panels/network/network-ethernet.ui:19 panels/network/network-simple.ui:39
 msgid "Wired"
 msgstr "有线"
 
-#: ../panels/network/net-device-ethernet.c:348
-#: ../panels/network/net-device-wifi.c:1694
-#: ../panels/network/network-ethernet.ui.h:3
-#: ../panels/network/network-mobile.ui.h:8
-#: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7
+#: panels/network/net-device-ethernet.c:345
+#: panels/network/net-device-wifi.c:1895 panels/network/network-ethernet.ui:120
+#: panels/network/network-mobile.ui:394 panels/network/network-simple.ui:75
+#: panels/network/network-vpn.ui:79
 msgid "Options…"
 msgstr "选项…"
 
-#: ../panels/network/net-device-mobile.c:223
+#: panels/network/net-device-mobile.c:238
 msgid "Add new connection"
 msgstr "添加新连接"
 
-#: ../panels/network/net-device-wifi.c:1205
-msgid ""
-"If you have a connection to the Internet other than wireless, you can set up "
-"a wireless hotspot to share the connection with others."
-msgstr ""
-"如果有无线网络以外的方式连接互联网,您可以配置无线热点并与他人共享网络连接。"
-
-#: ../panels/network/net-device-wifi.c:1209
+#: panels/network/net-device-wifi.c:1368
 #, c-format
 msgid "Switching on the wireless hotspot will disconnect you from <b>%s</b>."
 msgstr "打开无线网热点将使您从 <b>%s</b> 断开。"
 
-#: ../panels/network/net-device-wifi.c:1213
+#: panels/network/net-device-wifi.c:1372
 msgid ""
 "It is not possible to access the Internet through your wireless while the "
 "hotspot is active."
 msgstr "启用热点模式时无法通过无线网络访问互联网。"
 
-#: ../panels/network/net-device-wifi.c:1296
+#: panels/network/net-device-wifi.c:1379
+msgid "Turn On Wi-Fi Hotspot?"
+msgstr "打开 Wi-Fi 热点?"
+
+#: panels/network/net-device-wifi.c:1401
+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:1412
+msgid "_Turn On"
+msgstr "打开(_T)"
+
+#: panels/network/net-device-wifi.c:1489
 msgid "Stop hotspot and disconnect any users?"
 msgstr "停止热点并断开所有用户?"
 
-#: ../panels/network/net-device-wifi.c:1299
+#: panels/network/net-device-wifi.c:1492
 msgid "_Stop Hotspot"
 msgstr "停止热点(_S)"
 
-#: ../panels/network/net-device-wifi.c:1397
+#: panels/network/net-device-wifi.c:1592
 msgid "System policy prohibits use as a Hotspot"
 msgstr "系统策略禁止作为热点使用"
 
-#: ../panels/network/net-device-wifi.c:1400
+#: panels/network/net-device-wifi.c:1595
 msgid "Wireless device does not support Hotspot mode"
 msgstr "无线设备不支持热点模式"
 
-#: ../panels/network/net-device-wifi.c:1532
+#: panels/network/net-device-wifi.c:1733
 msgid ""
 "Network details for the selected networks, including passwords and any "
 "custom configuration will be lost."
 msgstr "所选网络的细节,包括密码和全部自定义设置都将丢失。"
 
-#: ../panels/network/net-device-wifi.c:1842
-msgid "History"
-msgstr "历史"
+#: panels/network/net-device-wifi.c:1737 panels/network/network-wifi.ui:1362
+msgid "_Forget"
+msgstr "忘记(_F)"
 
-#: ../panels/network/net-device-wifi.c:1846
-#: ../panels/printers/options-dialog.ui.h:2
-#: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:525
-#: ../panels/wacom/gnome-wacom-properties.ui.h:5
-msgid "_Close"
-msgstr "关闭(_C)"
+#: panels/network/net-device-wifi.c:2046 panels/network/net-device-wifi.c:2053
+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:1854
+#: panels/network/net-device-wifi.c:2086
 msgctxt "Wi-Fi Network"
 msgid "_Forget"
 msgstr "忘记(_F)"
 
 #. TRANSLATORS: this is when the use leaves the PAC textbox blank
-#: ../panels/network/net-proxy.c:67
+#: panels/network/net-proxy.c:102
 msgid ""
 "Web Proxy Autodiscovery is used when a Configuration URL is not provided."
 msgstr "若未提供配置 URL,将使用网络代理自动发现。"
@@ -2685,1081 +3009,1008 @@ msgstr "若未提供配置 URL,将使用网络代理自动发现。"
 #. * 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:75
+#: panels/network/net-proxy.c:110
 msgid "This is not recommended for untrusted public networks."
 msgstr "对于不可信的公共网络,不建议这样做。"
 
-#: ../panels/network/net-proxy.c:410
-msgid "Proxy"
-msgstr "代理"
-
-#: ../panels/network/network-ethernet.ui.h:2
-msgid "_Add Profile…"
-msgstr "添加配置(_A)…"
-
-#: ../panels/network/network-mobile.ui.h:1
+#: panels/network/network-mobile.ui:30
 msgid "IMEI"
 msgstr "IMEI"
 
-#: ../panels/network/network-mobile.ui.h:2
+#: panels/network/network-mobile.ui:48
 msgid "Provider"
 msgstr "提供者"
 
-#: ../panels/network/network-mobile.ui.h:7
-msgid "Network"
-msgstr "网络"
-
-#: ../panels/network/network-proxy.ui.h:1
-msgctxt "proxy method"
-msgid "None"
-msgstr "无"
-
-#: ../panels/network/network-proxy.ui.h:2
-msgctxt "proxy method"
-msgid "Manual"
-msgstr "手动"
-
-#: ../panels/network/network-proxy.ui.h:3
-msgctxt "proxy method"
-msgid "Automatic"
-msgstr "自动"
-
-#: ../panels/network/network-proxy.ui.h:4
-msgid "_Method"
-msgstr "方式(_M)"
-
-#: ../panels/network/network-proxy.ui.h:5
-msgid "_Configuration URL"
-msgstr "配置 URL (_C)"
+#: panels/network/network-proxy.ui:47 panels/network/network-proxy.ui:92
+msgid "Network Proxy"
+msgstr "网络代理"
 
-#: ../panels/network/network-proxy.ui.h:6
+#: panels/network/network-proxy.ui:173
 msgid "_HTTP Proxy"
 msgstr "_HTTP 代理"
 
-#: ../panels/network/network-proxy.ui.h:7
+#: panels/network/network-proxy.ui:192
 msgid "H_TTPS Proxy"
 msgstr "H_TTPS 代理"
 
-#: ../panels/network/network-proxy.ui.h:8
+#: panels/network/network-proxy.ui:211
 msgid "_FTP Proxy"
 msgstr "_FTP 代理"
 
-#: ../panels/network/network-proxy.ui.h:9
+#: panels/network/network-proxy.ui:230
 msgid "_Socks Host"
 msgstr "_Socks 主机"
 
-#: ../panels/network/network-proxy.ui.h:10
+#: panels/network/network-proxy.ui:249
 msgid "_Ignore Hosts"
 msgstr "忽略主机(_I)"
 
-#: ../panels/network/network-proxy.ui.h:11
+#: panels/network/network-proxy.ui:287
 msgid "HTTP proxy port"
 msgstr "HTTP 代理端口"
 
-#: ../panels/network/network-proxy.ui.h:12
+#: panels/network/network-proxy.ui:364
 msgid "HTTPS proxy port"
 msgstr "HTTPS 代理端口"
 
-#: ../panels/network/network-proxy.ui.h:13
+#: panels/network/network-proxy.ui:385
 msgid "FTP proxy port"
 msgstr "FTP 代理端口"
 
-#: ../panels/network/network-proxy.ui.h:14
+#: panels/network/network-proxy.ui:406
 msgid "Socks proxy port"
 msgstr "SOCKS 代理端口"
 
-#: ../panels/network/network-simple.ui.h:7
+#: panels/network/network-proxy.ui:435
+msgid "_Configuration URL"
+msgstr "配置 URL (_C)"
+
+#: panels/network/network-simple.ui:50
 msgid "Turn device off"
 msgstr "关闭设备"
 
-#: ../panels/network/network.ui.h:1
-msgid "Add Device"
-msgstr "添加设备"
-
-#: ../panels/network/network.ui.h:2
-msgid "Remove Device"
-msgstr "移除设备"
-
-#: panels/network/network.ui:102
+#: panels/network/network.ui:101
 msgid "Other Devices"
 msgstr "其他设备"
 
-#: ../panels/network/network-vpn.ui.h:1
-msgid "VPN Type"
-msgstr "VPN 类型"
-
-#: ../panels/network/network-vpn.ui.h:3
-msgid "Group Name"
-msgstr "组名"
-
-#: ../panels/network/network-vpn.ui.h:4
-msgid "Group Password"
-msgstr "组密码"
-
-#: ../panels/network/network-vpn.ui.h:5
-#: ../panels/printers/authentication-dialog.ui.h:4
-msgid "Username"
-msgstr "用户名"
+#: panels/network/network.ui:194
+msgid "Not set up"
+msgstr "未设置"
 
-#: ../panels/network/network-vpn.ui.h:6
+#: panels/network/network-vpn.ui:56
 msgid "Turn VPN connection off"
 msgstr "关闭 VPN 连接"
 
-#: ../panels/network/network-wifi.ui.h:3
+#: panels/network/network-wifi.ui:127
 msgid "Automatic _Connect"
 msgstr "自动连接(_C)"
 
-#: ../panels/network/network-wifi.ui.h:13
+#: panels/network/network-wifi.ui:474
 msgid "details"
 msgstr "详细信息"
 
-#: ../panels/network/network-wifi.ui.h:17
-#: ../panels/network/wireless-security/eap-method-leap.ui.h:2
-#: ../panels/network/wireless-security/eap-method-simple.ui.h:2
-#: ../panels/network/wireless-security/ws-leap.ui.h:2
-#: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1
-#: ../panels/sharing/sharing.ui.h:9
-#: ../panels/user-accounts/data/account-dialog.ui.h:12
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
-msgid "_Password"
-msgstr "密码(_P)"
-
-#: ../panels/network/network-wifi.ui.h:21
+#: panels/network/network-wifi.ui:622
 msgid "Show P_assword"
 msgstr "显示密码(_A)"
 
-#: ../panels/network/network-wifi.ui.h:22
+#: panels/network/network-wifi.ui:652
 msgid "Make available to other users"
 msgstr "对其他用户可用"
 
-#: ../panels/network/network-wifi.ui.h:23
+#: panels/network/network-wifi.ui:680
 msgid "identity"
 msgstr "身份"
 
-#: ../panels/network/network-wifi.ui.h:28
+#: panels/network/network-wifi.ui:714
+msgid "IPv_4"
+msgstr "IPv_4"
+
+#: panels/network/network-wifi.ui:755 panels/network/network-wifi.ui:1032
+msgid "_Addresses"
+msgstr "地址(_A)"
+
+#: panels/network/network-wifi.ui:779 panels/network/network-wifi.ui:1056
 msgid "Automatic (DHCP) addresses only"
 msgstr "仅自动分配地址 (DHCP)"
 
-#: ../panels/network/network-wifi.ui.h:29
+#: panels/network/network-wifi.ui:780 panels/network/network-wifi.ui:1057
 msgid "Link-local only"
 msgstr "仅本地链路"
 
-#: ../panels/network/network-wifi.ui.h:30
+#: panels/network/network-wifi.ui:781 panels/network/network-wifi.ui:1058
 msgid "Shared with other computers"
 msgstr "与其他计算机共享"
 
-#: ../panels/network/network-wifi.ui.h:33
+#: panels/network/network-wifi.ui:917 panels/network/network-wifi.ui:1194
 msgid "_Ignore automatically obtained routes"
 msgstr "忽略自动获取的路由(_I)"
 
-#: ../panels/network/network-wifi.ui.h:35
+#: panels/network/network-wifi.ui:960
 msgid "ipv4"
 msgstr "ipv4"
 
-#: ../panels/network/network-wifi.ui.h:37
+#: panels/network/network-wifi.ui:991
+msgid "IPv_6"
+msgstr "IPv_6"
+
+#: panels/network/network-wifi.ui:1237
 msgid "ipv6"
 msgstr "ipv6"
 
-#: ../panels/network/network-wifi.ui.h:39
+#: panels/network/network-wifi.ui:1277
 msgid "_Cloned MAC Address"
 msgstr "克隆的 MAC 地址(_C)"
 
-#: ../panels/network/network-wifi.ui.h:40
+#: panels/network/network-wifi.ui:1327
 msgid "hardware"
 msgstr "硬件"
 
-#: ../panels/network/network-wifi.ui.h:43
+#: panels/network/network-wifi.ui:1346
+msgid "_Reset"
+msgstr "重置(_R)"
+
+#: panels/network/network-wifi.ui:1382
 msgid ""
 "Reset the settings for this connection to their defaults, but remember as a "
 "preferred connection."
 msgstr "将这个连接的设置重置为默认值,但仍作为首选连接。"
 
-#: ../panels/network/network-wifi.ui.h:44
+#: panels/network/network-wifi.ui:1399
 msgid ""
 "Remove all details relating to this network and do not try to automatically "
 "connect to it."
 msgstr "删除关于这个网络的所有细节,不再尝试自动连接。"
 
-#: ../panels/network/network-wifi.ui.h:45
+#: panels/network/network-wifi.ui:1419
 msgid "reset"
 msgstr "重置"
 
-#: ../panels/network/network-wifi.ui.h:50
+#: panels/network/network-wifi.ui:1472
 msgid "Hardware"
 msgstr "硬件"
 
-#: ../panels/network/network-wifi.ui.h:52
+#: panels/network/network-wifi.ui:1476
+msgctxt "tab"
+msgid "Reset"
+msgstr "重置"
+
+#: panels/network/network-wifi.ui:1537
 msgid "Wi-Fi Hotspot"
 msgstr "Wi-Fi 热点"
 
-#: ../panels/network/network-wifi.ui.h:53
-msgid "_Turn On"
-msgstr "打开(_T)"
-
-#: ../panels/network/network-wifi.ui.h:54
-msgid "Wi-Fi"
-msgstr "Wi-Fi"
-
-#: ../panels/network/network-wifi.ui.h:55
-msgid "Turn Wi-Fi off"
-msgstr "关闭 Wi-Fi"
-
-#: ../panels/network/network-wifi.ui.h:56
-msgid "_Use as Hotspot…"
-msgstr "用作热点(_U)…"
-
-#: ../panels/network/network-wifi.ui.h:57
-msgid "_Connect to Hidden Network…"
-msgstr "连接到隐藏网络(_C)…"
-
-#: ../panels/network/network-wifi.ui.h:58
-msgid "_History"
-msgstr "历史(_H)"
-
-#: ../panels/network/network-wifi.ui.h:59
+#: panels/network/network-wifi.ui:1554
 msgid "Switch off to connect to a Wi-Fi network"
 msgstr "关闭以连接到无线网络"
 
-#: ../panels/network/network-wifi.ui.h:60
+#: panels/network/network-wifi.ui:1603
 msgid "Network Name"
 msgstr "网络名称"
 
-#: ../panels/network/network-wifi.ui.h:61
+#: panels/network/network-wifi.ui:1621
 msgid "Connected Devices"
 msgstr "已连接的设备"
 
-#: ../panels/network/network-wifi.ui.h:62
+#: panels/network/network-wifi.ui:1639
 msgid "Security type"
 msgstr "安全类型"
 
-#: ../panels/network/network-wifi.ui.h:63
-#: ../panels/printers/authentication-dialog.ui.h:5
-#: ../panels/user-accounts/data/account-dialog.ui.h:9
+#: panels/network/network-wifi.ui:1702
+msgctxt "Wi-Fi passkey"
 msgid "Password"
 msgstr "密码"
 
+#: panels/network/network-wifi.ui:1799
+msgid "Turn Wi-Fi off"
+msgstr "关闭 Wi-Fi"
+
+#: panels/network/network-wifi.ui:1831
+msgid "_Connect to Hidden Network…"
+msgstr "连接到隐藏网络(_C)…"
+
+#: panels/network/network-wifi.ui:1841
+msgid "_Turn On Wi-Fi Hotspot…"
+msgstr "(_T)打开 Wi-Fi 热点"
+
+#: panels/network/network-wifi.ui:1851
+msgid "_Known Wi-Fi Networks"
+msgstr "(_K)已知的 Wi-Fi 网络"
+
+#: panels/network/wifi.ui:40
+msgid "No Wi-Fi Adapter Found"
+msgstr "没有找到 Wi-Fi 适配器"
+
+#: panels/network/wifi.ui:52
+msgid "Make sure you have a Wi-Fi adapter plugged and turned on"
+msgstr "确保有一个 Wi-Fi 适配器已连接并打开。"
+
+#: panels/network/wifi.ui:127
+msgid "Airplane Mode"
+msgstr "飞行模式"
+
+#: panels/network/wifi.ui:142
+msgid "Disables Wi-Fi, Bluetooth and mobile broadband"
+msgstr "禁用 Wi-Fi、蓝牙和移动宽带"
+
+#: panels/network/wifi.ui:192
+msgid "Visible Networks"
+msgstr "可见网络"
+
+#: panels/network/wifi.ui:271
+msgid "NetworkManager needs to be running"
+msgstr "需要运行 NetworkManager。"
+
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:127
+#: panels/network/panel-common.c:127
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:131
+#: 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:147 panels/network/panel-common.c:201
 msgid "Status unknown"
 msgstr "未知状态"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:151
+#: panels/network/panel-common.c:151
 msgid "Unmanaged"
 msgstr "未托管"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:155
+#: panels/network/panel-common.c:155
 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:165 panels/network/panel-common.c:207
 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:169 panels/network/panel-common.c:211
 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:173 panels/network/panel-common.c:215
 msgid "Connected"
 msgstr "已连接"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:177
+#: panels/network/panel-common.c:177
 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:181 panels/network/panel-common.c:219
 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:185 panels/network/panel-common.c:227
 msgid "Status unknown (missing)"
 msgstr "未知状态(丢失)"
 
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:223
+#: 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:248
 msgid "Configuration failed"
 msgstr "配置失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:252
+#: panels/network/panel-common.c:252
 msgid "IP configuration failed"
 msgstr "IP 配置失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:256
+#: panels/network/panel-common.c:256
 msgid "IP configuration expired"
 msgstr "IP 配置已过期"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:260
+#: panels/network/panel-common.c:260
 msgid "Secrets were required, but not provided"
 msgstr "需要认证凭据,但没有提供"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:264
+#: panels/network/panel-common.c:264
 msgid "802.1x supplicant disconnected"
 msgstr "802.1X 客户端已断开"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:268
+#: panels/network/panel-common.c:268
 msgid "802.1x supplicant configuration failed"
 msgstr "802.1X 客户端配置失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:272
+#: panels/network/panel-common.c:272
 msgid "802.1x supplicant failed"
 msgstr "802.1X 客户端失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:276
+#: panels/network/panel-common.c:276
 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:280
 msgid "PPP service failed to start"
 msgstr "PPP 服务启动失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:284
+#: panels/network/panel-common.c:284
 msgid "PPP service disconnected"
 msgstr "PPP 服务已断开"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:288
+#: panels/network/panel-common.c:288
 msgid "PPP failed"
 msgstr "PPP 失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:292
+#: panels/network/panel-common.c:292
 msgid "DHCP client failed to start"
 msgstr "DHCP 客户端启动失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:296
+#: panels/network/panel-common.c:296
 msgid "DHCP client error"
 msgstr "DHCP 客户端错误"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:300
+#: panels/network/panel-common.c:300
 msgid "DHCP client failed"
 msgstr "DHCP 客户端失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:304
+#: panels/network/panel-common.c:304
 msgid "Shared connection service failed to start"
 msgstr "共享连接服务启动失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:308
+#: panels/network/panel-common.c:308
 msgid "Shared connection service failed"
 msgstr "共享连接服务失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:312
+#: panels/network/panel-common.c:312
 msgid "AutoIP service failed to start"
 msgstr "AutoIP 服务启动失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:316
+#: panels/network/panel-common.c:316
 msgid "AutoIP service error"
 msgstr "AutoIP 服务出错"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:320
+#: panels/network/panel-common.c:320
 msgid "AutoIP service failed"
 msgstr "AutoIP 服务失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:324
+#: panels/network/panel-common.c:324
 msgid "Line busy"
 msgstr "线路忙"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:328
+#: panels/network/panel-common.c:328
 msgid "No dial tone"
 msgstr "无拨号音"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:332
+#: panels/network/panel-common.c:332
 msgid "No carrier could be established"
 msgstr "无法建立载波"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:336
+#: panels/network/panel-common.c:336
 msgid "Dialing request timed out"
 msgstr "拨号请求超时"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:340
+#: panels/network/panel-common.c:340
 msgid "Dialing attempt failed"
 msgstr "拨号尝试失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:344
+#: panels/network/panel-common.c:344
 msgid "Modem initialization failed"
 msgstr "调制解调器初始化失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:348
+#: panels/network/panel-common.c:348
 msgid "Failed to select the specified APN"
 msgstr "无法选择指定的 APN"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:352
+#: panels/network/panel-common.c:352
 msgid "Not searching for networks"
 msgstr "未在搜索网络"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:356
+#: panels/network/panel-common.c:356
 msgid "Network registration denied"
 msgstr "网络注册被拒绝"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:360
+#: panels/network/panel-common.c:360
 msgid "Network registration timed out"
 msgstr "网络注册超时"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:364
+#: panels/network/panel-common.c:364
 msgid "Failed to register with the requested network"
 msgstr "无法在请求的网络上注册"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:368
+#: panels/network/panel-common.c:368
 msgid "PIN check failed"
 msgstr "PIN 检查失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:372
+#: panels/network/panel-common.c:372
 msgid "Firmware for the device may be missing"
 msgstr "设备可能缺少固件"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:376
+#: panels/network/panel-common.c:376
 msgid "Connection disappeared"
 msgstr "连接丢失"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:380
+#: panels/network/panel-common.c:380
 msgid "Existing connection was assumed"
 msgstr "已假定为现有连接"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:384
+#: panels/network/panel-common.c:384
 msgid "Modem not found"
 msgstr "未找到调制解调器"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:388
+#: panels/network/panel-common.c:388
 msgid "Bluetooth connection failed"
 msgstr "蓝牙连接失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:392
+#: panels/network/panel-common.c:392
 msgid "SIM Card not inserted"
 msgstr "未插入 SIM 卡"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:396
+#: panels/network/panel-common.c:396
 msgid "SIM Pin required"
 msgstr "需要 SIM PIN 码"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:400
+#: panels/network/panel-common.c:400
 msgid "SIM Puk required"
 msgstr "需要 SIM PUK 码"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:404
+#: panels/network/panel-common.c:404
 msgid "SIM wrong"
 msgstr "SIM 错误"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:408
+#: panels/network/panel-common.c:408
 msgid "Connection dependency failed"
 msgstr "连接依赖失败"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:433
+#: panels/network/panel-common.c:433
 msgid "Firmware missing"
 msgstr "固件缺失"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:437
+#: panels/network/panel-common.c:437
 msgid "Cable unplugged"
 msgstr "线缆已拔出"
 
-#: ../panels/network/wireless-security/eap-method.c:69
-msgid "undefined error in 802.1x security (wpa-eap)"
-msgstr "802.1x 安全性里未定义的错误 (wpa-eap)"
+#: panels/network/wireless-security/eap-method.c:69
+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:245
 msgid "no file selected"
 msgstr "未选择文件"
 
-#: ../panels/network/wireless-security/eap-method.c:276
+#: panels/network/wireless-security/eap-method.c:276
 msgid "unspecified error validating eap-method file"
 msgstr "验证 eap-method 文件时发生未知错误"
 
-#: ../panels/network/wireless-security/eap-method.c:480
+#: panels/network/wireless-security/eap-method.c:451
 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:483
+#: panels/network/wireless-security/eap-method.c:454
 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:72
 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:333
+#: 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:351
 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:288
+#: 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:289
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:406
+#: panels/network/wireless-security/eap-method-fast.c:406
 msgid "Choose a PAC file"
 msgstr "选择 PAC 文件"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:413
+#: panels/network/wireless-security/eap-method-fast.c:413
 msgid "PAC files (*.pac)"
 msgstr "PAC 文件(*.pac)"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:1
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:1
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:1
-#: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1
-#: ../panels/network/wireless-security/ws-wpa-eap.ui.h:1
-#: ../panels/printers/authentication-dialog.ui.h:1
-msgid " "
-msgstr " "
-
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:2
+#: panels/network/wireless-security/eap-method-fast.ui:22
 msgid "Anonymous"
 msgstr "匿名"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:3
+#: panels/network/wireless-security/eap-method-fast.ui:25
 msgid "Authenticated"
 msgstr "已认证"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:4
+#: panels/network/wireless-security/eap-method-fast.ui:28
 msgid "Both"
 msgstr "两者"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:6
+#: panels/network/wireless-security/eap-method-fast.ui:76
 msgid "PAC _file"
 msgstr "PAC 文件(_F)"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:7
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:8
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:5
+#: 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:97
 msgid "_Inner authentication"
 msgstr "内部认证(_I)"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:8
+#: panels/network/wireless-security/eap-method-fast.ui:156
 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:65
 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:74
 msgid "missing EAP-LEAP password"
 msgstr "缺失 EAP-LEAP 密码"
 
-#: ../panels/network/wireless-security/eap-method-leap.ui.h:1
-#: ../panels/network/wireless-security/eap-method-simple.ui.h:1
-#: ../panels/network/wireless-security/ws-leap.ui.h:1
-#: ../panels/user-accounts/data/account-dialog.ui.h:4
+#: 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/user-accounts/data/account-dialog.ui:142
+#: panels/user-accounts/data/account-dialog.ui:505
 msgid "_Username"
 msgstr "用户名(_U)"
 
-#: ../panels/network/wireless-security/eap-method-leap.ui.h:3
-#: ../panels/network/wireless-security/eap-method-simple.ui.h:3
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:7
-#: ../panels/network/wireless-security/ws-leap.ui.h:3
-#: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3
+#: 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
 msgid "Sho_w password"
 msgstr "显示密码(_W)"
 
-#: ../panels/network/wireless-security/eap-method-peap.c:63
+#: panels/network/wireless-security/eap-method-peap.c:63
 #, 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:68
 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:318
-#: ../panels/network/wireless-security/wireless-security.c:439
+#: panels/network/wireless-security/eap-method-peap.c:287
+#: panels/network/wireless-security/eap-method-ttls.c:336
+#: 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:501
-#: ../panels/network/wireless-security/eap-method-ttls.c:412
+#: 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:430
 msgid "Choose a Certificate Authority certificate"
 msgstr "选择 CA 证书"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:3
+#: panels/network/wireless-security/eap-method-peap.ui:25
 msgid "Version 0"
 msgstr "版本 0"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:4
+#: panels/network/wireless-security/eap-method-peap.ui:28
 msgid "Version 1"
 msgstr "版本 1"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:6
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:3
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:3
+#: 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:57
 msgid "C_A certificate"
 msgstr "C_A 证书"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:7
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:4
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4
+#: 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:79
 msgid "No CA certificate is _required"
 msgstr "不需要 CA 证书(_R)"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:9
+#: panels/network/wireless-security/eap-method-peap.ui:114
 msgid "PEAP _version"
 msgstr "PEAP 版本(_V)"
 
-#: ../panels/network/wireless-security/eap-method-simple.c:74
+#: panels/network/wireless-security/eap-method-simple.c:74
 msgid "missing EAP username"
 msgstr "缺失 EAP 用户名"
 
-#: ../panels/network/wireless-security/eap-method-simple.c:87
+#: panels/network/wireless-security/eap-method-simple.c:87
 msgid "missing EAP password"
 msgstr "缺失 EAP 密码"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:68
+#: panels/network/wireless-security/eap-method-tls.c:68
 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:77
 #, 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:84
 msgid "invalid EAP-TLS CA certificate: no certificate specified"
 msgstr "无效的 EAP-TLS CA 证书:未指定证书"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:95
-msgid "invalid EAP-TLS password: missing"
-msgstr "无效的 EAP-TLS 密码:缺失"
-
-#: ../panels/network/wireless-security/eap-method-tls.c:109
+#: panels/network/wireless-security/eap-method-tls.c:100
 #, c-format
 msgid "invalid EAP-TLS private-key: %s"
 msgstr "无效的 EAP-TLS CA 私钥:%s"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:119
+#: panels/network/wireless-security/eap-method-tls.c:110
 #, c-format
 msgid "invalid EAP-TLS user-certificate: %s"
 msgstr "无效的 EAP-TLS 用户证书:%s"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:316
+#: panels/network/wireless-security/eap-method-tls.c:307
 msgid "Unencrypted private keys are insecure"
 msgstr "未加密的私钥不安全"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:319
+#: panels/network/wireless-security/eap-method-tls.c:310
 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 password-protected private key.\n"
+"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 "
+"password-protected private key.\n"
 "\n"
 "(You can password-protect your private key with openssl)"
-msgstr ""
-"选择的私钥未设置密码,可能使您的安全凭据遭受攻击并失效。请选择一个带有密码的"
-"私钥。\n"
+msgstr "选择的私钥未设置密码保护,这可能会使您的安全凭据遭受攻击。请选择一个带有密码保护的私钥。\n"
 "\n"
 "(您可以使用 openssl 来向私钥添加密码)"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:495
+#: panels/network/wireless-security/eap-method-tls.c:486
 msgid "Choose your personal certificate"
 msgstr "选择您的个人证书"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:507
+#: panels/network/wireless-security/eap-method-tls.c:498
 msgid "Choose your private key"
 msgstr "选择您的私钥"
 
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:1
+#: panels/network/wireless-security/eap-method-tls.ui:24
 msgid "I_dentity"
 msgstr "身份(_D)"
 
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:2
+#: panels/network/wireless-security/eap-method-tls.ui:50
 msgid "_User certificate"
 msgstr "用户证书(_U)"
 
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:5
+#: panels/network/wireless-security/eap-method-tls.ui:115
 msgid "Private _key"
 msgstr "私钥(_K)"
 
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:6
+#: panels/network/wireless-security/eap-method-tls.ui:140
 msgid "_Private key password"
 msgstr "私钥密码(_P)"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:63
+#: panels/network/wireless-security/eap-method-ttls.c:63
 #, 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:68
 msgid "invalid EAP-TTLS CA certificate: no certificate specified"
 msgstr "无效的 EAP-TTLS CA 证书:未指定证书"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:258
+#: panels/network/wireless-security/eap-method-ttls.c:259
 msgid "PAP"
 msgstr "PAP"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:273
+#: panels/network/wireless-security/eap-method-ttls.c:274
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:303
+#: panels/network/wireless-security/eap-method-ttls.c:305
+msgid "MSCHAPv2 (no EAP)"
+msgstr "MSCHAPv2(无 EAP)"
+
+#: panels/network/wireless-security/eap-method-ttls.c:321
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../panels/network/wireless-security/wireless-security.c:87
-msgid "Unknown error validating 802.1x security"
+#: panels/network/wireless-security/wireless-security.c:87
+msgid "Unknown error validating 802.1X security"
 msgstr "验证 802.1x 安全性时发生未知错误"
 
-#: ../panels/network/wireless-security/wireless-security.c:451
+#: panels/network/wireless-security/wireless-security.c:453
 msgid "TLS"
 msgstr "TLS"
 
-#: ../panels/network/wireless-security/wireless-security.c:475
+#: panels/network/wireless-security/wireless-security.c:477
 msgid "PWD"
 msgstr "PWD"
 
-#: ../panels/network/wireless-security/wireless-security.c:486
+#: panels/network/wireless-security/wireless-security.c:488
 msgid "FAST"
 msgstr "FAST"
 
-#: ../panels/network/wireless-security/wireless-security.c:497
+#: panels/network/wireless-security/wireless-security.c:499
 msgid "Tunneled TLS"
 msgstr "隧道 TLS"
 
-#: ../panels/network/wireless-security/wireless-security.c:508
+#: panels/network/wireless-security/wireless-security.c:510
 msgid "Protected EAP (PEAP)"
 msgstr "受保护的 EAP (PEAP)"
 
-#: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:2
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:9
-#: ../panels/network/wireless-security/ws-wpa-eap.ui.h:2
+#: 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
 msgid "Au_thentication"
 msgstr "认证(_T)"
 
-#: ../panels/network/wireless-security/ws-leap.c:63
+#: panels/network/wireless-security/ws-leap.c:63
 msgid "missing leap-username"
 msgstr "缺失 leap-username"
 
-#: ../panels/network/wireless-security/ws-leap.c:74
+#: panels/network/wireless-security/ws-leap.c:74
 msgid "missing leap-password"
 msgstr "缺失 leap-password"
 
-#: ../panels/network/wireless-security/ws-wep-key.c:107
+#: panels/network/wireless-security/ws-wep-key.c:107
 msgid "missing wep-key"
 msgstr "缺失 wep-key"
 
-#: ../panels/network/wireless-security/ws-wep-key.c:116
+#: panels/network/wireless-security/ws-wep-key.c:116
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr "无效的 wep-key:%zu 长度的密钥只能包含十六进制数字"
 
-#: ../panels/network/wireless-security/ws-wep-key.c:124
+#: panels/network/wireless-security/ws-wep-key.c:124
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr "无效的 wep-key:%zu 长度的密钥只能包含 ASCII 字符"
 
-#: ../panels/network/wireless-security/ws-wep-key.c:130
+#: panels/network/wireless-security/ws-wep-key.c:130
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
-msgstr ""
-"无效的 wep-key:错误的密钥长度 %zu。密钥必须为长度 5/13 (ASCII) 或者 10/26 "
-"(十六进制)"
+msgstr "无效的 wep-key:错误的密钥长度 %zu。密钥必须为长度 5/13 (ASCII) 或者 10/26 (十六进制)"
 
-#: ../panels/network/wireless-security/ws-wep-key.c:137
+#: panels/network/wireless-security/ws-wep-key.c:137
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "无效的 wep-key:密码字段不能为空"
 
-#: ../panels/network/wireless-security/ws-wep-key.c:139
+#: panels/network/wireless-security/ws-wep-key.c:139
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "无效的 wep-key:密码字段必须短于 64 个字符"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:1
+#: panels/network/wireless-security/ws-wep-key.ui:11
 msgid "1 (Default)"
 msgstr "1(默认)"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:2
-msgid "2"
-msgstr "2"
-
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:3
-msgid "3"
-msgstr "3"
-
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:4
-msgid "4"
-msgstr "4"
-
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:5
+#: panels/network/wireless-security/ws-wep-key.ui:31
 msgid "Open System"
 msgstr "开放系统"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:6
+#: panels/network/wireless-security/ws-wep-key.ui:34
 msgid "Shared Key"
 msgstr "共享密钥"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:7
+#: panels/network/wireless-security/ws-wep-key.ui:56
 msgid "_Key"
 msgstr "密钥(_K)"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:8
+#: panels/network/wireless-security/ws-wep-key.ui:94
 msgid "Sho_w key"
 msgstr "显示密钥(_W)"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:10
+#: panels/network/wireless-security/ws-wep-key.ui:152
 msgid "WEP inde_x"
 msgstr "WEP 索引(_X)"
 
-#: ../panels/network/wireless-security/ws-wpa-psk.c:70
+#: panels/network/wireless-security/ws-wpa-psk.c:70
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
-msgstr ""
-"无效的 wep-psk:无效的密钥长度 %zu。必须为 [8,63] 字节或者 64 位十六进制数字"
+msgstr "无效的 wep-psk:无效的密钥长度 %zu。必须为 [8,63] 字节或者 64 位十六进制数字"
 
-#: ../panels/network/wireless-security/ws-wpa-psk.c:79
+#: panels/network/wireless-security/ws-wpa-psk.c:79
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr "无效的 wep-psk:无法将 64 字节作为十六进制来解析密钥"
 
-#: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2
+#: panels/network/wireless-security/ws-wpa-psk.ui:50
 msgid "_Type"
 msgstr "类型(_T)"
 
-#: ../panels/notifications/cc-notifications-panel.c:257
-#: ../panels/power/cc-power-panel.c:1974 ../panels/power/cc-power-panel.c:1981
-#: ../panels/privacy/cc-privacy-panel.c:190
-#: ../panels/privacy/cc-privacy-panel.c:257
-#: ../panels/universal-access/cc-ua-panel.c:269
-#: ../panels/universal-access/cc-ua-panel.c:590
-#: ../panels/universal-access/cc-ua-panel.c:603
-#: ../panels/universal-access/cc-ua-panel.c:615
-#: ../panels/universal-access/cc-ua-panel.c:786
-msgid "On"
-msgstr "开"
-
 #. This is the per application switch for message tray usage.
-#: ../panels/notifications/edit-dialog.ui.h:2
+#: panels/notifications/edit-dialog.ui:64
 msgctxt "notifications"
 msgid "_Notifications"
 msgstr "通知(_N)"
 
 #. This is the setting to configure sounds associated with notifications.
-#: ../panels/notifications/edit-dialog.ui.h:4
+#: panels/notifications/edit-dialog.ui:116
 msgctxt "notifications"
 msgid "Sound _Alerts"
 msgstr "声音警告(_A)"
 
-#: ../panels/notifications/edit-dialog.ui.h:5
+#: panels/notifications/edit-dialog.ui:172
 msgctxt "notifications"
-msgid "Notification _Banners"
-msgstr "通知条幅(_B)"
+msgid "Notification _Popups"
+msgstr "通知(_P)弹出窗口"
+
+#: panels/notifications/edit-dialog.ui:188
+msgid ""
+"Notifications will continue to appear in the notification list when popups "
+"are disabled."
+msgstr "当弹出窗口被禁用时,通知将继续出现在通知列表中。"
 
-#. Banners here refers to message tray notifications in the middle of the screen.
-#: ../panels/notifications/edit-dialog.ui.h:7
+#. Popups here refers to message tray notifications in the middle of the screen.
+#: panels/notifications/edit-dialog.ui:253
 msgctxt "notifications"
-msgid "Show Message _Content in Banners"
-msgstr "在通知条幅中显示消息内容(_C)"
+msgid "Show Message _Content in Popups"
+msgstr "在弹出式窗口中显示消息(_C)内容"
 
-#: ../panels/notifications/edit-dialog.ui.h:8
+#: panels/notifications/edit-dialog.ui:304
 msgctxt "notifications"
 msgid "_Lock Screen Notifications"
 msgstr "锁屏通知(_L)"
 
-#: ../panels/notifications/edit-dialog.ui.h:9
+#: panels/notifications/edit-dialog.ui:355
 msgctxt "notifications"
 msgid "Show Message C_ontent on Lock Screen"
 msgstr "锁屏时显示显示消息内容(_O)"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2
-msgid "No­ti­fi­ca­tions"
+#: panels/notifications/gnome-notifications-panel.desktop.in.in:3
+msgid "Notifications"
 msgstr "通知"
 
-#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3
+#: panels/notifications/gnome-notifications-panel.desktop.in.in:4
 msgid "Control which notifications are displayed and what they show"
 msgstr "控制显示的通知种类及内容"
 
-#. Translators: those are keywords for the notifications control-center panel
-#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/notifications/gnome-notifications-panel.desktop.in.in:7
+msgid "preferences-system-notifications"
+msgstr "preferences-system-notifications"
+
+#. Translators: Search terms to find the Notifications panel. Do NOT translate or localize the semicolons! 
The list MUST also end with a semicolon!
+#: panels/notifications/gnome-notifications-panel.desktop.in.in:20
 msgid "Notifications;Banner;Message;Tray;Popup;"
-msgstr ""
-"Notifications;Banner;Message;Tray;Popup;通知;横幅;条幅;黑条;消息;托盘;弹出;"
+msgstr "Notifications;Banner;Message;Tray;Popup;"
 
-#: ../panels/notifications/notifications.ui.h:1
-msgid "Notification _Banners"
-msgstr "通知条幅"
+#: panels/notifications/notifications.ui:84
+msgid "Notification _Popups"
+msgstr "通知(_P)弹出窗口"
 
-#: ../panels/notifications/notifications.ui.h:2
+#: panels/notifications/notifications.ui:134
 msgid "_Lock Screen Notifications"
 msgstr "锁屏通知(_L)"
 
 #. List of applications.
-#: ../panels/notifications/notifications.ui.h:4
-#: ../panels/privacy/privacy.ui.h:45 ../panels/sound/gvc-mixer-dialog.c:1781
+#: panels/notifications/notifications.ui:180 panels/privacy/privacy.ui:875
+#: panels/sound/gvc-mixer-dialog.c:1768
 msgid "Applications"
 msgstr "应用程序"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:170
+#: panels/online-accounts/cc-online-accounts-panel.c:148
 msgctxt "Online Account"
 msgid "Other"
 msgstr "其他"
 
-#. translators: This is the title of the "Add Account" dialog.
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291
-#: ../panels/online-accounts/online-accounts.ui.h:2
-msgid "Add Account"
-msgstr "添加帐号"
-
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328
-msgid "Mail"
-msgstr "邮件"
-
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334
-msgid "Calendar"
-msgstr "日历"
-
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340
-msgid "Contacts"
-msgstr "联系人"
-
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:346
-msgid "Chat"
-msgstr "聊天"
-
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:352
-msgid "Resources"
-msgstr "资源"
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:640
-msgid "Error creating account"
-msgstr "创建帐号出错"
+#. 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:612
+#, c-format
+msgid "%s Account"
+msgstr "%s 帐户"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:700
+#: panels/online-accounts/cc-online-accounts-panel.c:904
 msgid "Error removing account"
-msgstr "移除帐号出错"
+msgstr "移除帐户出错"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:736
-msgid "Are you sure you want to remove the account?"
-msgstr "确定要移除这个帐号吗?"
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:738
-msgid "This will not remove the account on the server."
-msgstr "这不会将该帐号从服务器上移除。"
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:739
-msgid "_Remove"
-msgstr "移除(_R)"
+#. Translators: The %s is the username (eg., debarshi ray gmail com
+#. * or rishi).
+#.
+#: panels/online-accounts/cc-online-accounts-panel.c:969
+#, c-format
+msgid "<b>%s</b> removed"
+msgstr "<b>%s</b> 已移除"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2
-msgid "On­line Accounts"
-msgstr "在线帐号"
+#: panels/online-accounts/gnome-online-accounts-panel.desktop.in.in:3
+msgid "Online Accounts"
+msgstr "在线帐户"
 
-#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3
+#: panels/online-accounts/gnome-online-accounts-panel.desktop.in.in:4
 msgid "Connect to your online accounts and decide what to use them for"
 msgstr "连接在线帐号并决定如何使用"
 
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/online-accounts/gnome-online-accounts-panel.desktop.in.in:7
+msgid "goa-panel"
+msgstr "goa-panel"
+
+#. Translators: Search terms to find the Online Accounts panel.
+#. Do NOT translate or localize the semicolons!
+#. The list MUST also end with a semicolon!
 #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application)
-#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5
+#: panels/online-accounts/gnome-online-accounts-panel.desktop.in.in:22
 msgid ""
 "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;"
 "Kerberos;IMAP;SMTP;Pocket;ReadItLater;"
-msgstr ""
-"Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;"
-"Kerberos;IMAP;SMTP;Pocket;ReadItLater;谷歌;脸谱;脸书;推特;雅虎;互联网;网络;在"
-"线;聊天;日历;邮件;联系人;云存储;稍后阅读;"
+msgstr 
"Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;Kerberos;IMAP;SMTP;Pocket;ReadItLater;"
 
-#: ../panels/online-accounts/online-accounts.ui.h:1
-msgid "No online accounts configured"
-msgstr "未设置在线帐号"
+#. 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
+msgid "Undo"
+msgstr "撤销"
 
-#: ../panels/online-accounts/online-accounts.ui.h:3
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
-msgid "Remove Account"
-msgstr "移除帐号"
+#: panels/online-accounts/online-accounts.ui:125
+msgid "Connect to your data in the cloud"
+msgstr "连接到您在云中的数据"
 
-#: ../panels/online-accounts/online-accounts.ui.h:4
-msgid "Add an online account"
-msgstr "添加在线帐号"
+#: panels/online-accounts/online-accounts.ui:137
+msgid "No internet connection — connect to set up new online accounts"
+msgstr "没有互联网连接 -- 连接后设置新的在线账户。"
 
-# 统一下翻译
-#: ../panels/online-accounts/online-accounts.ui.h:5
-msgid ""
-"Adding an account allows your applications to access it for documents, mail, "
-"contacts, calendar, chat and more."
-msgstr "添加一个帐号以让您的应用访问帐号的文档、邮件、联系人、日历、聊天等。"
+#: panels/online-accounts/online-accounts.ui:159
+msgid "Add an account"
+msgstr "添加在线帐户"
+
+#: panels/online-accounts/online-accounts.ui:264
+msgid "Remove Account"
+msgstr "移除帐号"
 
-#: ../panels/power/cc-power-panel.c:253
+#: panels/power/cc-power-panel.c:253
 msgid "Unknown time"
 msgstr "未知时间"
 
-#: ../panels/power/cc-power-panel.c:259
+#: panels/power/cc-power-panel.c:259
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i 分钟"
 
-#: ../panels/power/cc-power-panel.c:271
+#: panels/power/cc-power-panel.c:271
 #, c-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -3767,1123 +4018,1217 @@ msgstr[0] "%i 小时"
 
 #. 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:279
+#: panels/power/cc-power-panel.c:279
 #, c-format
 msgid "%i %s %i %s"
 msgstr "%i %s %i %s"
 
-#: ../panels/power/cc-power-panel.c:280
+#: panels/power/cc-power-panel.c:280
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "时"
 
-#: ../panels/power/cc-power-panel.c:281
+#: panels/power/cc-power-panel.c:281
 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:300
+#: panels/power/cc-power-panel.c:300
 #, 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:307
+#: panels/power/cc-power-panel.c:307
 #, 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:312
+#: panels/power/cc-power-panel.c:312
 #, c-format
 msgid "%s remaining"
 msgstr "剩余 %s"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:317 ../panels/power/cc-power-panel.c:345
+#: panels/power/cc-power-panel.c:317 panels/power/cc-power-panel.c:345
 msgid "Fully charged"
 msgstr "已充满"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:321 ../panels/power/cc-power-panel.c:349
+#: panels/power/cc-power-panel.c:321 panels/power/cc-power-panel.c:349
 msgid "Empty"
 msgstr "电池已耗尽"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:336
+#: panels/power/cc-power-panel.c:336
 msgid "Charging"
 msgstr "正在充电"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:341
+#: panels/power/cc-power-panel.c:341
 msgid "Discharging"
 msgstr "正在放电"
 
-#: ../panels/power/cc-power-panel.c:464
+#: panels/power/cc-power-panel.c:464
 msgctxt "Battery name"
 msgid "Main"
 msgstr "主电池"
 
-#: ../panels/power/cc-power-panel.c:466
+#: panels/power/cc-power-panel.c:466
 msgctxt "Battery name"
 msgid "Extra"
 msgstr "附加电池"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:537
+#: panels/power/cc-power-panel.c:537
 msgid "Wireless mouse"
 msgstr "无线鼠标"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:540
+#: panels/power/cc-power-panel.c:540
 msgid "Wireless keyboard"
 msgstr "无线键盘"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:543
+#: panels/power/cc-power-panel.c:543
 msgid "Uninterruptible power supply"
 msgstr "不间断电源 (UPS)"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:546
+#: panels/power/cc-power-panel.c:546
 msgid "Personal digital assistant"
 msgstr "个人数字助理(PDA)"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:549
+#: panels/power/cc-power-panel.c:549
 msgid "Cellphone"
 msgstr "手机"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:552
+#: panels/power/cc-power-panel.c:552
 msgid "Media player"
 msgstr "媒体播放器"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:555
+#: panels/power/cc-power-panel.c:555 panels/wacom/cc-wacom-panel.c:837
 msgid "Tablet"
 msgstr "手写板"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:558
+#: panels/power/cc-power-panel.c:558
 msgid "Computer"
 msgstr "计算机"
 
+#. TRANSLATORS: secondary battery
+#: panels/power/cc-power-panel.c:561
+msgid "Gaming input device"
+msgstr "游戏输入设备"
+
 #. TRANSLATORS: secondary battery, misc
-#: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801
-#: ../panels/power/cc-power-panel.c:2366
+#: panels/power/cc-power-panel.c:564 panels/power/cc-power-panel.c:804
+#: panels/power/cc-power-panel.c:2380
 msgid "Battery"
 msgstr "电池"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:615
+#: panels/power/cc-power-panel.c:618
 msgctxt "Battery power"
 msgid "Charging"
 msgstr "正在充电"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:622
+#: panels/power/cc-power-panel.c:625
 msgctxt "Battery power"
 msgid "Caution"
 msgstr "警告"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:627
+#: panels/power/cc-power-panel.c:630
 msgctxt "Battery power"
 msgid "Low"
 msgstr "低"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:632
+#: panels/power/cc-power-panel.c:635
 msgctxt "Battery power"
 msgid "Good"
 msgstr "充足"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:637
+#: panels/power/cc-power-panel.c:640
 msgctxt "Battery power"
 msgid "Fully charged"
 msgstr "已充满"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:641
+#: panels/power/cc-power-panel.c:644
 msgctxt "Battery power"
 msgid "Empty"
 msgstr "电池已耗尽"
 
-#: ../panels/power/cc-power-panel.c:799
+#: panels/power/cc-power-panel.c:802
 msgid "Batteries"
 msgstr "电池"
 
-#: ../panels/power/cc-power-panel.c:1227
+#: panels/power/cc-power-panel.c:1242
 msgid "When _idle"
 msgstr "空闲时(_I)"
 
-#: ../panels/power/cc-power-panel.c:1681
+#: panels/power/cc-power-panel.c:1696
 msgid "Power Saving"
 msgstr "节电"
 
-#: ../panels/power/cc-power-panel.c:1716
+#: panels/power/cc-power-panel.c:1727
 msgid "_Screen brightness"
 msgstr "屏幕亮度(_S)"
 
-#: ../panels/power/cc-power-panel.c:1735
+#: panels/power/cc-power-panel.c:1746
 msgid "Automatic brightness"
 msgstr "自动亮度"
 
-#: ../panels/power/cc-power-panel.c:1755
+#: panels/power/cc-power-panel.c:1766
 msgid "_Keyboard brightness"
 msgstr "键盘亮度(_K)"
 
-#: ../panels/power/cc-power-panel.c:1765
+#: panels/power/cc-power-panel.c:1776
 msgid "_Dim screen when inactive"
 msgstr "无操作时使屏幕变暗(_D)"
 
-#: ../panels/power/cc-power-panel.c:1790
+#: panels/power/cc-power-panel.c:1801
 msgid "_Blank screen"
 msgstr "空白屏幕(_B)"
 
-#: ../panels/power/cc-power-panel.c:1827
+#: panels/power/cc-power-panel.c:1838
 msgid "_Wi-Fi"
 msgstr "_Wi-Fi"
 
-#: ../panels/power/cc-power-panel.c:1832
+#: panels/power/cc-power-panel.c:1843
 msgid "Turn off Wi-Fi to save power."
 msgstr "关闭 Wi-Fi 以节省电源。"
 
-#: ../panels/power/cc-power-panel.c:1857
+#: panels/power/cc-power-panel.c:1868
 msgid "_Mobile broadband"
 msgstr "移动宽带(_M)"
 
-#: ../panels/power/cc-power-panel.c:1862
+#: panels/power/cc-power-panel.c:1873
 msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power."
 msgstr "关闭移动宽带(3G、4G、WiMax 等)以节省电源。"
 
-#: ../panels/power/cc-power-panel.c:1907
+#: panels/power/cc-power-panel.c:1926
 msgid "_Bluetooth"
 msgstr "蓝牙(_B)"
 
-#: ../panels/power/cc-power-panel.c:1970
+#: panels/power/cc-power-panel.c:1931
+msgid "Turn off Bluetooth to save power."
+msgstr "关闭蓝牙以省电。"
+
+#: panels/power/cc-power-panel.c:1990
 msgid "When on battery power"
 msgstr "电池供电时"
 
-#: ../panels/power/cc-power-panel.c:1972
+#: panels/power/cc-power-panel.c:1992
 msgid "When plugged in"
 msgstr "插入电源时"
 
-#: ../panels/power/cc-power-panel.c:2067
+#: panels/power/cc-power-panel.c:2087
 msgid "Suspend"
 msgstr "挂起"
 
-#: ../panels/power/cc-power-panel.c:2068
+#: panels/power/cc-power-panel.c:2088
+msgid "Power Off"
+msgstr "电源关闭"
+
+#: panels/power/cc-power-panel.c:2089
 msgid "Hibernate"
 msgstr "休眠"
 
-#: ../panels/power/cc-power-panel.c:2069
+#: panels/power/cc-power-panel.c:2090
 msgid "Nothing"
 msgstr "不处理"
 
 #. Frame header
-#: ../panels/power/cc-power-panel.c:2183
+#: panels/power/cc-power-panel.c:2204
 msgid "Suspend & Power Button"
 msgstr "挂起和关机按钮"
 
-#: ../panels/power/cc-power-panel.c:2226
+#: panels/power/cc-power-panel.c:2243
 msgid "_Automatic suspend"
 msgstr "自动挂起(_A)"
 
-#: ../panels/power/cc-power-panel.c:2227
+#: panels/power/cc-power-panel.c:2244
 msgid "Automatic suspend"
 msgstr "自动挂起"
 
-#: ../panels/power/cc-power-panel.c:2294
+#: panels/power/cc-power-panel.c:2311
 msgid "_When the Power Button is pressed"
 msgstr "按下电源按钮时(_W)"
 
-#: ../panels/power/cc-power-panel.c:2420 ../shell/alt/cc-window.c:270
-#: ../shell/panel-list.ui.h:1
+#: panels/power/cc-power-panel.c:2430 shell/cc-window.c:216
+#: shell/panel-list.ui:45
 msgid "Devices"
 msgstr "设备"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/power/gnome-power-panel.desktop.in.in.h:2
-msgid "Po­wer"
+#: panels/power/gnome-power-panel.desktop.in.in:3
+msgid "Power"
 msgstr "电源"
 
-#: ../panels/power/gnome-power-panel.desktop.in.in.h:3
+#: panels/power/gnome-power-panel.desktop.in.in:4
 msgid "View your battery status and change power saving settings"
 msgstr "查看电池状态并更改省电设置"
 
-#. Translators: those are keywords for the power control-center panel
-#: ../panels/power/gnome-power-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/power/gnome-power-panel.desktop.in.in:7
+msgid "gnome-power-manager"
+msgstr "gnome-power-manager"
+
+#. Translators: Search terms to find the Power panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+#: panels/power/gnome-power-panel.desktop.in.in:19
 msgid ""
 "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;"
-msgstr ""
-"Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;"
-"电源;睡眠;挂起;休眠;电池;亮度;暗;空白;显示器;空闲;"
+msgstr "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;"
+
+#: panels/power/power.ui:17
+msgid "20 minutes"
+msgstr "20 分钟"
 
-#: ../panels/power/power.ui.h:3
+#: panels/power/power.ui:21
+msgid "25 minutes"
+msgstr "25 分钟"
+
+#: panels/power/power.ui:29
 msgid "45 minutes"
 msgstr "45 分钟"
 
-#: ../panels/power/power.ui.h:4 ../panels/privacy/privacy.ui.h:8
+#: panels/power/power.ui:33 panels/privacy/privacy.ui:42
+#: panels/privacy/privacy.ui:56
 msgid "1 hour"
 msgstr "1 小时"
 
-#: ../panels/power/power.ui.h:5
+#: panels/power/power.ui:37
 msgid "80 minutes"
 msgstr "80 分钟"
 
-#: ../panels/power/power.ui.h:6
+#: panels/power/power.ui:41
 msgid "90 minutes"
 msgstr "90 分钟"
 
-#: ../panels/power/power.ui.h:7
+#: panels/power/power.ui:45
 msgid "100 minutes"
 msgstr "100 分钟"
 
-#: ../panels/power/power.ui.h:8
+#: panels/power/power.ui:49
 msgid "2 hours"
 msgstr "2 小时"
 
-#: ../panels/power/power.ui.h:9 ../panels/privacy/privacy.ui.h:3
+#: panels/power/power.ui:63 panels/privacy/privacy.ui:22
 msgid "1 minute"
 msgstr "1 分钟"
 
-#: ../panels/power/power.ui.h:10 ../panels/privacy/privacy.ui.h:4
+#: panels/power/power.ui:67 panels/privacy/privacy.ui:26
 msgid "2 minutes"
 msgstr "2 分钟"
 
-#: ../panels/power/power.ui.h:11 ../panels/privacy/privacy.ui.h:5
+#: panels/power/power.ui:71 panels/privacy/privacy.ui:30
 msgid "3 minutes"
 msgstr "3 分钟"
 
-#: ../panels/power/power.ui.h:12
+#: panels/power/power.ui:75
 msgid "4 minutes"
 msgstr "4 分钟"
 
-#: ../panels/power/power.ui.h:13 ../panels/privacy/privacy.ui.h:6
+#: panels/power/power.ui:79 panels/privacy/privacy.ui:34
 msgid "5 minutes"
 msgstr "5 分钟"
 
-#: ../panels/power/power.ui.h:14
+#: panels/power/power.ui:83
 msgid "8 minutes"
 msgstr "8 分钟"
 
-#: ../panels/power/power.ui.h:15
+#: panels/power/power.ui:87
 msgid "10 minutes"
 msgstr "10 分钟"
 
-#: ../panels/power/power.ui.h:16
+#: panels/power/power.ui:91
 msgid "12 minutes"
 msgstr "12 分钟"
 
-#: ../panels/power/power.ui.h:18
+#: panels/power/power.ui:155
 msgid "Automatic Suspend"
 msgstr "自动挂起"
 
-#: ../panels/power/power.ui.h:19
+#: panels/power/power.ui:180
 msgid "_Plugged In"
 msgstr "已插入电源(_P)"
 
-#: ../panels/power/power.ui.h:20
+#: panels/power/power.ui:196
 msgid "On _Battery Power"
 msgstr "使用电池时(_B)"
 
-#: ../panels/power/power.ui.h:21 ../panels/universal-access/uap.ui.h:33
+#: panels/power/power.ui:241 panels/power/power.ui:301
+#: panels/universal-access/uap.ui:1501
 msgid "Delay"
 msgstr "延迟"
 
-#: ../panels/printers/authentication-dialog.ui.h:3
+#: panels/printers/authentication-dialog.ui:11
+msgid " "
+msgstr " "
+
+#: panels/printers/authentication-dialog.ui:42
 msgid "Authenticate"
 msgstr "认证"
 
-#: ../panels/printers/authentication-dialog.ui.h:6
+#. 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:361
+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:382
+#: panels/user-accounts/data/account-dialog.ui:240
+msgid "Password"
+msgstr "密码"
+
+#: panels/printers/authentication-dialog.ui:139
+#: panels/printers/new-printer-dialog.ui:336
 msgid "Authentication Required"
 msgstr "需要认证"
 
-#. Translators: The printer is low on toner
-#: ../panels/printers/cc-printers-panel.c:684
-msgid "Low on toner"
-msgstr "墨粉不足"
+#. Translators: %s is the printer name
+#: panels/printers/cc-printers-panel.c:842
+#, c-format
+msgid "Printer “%s” has been deleted"
+msgstr "打印机 \"%s\" 已被删除"
 
-#. Translators: The printer has no toner left
-#: ../panels/printers/cc-printers-panel.c:686
-msgid "Out of toner"
-msgstr "墨粉用尽"
+#. Translators: Addition of the new printer failed.
+#: panels/printers/cc-printers-panel.c:1142
+msgid "Failed to add new printer."
+msgstr "添加新打印机失败。"
 
-#. Translators: "Developer" is a chemical for photo development,
-#. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:689
-msgid "Low on developer"
-msgstr "显影剂不足"
+#. Translators: The XML file containing user interface can not be loaded
+#: panels/printers/cc-printers-panel.c:1514
+#, c-format
+msgid "Could not load ui: %s"
+msgstr "无法载入界面:%s"
 
-#. Translators: "Developer" is a chemical for photo development,
-#. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:692
-msgid "Out of developer"
-msgstr "显影剂用尽"
+#: panels/printers/details-dialog.ui:63 panels/printers/printer-entry.ui:223
+msgid "Location"
+msgstr "位置"
 
-#. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:694
-msgid "Low on a marker supply"
-msgstr "标记墨水不足"
+#. Translators: Name of column showing printer drivers
+#: panels/printers/details-dialog.ui:111
+#: panels/printers/pp-ppd-selection-dialog.c:250
+msgid "Driver"
+msgstr "驱动"
 
-#. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:696
-msgid "Out of a marker supply"
-msgstr "标记墨水用尽"
+#: panels/printers/details-dialog.ui:147
+msgid "Searching for preferred drivers…"
+msgstr "正在搜索首选驱动…..."
 
-#. Translators: One or more covers on the printer are open
-#: ../panels/printers/cc-printers-panel.c:698
-msgid "Open cover"
-msgstr "打开上盖"
+#: panels/printers/details-dialog.ui:169
+msgid "Search for Drivers"
+msgstr "搜索驱动"
 
-#. Translators: One or more doors on the printer are open
-#: ../panels/printers/cc-printers-panel.c:700
-msgid "Open door"
-msgstr "打开后盖"
+#: panels/printers/details-dialog.ui:177
+msgid "Select from Database…"
+msgstr "从数据库选择…..."
 
-#. Translators: At least one input tray is low on media
-#: ../panels/printers/cc-printers-panel.c:702
-msgid "Low on paper"
-msgstr "纸张不足"
+#: panels/printers/details-dialog.ui:185
+msgid "Install PPD File…"
+msgstr "安装 PPD 文件…..."
 
-#. Translators: At least one input tray is empty
-#: ../panels/printers/cc-printers-panel.c:704
-msgid "Out of paper"
-msgstr "纸张用尽"
+#: panels/printers/gnome-printers-panel.desktop.in.in:3
+msgid "Printers"
+msgstr "打印机"
 
-#. Translators: The printer is offline
-#: ../panels/printers/cc-printers-panel.c:706
-msgctxt "printer state"
-msgid "Offline"
-msgstr "离线"
+#: panels/printers/gnome-printers-panel.desktop.in.in:4
+msgid "Add printers, view printer jobs and decide how you want to print"
+msgstr "添加打印机,查看打印任务和管理打印"
 
-#. Translators: Someone has stopped the Printer
-#. Translators: Printer's state (no jobs can be processed)
-#: ../panels/printers/cc-printers-panel.c:708
-#: ../panels/printers/cc-printers-panel.c:898
-msgctxt "printer state"
-msgid "Stopped"
-msgstr "已停止"
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/printers/gnome-printers-panel.desktop.in.in:7
+msgid "printer"
+msgstr "打印机"
 
-#. Translators: The printer marker supply waste receptacle is almost full
-#: ../panels/printers/cc-printers-panel.c:710
-msgid "Waste receptacle almost full"
-msgstr "废粉仓将满"
+#. Translators: Search terms to find the Printers panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#: panels/printers/gnome-printers-panel.desktop.in.in:16
+msgid "Printer;Queue;Print;Paper;Ink;Toner;"
+msgstr "Printer;Queue;Print;Paper;Ink;Toner;"
 
-#. Translators: The printer marker supply waste receptacle is full
-#: ../panels/printers/cc-printers-panel.c:712
-msgid "Waste receptacle full"
-msgstr "废粉仓已满"
+#. Translators: This is a windows domain used with SMB protocol.
+#: panels/printers/jobs-dialog.ui:44
+msgid "Domain"
+msgstr "域"
 
-#. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:714
-msgid "The optical photo conductor is near end of life"
-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: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:716
-msgid "The optical photo conductor is no longer functioning"
-msgstr "感光鼓故障"
+#. Translators: this action removes (purges) all the listed jobs from the list.
+#: panels/printers/jobs-dialog.ui:163
+msgid "Clear All"
+msgstr "全部清除"
 
-#. Translators: Printer's state (printer is being configured right now)
-#: ../panels/printers/cc-printers-panel.c:825
-msgctxt "printer state"
-msgid "Configuring"
-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: Printer's state (can start new job without waiting)
-#: ../panels/printers/cc-printers-panel.c:884
-msgctxt "printer state"
-msgid "Ready"
-msgstr "就绪"
+#. 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: Printer's state (printer is ready but doesn't accept new jobs)
-#: ../panels/printers/cc-printers-panel.c:889
-msgctxt "printer state"
-msgid "Does not accept 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:384
+#: panels/printers/pp-new-printer-dialog.c:456
+msgid "Add Printer"
+msgstr "添加打印机"
 
-#. Translators: Printer's state (jobs are processing)
-#: ../panels/printers/cc-printers-panel.c:894
-msgctxt "printer state"
-msgid "Processing"
-msgstr "正在处理"
+#. Translators: This button opens authentication dialog for selected server.
+#. Translators: This buttons submits the credentials for the selected server.
+#: panels/printers/new-printer-dialog.ui:96
+#: panels/printers/new-printer-dialog.ui:111
+msgid "_Unlock"
+msgstr "解锁(_U)"
 
-# 以下几个level似乎译为“量”更好
-#. Translators: Toner supply
-#: ../panels/printers/cc-printers-panel.c:1014
-msgid "Toner Level"
-msgstr "碳粉量"
+#. Translators: No printers were detected
+#: panels/printers/new-printer-dialog.ui:210
+msgid "No Printers Found"
+msgstr "没有找到打印机"
 
-#. Translators: Ink supply
-#: ../panels/printers/cc-printers-panel.c:1017
-msgid "Ink Level"
-msgstr "墨水量"
+#. Translators: The entered text should contain network address of a printer or a text which will filter 
found devices (their names and locations)
+#: panels/printers/new-printer-dialog.ui:283
+msgid "Enter a network address or search for a printer"
+msgstr "输入网络地址或搜索打印机"
 
-#. Translators: By supply we mean ink, toner, staples, water, ...
-#: ../panels/printers/cc-printers-panel.c:1020
-msgid "Supply Level"
-msgstr "耗材量"
+#: panels/printers/new-printer-dialog.ui:352
+msgid "Enter username and password to view printers on Print Server."
+msgstr "输入用户名和密码以查看打印服务器上的打印机。"
 
-#. Translators: Printer's state (printer is being installed right now)
-#: ../panels/printers/cc-printers-panel.c:1038
-msgctxt "printer state"
-msgid "Installing"
-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:893
+msgid "Test Page"
+msgstr "测试页"
 
-#. Translators: there is n active print jobs on this printer
-#: ../panels/printers/cc-printers-panel.c:1552
+#. Translators: This is the title of the dialog. %s is the printer name.
+#: panels/printers/pp-details-dialog.c:135
+#: panels/printers/pp-details-dialog.c:435
 #, c-format
-msgid "%u active"
-msgid_plural "%u active"
-msgstr[0] "%u 项活动任务"
+msgid "%s Details"
+msgstr "%s 详细信息"
 
-#. Translators: Addition of the new printer failed.
-#: ../panels/printers/cc-printers-panel.c:1893
-msgid "Failed to add new printer."
-msgstr "添加新打印机失败。"
+#: panels/printers/pp-details-dialog.c:184
+msgid "No suitable driver found"
+msgstr "未找到合适的驱动"
 
-#: ../panels/printers/cc-printers-panel.c:2074
+#: panels/printers/pp-details-dialog.c:328
 msgid "Select PPD File"
 msgstr "选择 PPD 文件"
 
-#: ../panels/printers/cc-printers-panel.c:2083
+#: panels/printers/pp-details-dialog.c:337
 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/cc-printers-panel.c:2390
-msgid "No suitable driver found"
-msgstr "未找到合适的驱动"
-
-#: ../panels/printers/cc-printers-panel.c:2461
-msgid "Searching for preferred drivers…"
-msgstr "正在搜索首选驱动…"
-
-#: ../panels/printers/cc-printers-panel.c:2482
-msgid "Select from database…"
-msgstr "从数据库选择…"
-
-#: ../panels/printers/cc-printers-panel.c:2491
-msgid "Provide PPD File…"
-msgstr "提供 PPD 文件…"
-
-#. Translators: Name of job which makes printer to print test page
-#: ../panels/printers/cc-printers-panel.c:2638
-#: ../panels/printers/cc-printers-panel.c:2661
-msgid "Test page"
-msgstr "测试页"
-
-#. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:3116
-#, c-format
-msgid "Could not load ui: %s"
-msgstr "无法载入界面:%s"
-
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2
-msgid "Prin­ters"
-msgstr "打印机"
-
-#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3
-msgid "Add printers, view printer jobs and decide how you want to print"
-msgstr "添加打印机,查看打印任务和管理打印"
-
-#. Translators: those are keywords for the printing control-center panel
-#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5
-msgid "Printer;Queue;Print;Paper;Ink;Toner;"
-msgstr ""
-"Printer;Queue;Print;Paper;Ink;Toner;打印机;队列;打印;纸张;墨水;墨粉;硒鼓;墨"
-"盒;"
-
-#. Translators: this action removes (purges) all the listed jobs from the list.
-#: ../panels/printers/jobs-dialog.ui.h:2
-msgid "Clear All"
-msgstr "全部清除"
-
-#. Translators: this label describes the dialog empty state, with no jobs listed.
-#: ../panels/printers/jobs-dialog.ui.h:4
-msgid "No Active Printer Jobs"
-msgstr "没有活动的打印机任务"
-
-#: ../panels/printers/new-printer-dialog.ui.h:1
-msgid "Add a New Printer"
-msgstr "添加打印机"
-
-#. Translators: This button opens authentication dialog for selected server.
-#: ../panels/printers/new-printer-dialog.ui.h:5
-msgid "A_uthenticate"
-msgstr "认证(_U)"
-
-#. Translators: No printers were found
-#: ../panels/printers/new-printer-dialog.ui.h:7
-msgid "No printers detected."
-msgstr "未检测到打印机。"
-
-#. Translators: The entered text should contain network address of a printer or a text which will filter 
found devices (their names and locations)
-#: ../panels/printers/new-printer-dialog.ui.h:9
-msgid "Enter a network address or search for a printer"
-msgstr "输入网络地址或搜索打印机"
-
-#: ../panels/printers/options-dialog.ui.h:1
-msgid "Loading options…"
-msgstr "正在载入选项…"
-
-#: ../panels/printers/ppd-selection-dialog.ui.h:1
+#: panels/printers/ppd-selection-dialog.ui:10
 msgid "Select Printer Driver"
 msgstr "选择打印机驱动"
 
-#: ../panels/printers/ppd-selection-dialog.ui.h:3
-#: ../panels/user-accounts/um-photo-dialog.c:96
+#: panels/printers/ppd-selection-dialog.ui:40
+#: panels/user-accounts/um-photo-dialog.c:105
 msgid "Select"
 msgstr "选择"
 
-#: ../panels/printers/ppd-selection-dialog.ui.h:4
-msgid "Loading drivers database..."
-msgstr "正在载入驱动数据库…"
+#: panels/printers/ppd-selection-dialog.ui:73
+msgid "Loading drivers database…"
+msgstr "正在载入驱动数据库…..."
 
 #. Translators: The found device is a JetDirect printer
-#: ../panels/printers/pp-host.c:526
+#: panels/printers/pp-host.c:539
 msgid "JetDirect Printer"
 msgstr "JetDirect 打印机"
 
 #. Translators: The found device is a Line Printer Daemon printer
-#: ../panels/printers/pp-host.c:782
+#: panels/printers/pp-host.c:795
 msgid "LPD Printer"
 msgstr "LPD 打印机"
 
 #. Translators: this is an option of "Two Sided"
-#: ../panels/printers/pp-ipp-option-widget.c:66
-#: ../panels/printers/pp-ppd-option-widget.c:70
+#: panels/printers/pp-ipp-option-widget.c:66
+#: panels/printers/pp-ppd-option-widget.c:70
 msgid "One Sided"
 msgstr "单面"
 
 #. Translators: this is an option of "Two Sided"
-#: ../panels/printers/pp-ipp-option-widget.c:68
-#: ../panels/printers/pp-ppd-option-widget.c:72
+#: panels/printers/pp-ipp-option-widget.c:68
+#: panels/printers/pp-ppd-option-widget.c:72
 msgid "Long Edge (Standard)"
 msgstr "长边(标准)"
 
 #. Translators: this is an option of "Two Sided"
-#: ../panels/printers/pp-ipp-option-widget.c:70
-#: ../panels/printers/pp-ppd-option-widget.c:74
+#: panels/printers/pp-ipp-option-widget.c:70
+#: panels/printers/pp-ppd-option-widget.c:74
 msgid "Short Edge (Flip)"
 msgstr "短边(翻转)"
 
 #. Translators: this is an option of "Orientation"
-#: ../panels/printers/pp-ipp-option-widget.c:72
+#: panels/printers/pp-ipp-option-widget.c:72
 msgid "Portrait"
 msgstr "纵向"
 
 #. Translators: this is an option of "Orientation"
-#: ../panels/printers/pp-ipp-option-widget.c:74
+#: panels/printers/pp-ipp-option-widget.c:74
 msgid "Landscape"
 msgstr "横向"
 
 #. Translators: this is an option of "Orientation"
-#: ../panels/printers/pp-ipp-option-widget.c:76
+#: panels/printers/pp-ipp-option-widget.c:76
 msgid "Reverse landscape"
 msgstr "横向倒转"
 
 #. Translators: this is an option of "Orientation"
-#: ../panels/printers/pp-ipp-option-widget.c:78
+#: panels/printers/pp-ipp-option-widget.c:78
 msgid "Reverse portrait"
 msgstr "纵向倒转"
 
 #. Translators: Job's state (job is waiting to be printed)
-#: ../panels/printers/pp-jobs-dialog.c:103
+#: panels/printers/pp-jobs-dialog.c:234
 msgctxt "print job"
 msgid "Pending"
 msgstr "等待中"
 
 #. Translators: Job's state (job is held for printing)
-#: ../panels/printers/pp-jobs-dialog.c:107
+#: panels/printers/pp-jobs-dialog.c:240
 msgctxt "print job"
 msgid "Paused"
 msgstr "暂停"
 
+#. Translators: Job's state (job needs authentication to proceed further)
+#: panels/printers/pp-jobs-dialog.c:245
+msgctxt "print job"
+msgid "Authentication required"
+msgstr "需要认证"
+
 #. Translators: Job's state (job is currently printing)
-#: ../panels/printers/pp-jobs-dialog.c:111
+#: panels/printers/pp-jobs-dialog.c:250
 msgctxt "print job"
 msgid "Processing"
 msgstr "正在处理"
 
 #. Translators: Job's state (job has been stopped)
-#: ../panels/printers/pp-jobs-dialog.c:115
+#: panels/printers/pp-jobs-dialog.c:254
 msgctxt "print job"
 msgid "Stopped"
 msgstr "已停止"
 
 #. Translators: Job's state (job has been canceled)
-#: ../panels/printers/pp-jobs-dialog.c:119
+#: panels/printers/pp-jobs-dialog.c:258
 msgctxt "print job"
 msgid "Canceled"
 msgstr "已取消"
 
 #. Translators: Job's state (job has aborted due to error)
-#: ../panels/printers/pp-jobs-dialog.c:123
+#: panels/printers/pp-jobs-dialog.c:262
 msgctxt "print job"
 msgid "Aborted"
 msgstr "已中止"
 
 #. Translators: Job's state (job has completed successfully)
-#: ../panels/printers/pp-jobs-dialog.c:127
+#: panels/printers/pp-jobs-dialog.c:266
 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
+#, 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:289
+#: panels/printers/pp-jobs-dialog.c:620
 #, c-format
 msgctxt "Printer jobs dialog title"
-msgid "%s - Active Jobs"
-msgstr "%s 项活动任务"
+msgid "%s — Active Jobs"
+msgstr "%s — 活跃的作业"
+
+#. Translators: The printer needs authentication info to print.
+#: panels/printers/pp-jobs-dialog.c:625
+#, c-format
+msgid "Enter credentials to print from %s."
+msgstr "输入从 %s 打印的凭证。"
+
+#: panels/printers/pp-new-printer-dialog.c:402
+msgid "Unlock Print Server"
+msgstr "解锁打印服务器"
+
+#. Translators: Samba server needs authentication of the user to show list of its printers.
+#: panels/printers/pp-new-printer-dialog.c:406
+#, c-format
+msgid "Unlock %s."
+msgstr "解锁 %s。"
+
+#. Translators: Samba server needs authentication of the user to show list of its printers.
+#: panels/printers/pp-new-printer-dialog.c:411
+#, c-format
+msgid "Enter username and password to view printers on %s."
+msgstr "输入用户名和密码以查看 %s 上可用的打印机。"
+
+#: panels/printers/pp-new-printer-dialog.c:876
+msgid "Searching for Printers"
+msgstr "搜索打印机"
 
 #. Translators: The found device is a printer connected via USB
-#: ../panels/printers/pp-new-printer-dialog.c:1659
+#: panels/printers/pp-new-printer-dialog.c:1799
 msgid "USB"
 msgstr "USB"
 
 #. Translators: The found device is a printer connected via serial port
-#: ../panels/printers/pp-new-printer-dialog.c:1664
+#: panels/printers/pp-new-printer-dialog.c:1804
 msgid "Serial Port"
 msgstr "串口"
 
 #. Translators: The found device is a printer connected via parallel port
-#: ../panels/printers/pp-new-printer-dialog.c:1671
+#: panels/printers/pp-new-printer-dialog.c:1811
 msgid "Parallel Port"
 msgstr "并口"
 
-#. Translators: The found device is a printer connected via Bluetooth
-#: ../panels/printers/pp-new-printer-dialog.c:1676
-msgid "Bluetooth"
-msgstr "蓝牙"
-
 #. Translators: Location of found network printer (e.g. Kitchen, Reception)
-#: ../panels/printers/pp-new-printer-dialog.c:1713
+#: panels/printers/pp-new-printer-dialog.c:1853
 #, c-format
 msgid "Location: %s"
 msgstr "位置:%s"
 
 #. Translators: Network address of found printer
-#: ../panels/printers/pp-new-printer-dialog.c:1718
+#: panels/printers/pp-new-printer-dialog.c:1858
 #, 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:1747
+#: panels/printers/pp-new-printer-dialog.c:1887
 msgid "Server requires authentication"
 msgstr "服务器要求认证"
 
-#: ../panels/printers/pp-options-dialog.c:81
+#: panels/printers/pp-options-dialog.c:83
 msgid "Two Sided"
 msgstr "双面"
 
-#: ../panels/printers/pp-options-dialog.c:82
+#: panels/printers/pp-options-dialog.c:84
 msgid "Paper Type"
 msgstr "纸张类型"
 
-#: ../panels/printers/pp-options-dialog.c:83
+#: panels/printers/pp-options-dialog.c:85
 msgid "Paper Source"
 msgstr "纸张来源"
 
-#: ../panels/printers/pp-options-dialog.c:84
+#: panels/printers/pp-options-dialog.c:86
 msgid "Output Tray"
 msgstr "出纸托盘"
 
-#: ../panels/printers/pp-options-dialog.c:86
+#: panels/printers/pp-options-dialog.c:88
 msgid "GhostScript pre-filtering"
 msgstr "GhostScript 预过滤"
 
 #. Translators: This option sets number of pages printed on one sheet
-#: ../panels/printers/pp-options-dialog.c:533
+#: 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:545
+#: 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:557
-msgid "Orientation"
-msgstr "方向"
-
 #. Translators: "General" tab contains general printer options
-#: ../panels/printers/pp-options-dialog.c:654
+#: 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:657
+#: 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:660
+#: 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:663
+#: 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:666
+#: 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:669
+#: 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:672
+#: 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:675
+#: 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:908
+msgid "Test page"
+msgstr "测试页"
+
 #. Translators: this is an option of "Paper Source"
-#: ../panels/printers/pp-ppd-option-widget.c:76
-#: ../panels/printers/pp-ppd-option-widget.c:78
-#: ../panels/printers/pp-ppd-option-widget.c:86
+#: panels/printers/pp-ppd-option-widget.c:76
+#: panels/printers/pp-ppd-option-widget.c:78
+#: panels/printers/pp-ppd-option-widget.c:86
 msgid "Auto Select"
 msgstr "自动选择"
 
 #. Translators: this is an option of "Paper Source"
 #. Translators: this is an option of "Resolution"
-#: ../panels/printers/pp-ppd-option-widget.c:80
-#: ../panels/printers/pp-ppd-option-widget.c:82
-#: ../panels/printers/pp-ppd-option-widget.c:84
-#: ../panels/printers/pp-ppd-option-widget.c:88
+#: panels/printers/pp-ppd-option-widget.c:80
+#: panels/printers/pp-ppd-option-widget.c:82
+#: panels/printers/pp-ppd-option-widget.c:84
+#: panels/printers/pp-ppd-option-widget.c:88
 msgid "Printer Default"
 msgstr "打印机默认设置"
 
 #. Translators: this is an option of "GhostScript"
-#: ../panels/printers/pp-ppd-option-widget.c:90
+#: panels/printers/pp-ppd-option-widget.c:90
 msgid "Embed GhostScript fonts only"
 msgstr "仅内嵌 GhostScript 字体"
 
 #. Translators: this is an option of "GhostScript"
-#: ../panels/printers/pp-ppd-option-widget.c:92
+#: panels/printers/pp-ppd-option-widget.c:92
 msgid "Convert to PS level 1"
 msgstr "转换为 PS 等级 1"
 
 #. Translators: this is an option of "GhostScript"
-#: ../panels/printers/pp-ppd-option-widget.c:94
+#: panels/printers/pp-ppd-option-widget.c:94
 msgid "Convert to PS level 2"
-msgstr "转换为 PS 等级 1"
+msgstr "转换为 PS 等级 2"
 
 #. Translators: this is an option of "GhostScript"
-#: ../panels/printers/pp-ppd-option-widget.c:96
+#: panels/printers/pp-ppd-option-widget.c:96
 msgid "No pre-filtering"
 msgstr "无预过滤"
 
 #. Translators: Name of column showing printer manufacturers
-#: ../panels/printers/pp-ppd-selection-dialog.c:233
+#: panels/printers/pp-ppd-selection-dialog.c:233
 msgid "Manufacturer"
 msgstr "厂商"
 
-#. Translators: Name of column showing printer drivers
-#: ../panels/printers/pp-ppd-selection-dialog.c:250
-msgid "Driver"
-msgstr "驱动"
+#. Translators: This is the label of the button that opens the Jobs Dialog.
+#: panels/printers/pp-printer-entry.c:613 panels/printers/printer-entry.ui:166
+msgid "No Active Jobs"
+msgstr "没有活跃的作业"
 
-#. Translators: Samba server needs authentication of the user to show list of its printers.
-#: ../panels/printers/pp-samba.c:248
+#. Translators: This is the label of the button that opens the Jobs Dialog.
+#: panels/printers/pp-printer-entry.c:618
 #, c-format
-msgid "Enter your username and password to view printers available on %s."
-msgstr "输入用户名和密码以查看 %s 上可用的打印机。"
+msgid "%u Job"
+msgid_plural "%u Jobs"
+msgstr[0] "%u 作业"
 
-#: ../panels/printers/printers.ui.h:1
-msgid "Add Printer"
-msgstr "添加打印机"
+#. Translators: Name of job which makes printer to clean its heads
+#: panels/printers/pp-printer-entry.c:752
+msgid "Clean print heads"
+msgstr "清洁打印头"
 
-#: ../panels/printers/printers.ui.h:2
-msgid "Remove Printer"
-msgstr "移除打印机"
+#. Translators: The printer is low on toner
+#: panels/printers/pp-printer-entry.c:804
+msgid "Low on toner"
+msgstr "墨粉不足"
 
-#. Translators: By supply we mean ink, toner, staples, water, ...
-#: ../panels/printers/printers.ui.h:4
-msgid "Supply"
-msgstr "耗材"
+#. Translators: The printer has no toner left
+#: panels/printers/pp-printer-entry.c:806
+msgid "Out of toner"
+msgstr "墨粉用尽"
 
-#. Translators: Location of the printer (e.g. Lab, 1st floor,...).
-#: ../panels/printers/printers.ui.h:6
-msgid "Location"
-msgstr "位置"
+#. Translators: "Developer" is a chemical for photo development,
+#. * http://en.wikipedia.org/wiki/Photographic_developer
+#: panels/printers/pp-printer-entry.c:809
+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:812
+msgid "Out of developer"
+msgstr "显影剂用尽"
 
-#. Translators: This checkbox is checked when the default printer is selected.
-#: ../panels/printers/printers.ui.h:8
-msgid "_Default printer"
-msgstr "默认打印机(_D)"
+#. Translators: "marker" is one color bin of the printer
+#: panels/printers/pp-printer-entry.c:814
+msgid "Low on a marker supply"
+msgstr "标记墨水不足"
 
-#: ../panels/printers/printers.ui.h:9
-msgid "Jobs"
-msgstr "任务"
+#. Translators: "marker" is one color bin of the printer
+#: panels/printers/pp-printer-entry.c:816
+msgid "Out of a marker supply"
+msgstr "标记墨水用尽"
+
+#. Translators: One or more covers on the printer are open
+#: panels/printers/pp-printer-entry.c:818
+msgid "Open cover"
+msgstr "打开上盖"
+
+#. Translators: One or more doors on the printer are open
+#: panels/printers/pp-printer-entry.c:820
+msgid "Open door"
+msgstr "打开后盖"
+
+#. Translators: At least one input tray is low on media
+#: panels/printers/pp-printer-entry.c:822
+msgid "Low on paper"
+msgstr "纸张不足"
+
+#. Translators: At least one input tray is empty
+#: panels/printers/pp-printer-entry.c:824
+msgid "Out of paper"
+msgstr "纸张用尽"
+
+#. Translators: The printer is offline
+#: panels/printers/pp-printer-entry.c:826
+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:828
+#: panels/printers/pp-printer-entry.c:971
+msgctxt "printer state"
+msgid "Stopped"
+msgstr "已停止"
+
+#. Translators: The printer marker supply waste receptacle is almost full
+#: panels/printers/pp-printer-entry.c:830
+msgid "Waste receptacle almost full"
+msgstr "废粉仓将满"
+
+#. Translators: The printer marker supply waste receptacle is full
+#: panels/printers/pp-printer-entry.c:832
+msgid "Waste receptacle full"
+msgstr "废粉仓已满"
+
+#. Translators: Optical photo conductors are used in laser printers
+#: panels/printers/pp-printer-entry.c:834
+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:836
+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:957
+msgctxt "printer state"
+msgid "Ready"
+msgstr "就绪"
 
-#. Translators: Opens a dialog containing printer
-#: ../panels/printers/printers.ui.h:11
-msgid "Show _Jobs"
-msgstr "显示任务(_J)"
+#. Translators: Printer's state (printer is ready but doesn't accept new jobs)
+#: panels/printers/pp-printer-entry.c:962
+msgctxt "printer state"
+msgid "Does not accept jobs"
+msgstr "不接收任务"
+
+#. Translators: Printer's state (jobs are processing)
+#: panels/printers/pp-printer-entry.c:967
+msgctxt "printer state"
+msgid "Processing"
+msgstr "正在处理"
+
+#: panels/printers/printer-entry.ui:14
+msgid "Printing Options"
+msgstr "打印选项"
+
+#: panels/printers/printer-entry.ui:26
+msgid "Printer Details"
+msgstr "打印机详情"
+
+#. Set this printer as default
+#: panels/printers/printer-entry.ui:38
+msgid "Use Printer by Default"
+msgstr "默认使用打印机"
+
+#. Translators: This button executes command which cleans print heads of the printer.
+#: panels/printers/printer-entry.ui:50
+msgid "Clean Print Heads"
+msgstr "取消打印头"
+
+#: panels/printers/printer-entry.ui:61
+msgid "Remove Printer"
+msgstr "移除打印机"
 
-#: ../panels/printers/printers.ui.h:12
+#: panels/printers/printer-entry.ui:193
 msgid "Model"
 msgstr "型号"
 
-#: ../panels/printers/printers.ui.h:15
-msgid "label"
-msgstr "标签"
-
-#: ../panels/printers/printers.ui.h:17
-msgid "Setting new driver…"
-msgstr "正在设置新驱动…"
+#: panels/printers/printer-entry.ui:251
+msgid "Ink Level"
+msgstr "墨水量"
 
-#: ../panels/printers/printers.ui.h:18
-msgid "page 3"
-msgstr "第 3 页"
+#. Translators: This is the message which follows the printer error.
+#: panels/printers/printer-entry.ui:312
+msgid "Please restart when the problem is resolved."
+msgstr "问题解决后请重启。"
 
-#. Translators: This button executes command which prints test page.
-#: ../panels/printers/printers.ui.h:20
-msgid "Print _Test Page"
-msgstr "打印测试页(_T)"
+#. Translators: This is the button which restarts the printer.
+#: panels/printers/printer-entry.ui:319
+msgid "Restart"
+msgstr "重启"
 
-#. Translators: This button opens printer
-#: ../panels/printers/printers.ui.h:22 ../panels/region/region.ui.h:6
-msgid "_Options"
-msgstr "选项(_O)"
+#. Translators: This button adds new printer.
+#: panels/printers/printers.ui:20
+msgid "Add…"
+msgstr "添加......"
 
-#: ../panels/printers/printers.ui.h:23
+#: panels/printers/printers.ui:186
 msgid "No printers"
 msgstr "无打印机"
 
 #. Translators: This button adds new printer.
-#: ../panels/printers/printers.ui.h:25
-msgid "Add a Printer"
-msgstr "添加打印机"
+#: panels/printers/printers.ui:200
+msgid "Add a Printer…"
+msgstr "添加一个打印机......"
 
 #. Translators: The CUPS server is not running (we can not connect to it).
-#: ../panels/printers/printers.ui.h:27
+#: panels/printers/printers.ui:232
 msgid ""
 "Sorry! The system printing service\n"
-"doesn't seem to be available."
+"doesn’t seem to be available."
 msgstr "抱歉,系统打印服务似乎不可用。"
 
-#: ../panels/privacy/cc-privacy-panel.c:387 ../panels/privacy/privacy.ui.h:24
+#: panels/privacy/cc-privacy-panel.c:387 panels/privacy/privacy.ui:280
 msgid "Screen Lock"
 msgstr "锁屏"
 
-#: ../panels/privacy/cc-privacy-panel.c:438
+#: panels/privacy/cc-privacy-panel.c:438
 msgid "In use"
 msgstr "已占用"
 
-#: ../panels/privacy/cc-privacy-panel.c:443
+#: panels/privacy/cc-privacy-panel.c:443
 msgctxt "Location services status"
 msgid "On"
 msgstr "开启"
 
-#: ../panels/privacy/cc-privacy-panel.c:444
+#: panels/privacy/cc-privacy-panel.c:444
 msgctxt "Location services status"
 msgid "Off"
 msgstr "关闭"
 
-#: ../panels/privacy/cc-privacy-panel.c:823 ../panels/privacy/privacy.ui.h:42
+#: panels/privacy/cc-privacy-panel.c:823 panels/privacy/privacy.ui:745
 msgid "Location Services"
 msgstr "定位服务"
 
-#: ../panels/privacy/cc-privacy-panel.c:942 ../panels/privacy/privacy.ui.h:19
+#: panels/privacy/cc-privacy-panel.c:946 panels/privacy/privacy.ui:127
 msgid "Usage & History"
 msgstr "用量及历史"
 
-#: ../panels/privacy/cc-privacy-panel.c:1067
+#: panels/privacy/cc-privacy-panel.c:1075
 msgid "Empty all items from Trash?"
 msgstr "清空回收站中的所有项目吗?"
 
-#: ../panels/privacy/cc-privacy-panel.c:1068
+#: panels/privacy/cc-privacy-panel.c:1076
 msgid "All items in the Trash will be permanently deleted."
 msgstr "回收站内的所有项目将会永久删除。"
 
-#: ../panels/privacy/cc-privacy-panel.c:1069 ../panels/privacy/privacy.ui.h:34
+#: panels/privacy/cc-privacy-panel.c:1077
 msgid "_Empty Trash"
 msgstr "清空回收站(_E)"
 
-#: ../panels/privacy/cc-privacy-panel.c:1092
+#: panels/privacy/cc-privacy-panel.c:1100
 msgid "Delete all the temporary files?"
 msgstr "删除所有临时文件吗?"
 
-#: ../panels/privacy/cc-privacy-panel.c:1093
+#: panels/privacy/cc-privacy-panel.c:1101
 msgid "All the temporary files will be permanently deleted."
 msgstr "所有临时文件将会永久删除。"
 
-#: ../panels/privacy/cc-privacy-panel.c:1094 ../panels/privacy/privacy.ui.h:35
+#: panels/privacy/cc-privacy-panel.c:1102
 msgid "_Purge Temporary Files"
 msgstr "清理临时文件(_P)"
 
-#: ../panels/privacy/cc-privacy-panel.c:1116 ../panels/privacy/privacy.ui.h:29
+#: panels/privacy/cc-privacy-panel.c:1124 panels/privacy/privacy.ui:432
 msgid "Purge Trash & Temporary Files"
 msgstr "清理回收站及临时文件"
 
-#: ../panels/privacy/cc-privacy-panel.c:1156 ../panels/privacy/privacy.ui.h:36
+#: panels/privacy/cc-privacy-panel.c:1164 panels/privacy/privacy.ui:637
 msgid "Software Usage"
 msgstr "软件使用统计"
 
-#: ../panels/privacy/cc-privacy-panel.c:1197 ../panels/privacy/privacy.ui.h:46
+#: panels/privacy/cc-privacy-panel.c:1205 panels/privacy/privacy.ui:959
 msgid "Problem Reporting"
 msgstr "报告问题"
 
 #. translators: '%s' is the distributor's name, such as 'Fedora'
-#: ../panels/privacy/cc-privacy-panel.c:1211
+#: panels/privacy/cc-privacy-panel.c:1219
 #, c-format
 msgid ""
 "Sending reports of technical problems helps us improve %s. Reports are sent "
 "anonymously and are scrubbed of personal data."
 msgstr "发送匿名的技术问题报告能帮助我们改进 %s,这些报告中不含个人数据。"
 
-#: ../panels/privacy/cc-privacy-panel.c:1223 ../panels/privacy/privacy.ui.h:41
+#: panels/privacy/cc-privacy-panel.c:1231 panels/privacy/privacy.ui:719
 msgid "Privacy Policy"
 msgstr "隐私政策"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2
-msgid "Pri­va­cy"
+#: panels/privacy/gnome-privacy-panel.desktop.in.in:3
+msgid "Privacy"
 msgstr "隐私"
 
-#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3
+#: panels/privacy/gnome-privacy-panel.desktop.in.in:4
 msgid "Protect your personal information and control what others might see"
 msgstr "保护个人信息并控制他人可见的信息"
 
-#. Translators: those are keywords for the privacy control-center panel
-#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5
+#. FIXME
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/privacy/gnome-privacy-panel.desktop.in.in:8
+msgid "preferences-system-privacy"
+msgstr "preferences-system-privacy"
+
+#. 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;屏幕;锁定;诊断;崩溃;私有;最近;临时;索引;名称;网络;认证;"
+msgstr 
"screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;network;identity;屏幕;锁定;诊断;崩溃;私有;最近;临时;索引;名称;网络;认证;"
 
-#: ../panels/privacy/privacy.ui.h:1
+#: panels/privacy/privacy.ui:14
 msgid "Screen Turns Off"
 msgstr "关闭屏幕"
 
-#: ../panels/privacy/privacy.ui.h:2
+#: panels/privacy/privacy.ui:18
 msgid "30 seconds"
 msgstr "30 秒"
 
-#: ../panels/privacy/privacy.ui.h:9
+#: panels/privacy/privacy.ui:60 panels/privacy/privacy.ui:106
 msgid "1 day"
 msgstr "1 天"
 
-#: ../panels/privacy/privacy.ui.h:10
+#: panels/privacy/privacy.ui:64
 msgid "2 days"
 msgstr "2 天"
 
-#: ../panels/privacy/privacy.ui.h:11
+#: panels/privacy/privacy.ui:68
 msgid "3 days"
 msgstr "3 天"
 
-#: ../panels/privacy/privacy.ui.h:12
+#: panels/privacy/privacy.ui:72
 msgid "4 days"
 msgstr "4 天"
 
-#: ../panels/privacy/privacy.ui.h:13
+#: panels/privacy/privacy.ui:76
 msgid "5 days"
 msgstr "5 天"
 
-#: ../panels/privacy/privacy.ui.h:14
+#: panels/privacy/privacy.ui:80
 msgid "6 days"
 msgstr "6 天"
 
-#: ../panels/privacy/privacy.ui.h:15
+#: panels/privacy/privacy.ui:84 panels/privacy/privacy.ui:110
 msgid "7 days"
 msgstr "7 天"
 
-#: ../panels/privacy/privacy.ui.h:16
+#: panels/privacy/privacy.ui:88
 msgid "14 days"
 msgstr "14 天"
 
-#: ../panels/privacy/privacy.ui.h:17
+#: panels/privacy/privacy.ui:92 panels/privacy/privacy.ui:114
 msgid "30 days"
 msgstr "30 天"
 
-#: ../panels/privacy/privacy.ui.h:18
+#: panels/privacy/privacy.ui:118
 msgid "Forever"
 msgstr "永久"
 
-#: ../panels/privacy/privacy.ui.h:20
+#: panels/privacy/privacy.ui:148
 msgid ""
 "Remembering your history makes things easier to find again. These items are "
 "never shared over the network."
 msgstr "记住历史能够在下次使用时方便查找。这些条目永远不会通过网络共享。"
 
-#: ../panels/privacy/privacy.ui.h:21
+#: panels/privacy/privacy.ui:176
 msgid "_Recently Used"
 msgstr "最近使用(_R)"
 
-#: ../panels/privacy/privacy.ui.h:22
+#: panels/privacy/privacy.ui:207
 msgid "Retain _History"
 msgstr "保留历史(_H)"
 
-#: ../panels/privacy/privacy.ui.h:23
+#: panels/privacy/privacy.ui:247
 msgid "Cl_ear Recent History"
 msgstr "清理最近历史(_E)"
 
-#: ../panels/privacy/privacy.ui.h:25
+#: panels/privacy/privacy.ui:301
 msgid "The Screen Lock protects your privacy when you are away."
 msgstr "离开时锁定屏幕可以保护隐私。"
 
-#: ../panels/privacy/privacy.ui.h:26
+#: panels/privacy/privacy.ui:328
 msgid "Automatic Screen _Lock"
 msgstr "自动锁屏(_L)"
 
-#: ../panels/privacy/privacy.ui.h:27
+#: panels/privacy/privacy.ui:362
 msgid "Lock screen _after blank for"
 msgstr "黑屏至锁屏的等待时间(_A)"
 
-#: ../panels/privacy/privacy.ui.h:28
+#: panels/privacy/privacy.ui:394
 msgid "Show _Notifications"
 msgstr "显示通知(_N)"
 
-#: ../panels/privacy/privacy.ui.h:30
+#: panels/privacy/privacy.ui:454
 msgid ""
 "Automatically purge the Trash and temporary files to help keep your computer "
 "free of unnecessary sensitive information."
 msgstr "自动清理回收站和临时文件,避免计算机保存不必要的敏感信息。"
 
-#: ../panels/privacy/privacy.ui.h:31
+#: panels/privacy/privacy.ui:483
 msgid "Automatically empty _Trash"
 msgstr "自动清空回收站(_T)"
 
-#: ../panels/privacy/privacy.ui.h:32
+#: panels/privacy/privacy.ui:515
 msgid "Automatically purge Temporary _Files"
 msgstr "自动清理临时文件(_F)"
 
-#: ../panels/privacy/privacy.ui.h:33
+#: panels/privacy/privacy.ui:546
 msgid "Purge _After"
 msgstr "清理延时(_A)"
 
-#: ../panels/privacy/privacy.ui.h:37
+#: panels/privacy/privacy.ui:590
+msgid "_Empty Trash…"
+msgstr "(_E)清空回收站......"
+
+#: panels/privacy/privacy.ui:606
+msgid "_Purge Temporary Files…"
+msgstr "(_P)清除临时文件......"
+
+#: panels/privacy/privacy.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 "
@@ -4891,1661 +5236,1694 @@ msgid ""
 "\n"
 "All the information we collect is made anonymous, and we will never share "
 "your data with third parties."
-msgstr ""
-"发送软件的使用情况有助于我们向提供更准确的推荐,帮助改进软件。\n"
+msgstr "发送软件的使用情况有助于我们向提供更准确的推荐,帮助改进软件。\n"
 "\n"
 "信息均为匿名收集,不会与他人分享。"
 
-#: ../panels/privacy/privacy.ui.h:40
+#: panels/privacy/privacy.ui:681
 msgid "_Send software usage statistics"
 msgstr "发送软件使用统计信息(_S)"
 
-#: ../panels/privacy/privacy.ui.h:43
+#: panels/privacy/privacy.ui:764
 msgid ""
 "Location services allow applications to know your location. Using Wi-Fi and "
 "mobile broadband increases accuracy."
-msgstr ""
-"定位服务允许应用得知您的地理位置。使用 Wi-Fi 和移动宽带可以提高精确度。"
+msgstr "定位服务允许应用得知您的地理位置。使用 Wi-Fi 和移动宽带可以提高精确度。"
 
-#: ../panels/privacy/privacy.ui.h:44
+#: panels/privacy/privacy.ui:778
+msgid ""
+"Uses Mozilla Location Service: <a href='https://location.services.mozilla.";
+"com/privacy'>Privacy Policy</a>"
+msgstr "使用 Mozilla 位置服务:<a href='https://location.services.mozilla.com/privacy'>隐私政策</a>"
+
+#: panels/privacy/privacy.ui:828
 msgid "_Location Services"
 msgstr "定位服务(_L)"
 
-#: ../panels/privacy/privacy.ui.h:47
+#: panels/privacy/privacy.ui:1026
 msgid "_Automatic Problem Reporting"
 msgstr "自动报告问题(_A)"
 
-#: ../panels/region/cc-format-chooser.c:120
+#: panels/region/cc-format-chooser.c:118
 msgctxt "measurement format"
 msgid "Imperial"
 msgstr "英制"
 
-#: ../panels/region/cc-format-chooser.c:122
+#: panels/region/cc-format-chooser.c:120
 msgctxt "measurement format"
 msgid "Metric"
-msgstr "公制"
+msgstr "Metric"
 
-#: ../panels/region/cc-format-chooser.c:287
+#: panels/region/cc-format-chooser.c:285
 msgid "No regions found"
 msgstr "无可用区域"
 
-#: ../panels/region/cc-input-chooser.c:182
+#: panels/region/cc-input-chooser.c:182
 msgid "No input sources found"
 msgstr "无输入源"
 
-#: ../panels/region/cc-input-chooser.c:992
+#: panels/region/cc-input-chooser.c:1012
 msgctxt "Input Source"
 msgid "Other"
 msgstr "其他"
 
-#: ../panels/region/cc-region-panel.c:247
-#: ../panels/user-accounts/um-user-panel.c:1087
-msgid "Your session needs to be restarted for changes to take effect"
-msgstr "修改需要重启会话才能生效"
-
-#: ../panels/region/cc-region-panel.c:251
-#: ../panels/user-accounts/um-user-panel.c:1091
-msgid "Restart Now"
-msgstr "现在重启"
-
-#: ../panels/region/cc-region-panel.c:888
+#: panels/region/cc-region-panel.c:881
 msgid "No input source selected"
 msgstr "未选择输入源"
 
-#: ../panels/region/cc-region-panel.c:1779
+#: panels/region/cc-region-panel.c:1773
 msgid "Login _Screen"
 msgstr "登录屏幕(_S)"
 
-#: ../panels/region/format-chooser.ui.h:1
+#: panels/region/format-chooser.ui:7
 msgid "Formats"
 msgstr "格式"
 
-#: ../panels/region/format-chooser.ui.h:4
+#: panels/region/format-chooser.ui:120
 msgid "Preview"
 msgstr "预览"
 
-#: ../panels/region/format-chooser.ui.h:5
+#: panels/region/format-chooser.ui:137
 msgid "Dates"
 msgstr "日期"
 
-#: ../panels/region/format-chooser.ui.h:6
+#: panels/region/format-chooser.ui:168
 msgid "Times"
 msgstr "时间"
 
-#: ../panels/region/format-chooser.ui.h:7
+#: panels/region/format-chooser.ui:199
+msgid "Dates & Times"
+msgstr "日期和时间"
+
+#: panels/region/format-chooser.ui:230
 msgid "Numbers"
 msgstr "数字"
 
-#: ../panels/region/format-chooser.ui.h:8
+#: panels/region/format-chooser.ui:247
 msgid "Measurement"
 msgstr "度量"
 
-#: ../panels/region/format-chooser.ui.h:9
+#: panels/region/format-chooser.ui:264
 msgid "Paper"
 msgstr "纸张"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:2
-msgid "Re­gion & Lan­guage"
+#: panels/region/gnome-region-panel.desktop.in.in:3
+msgid "Region & Language"
 msgstr "区域和语言"
 
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:3
+#: panels/region/gnome-region-panel.desktop.in.in:4
 msgid ""
 "Select your display language, formats, keyboard layouts and input sources"
 msgstr "选择您的显示语言、格式、键盘布局和输入源"
 
-#. Translators: those are keywords for the region control-center panel
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/region/gnome-region-panel.desktop.in.in:7
+msgid "preferences-desktop-locale"
+msgstr "preferences-desktop-locale"
+
+#. 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/input-chooser.ui.h:1
+#: panels/region/input-chooser.ui:5
 msgid "Add an Input Source"
 msgstr "添加输入源"
 
-#: ../panels/region/input-chooser.ui.h:4
-msgid "Input methods can't be used on the login screen"
-msgstr "不能在登录屏幕使用输入法"
+#: panels/region/input-chooser.ui:76
+msgid "Input methods can’t be used on the login screen"
+msgstr "在登录屏幕中不能使用输入法"
 
-#: ../panels/region/input-options.ui.h:1
+#: panels/region/input-options.ui:7
 msgid "Input Source Options"
 msgstr "输入源选项"
 
-#: ../panels/region/input-options.ui.h:2
+#: panels/region/input-options.ui:27
 msgid "Use the _same source for all windows"
 msgstr "所有窗口使用相同的输入源(_S)"
 
-#: ../panels/region/input-options.ui.h:3
+#: panels/region/input-options.ui:45
 msgid "Allow _different sources for each window"
 msgstr "每个窗口使用不同的输入源(_D)"
 
-#: ../panels/region/input-options.ui.h:4 ../shell/cc-application.c:251
-msgid "Keyboard Shortcuts"
-msgstr "键盘快捷键"
-
-#: ../panels/region/input-options.ui.h:5
+#: panels/region/input-options.ui:85
 msgid "Switch to previous source"
 msgstr "切换至上个输入源"
 
-#: ../panels/region/input-options.ui.h:6
+#: panels/region/input-options.ui:102
 msgid "Super+Shift+Space"
 msgstr "Super+Shift+Space"
 
-#: ../panels/region/input-options.ui.h:7
+#: panels/region/input-options.ui:116
 msgid "Switch to next source"
 msgstr "切换至下个输入源"
 
-#: ../panels/region/input-options.ui.h:8
+#: panels/region/input-options.ui:133
 msgid "Super+Space"
 msgstr "Super+Space"
 
-#: ../panels/region/input-options.ui.h:9
+#: panels/region/input-options.ui:147
 msgid "You can change these shortcuts in the keyboard settings"
 msgstr "可以在键盘设置中修改快捷键"
 
-#: ../panels/region/input-options.ui.h:10
+#: panels/region/input-options.ui:164
 msgid "Alternative switch to next source"
 msgstr "切换至下个源第二组快捷键"
 
-#: ../panels/region/input-options.ui.h:11
+#: panels/region/input-options.ui:181
 msgid "Left+Right Alt"
 msgstr "左+右 Alt"
 
-#: ../panels/region/region.ui.h:1
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
+#: panels/region/region.ui:67
+#: panels/user-accounts/data/user-accounts-dialog.ui:348
 msgid "_Language"
 msgstr "语言(_L)"
 
-#: ../panels/region/region.ui.h:2
+#: panels/region/region.ui:85
 msgid "English (United Kingdom)"
 msgstr "英语(英国)"
 
-#: ../panels/region/region.ui.h:3
+#: panels/region/region.ui:112
+msgid "Restart the session for changes to take effect"
+msgstr "重启会话以使修改生效"
+
+#: panels/region/region.ui:134
+msgid "Restart…"
+msgstr "重启......"
+
+#: panels/region/region.ui:169
 msgid "_Formats"
 msgstr "格式(_F)"
 
-#: ../panels/region/region.ui.h:4
+#: panels/region/region.ui:187
 msgid "United Kingdom"
 msgstr "英国"
 
-#: ../panels/region/region.ui.h:5
+#: panels/region/region.ui:229
 msgid "Input Sources"
 msgstr "输入源"
 
-#: ../panels/region/region.ui.h:7
+#: panels/region/region.ui:245
+msgid "_Options"
+msgstr "选项(_O)"
+
+#: panels/region/region.ui:311
 msgid "Add input source"
 msgstr "添加输入源"
 
-#: ../panels/region/region.ui.h:8
+#: panels/region/region.ui:336
 msgid "Remove input source"
 msgstr "移除输入源"
 
-#: ../panels/region/region.ui.h:9
+#: panels/region/region.ui:386
 msgid "Move input source up"
 msgstr "上移输入源"
 
-#: ../panels/region/region.ui.h:10
+#: panels/region/region.ui:411
 msgid "Move input source down"
 msgstr "下移输入源"
 
-#: ../panels/region/region.ui.h:11
+#: panels/region/region.ui:461
 msgid "Configure input source"
 msgstr "配置输入源"
 
-#: ../panels/region/region.ui.h:12
+#: panels/region/region.ui:486
 msgid "Show input source keyboard layout"
 msgstr "显示输入源键盘布局"
 
-#: ../panels/region/region.ui.h:13
+#: panels/region/region.ui:530
 msgid "Login settings are used by all users when logging into the system"
 msgstr "登录设置将对所有于本机登录的用户共享"
 
-#: ../panels/search/cc-search-locations-dialog.c:634
+#: panels/search/cc-search-locations-dialog.c:639
 msgid "Select Location"
 msgstr "选择位置"
 
-#: ../panels/search/cc-search-locations-dialog.c:638
+#: panels/search/cc-search-locations-dialog.c:643
 msgid "_OK"
 msgstr "确定(_O)"
 
-#: ../panels/search/cc-search-panel.c:177
+#: panels/search/cc-search-panel.c:178
 msgid "No applications found"
 msgstr "未找到应用"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/search/gnome-search-panel.desktop.in.in.h:2
-msgid "Search"
-msgstr "搜索"
-
-#: ../panels/search/gnome-search-panel.desktop.in.in.h:3
+#: panels/search/gnome-search-panel.desktop.in.in:4
 msgid ""
 "Control which applications show search results in the Activities Overview"
 msgstr "控制在活动总览中显示哪些程序的搜索结果"
 
-#. Translators: those are keywords for the search control-center panel
-#: ../panels/search/gnome-search-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/search/gnome-search-panel.desktop.in.in:7
+msgid "preferences-system-search"
+msgstr "preferences-system-search"
+
+#. Translators: Search terms to find the Search panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+#: panels/search/gnome-search-panel.desktop.in.in:19
 msgid "Search;Find;Index;Hide;Privacy;Results;"
-msgstr ""
-"Search;Find;Index;Hide;Privacy;Results;搜索;查找;寻找;索引;隐藏;隐私;结果;"
+msgstr "Search;Find;Index;Hide;Privacy;Results;搜索;查找;寻找;索引;隐藏;隐私;结果;"
 
-#: ../panels/search/search-locations-dialog.ui.h:1
+#: panels/search/search-locations-dialog.ui:9
 msgid "Search Locations"
 msgstr "搜索位置"
 
-#: ../panels/search/search-locations-dialog.ui.h:2
+#: panels/search/search-locations-dialog.ui:43
 msgid "Places"
 msgstr "位置"
 
-#: ../panels/search/search-locations-dialog.ui.h:3
+#: panels/search/search-locations-dialog.ui:73
 msgid "Bookmarks"
 msgstr "书签"
 
-#: ../panels/search/search-locations-dialog.ui.h:4
+#: panels/search/search-locations-dialog.ui:130
 msgid "Other"
 msgstr "其他"
 
-#: ../panels/search/search.ui.h:1
+#: panels/search/search.ui:66
 msgid "Move Up"
 msgstr "上移"
 
-#: ../panels/search/search.ui.h:2
+#: panels/search/search.ui:83
 msgid "Move Down"
 msgstr "下移"
 
-#: ../panels/search/search.ui.h:3
+#: panels/search/search.ui:119
 msgid "Preferences"
 msgstr "首选项"
 
 #. Label
-#: ../panels/sharing/cc-sharing-networks.c:303
+#: panels/sharing/cc-sharing-networks.c:305
 msgid "No networks selected for sharing"
 msgstr "未选择要共享的网络"
 
-#: ../panels/sharing/cc-sharing-panel.c:263
+#: panels/sharing/cc-sharing-panel.c:283
 msgctxt "service is enabled"
 msgid "On"
 msgstr "已开启"
 
-#: ../panels/sharing/cc-sharing-panel.c:265
-#: ../panels/sharing/cc-sharing-panel.c:292
+#: panels/sharing/cc-sharing-panel.c:285 panels/sharing/cc-sharing-panel.c:312
 msgctxt "service is disabled"
 msgid "Off"
 msgstr "已关闭"
 
-#: ../panels/sharing/cc-sharing-panel.c:295
+#: panels/sharing/cc-sharing-panel.c:315
 msgctxt "service is enabled"
 msgid "Enabled"
 msgstr "已启用"
 
-#: ../panels/sharing/cc-sharing-panel.c:298
+#: panels/sharing/cc-sharing-panel.c:318
 msgctxt "service is active"
 msgid "Active"
 msgstr "活动"
 
-#: ../panels/sharing/cc-sharing-panel.c:369
+#: panels/sharing/cc-sharing-panel.c:389
 msgid "Choose a Folder"
 msgstr "选择文件夹"
 
-#: ../panels/sharing/cc-sharing-panel.c:680
+#: panels/sharing/cc-sharing-panel.c:701
 #, c-format
 msgid ""
-"Personal File Sharing allows you to share your Public folder with others on "
-"your current network using: <a href=\"dav://%s\">dav://%s</a>"
-msgstr ""
-"个人网络共享允许您与当前网络中的其他人共享自己的共享文件夹,使用地址:<a "
-"href=\"dav://%s\">dav://%s</a>"
+"File Sharing allows you to share your Public folder with others on your "
+"current network using: <a href=\"dav://%s\">dav://%s</a>"
+msgstr "文件共享允许您与当前网络上的其他人共享您的公共文件夹,使用:<a href=\"dav://%s\">dav://%s</a>"
 
-#: ../panels/sharing/cc-sharing-panel.c:682
+#: panels/sharing/cc-sharing-panel.c:703
 #, c-format
 msgid ""
 "When remote login is enabled, remote users can connect using the Secure "
 "Shell command:\n"
 "<a href=\"ssh %s\">ssh %s</a>"
-msgstr ""
-"当启用远程登录是,远程用户可以使用 SSH 命令来连接:\n"
+msgstr "当启用远程登录是,远程用户可以使用 SSH 命令来连接:\n"
 "<a href=\"ssh %s\">ssh %s</a>"
 
-#: ../panels/sharing/cc-sharing-panel.c:684
+#: panels/sharing/cc-sharing-panel.c:705
 #, c-format
 msgid ""
 "Screen sharing allows remote users to view or control your screen by "
 "connecting to <a href=\"vnc://%s\">vnc://%s</a>"
-msgstr ""
-"屏幕共享允许远程用户查看或控制您的屏幕通过连接到:<a href=\"vnc://%s\">vnc://"
-"%s</a> "
+msgstr "屏幕共享允许远程用户查看或控制您的屏幕通过连接到:<a href=\"vnc://%s\">vnc://%s</a>"
 
-#: ../panels/sharing/cc-sharing-panel.c:796
+#: panels/sharing/cc-sharing-panel.c:817
 msgid "Copy"
 msgstr "复制"
 
-#: ../panels/sharing/cc-sharing-panel.c:1122
+#: panels/sharing/cc-sharing-panel.c:1294
+#: panels/sharing/gnome-sharing-panel.desktop.in.in:3
 msgid "Sharing"
 msgstr "共享"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2
-msgid "Sha­ring"
-msgstr "共享"
-
-#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3
+#: panels/sharing/gnome-sharing-panel.desktop.in.in:4
 msgid "Control what you want to share with others"
 msgstr "控制想要与其他用户共享的内容"
 
-#. Translators: those are keywords for the sharing control-center panel
-#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/sharing/gnome-sharing-panel.desktop.in.in:7
+msgid "preferences-system-sharing"
+msgstr "preferences-system-sharing"
+
+#. Translators: Search terms to find the Sharing panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#: panels/sharing/gnome-sharing-panel.desktop.in.in:16
 msgid ""
 "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;"
 "movies;server;renderer;"
-msgstr ""
-"share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;"
-"movies;server;renderer;共享;主机;名称;远程;桌面;媒体;音频;视频;图片;照片;电"
-"影;服务器;渲染;"
+msgstr 
"share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;movies;server;renderer;共享;主机;名称;远程;桌面;媒体;音频;视频;图片;照片;电影;服务器;渲染;"
 
-#: ../panels/sharing/networks.ui.h:1
+#: panels/sharing/networks.ui:19
 msgid "Networks"
 msgstr "网络"
 
-#: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1
+#: panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in:11
 msgid "Enable or disable remote login"
 msgstr "启用或禁用远程登录"
 
-#: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:2
+#: panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in:12
 msgid "Authentication is required to enable or disable remote login"
 msgstr "启用或禁用远程登录需要认证"
 
-#: ../panels/sharing/sharing.ui.h:1
+#: panels/sharing/sharing.ui:46
 msgid "_Computer Name"
 msgstr "计算机名(_C)"
 
-#: ../panels/sharing/sharing.ui.h:2
+#: panels/sharing/sharing.ui:104
 msgid "_File Sharing"
 msgstr "文件共享(_F)"
 
-#: ../panels/sharing/sharing.ui.h:3
+#: panels/sharing/sharing.ui:147
 msgid "_Screen Sharing"
 msgstr "屏幕共享(_S)"
 
-#: ../panels/sharing/sharing.ui.h:4
+#: panels/sharing/sharing.ui:190
 msgid "_Media Sharing"
 msgstr "媒体共享(_M)"
 
-#: ../panels/sharing/sharing.ui.h:5
+#: panels/sharing/sharing.ui:233
 msgid "_Remote Login"
 msgstr "远程登录(_R)"
 
-#: ../panels/sharing/sharing.ui.h:6
+#: panels/sharing/sharing.ui:272
 msgid "Some services are disabled because of no network access."
 msgstr "因为没有网络,一些服务已经禁用。"
 
-#: ../panels/sharing/sharing.ui.h:7
+#: panels/sharing/sharing.ui:286 panels/sharing/sharing.ui:413
 msgid "File Sharing"
 msgstr "文件共享"
 
-#: ../panels/sharing/sharing.ui.h:8
+#: panels/sharing/sharing.ui:333
 msgid "_Require Password"
 msgstr "需要密码(_R)"
 
-#: ../panels/sharing/sharing.ui.h:10
+#: panels/sharing/sharing.ui:424 panels/sharing/sharing.ui:496
 msgid "Remote Login"
 msgstr "远程登录"
 
-#: ../panels/sharing/sharing.ui.h:11
+#: panels/sharing/sharing.ui:519 panels/sharing/sharing.ui:765
 msgid "Screen Sharing"
 msgstr "屏幕共享"
 
-#: ../panels/sharing/sharing.ui.h:12
+#: panels/sharing/sharing.ui:577
 msgid "_Allow connections to control the screen"
 msgstr "允许连接控制屏幕(_A)"
 
-#: ../panels/sharing/sharing.ui.h:13
+#: panels/sharing/sharing.ui:622
 msgid "_Password:"
 msgstr "密码(_P):"
 
-#: ../panels/sharing/sharing.ui.h:14
+#: panels/sharing/sharing.ui:652
 msgid "_Show Password"
 msgstr "显示密码(_S)"
 
-#: ../panels/sharing/sharing.ui.h:15
+#: panels/sharing/sharing.ui:683
 msgid "Access Options"
 msgstr "访问选项"
 
-#: ../panels/sharing/sharing.ui.h:16
+#: panels/sharing/sharing.ui:697
 msgid "_New connections must ask for access"
 msgstr "建立新连接前必须询问访问权限(_N)"
 
-#: ../panels/sharing/sharing.ui.h:17
+#: panels/sharing/sharing.ui:715
 msgid "_Require a password"
 msgstr "需要密码(_R)"
 
-#: ../panels/sharing/sharing.ui.h:18
+#: panels/sharing/sharing.ui:776 panels/sharing/sharing.ui:870
 msgid "Media Sharing"
 msgstr "媒体共享"
 
-#: ../panels/sharing/sharing.ui.h:19
+#: panels/sharing/sharing.ui:809
 msgid "Share music, photos and videos over the network."
 msgstr "通过网络共享音乐、照片和视频。"
 
-#: ../panels/sharing/sharing.ui.h:20
+#: panels/sharing/sharing.ui:824
 msgid "Folders"
 msgstr "文件夹"
 
-#: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:1
+#: panels/sound/data/gnome-sound-panel.desktop.in.in:3
 msgid "Sound"
 msgstr "声音"
 
-#: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:2
+#: panels/sound/data/gnome-sound-panel.desktop.in.in:4
 msgid "Change sound levels, inputs, outputs, and alert sounds"
 msgstr "更改音频音量、音频输入输出和事件声音"
 
-#. Translators: those are keywords for the sound control-center panel
-#: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:4
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/sound/data/gnome-sound-panel.desktop.in.in:7
+msgid "multimedia-volume-control"
+msgstr "multimedia-volume-control"
+
+#. Translators: Search terms to find the Sound panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+#: panels/sound/data/gnome-sound-panel.desktop.in.in:20
 msgid "Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;Audio;"
-msgstr ""
-"Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;声卡;麦克风;话筒;音量;"
-"淡入淡出;均衡;蓝牙;耳机;耳麦;音频;"
+msgstr "Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;声卡;麦克风;话筒;音量;淡入淡出;均衡;蓝牙;耳机;耳麦;音频;"
 
 #. Translators: This is the name of an audio file that sounds like the bark of a dog.
 #. You might want to translate it into the equivalent words of your language.
-#: ../panels/sound/data/sounds/gnome-sounds-default.xml.in.in.h:3
+#: panels/sound/data/sounds/gnome-sounds-default.xml.in.in:6
 msgid "Bark"
 msgstr "犬吠"
 
 #. Translators: This is the name of an audio file that sounds like a water drip.
 #. You might want to translate it into the equivalent words of your language.
-#: ../panels/sound/data/sounds/gnome-sounds-default.xml.in.in.h:6
+#: panels/sound/data/sounds/gnome-sounds-default.xml.in.in:12
 msgid "Drip"
 msgstr "雨滴"
 
 #. Translators: This is the name of an audio file that sounds like tapping glass.
 #. You might want to translate it into the equivalent words of your language.
-#: ../panels/sound/data/sounds/gnome-sounds-default.xml.in.in.h:9
+#: panels/sound/data/sounds/gnome-sounds-default.xml.in.in:18
 msgid "Glass"
 msgstr "玻璃"
 
 #. Translators: This is the name of an audio file that sounds sort of like a submarine sonar ping.
 #. You might want to translate it into the equivalent words of your language.
-#: ../panels/sound/data/sounds/gnome-sounds-default.xml.in.in.h:12
+#: panels/sound/data/sounds/gnome-sounds-default.xml.in.in:24
 msgid "Sonar"
 msgstr "声纳"
 
-#: ../panels/sound/gvc-balance-bar.c:105
+#: panels/sound/gvc-balance-bar.c:104
 msgctxt "balance"
 msgid "Left"
 msgstr "左"
 
-#: ../panels/sound/gvc-balance-bar.c:106
+#: panels/sound/gvc-balance-bar.c:105
 msgctxt "balance"
 msgid "Right"
 msgstr "右"
 
-#: ../panels/sound/gvc-balance-bar.c:109
+#: panels/sound/gvc-balance-bar.c:108
 msgctxt "balance"
 msgid "Rear"
 msgstr "后"
 
-#: ../panels/sound/gvc-balance-bar.c:110
+#: panels/sound/gvc-balance-bar.c:109
 msgctxt "balance"
 msgid "Front"
 msgstr "前"
 
-#: ../panels/sound/gvc-balance-bar.c:113
+#: panels/sound/gvc-balance-bar.c:112
 msgctxt "balance"
 msgid "Minimum"
 msgstr "最小"
 
-#: ../panels/sound/gvc-balance-bar.c:114
+#: panels/sound/gvc-balance-bar.c:113
 msgctxt "balance"
 msgid "Maximum"
 msgstr "最大"
 
-#: ../panels/sound/gvc-balance-bar.c:289
+#: panels/sound/gvc-balance-bar.c:288
 msgid "_Balance:"
 msgstr "均衡(_B):"
 
-#: ../panels/sound/gvc-balance-bar.c:292
+#: panels/sound/gvc-balance-bar.c:291
 msgid "_Fade:"
 msgstr "淡出淡入(_F):"
 
-#: ../panels/sound/gvc-balance-bar.c:295
+#: panels/sound/gvc-balance-bar.c:294
 msgid "_Subwoofer:"
 msgstr "重低音(_S):"
 
-#: ../panels/sound/gvc-channel-bar.c:611 ../panels/sound/gvc-channel-bar.c:620
+#: panels/sound/gvc-channel-bar.c:610 panels/sound/gvc-channel-bar.c:619
 msgctxt "volume"
 msgid "100%"
 msgstr "100%"
 
-#: ../panels/sound/gvc-channel-bar.c:615
+#: panels/sound/gvc-channel-bar.c:614
 msgctxt "volume"
 msgid "Unamplified"
 msgstr "减弱"
 
-#: ../panels/sound/gvc-combo-box.c:166 ../panels/sound/gvc-mixer-dialog.c:249
-#: ../panels/sound/gvc-mixer-dialog.c:515
+#: panels/sound/gvc-combo-box.c:166 panels/sound/gvc-mixer-dialog.c:253
+#: panels/sound/gvc-mixer-dialog.c:520
 msgid "_Profile:"
 msgstr "配置(_P):"
 
-#. translators:
-#. * The number of sound outputs on a particular device
-#: ../panels/sound/gvc/gvc-mixer-control.c:1837
-#, c-format
-msgid "%u Output"
-msgid_plural "%u Outputs"
-msgstr[0] "%u 路输出"
-
-#. translators:
-#. * The number of sound inputs on a particular device
-#: ../panels/sound/gvc/gvc-mixer-control.c:1847
-#, c-format
-msgid "%u Input"
-msgid_plural "%u Inputs"
-msgstr[0] "%u 路输入"
-
-#: ../panels/sound/gvc/gvc-mixer-control.c:2373
-msgid "System Sounds"
-msgstr "系统声音"
-
-#: ../panels/sound/gvc-mixer-dialog.c:251
+#: panels/sound/gvc-mixer-dialog.c:255
 msgid "_Test Speakers"
 msgstr "测试扬声器(_T)"
 
-#: ../panels/sound/gvc-mixer-dialog.c:420
+#: panels/sound/gvc-mixer-dialog.c:424
 msgid "Peak detect"
 msgstr "峰值检测"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1512
+#: panels/sound/gvc-mixer-dialog.c:1499
 msgid "Device"
 msgstr "设备"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1575
+#: panels/sound/gvc-mixer-dialog.c:1562
 #, c-format
 msgid "Speaker Testing for %s"
 msgstr "%s 扬声器测试"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1631
+#: panels/sound/gvc-mixer-dialog.c:1617
 msgid "_Output volume:"
 msgstr "输出音量(_O):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1645
+#: panels/sound/gvc-mixer-dialog.c:1631
 msgid "Output"
 msgstr "输出"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1650
+#: panels/sound/gvc-mixer-dialog.c:1636
 msgid "C_hoose a device for sound output:"
 msgstr "选择音频输出设备(_H):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1672
+#: panels/sound/gvc-mixer-dialog.c:1658
 msgid "Settings for the selected device:"
 msgstr "选中设备的设置:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1683
+#: panels/sound/gvc-mixer-dialog.c:1669
 msgid "Input"
 msgstr "输入"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1690
+#: panels/sound/gvc-mixer-dialog.c:1676
 msgid "_Input volume:"
 msgstr "输入音量(_I):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1711
+#: panels/sound/gvc-mixer-dialog.c:1697
 msgid "Input level:"
 msgstr "输入等级:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1737
+#: panels/sound/gvc-mixer-dialog.c:1723
 msgid "C_hoose a device for sound input:"
 msgstr "选择音频输入设备(_H):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1761
+#: panels/sound/gvc-mixer-dialog.c:1747
 msgid "Sound Effects"
 msgstr "声音效果"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1768
+#: panels/sound/gvc-mixer-dialog.c:1754
 msgid "_Alert volume:"
 msgstr "警告音量(_A):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1785
+#: panels/sound/gvc-mixer-dialog.c:1775
 msgid "No application is currently playing or recording audio."
 msgstr "没有正在播放或录制音频的程序。"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:188
+#: panels/sound/gvc-sound-theme-chooser.c:187
 msgid "Built-in"
 msgstr "内置"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:454
-#: ../panels/sound/gvc-sound-theme-chooser.c:466
-#: ../panels/sound/gvc-sound-theme-chooser.c:478
+#: panels/sound/gvc-sound-theme-chooser.c:446
+#: panels/sound/gvc-sound-theme-chooser.c:458
+#: panels/sound/gvc-sound-theme-chooser.c:470
 msgid "Sound Preferences"
 msgstr "声音首选项"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:457
-#: ../panels/sound/gvc-sound-theme-chooser.c:468
-#: ../panels/sound/gvc-sound-theme-chooser.c:480
+#: panels/sound/gvc-sound-theme-chooser.c:449
+#: panels/sound/gvc-sound-theme-chooser.c:460
+#: panels/sound/gvc-sound-theme-chooser.c:472
 msgid "Testing event sound"
 msgstr "测试事件声音"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:554
+#: panels/sound/gvc-sound-theme-chooser.c:544
+#: panels/wacom/wacom-stylus-page.ui:25
 msgid "Default"
 msgstr "默认"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:555
+#: panels/sound/gvc-sound-theme-chooser.c:545
 msgid "From theme"
 msgstr "来自主题"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:740
+#: panels/sound/gvc-sound-theme-chooser.c:720
 msgid "C_hoose an alert sound:"
 msgstr "选择警告声音(_H):"
 
-#: ../panels/sound/gvc-speaker-test.c:231
+#: panels/sound/gvc-speaker-test.c:229
 msgid "Stop"
 msgstr "停止"
 
-#: ../panels/sound/gvc-speaker-test.c:231
-#: ../panels/sound/gvc-speaker-test.c:343
+#: panels/sound/gvc-speaker-test.c:229 panels/sound/gvc-speaker-test.c:341
 msgid "Test"
 msgstr "测试"
 
-#: ../panels/sound/gvc-speaker-test.c:239
+#: panels/sound/gvc-speaker-test.c:237
 msgid "Subwoofer"
 msgstr "重低音"
 
-#: ../panels/sound/sound-theme-file-utils.c:304
+#: panels/sound/sound-theme-file-utils.c:288
 msgid "Custom"
 msgstr "自定义"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2
-msgid "Uni­ver­sal Access"
-msgstr "通用辅助功能"
+#. translators: the labels will read:
+#. * Cursor Size: Default
+#: panels/universal-access/cc-ua-panel.c:353
+msgctxt "cursor size"
+msgid "Default"
+msgstr "默认"
+
+#: panels/universal-access/cc-ua-panel.c:356
+msgctxt "cursor size"
+msgid "Medium"
+msgstr "中"
+
+#: panels/universal-access/cc-ua-panel.c:359
+msgctxt "cursor size"
+msgid "Large"
+msgstr "大"
+
+#: panels/universal-access/cc-ua-panel.c:362
+msgctxt "cursor size"
+msgid "Larger"
+msgstr "更大"
+
+#: panels/universal-access/cc-ua-panel.c:365
+msgctxt "cursor size"
+msgid "Largest"
+msgstr "最大"
 
-#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3
+#: panels/universal-access/cc-ua-panel.c:369
+#, c-format
+msgid "%d pixel"
+msgid_plural "%d pixels"
+msgstr[0] "%d 像素"
+
+#: panels/universal-access/gnome-universal-access-panel.desktop.in.in:4
 msgid "Make it easier to see, hear, type, point and click"
 msgstr "辅助视觉、听觉、打字和指点操作"
 
-#. Translators: those are keywords for the universal access control-center panel
-#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/universal-access/gnome-universal-access-panel.desktop.in.in:7
+msgid "preferences-desktop-accessibility"
+msgstr "preferences-desktop-accessibility"
+
+#. Translators: Search terms to find the Universal Access panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
+#: panels/universal-access/gnome-universal-access-panel.desktop.in.in:19
 msgid ""
 "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;"
-"AccessX;Sticky;Keys;Slow;Bounce;Mouse;"
-msgstr ""
-"Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen Reader;text;font;size;"
-"AccessX;Sticky Keys;Slow Keys;Bounce Keys;Mouse Keys;键盘;辅助功能;对比度;缩"
-"放;屏幕读取器;文本;字体;大小;粘滞键;慢速键;回弹键;鼠标;"
+"AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;click;Delay;Assist;Repeat;Blink;"
+msgstr 
"Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;click;Delay;Assist;Repeat;Blink;"
 
-#: ../panels/universal-access/uap.ui.h:1
+#: panels/universal-access/uap.ui:89
 msgid "_Always Show Universal Access Menu"
 msgstr "始终显示通用辅助功能菜单(_A)"
 
-#: ../panels/universal-access/uap.ui.h:2
+#: panels/universal-access/uap.ui:131
 msgid "Seeing"
 msgstr "视觉"
 
-#: ../panels/universal-access/uap.ui.h:3
+#: panels/universal-access/uap.ui:177
 msgid "_High Contrast"
 msgstr "高对比度(_H)"
 
-#: ../panels/universal-access/uap.ui.h:4
+#: panels/universal-access/uap.ui:224
 msgid "_Large Text"
 msgstr "大号文本(_L)"
 
-#: ../panels/universal-access/uap.ui.h:5
-#: ../panels/universal-access/zoom-options.ui.h:7
+#: panels/universal-access/uap.ui:269
+msgid "C_ursor Size"
+msgstr "(_u)光标大小"
+
+#: panels/universal-access/uap.ui:316
+#: panels/universal-access/zoom-options.ui:98
 msgid "_Zoom"
 msgstr "缩放(_Z)"
 
-#: ../panels/universal-access/uap.ui.h:7
+#: panels/universal-access/uap.ui:362
 msgid "Screen _Reader"
 msgstr "屏幕朗读(_R)"
 
-#: ../panels/universal-access/uap.ui.h:8
+#: panels/universal-access/uap.ui:408 panels/universal-access/uap.ui:1237
 msgid "_Sound Keys"
 msgstr "发声键(_S)"
 
-#: ../panels/universal-access/uap.ui.h:9
+#: panels/universal-access/uap.ui:470
 msgid "Hearing"
 msgstr "听觉"
 
-#: ../panels/universal-access/uap.ui.h:10
+#: panels/universal-access/uap.ui:514 panels/universal-access/uap.ui:1340
 msgid "_Visual Alerts"
 msgstr "视觉警告(_V)"
 
-#: ../panels/universal-access/uap.ui.h:12
+#: panels/universal-access/uap.ui:622
 msgid "Screen _Keyboard"
 msgstr "屏幕键盘(_K)"
 
-#: ../panels/universal-access/uap.ui.h:13
+#: panels/universal-access/uap.ui:667
 msgid "R_epeat Keys"
 msgstr "重复键(_E)"
 
-#: ../panels/universal-access/uap.ui.h:14
+#: panels/universal-access/uap.ui:713
 msgid "Cursor _Blinking"
 msgstr "光标闪烁(_B)"
 
-#: ../panels/universal-access/uap.ui.h:15
+#: panels/universal-access/uap.ui:759
 msgid "_Typing Assist (AccessX)"
 msgstr "AccessX 打字助手(_T)"
 
-#: ../panels/universal-access/uap.ui.h:16
+#: panels/universal-access/uap.ui:820
 msgid "Pointing & Clicking"
 msgstr "指向和点击"
 
-#: ../panels/universal-access/uap.ui.h:17
+#: panels/universal-access/uap.ui:866
 msgid "_Mouse Keys"
 msgstr "鼠标键(_M)"
 
-#: ../panels/universal-access/uap.ui.h:18
+#: panels/universal-access/uap.ui:911
 msgid "_Click Assist"
 msgstr "点击助手(_C)"
 
-#: ../panels/universal-access/uap.ui.h:19
+#: panels/universal-access/uap.ui:957
 msgid "_Double-Click Delay"
 msgstr "双击延时(_D)"
 
-#: ../panels/universal-access/uap.ui.h:20
+#: panels/universal-access/uap.ui:977
 msgid "Double-Click Delay"
 msgstr "双击延时"
 
-#: ../panels/universal-access/uap.ui.h:21
+#: panels/universal-access/uap.ui:1042
+msgid "Cursor Size"
+msgstr "光标大小"
+
+#: panels/universal-access/uap.ui:1069
+msgid ""
+"Cursor size can be combined with zoom to make it easier to see the cursor."
+msgstr "光标的大小可以与缩放相结合,使其更容易看到光标。"
+
+#: panels/universal-access/uap.ui:1105
 msgid "Screen Reader"
 msgstr "屏幕朗读"
 
-#: ../panels/universal-access/uap.ui.h:22
+#: panels/universal-access/uap.ui:1122
 msgid "The screen reader reads displayed text as you move the focus."
 msgstr "移动焦点时朗读显示的文本。"
 
-#: ../panels/universal-access/uap.ui.h:23
+#: panels/universal-access/uap.ui:1155
 msgid "_Screen Reader"
 msgstr "屏幕朗读(_S)"
 
-#: ../panels/universal-access/uap.ui.h:24
+#: panels/universal-access/uap.ui:1194
 msgid "Sound Keys"
 msgstr "发声键"
 
-#: ../panels/universal-access/uap.ui.h:25
+#: panels/universal-access/uap.ui:1212
 msgid "Beep when Num Lock or Caps Lock are turned on or off."
 msgstr "数字键盘锁定或大小写锁定开启或关闭时发出蜂鸣声。"
 
-#: ../panels/universal-access/uap.ui.h:26
+#: panels/universal-access/uap.ui:1282
 msgid "Visual Alerts"
 msgstr "视觉警告"
 
-#: ../panels/universal-access/uap.ui.h:27
+#: panels/universal-access/uap.ui:1286
 msgid "_Test flash"
 msgstr "测试闪烁(_T)"
 
-#: ../panels/universal-access/uap.ui.h:28
+#: panels/universal-access/uap.ui:1315
 msgid "Use a visual indication when an alert sound occurs."
 msgstr "发出警告声时使用视觉提示。"
 
-#: ../panels/universal-access/uap.ui.h:29
+#: panels/universal-access/uap.ui:1366
 msgid "Flash the _window title"
 msgstr "闪烁窗口标题栏(_W)"
 
-#: ../panels/universal-access/uap.ui.h:30
+#: panels/universal-access/uap.ui:1384
 msgid "Flash the entire _screen"
 msgstr "闪烁整个屏幕(_S)"
 
-#: ../panels/universal-access/uap.ui.h:31
+#: panels/universal-access/uap.ui:1429
 msgid "Repeat Keys"
 msgstr "重复"
 
-#: ../panels/universal-access/uap.ui.h:32
+#: panels/universal-access/uap.ui:1459
 msgid "Key presses repeat when key is held down."
 msgstr "按住某一键时重复该键。"
 
-#: ../panels/universal-access/uap.ui.h:34
+#: panels/universal-access/uap.ui:1538
 msgid "Repeat keys delay"
 msgstr "重复键延时"
 
-#: ../panels/universal-access/uap.ui.h:35
+#: panels/universal-access/uap.ui:1586 panels/universal-access/uap.ui:1719
 msgid "Speed"
 msgstr "速度"
 
-#: ../panels/universal-access/uap.ui.h:36
+#: panels/universal-access/uap.ui:1623
 msgid "Repeat keys speed"
 msgstr "重复键速度"
 
-#: ../panels/universal-access/uap.ui.h:37
+#: panels/universal-access/uap.ui:1647
 msgid "Cursor Blinking"
 msgstr "光标闪烁"
 
-#: ../panels/universal-access/uap.ui.h:38
+#: panels/universal-access/uap.ui:1677
 msgid "Cursor blinks in text fields."
 msgstr "文本字段中光标闪烁。"
 
-#: ../panels/universal-access/uap.ui.h:39
+#: panels/universal-access/uap.ui:1756
 msgid "Cursor blinking speed"
 msgstr "光标闪烁速度"
 
-#: ../panels/universal-access/uap.ui.h:40
+#: panels/universal-access/uap.ui:1792
 msgid "Typing Assist"
 msgstr "打字助手"
 
-#: ../panels/universal-access/uap.ui.h:41
+#: panels/universal-access/uap.ui:1831
 msgid "_Sticky Keys"
 msgstr "粘滞键(_S)"
 
-#: ../panels/universal-access/uap.ui.h:42
+#: panels/universal-access/uap.ui:1848
 msgid "Treats a sequence of modifier keys as a key combination"
 msgstr "将一系列按键当作组合键"
 
-#: ../panels/universal-access/uap.ui.h:43
+#: panels/universal-access/uap.ui:1872
 msgid "_Disable if two keys are pressed together"
 msgstr "同时按下两个键时禁用输入(_D)"
 
-#: ../panels/universal-access/uap.ui.h:44
+#: panels/universal-access/uap.ui:1890
 msgid "Beep when a _modifier key is pressed"
 msgstr "按修饰键时蜂鸣(_M)"
 
-#: ../panels/universal-access/uap.ui.h:45
+#: panels/universal-access/uap.ui:1938
 msgid "S_low Keys"
 msgstr "慢速键(_L)"
 
-#: ../panels/universal-access/uap.ui.h:46
+#: panels/universal-access/uap.ui:1955
 msgid "Puts a delay between when a key is pressed and when it is accepted"
 msgstr "在按下按键和接受按键之间添加延迟"
 
-#: ../panels/universal-access/uap.ui.h:47
+#: panels/universal-access/uap.ui:1988 panels/universal-access/uap.ui:2201
+#: panels/universal-access/uap.ui:2538
 msgid "A_cceptance delay:"
 msgstr "按键接受延迟(_C):"
 
-#: ../panels/universal-access/uap.ui.h:48
+#: panels/universal-access/uap.ui:2010
 msgctxt "slow keys delay"
 msgid "Short"
 msgstr "短"
 
-#: ../panels/universal-access/uap.ui.h:49
+#: panels/universal-access/uap.ui:2029
 msgid "Slow keys typing delay"
 msgstr "慢速键输入延迟"
 
-#: ../panels/universal-access/uap.ui.h:50
+#: panels/universal-access/uap.ui:2044
 msgctxt "slow keys delay"
 msgid "Long"
 msgstr "长"
 
-#: ../panels/universal-access/uap.ui.h:51
+#: panels/universal-access/uap.ui:2071
 msgid "Beep when a key is pr_essed"
 msgstr "按键时蜂鸣(_E)"
 
-#: ../panels/universal-access/uap.ui.h:52
+#: panels/universal-access/uap.ui:2088
 msgid "Beep when a key is _accepted"
 msgstr "按键被接受时蜂鸣(_A)"
 
-#: ../panels/universal-access/uap.ui.h:53
+#: panels/universal-access/uap.ui:2105 panels/universal-access/uap.ui:2284
 msgid "Beep when a key is _rejected"
 msgstr "按键被拒绝时蜂鸣(_R)"
 
-#: ../panels/universal-access/uap.ui.h:54
+#: panels/universal-access/uap.ui:2151
 msgid "_Bounce Keys"
 msgstr "重复键(_B)"
 
-#: ../panels/universal-access/uap.ui.h:55
+#: panels/universal-access/uap.ui:2168
 msgid "Ignores fast duplicate keypresses"
 msgstr "忽略快速重复按键"
 
-#: ../panels/universal-access/uap.ui.h:56
+#: panels/universal-access/uap.ui:2223
 msgctxt "bounce keys delay"
 msgid "Short"
 msgstr "短"
 
-#: ../panels/universal-access/uap.ui.h:57
+#: panels/universal-access/uap.ui:2242
 msgid "Bounce keys typing delay"
 msgstr "重复键输入延迟"
 
-#: ../panels/universal-access/uap.ui.h:58
+#: panels/universal-access/uap.ui:2257
 msgctxt "bounce keys delay"
 msgid "Long"
 msgstr "长"
 
-#: ../panels/universal-access/uap.ui.h:59
+#: panels/universal-access/uap.ui:2370
 msgid "_Enable by Keyboard"
 msgstr "通过键盘启用(_E)"
 
-#: ../panels/universal-access/uap.ui.h:60
+#: panels/universal-access/uap.ui:2387
 msgid "Turn accessibility features on and off using the keyboard"
 msgstr "通过键盘开关辅助功能特性"
 
-#: ../panels/universal-access/uap.ui.h:61
+#: panels/universal-access/uap.ui:2451
 msgid "Click Assist"
 msgstr "点击助手"
 
-#: ../panels/universal-access/uap.ui.h:62
+#: panels/universal-access/uap.ui:2487
 msgid "_Simulated Secondary Click"
 msgstr "模拟右键点击(_S)"
 
-#: ../panels/universal-access/uap.ui.h:63
+#: panels/universal-access/uap.ui:2505
 msgid "Trigger a secondary click by holding down the primary button"
 msgstr "按住鼠标主键不放时触发右键点击"
 
-#: ../panels/universal-access/uap.ui.h:64
+#: panels/universal-access/uap.ui:2559
 msgctxt "secondary click"
 msgid "Short"
 msgstr "短"
 
-#: ../panels/universal-access/uap.ui.h:65
+#: panels/universal-access/uap.ui:2578
 msgid "Secondary click delay"
 msgstr "右键点击延迟"
 
-#: ../panels/universal-access/uap.ui.h:66
+#: panels/universal-access/uap.ui:2593
 msgctxt "secondary click delay"
 msgid "Long"
 msgstr "长"
 
-#: ../panels/universal-access/uap.ui.h:67
+#: panels/universal-access/uap.ui:2650
 msgid "_Hover Click"
 msgstr "悬停点击(_H)"
 
-#: ../panels/universal-access/uap.ui.h:68
+#: panels/universal-access/uap.ui:2668
 msgid "Trigger a click when the pointer hovers"
 msgstr "指针悬停时触发点击。"
 
-#: ../panels/universal-access/uap.ui.h:69
+#: panels/universal-access/uap.ui:2701
 msgid "D_elay:"
 msgstr "延迟(_E):"
 
-#: ../panels/universal-access/uap.ui.h:70
+#: panels/universal-access/uap.ui:2723
 msgctxt "dwell click delay"
 msgid "Short"
 msgstr "短"
 
-#: ../panels/universal-access/uap.ui.h:71
+#: panels/universal-access/uap.ui:2754
 msgctxt "dwell click delay"
 msgid "Long"
 msgstr "长"
 
-#: ../panels/universal-access/uap.ui.h:72
+#: panels/universal-access/uap.ui:2790
 msgid "Motion _threshold:"
 msgstr "运动阈值(_T):"
 
-#: ../panels/universal-access/uap.ui.h:73
+#: panels/universal-access/uap.ui:2812
 msgctxt "dwell click threshold"
 msgid "Small"
 msgstr "小"
 
-#: ../panels/universal-access/uap.ui.h:74
+#: panels/universal-access/uap.ui:2843
 msgctxt "dwell click threshold"
 msgid "Large"
 msgstr "大"
 
-#: ../panels/universal-access/zoom-options.c:333
+#: panels/universal-access/zoom-options.c:333
 msgctxt "Distance"
 msgid "Short"
 msgstr "短"
 
-#: ../panels/universal-access/zoom-options.c:334
+#: panels/universal-access/zoom-options.c:334
 msgctxt "Distance"
 msgid "¼ Screen"
 msgstr "¼ 屏幕"
 
-#: ../panels/universal-access/zoom-options.c:335
+#: panels/universal-access/zoom-options.c:335
 msgctxt "Distance"
 msgid "½ Screen"
 msgstr "½ 屏幕"
 
-#: ../panels/universal-access/zoom-options.c:336
+#: panels/universal-access/zoom-options.c:336
 msgctxt "Distance"
 msgid "¾ Screen"
 msgstr "¾ 屏幕"
 
-#: ../panels/universal-access/zoom-options.c:337
+#: panels/universal-access/zoom-options.c:337
 msgctxt "Distance"
 msgid "Long"
 msgstr "长"
 
-#: ../panels/universal-access/zoom-options.ui.h:1
+#: panels/universal-access/zoom-options.ui:48
 msgid "Full Screen"
 msgstr "全屏"
 
-#: ../panels/universal-access/zoom-options.ui.h:2
+#: panels/universal-access/zoom-options.ui:53
 msgid "Top Half"
 msgstr "上半部分"
 
-#: ../panels/universal-access/zoom-options.ui.h:3
+#: panels/universal-access/zoom-options.ui:58
 msgid "Bottom Half"
 msgstr "下半部分"
 
-#: ../panels/universal-access/zoom-options.ui.h:4
+#: panels/universal-access/zoom-options.ui:63
 msgid "Left Half"
 msgstr "左半部分"
 
-#: ../panels/universal-access/zoom-options.ui.h:5
+#: panels/universal-access/zoom-options.ui:68
 msgid "Right Half"
 msgstr "右半部分"
 
-#: ../panels/universal-access/zoom-options.ui.h:6
+#: panels/universal-access/zoom-options.ui:77
 msgid "Zoom Options"
 msgstr "缩放选项"
 
-#: ../panels/universal-access/zoom-options.ui.h:8
+#: panels/universal-access/zoom-options.ui:186
 msgid "_Magnification:"
 msgstr "放大比率(_M):"
 
-#: ../panels/universal-access/zoom-options.ui.h:9
+#: panels/universal-access/zoom-options.ui:250
 msgid "_Follow mouse cursor"
 msgstr "跟随鼠标光标(_F)"
 
-#: ../panels/universal-access/zoom-options.ui.h:10
+#: panels/universal-access/zoom-options.ui:270
 msgid "_Screen part:"
 msgstr "屏幕区域(_S):"
 
-#: ../panels/universal-access/zoom-options.ui.h:11
+#: panels/universal-access/zoom-options.ui:332
 msgid "Magnifier _extends outside of screen"
 msgstr "放大镜可延伸至屏幕外(_E)"
 
-#: ../panels/universal-access/zoom-options.ui.h:12
+#: panels/universal-access/zoom-options.ui:351
 msgid "_Keep magnifier cursor centered"
 msgstr "保持放大镜光标居中(_K)"
 
-#: ../panels/universal-access/zoom-options.ui.h:13
+#: panels/universal-access/zoom-options.ui:370
 msgid "Magnifier cursor _pushes contents around"
 msgstr "放大镜光标推动内容(_P)"
 
-#: ../panels/universal-access/zoom-options.ui.h:14
+#: panels/universal-access/zoom-options.ui:389
 msgid "Magnifier cursor moves with _contents"
 msgstr "放大镜光标与内容同步移动(_C)"
 
-#: ../panels/universal-access/zoom-options.ui.h:15
+#: panels/universal-access/zoom-options.ui:423
 msgid "Magnifier Position:"
 msgstr "放大镜位置:"
 
-#: ../panels/universal-access/zoom-options.ui.h:16
+#: panels/universal-access/zoom-options.ui:444
 msgid "Magnifier"
 msgstr "放大镜"
 
-#: ../panels/universal-access/zoom-options.ui.h:17
+#: panels/universal-access/zoom-options.ui:490
 msgid "_Thickness:"
 msgstr "粗细(_T):"
 
-#: ../panels/universal-access/zoom-options.ui.h:18
+#: panels/universal-access/zoom-options.ui:516
 msgctxt "universal access, thickness"
 msgid "Thin"
 msgstr "细"
 
-#: ../panels/universal-access/zoom-options.ui.h:19
+#: panels/universal-access/zoom-options.ui:548
 msgctxt "universal access, thickness"
 msgid "Thick"
 msgstr "粗"
 
-#: ../panels/universal-access/zoom-options.ui.h:20
+#: panels/universal-access/zoom-options.ui:574
 msgid "_Length:"
 msgstr "长度(_L):"
 
 #. The color of the accessibility crosshair
-#: ../panels/universal-access/zoom-options.ui.h:22
+#: panels/universal-access/zoom-options.ui:626
 msgid "Co_lor:"
 msgstr "颜色(_L):"
 
-#: ../panels/universal-access/zoom-options.ui.h:23
+#: panels/universal-access/zoom-options.ui:690
 msgid "_Crosshairs:"
 msgstr "十字光标(_C):"
 
-#: ../panels/universal-access/zoom-options.ui.h:24
+#: panels/universal-access/zoom-options.ui:741
 msgid "_Overlaps mouse cursor"
 msgstr "光标与鼠标指针重叠(——O)"
 
-#: ../panels/universal-access/zoom-options.ui.h:25
+#: panels/universal-access/zoom-options.ui:779
 msgid "Crosshairs"
 msgstr "十字光标"
 
-#: ../panels/universal-access/zoom-options.ui.h:26
+#: panels/universal-access/zoom-options.ui:827
 msgid "_White on black:"
 msgstr "白底黑字(_W):"
 
-#: ../panels/universal-access/zoom-options.ui.h:27
+#: panels/universal-access/zoom-options.ui:850
 msgid "_Brightness:"
 msgstr "亮度(_B):"
 
-#: ../panels/universal-access/zoom-options.ui.h:28
+#: panels/universal-access/zoom-options.ui:874
 msgid "_Contrast:"
 msgstr "对比度(_C):"
 
 #. The contrast scale goes from Color to None (grayscale)
-#: ../panels/universal-access/zoom-options.ui.h:30
+#: panels/universal-access/zoom-options.ui:897
 msgctxt "universal access, contrast"
 msgid "Co_lor"
 msgstr "色彩(_L)"
 
-#: ../panels/universal-access/zoom-options.ui.h:31
+#: panels/universal-access/zoom-options.ui:925
 msgctxt "universal access, color"
 msgid "None"
 msgstr "无"
 
-#: ../panels/universal-access/zoom-options.ui.h:32
+#: panels/universal-access/zoom-options.ui:957
 msgctxt "universal access, color"
 msgid "Full"
 msgstr "完全"
 
-#: ../panels/universal-access/zoom-options.ui.h:33
+#: panels/universal-access/zoom-options.ui:1023
 msgctxt "universal access, brightness"
 msgid "Low"
 msgstr "低"
 
-#: ../panels/universal-access/zoom-options.ui.h:34
+#: panels/universal-access/zoom-options.ui:1056
 msgctxt "universal access, brightness"
 msgid "High"
 msgstr "高"
 
-#: ../panels/universal-access/zoom-options.ui.h:35
+#: panels/universal-access/zoom-options.ui:1087
 msgctxt "universal access, contrast"
 msgid "Low"
 msgstr "低"
 
-#: ../panels/universal-access/zoom-options.ui.h:36
+#: panels/universal-access/zoom-options.ui:1120
 msgctxt "universal access, contrast"
 msgid "High"
 msgstr "高"
 
-#: ../panels/universal-access/zoom-options.ui.h:37
+#: panels/universal-access/zoom-options.ui:1156
 msgid "Color Effects:"
 msgstr "色彩效果:"
 
-#: ../panels/universal-access/zoom-options.ui.h:38
+#: panels/universal-access/zoom-options.ui:1181
 msgid "Color Effects"
 msgstr "色彩效果"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:1
-#: ../panels/user-accounts/data/join-dialog.ui.h:1
+#: panels/user-accounts/data/account-dialog.ui:18
+#: panels/user-accounts/data/join-dialog.ui:11
 msgid "Add User"
 msgstr "添加用户"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:5
+#: panels/user-accounts/data/account-dialog.ui:171
 msgid "_Full Name"
 msgstr "全名(_F)"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:6
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2
+#: panels/user-accounts/data/account-dialog.ui:197
+#: panels/user-accounts/data/user-accounts-dialog.ui:146
 msgid "Standard"
 msgstr "标准"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:7
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
+#: panels/user-accounts/data/account-dialog.ui:207
+#: panels/user-accounts/data/user-accounts-dialog.ui:155
 msgid "Administrator"
 msgstr "管理员"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:8
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
+#: panels/user-accounts/data/account-dialog.ui:223
+#: panels/user-accounts/data/user-accounts-dialog.ui:173
 msgid "Account _Type"
 msgstr "帐号类型(_T)"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:10
+#: panels/user-accounts/data/account-dialog.ui:260
 msgid "Allow user to set a password when they next _login"
 msgstr "允许用户下次登录时更改密码(_L)"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:11
+#: panels/user-accounts/data/account-dialog.ui:274
 msgid "Set a password _now"
 msgstr "现在设置密码(_N)"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:13
+#: panels/user-accounts/data/account-dialog.ui:387
 msgid "_Confirm"
 msgstr "确认(_C)"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:14
+#: panels/user-accounts/data/account-dialog.ui:463
+#: panels/user-accounts/data/account-dialog.ui:667
 msgid ""
 "Enterprise login allows an existing centrally managed user account to be "
 "used on this device. You can also use this account to access company "
 "resources on the internet."
-msgstr ""
-"企业登录允许在本设备上使用已有的、集中管理的用户帐号。您也可以使用此账号访问"
-"公司在互联网上的资源。"
+msgstr "企业登录允许在本设备上使用已有的、集中管理的用户帐号。您也可以使用此账号访问公司在互联网上的资源。"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:15
-#: ../panels/user-accounts/data/join-dialog.ui.h:9
+#: panels/user-accounts/data/account-dialog.ui:485
+#: panels/user-accounts/data/join-dialog.ui:116
 msgid "_Domain"
 msgstr "域(_D)"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:16
+#: panels/user-accounts/data/account-dialog.ui:707
 msgid "You are Offline"
 msgstr "您已离线"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:17
+#: panels/user-accounts/data/account-dialog.ui:726
 msgid "You must be online in order to add enterprise users."
 msgstr "您必须在线以添加企业登录帐号。"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:18
+#: panels/user-accounts/data/account-dialog.ui:760
 msgid "_Enterprise Login"
 msgstr "企业登录(_E)"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:1
+#: panels/user-accounts/data/account-fingerprint.ui:12
 msgid "Left thumb"
 msgstr "左手拇指"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:2
+#: panels/user-accounts/data/account-fingerprint.ui:15
 msgid "Left middle finger"
 msgstr "左手中指"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:3
+#: panels/user-accounts/data/account-fingerprint.ui:18
 msgid "Left ring finger"
 msgstr "左手无名指"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:4
+#: panels/user-accounts/data/account-fingerprint.ui:21
 msgid "Left little finger"
 msgstr "左手小指"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:5
+#: panels/user-accounts/data/account-fingerprint.ui:24
 msgid "Right thumb"
 msgstr "右手拇指"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:6
+#: panels/user-accounts/data/account-fingerprint.ui:27
 msgid "Right middle finger"
 msgstr "右手中指"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:7
+#: panels/user-accounts/data/account-fingerprint.ui:30
 msgid "Right ring finger"
 msgstr "右手无名指"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:8
+#: panels/user-accounts/data/account-fingerprint.ui:33
 msgid "Right little finger"
 msgstr "右手小指"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:9
-#: ../panels/user-accounts/um-fingerprint-dialog.c:687
+#: panels/user-accounts/data/account-fingerprint.ui:39
+#: panels/user-accounts/um-fingerprint-dialog.c:677
 msgid "Enable Fingerprint Login"
 msgstr "启用指纹登录"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:10
+#: panels/user-accounts/data/account-fingerprint.ui:89
 msgid "_Right index finger"
 msgstr "右手食指(_R)"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:11
+#: panels/user-accounts/data/account-fingerprint.ui:105
 msgid "_Left index finger"
 msgstr "左手食指(_L)"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:12
+#: panels/user-accounts/data/account-fingerprint.ui:126
 msgid "_Other finger:"
 msgstr "其他手指(_O):"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:13
+#: panels/user-accounts/data/account-fingerprint.ui:324
 msgid ""
 "Your fingerprint was successfully saved. You should now be able to log in "
 "using your fingerprint reader."
 msgstr "您的指纹已成功保存,从现在起可以使用指纹登录。"
 
-#: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:1
+#: panels/user-accounts/data/avatar-chooser.ui:27
+msgid "Take a Picture…"
+msgstr "拍照…..."
+
+#: panels/user-accounts/data/avatar-chooser.ui:34
+msgid "Select a File…"
+msgstr "选择一个文件......"
+
+#: panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in:3
 msgid "Users"
 msgstr "用户"
 
-#: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:2
+#: panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in:4
 msgid "Add or remove users and change your password"
 msgstr "添加或删除用户及更改密码"
 
-#. Translators: those are keywords for the user accounts control-center panel
-#: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:4
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in:7
+msgid "system-users"
+msgstr "system-users"
+
+#. Translators: Search terms to find the Users panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+#: panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in:20
 msgid "Login;Name;Fingerprint;Avatar;Logo;Face;Password;"
-msgstr ""
-"Login;Name;Fingerprint;Avatar;Logo;Face;Password;登录;名称;指纹;头像;标志;密"
-"码;"
+msgstr "Login;Name;Fingerprint;Avatar;Logo;Face;Password;登录;名称;指纹;头像;标志;密码;"
 
 #. Translators: This button enrolls the computer in the domain in order to use enterprise logins.
-#: ../panels/user-accounts/data/join-dialog.ui.h:4
+#: panels/user-accounts/data/join-dialog.ui:39
 msgid "_Enroll"
 msgstr "登记(_E)"
 
-#: ../panels/user-accounts/data/join-dialog.ui.h:5
+#: panels/user-accounts/data/join-dialog.ui:75
 msgid "Domain Administrator Login"
 msgstr "域管理员登录"
 
-#: ../panels/user-accounts/data/join-dialog.ui.h:6
+#: panels/user-accounts/data/join-dialog.ui:93
 msgid ""
 "In order to use enterprise logins, this computer needs to be\n"
 "enrolled in the domain. Please have your network administrator\n"
 "type their domain password here."
-msgstr ""
-"要使用企业登录,需要在域中注册该计算机。\n"
-"请要求网络管理员在此输入域密码。"
+msgstr "要使用企业登录, 需要在域中\n"
+"注册该计算机。请要求网络管理员\n"
+"在此输入域密码。"
 
-#: ../panels/user-accounts/data/join-dialog.ui.h:10
+#: panels/user-accounts/data/join-dialog.ui:150
 msgid "Administrator _Name"
 msgstr "管理员名称(_N)"
 
-#: ../panels/user-accounts/data/join-dialog.ui.h:11
+#: panels/user-accounts/data/join-dialog.ui:185
 msgid "Administrator Password"
 msgstr "管理员密码"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:1
+#: panels/user-accounts/data/password-dialog.ui:7
 msgid "Change Password"
 msgstr "更改密码"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:3
+#: panels/user-accounts/data/password-dialog.ui:38
 msgid "Ch_ange"
 msgstr "更改(_A)"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:4
+#: panels/user-accounts/data/password-dialog.ui:142
 msgid "_Verify New Password"
 msgstr "确认新密码(_V)"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:5
+#: panels/user-accounts/data/password-dialog.ui:159
 msgid "_New Password"
 msgstr "新密码(_N)"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:6
+#: panels/user-accounts/data/password-dialog.ui:208
 msgid "Current _Password"
 msgstr "当前密码(_P)"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:7
+#: panels/user-accounts/data/password-dialog.ui:243
 msgid "Allow user to change their password on next login"
 msgstr "允许用户下次登录时更改密码"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:8
+#: panels/user-accounts/data/password-dialog.ui:256
 msgid "Set a password now"
 msgstr "现在设置密码"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1
+#: panels/user-accounts/data/user-accounts-dialog.ui:20
 msgid "_Add User…"
 msgstr "添加用户(_A)…"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
+#: panels/user-accounts/data/user-accounts-dialog.ui:69
+msgid "Your session needs to be restarted for changes to take effect"
+msgstr "修改需要重启会话才能生效"
+
+#: panels/user-accounts/data/user-accounts-dialog.ui:77
+msgid "Restart Now"
+msgstr "现在重启"
+
+#: panels/user-accounts/data/user-accounts-dialog.ui:244
 msgid "A_utomatic Login"
 msgstr "自动登录(_U)"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
+#: panels/user-accounts/data/user-accounts-dialog.ui:285
 msgid "_Fingerprint Login"
 msgstr "指纹登录(_F)"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
+#: panels/user-accounts/data/user-accounts-dialog.ui:311
+#: panels/user-accounts/data/user-accounts-dialog.ui:324
 msgid "User Icon"
 msgstr "用户图标"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
+#: panels/user-accounts/data/user-accounts-dialog.ui:387
 msgid "Last Login"
 msgstr "最近登录"
 
-#: ../panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in.h:1
+#: panels/user-accounts/data/user-accounts-dialog.ui:434
+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/data/user-accounts-dialog.ui:466
+msgid "No Users Found"
+msgstr "没有找到用户"
+
+#: panels/user-accounts/data/user-accounts-dialog.ui:476
+msgid "Unlock to add a user account."
+msgstr "解锁以添加一个用户帐户"
+
+#: panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in:11
 msgid "Manage user accounts"
 msgstr "管理用户帐号"
 
-#: ../panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in.h:2
+#: panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in:12
 msgid "Authentication is required to change user data"
 msgstr "改变用户数据需要认证"
 
-#: ../panels/user-accounts/pw-utils.c:81
+#: panels/user-accounts/pw-utils.c:81
 msgctxt "Password hint"
 msgid "The new password needs to be different from the old one."
 msgstr "新密码不能和旧密码相同。"
 
-#: ../panels/user-accounts/pw-utils.c:83
+#: panels/user-accounts/pw-utils.c:83
 msgctxt "Password hint"
 msgid "Try changing some letters and numbers."
 msgstr "请改动一些字母和数字。"
 
-#: ../panels/user-accounts/pw-utils.c:85 ../panels/user-accounts/pw-utils.c:93
+#: panels/user-accounts/pw-utils.c:85 panels/user-accounts/pw-utils.c:93
 msgctxt "Password hint"
 msgid "Try changing the password a bit more."
 msgstr "请进一步修改密码。"
 
-#: ../panels/user-accounts/pw-utils.c:87
+#: panels/user-accounts/pw-utils.c:87
 msgctxt "Password hint"
 msgid "A password without your user name would be stronger."
 msgstr "不包含用户名的密码更安全。"
 
-#: ../panels/user-accounts/pw-utils.c:89
+#: panels/user-accounts/pw-utils.c:89
 msgctxt "Password hint"
 msgid "Try to avoid using your name in the password."
 msgstr "请勿在密码中使用您的名字。"
 
-#: ../panels/user-accounts/pw-utils.c:91
+#: panels/user-accounts/pw-utils.c:91
 msgctxt "Password hint"
 msgid "Try to avoid some of the words included in the password."
 msgstr "请勿在密码中使用单词。"
 
-#: ../panels/user-accounts/pw-utils.c:95
+#: panels/user-accounts/pw-utils.c:95
 msgctxt "Password hint"
 msgid "Try to avoid common words."
 msgstr "请勿使用常用单词。"
 
-#: ../panels/user-accounts/pw-utils.c:97
+#: panels/user-accounts/pw-utils.c:97
 msgctxt "Password hint"
 msgid "Try to avoid reordering existing words."
 msgstr "请勿仅变更现有单词顺序。"
 
-#: ../panels/user-accounts/pw-utils.c:99
+#: panels/user-accounts/pw-utils.c:99
 msgctxt "Password hint"
 msgid "Try to use more numbers."
 msgstr "请使用更多数字。"
 
-#: ../panels/user-accounts/pw-utils.c:101
+#: panels/user-accounts/pw-utils.c:101
 msgctxt "Password hint"
 msgid "Try to use more uppercase letters."
 msgstr "请使用更多大写字母。"
 
-#: ../panels/user-accounts/pw-utils.c:103
+#: panels/user-accounts/pw-utils.c:103
 msgctxt "Password hint"
 msgid "Try to use more lowercase letters."
 msgstr "请使用更多小写字母。"
 
-#: ../panels/user-accounts/pw-utils.c:105
+#: panels/user-accounts/pw-utils.c:105
 msgctxt "Password hint"
 msgid "Try to use more special characters, like punctuation."
 msgstr "请使用更多特殊字符,如标点符号。"
 
-#: ../panels/user-accounts/pw-utils.c:107
+#: panels/user-accounts/pw-utils.c:107
 msgctxt "Password hint"
 msgid "Try to use a mixture of letters, numbers and punctuation."
 msgstr "请混用字母、数字和标点符号。"
 
-#: ../panels/user-accounts/pw-utils.c:109
+#: panels/user-accounts/pw-utils.c:109
 msgctxt "Password hint"
 msgid "Try to avoid repeating the same character."
 msgstr "请避免重复相同的字符。"
 
-#: ../panels/user-accounts/pw-utils.c:111
+#: panels/user-accounts/pw-utils.c:111
 msgctxt "Password hint"
 msgid ""
 "Try to avoid repeating the same type of character: you need to mix up "
 "letters, numbers and punctuation."
 msgstr "请避免重复相同类型的字符:你需要混合字母、数字和标点符号。"
 
-#: ../panels/user-accounts/pw-utils.c:113
+#: panels/user-accounts/pw-utils.c:113
 msgctxt "Password hint"
 msgid "Try to avoid sequences like 1234 or abcd."
 msgstr "请避免使用如 1234 或 abcd 的有规律序列。"
 
-#: ../panels/user-accounts/pw-utils.c:115
+#: panels/user-accounts/pw-utils.c:115
 msgctxt "Password hint"
-msgid "Try to add more letters, numbers and symbols."
-msgstr "请使用更多字母、数字和符号。"
+msgid ""
+"Password needs to be longer. Try to add more letters, numbers and "
+"punctuation."
+msgstr "密码太短。添加更多的字母、数字和标点符号。"
 
-#: ../panels/user-accounts/pw-utils.c:117
+#: panels/user-accounts/pw-utils.c:117
 msgctxt "Password hint"
 msgid "Mix uppercase and lowercase and try to use a number or two."
 msgstr "密码需要大小写字母混用并试着使用一到两个数字。"
 
-#: ../panels/user-accounts/pw-utils.c:119
+#: panels/user-accounts/pw-utils.c:119
 msgctxt "Password hint"
 msgid ""
-"Good password! Adding more letters, numbers and punctuation will make it "
-"stronger."
-msgstr "密码不错!增加更多字母、数字和标点可进一步提高密码强度。"
-
-#: ../panels/user-accounts/pw-utils.c:141
-#: ../panels/user-accounts/pw-utils.c:171
-msgctxt "Password strength"
-msgid "Strength: Weak"
-msgstr "强度:较弱"
-
-#: ../panels/user-accounts/pw-utils.c:145
-#: ../panels/user-accounts/pw-utils.c:172
-msgctxt "Password strength"
-msgid "Strength: Low"
-msgstr "强度:较低"
-
-#: ../panels/user-accounts/pw-utils.c:148
-#: ../panels/user-accounts/pw-utils.c:173
-msgctxt "Password strength"
-msgid "Strength: Medium"
-msgstr "强度:中等"
-
-#: ../panels/user-accounts/pw-utils.c:151
-#: ../panels/user-accounts/pw-utils.c:174
-msgctxt "Password strength"
-msgid "Strength: Good"
-msgstr "强度:良好"
-
-#: ../panels/user-accounts/pw-utils.c:154
-#: ../panels/user-accounts/pw-utils.c:175
-msgctxt "Password strength"
-msgid "Strength: High"
-msgstr "强度:较高"
-
-#: ../panels/user-accounts/run-passwd.c:422
+"Adding more letters, numbers and punctuation will make the password stronger."
+msgstr "加入更多的字母、数字和标点符号会使密码更加牢固。"
+
+#: panels/user-accounts/run-passwd.c:422
 msgid "Authentication failed"
 msgstr "认证失败"
 
-#: ../panels/user-accounts/run-passwd.c:502
+#: panels/user-accounts/run-passwd.c:502
 #, c-format
 msgid "The new password is too short"
 msgstr "新密码太短"
 
-#: ../panels/user-accounts/run-passwd.c:508
+#: panels/user-accounts/run-passwd.c:508
 #, c-format
 msgid "The new password is too simple"
 msgstr "新密码太简单"
 
-#: ../panels/user-accounts/run-passwd.c:514
+#: panels/user-accounts/run-passwd.c:514
 #, 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:517
 #, 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:520
 #, 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:524
 #, 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:528
 #, 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:532
 #, 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:536
 #, c-format
 msgid "Unknown error"
 msgstr "未知错误"
 
-#: ../panels/user-accounts/um-account-dialog.c:34
+#: panels/user-accounts/um-account-dialog.c:34
 msgid "Should match the web address of your login provider."
 msgstr "应与您登录提供商的网络地址相同。"
 
-#: ../panels/user-accounts/um-account-dialog.c:228
+#: panels/user-accounts/um-account-dialog.c:229
 msgid "Failed to add account"
 msgstr "添加帐号失败"
 
-#: ../panels/user-accounts/um-account-dialog.c:448
+#: panels/user-accounts/um-account-dialog.c:462
 msgid "Passwords do not match."
 msgstr "密码不匹配。"
 
-#: ../panels/user-accounts/um-account-dialog.c:702
-#: ../panels/user-accounts/um-account-dialog.c:748
-#: ../panels/user-accounts/um-account-dialog.c:769
+#: panels/user-accounts/um-account-dialog.c:717
+#: panels/user-accounts/um-account-dialog.c:763
+#: panels/user-accounts/um-account-dialog.c:784
 msgid "Failed to register account"
 msgstr "注册用户失败"
 
-#: ../panels/user-accounts/um-account-dialog.c:892
+#: panels/user-accounts/um-account-dialog.c:907
 msgid "No supported way to authenticate with this domain"
 msgstr "没有支持该域的验证方法"
 
-#: ../panels/user-accounts/um-account-dialog.c:965
+#: panels/user-accounts/um-account-dialog.c:980
 msgid "Failed to join domain"
 msgstr "加入域失败"
 
-#: ../panels/user-accounts/um-account-dialog.c:1026
+#: panels/user-accounts/um-account-dialog.c:1041
 msgid ""
-"That login name didn't work.\n"
+"That login name didn’t work.\n"
 "Please try again."
-msgstr "登录名不正确,请重试。"
+msgstr "登录名不正确。\n"
+"请重试。"
 
-#: ../panels/user-accounts/um-account-dialog.c:1033
+#: panels/user-accounts/um-account-dialog.c:1048
 msgid ""
-"That login password didn't work.\n"
+"That login password didn’t work.\n"
 "Please try again."
-msgstr "登录密码不正确,请重试。"
+msgstr "登录密码不正确。\n"
+"请重试。"
 
-#: ../panels/user-accounts/um-account-dialog.c:1041
+#: panels/user-accounts/um-account-dialog.c:1056
 msgid "Failed to log into domain"
 msgstr "登录到域失败"
 
-#: ../panels/user-accounts/um-account-dialog.c:1099
-msgid "Unable find the domain. Maybe you misspelled it?"
-msgstr "找不到该域名,也许拼写有误?"
+#: panels/user-accounts/um-account-dialog.c:1114
+msgid "Unable to find the domain. Maybe you misspelled it?"
+msgstr "找不到域名。拼写有误?"
 
-#: ../panels/user-accounts/um-account-type.c:34
+#: panels/user-accounts/um-account-type.c:34
 msgctxt "Account type"
 msgid "Standard"
 msgstr "标准"
 
-#: ../panels/user-accounts/um-account-type.c:36
+#: panels/user-accounts/um-account-type.c:36
 msgctxt "Account type"
 msgid "Administrator"
 msgstr "管理员"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:138
+#: panels/user-accounts/um-fingerprint-dialog.c:139
 msgid ""
 "You are not allowed to access the device. Contact your system administrator."
 msgstr "您未被允许访问该设备。请联系系统管理员。"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:140
+#: panels/user-accounts/um-fingerprint-dialog.c:141
 msgid "The device is already in use."
 msgstr "设备正被占用。"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:142
+#: panels/user-accounts/um-fingerprint-dialog.c:143
 msgid "An internal error occurred."
 msgstr "发生了一个内部错误。"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:216
+#: panels/user-accounts/um-fingerprint-dialog.c:214
 msgid "Enabled"
 msgstr "已启用"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:264
+#: panels/user-accounts/um-fingerprint-dialog.c:260
 msgid "Delete registered fingerprints?"
 msgstr "要删除已记录的指纹吗?"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:268
+#: panels/user-accounts/um-fingerprint-dialog.c:264
 msgid "_Delete Fingerprints"
 msgstr "删除指纹(_D)"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:274
+#: panels/user-accounts/um-fingerprint-dialog.c:270
 msgid ""
 "Do you want to delete your registered fingerprints so fingerprint login is "
 "disabled?"
 msgstr "确定要删除已登记的指纹吗?这将禁用指纹登录。"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:444
+#: panels/user-accounts/um-fingerprint-dialog.c:440
 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:505
-#: ../panels/user-accounts/um-fingerprint-dialog.c:547
+#: panels/user-accounts/um-fingerprint-dialog.c:501
+#: panels/user-accounts/um-fingerprint-dialog.c:543
 #, c-format
-msgid "Could not access '%s' device"
-msgstr "无法访问设备“%s”"
+msgid "Could not access “%s” device"
+msgstr "无法访问“%s”设备"
 
 #. 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:588
+#: panels/user-accounts/um-fingerprint-dialog.c:584
 #, c-format
-msgid "Could not start finger capture on '%s' device"
+msgid "Could not start finger capture on “%s” device"
 msgstr "无法在设备“%s”上启动指纹采集"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:638
+#: panels/user-accounts/um-fingerprint-dialog.c:628
 msgid "Could not access any fingerprint readers"
 msgstr "无法访问指纹读取器"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:639
+#: panels/user-accounts/um-fingerprint-dialog.c:629
 msgid "Please contact your system administrator for help."
 msgstr "请联系系统管理员以寻求帮助。"
 
@@ -6554,26 +6932,26 @@ msgstr "请联系系统管理员以寻求帮助。"
 #. * "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:721
+#: panels/user-accounts/um-fingerprint-dialog.c:711
 #, c-format
 msgid ""
 "To enable fingerprint login, you need to save one of your fingerprints, "
-"using the '%s' device."
+"using the “%s” device."
 msgstr "要启用指纹登录,您需要使用设备“%s”保存一个指纹。"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:728
+#: panels/user-accounts/um-fingerprint-dialog.c:718
 msgid "Selecting finger"
 msgstr "选择手指"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:729
+#: panels/user-accounts/um-fingerprint-dialog.c:719
 msgid "Enrolling fingerprints"
 msgstr "正在登记指纹"
 
-#: ../panels/user-accounts/um-history-dialog.c:70
+#: panels/user-accounts/um-history-dialog.c:70
 msgid "This Week"
 msgstr "本周"
 
-#: ../panels/user-accounts/um-history-dialog.c:73
+#: panels/user-accounts/um-history-dialog.c:73
 msgid "Last Week"
 msgstr "上周"
 
@@ -6581,702 +6959,1036 @@ msgstr "上周"
 #. shown as the first day of a week on login history dialog.
 #. Translators: This is a date format string in the style of "Feb 24",
 #. shown as the last day of a week on login history dialog.
-#: ../panels/user-accounts/um-history-dialog.c:79
-#: ../panels/user-accounts/um-history-dialog.c:83
+#: panels/user-accounts/um-history-dialog.c:79
+#: panels/user-accounts/um-history-dialog.c:83
 msgctxt "login history week label"
 msgid "%b %e"
 msgstr "%b %e"
 
 #. Translators: This is a date format string in the style of "Feb 24, 2013",
 #. shown as the last day of a week on login history dialog.
-#: ../panels/user-accounts/um-history-dialog.c:88
+#: panels/user-accounts/um-history-dialog.c:88
 msgctxt "login history week label"
 msgid "%b %e, %Y"
-msgstr "%Y %b %e"
+msgstr "%b %e, %Y"
 
 #. Translators: This indicates a week label on a login history.
 #. The first %s is the first day of a week, and the second %s the last day.
-#: ../panels/user-accounts/um-history-dialog.c:93
+#: panels/user-accounts/um-history-dialog.c:93
 #, c-format
 msgctxt "login history week label"
-msgid "%s - %s"
-msgstr "%s - %s"
+msgid "%s — %s"
+msgstr "%s — %s"
 
 #. 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/um-history-dialog.c:177
-#: ../panels/user-accounts/um-user-panel.c:841
+#: panels/user-accounts/um-history-dialog.c:177
+#: panels/user-accounts/um-user-panel.c:766
 msgctxt "login date-time"
 msgid "%k:%M"
 msgstr "%k:%M"
 
 #. Translators: This indicates a login date-time.
 #. The first %s is a date, and the second %s a time.
-#: ../panels/user-accounts/um-history-dialog.c:180
-#: ../panels/user-accounts/um-user-panel.c:845
+#: panels/user-accounts/um-history-dialog.c:180
+#: panels/user-accounts/um-user-panel.c:770
 #, c-format
 msgctxt "login date-time"
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../panels/user-accounts/um-history-dialog.c:250
+#: panels/user-accounts/um-history-dialog.c:250
 msgid "Session Ended"
 msgstr "会话结束"
 
-#: ../panels/user-accounts/um-history-dialog.c:256
+#: panels/user-accounts/um-history-dialog.c:256
 msgid "Session Started"
 msgstr "会话开始"
 
 #. Translators: This is the title of the "Account Activity" dialog.
 #. The %s is the user real name.
-#: ../panels/user-accounts/um-history-dialog.c:299
+#: panels/user-accounts/um-history-dialog.c:299
 #, c-format
-msgid "%s - Account Activity"
-msgstr "%s - 账号活动"
+msgid "%s — Account Activity"
+msgstr "%s - 账户活动"
 
-#: ../panels/user-accounts/um-password-dialog.c:145
+#: panels/user-accounts/um-password-dialog.c:144
 msgid "Please choose another password."
 msgstr "请选择另一个密码。"
 
-#: ../panels/user-accounts/um-password-dialog.c:154
+#: panels/user-accounts/um-password-dialog.c:153
 msgid "Please type your current password again."
 msgstr "请再次输入当前密码。"
 
-#: ../panels/user-accounts/um-password-dialog.c:160
+#: panels/user-accounts/um-password-dialog.c:159
 msgid "Password could not be changed"
 msgstr "无法更改密码"
 
-#: ../panels/user-accounts/um-password-dialog.c:286
+#: panels/user-accounts/um-password-dialog.c:285
 msgid "The passwords do not match."
 msgstr "密码不匹配。"
 
-#: ../panels/user-accounts/um-photo-dialog.c:214
+#: panels/user-accounts/um-photo-dialog.c:227
 msgid "Browse for more pictures"
 msgstr "浏览更多图片"
 
-#: ../panels/user-accounts/um-photo-dialog.c:448
-msgid "Disable image"
-msgstr "禁用图像"
-
-#: ../panels/user-accounts/um-photo-dialog.c:466
-msgid "Take a photo…"
-msgstr "拍张照片…"
-
-#: ../panels/user-accounts/um-photo-dialog.c:484
-msgid "Browse for more pictures…"
-msgstr "浏览更多图片…"
-
-#: ../panels/user-accounts/um-photo-dialog.c:708
-#, c-format
-msgid "Used by %s"
-msgstr "已被 %s 使用"
-
-#: ../panels/user-accounts/um-realm-manager.c:350
+#: panels/user-accounts/um-realm-manager.c:350
 msgid "Cannot automatically join this type of domain"
 msgstr "无法自动加入此类域"
 
-#: ../panels/user-accounts/um-realm-manager.c:413
+#: panels/user-accounts/um-realm-manager.c:413
 #, c-format
 msgid "No such domain or realm found"
 msgstr "无此域或 Realm"
 
-#: ../panels/user-accounts/um-realm-manager.c:815
-#: ../panels/user-accounts/um-realm-manager.c:829
+#: panels/user-accounts/um-realm-manager.c:815
+#: panels/user-accounts/um-realm-manager.c:829
 #, c-format
 msgid "Cannot log in as %s at the %s domain"
 msgstr "无法以 %s 的身份登录域 %s"
 
-#: ../panels/user-accounts/um-realm-manager.c:821
+#: panels/user-accounts/um-realm-manager.c:821
 msgid "Invalid password, please try again"
 msgstr "无效密码,请重试"
 
-#: ../panels/user-accounts/um-realm-manager.c:834
+#: panels/user-accounts/um-realm-manager.c:834
 #, c-format
-msgid "Couldn't connect to the %s domain: %s"
+msgid "Couldn’t connect to the %s domain: %s"
 msgstr "无法连接到 %s 域:%s"
 
-#: ../panels/user-accounts/um-user-panel.c:239
-msgid "Other Accounts"
-msgstr "其他帐号"
+#: panels/user-accounts/um-user-panel.c:200
+msgid "Your account"
+msgstr "您的账户"
 
-#: ../panels/user-accounts/um-user-panel.c:447
+#: panels/user-accounts/um-user-panel.c:380
 msgid "Failed to delete user"
 msgstr "删除用户失败"
 
-#: ../panels/user-accounts/um-user-panel.c:507
-#: ../panels/user-accounts/um-user-panel.c:566
-#: ../panels/user-accounts/um-user-panel.c:618
+#: panels/user-accounts/um-user-panel.c:438
+#: panels/user-accounts/um-user-panel.c:497
+#: panels/user-accounts/um-user-panel.c:549
 msgid "Failed to revoke remotely managed user"
 msgstr "吊销远程管理的用户失败"
 
-#: ../panels/user-accounts/um-user-panel.c:674
+#: panels/user-accounts/um-user-panel.c:603
 msgid "You cannot delete your own account."
 msgstr "不能删除自己的帐号。"
 
-#: ../panels/user-accounts/um-user-panel.c:683
+#: panels/user-accounts/um-user-panel.c:612
 #, c-format
 msgid "%s is still logged in"
 msgstr "%s 已经登录"
 
-#: ../panels/user-accounts/um-user-panel.c:687
+#: panels/user-accounts/um-user-panel.c:616
 msgid ""
 "Deleting a user while they are logged in can leave the system in an "
 "inconsistent state."
 msgstr "删除已登录帐号可能导致系统不一致。"
 
-#: ../panels/user-accounts/um-user-panel.c:696
+#: panels/user-accounts/um-user-panel.c:625
 #, c-format
-msgid "Do you want to keep %s's files?"
+msgid "Do you want to keep %s’s files?"
 msgstr "要保留 %s 的文件吗?"
 
-#: ../panels/user-accounts/um-user-panel.c:700
+#: panels/user-accounts/um-user-panel.c:629
 msgid ""
 "It is possible to keep the home directory, mail spool and temporary files "
 "around when deleting a user account."
 msgstr "删除用户时可以保留其主目录、电子邮件目录和临时文件。"
 
-#: ../panels/user-accounts/um-user-panel.c:703
+#: panels/user-accounts/um-user-panel.c:632
 msgid "_Delete Files"
 msgstr "删除文件(_D)"
 
-#: ../panels/user-accounts/um-user-panel.c:704
+#: panels/user-accounts/um-user-panel.c:633
 msgid "_Keep Files"
 msgstr "保留文件(_K)"
 
-#: ../panels/user-accounts/um-user-panel.c:718
+#: panels/user-accounts/um-user-panel.c:647
 #, c-format
-msgid "Are you sure you want to revoke remotely managed %s's account?"
-msgstr "您确定要吊销远程管理的帐号 %s 吗?"
+msgid "Are you sure you want to revoke remotely managed %s’s account?"
+msgstr "确定要撤销远程管理的%s的帐户吗?"
 
-#: ../panels/user-accounts/um-user-panel.c:722
+#: panels/user-accounts/um-user-panel.c:651
 msgid "_Delete"
 msgstr "删除(_D)"
 
-#: ../panels/user-accounts/um-user-panel.c:774
+#: panels/user-accounts/um-user-panel.c:701
 msgctxt "Password mode"
 msgid "Account disabled"
 msgstr "帐号已禁用"
 
-#: ../panels/user-accounts/um-user-panel.c:782
+#: panels/user-accounts/um-user-panel.c:709
 msgctxt "Password mode"
 msgid "To be set at next login"
 msgstr "下次登录时设置"
 
-#: ../panels/user-accounts/um-user-panel.c:785
+#: panels/user-accounts/um-user-panel.c:712
 msgctxt "Password mode"
 msgid "None"
 msgstr "无"
 
-#: ../panels/user-accounts/um-user-panel.c:834
+#: panels/user-accounts/um-user-panel.c:759
 msgid "Logged in"
 msgstr "已登录"
 
-#: ../panels/user-accounts/um-user-panel.c:1290
+#: panels/user-accounts/um-user-panel.c:1106
 msgid "Failed to contact the accounts service"
 msgstr "联系帐号服务失败"
 
-#: ../panels/user-accounts/um-user-panel.c:1292
+#: panels/user-accounts/um-user-panel.c:1108
 msgid "Please make sure that the AccountService is installed and enabled."
 msgstr "请确定帐号服务已正确安装并启用。"
 
-#: ../panels/user-accounts/um-user-panel.c:1334
+#. Translator comments:
+#. * 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/um-user-panel.c:1140
 msgid ""
 "To make changes,\n"
 "click the * icon first"
-msgstr ""
-"要进行更改,\n"
+msgstr "要进行更改,\n"
 "请先点击 * 图标"
 
-#: ../panels/user-accounts/um-user-panel.c:1374
+#: panels/user-accounts/um-user-panel.c:1180
 msgid "Create a user account"
 msgstr "创建用户帐号"
 
-#: ../panels/user-accounts/um-user-panel.c:1385
-#: ../panels/user-accounts/um-user-panel.c:1677
+#: panels/user-accounts/um-user-panel.c:1191
+#: panels/user-accounts/um-user-panel.c:1370
 msgid ""
 "To create a user account,\n"
 "click the * icon first"
-msgstr ""
-"要创建用户帐号,\n"
+msgstr "要创建用户帐号,\n"
 "请先点击 * 图标"
 
-#: ../panels/user-accounts/um-user-panel.c:1395
+#: panels/user-accounts/um-user-panel.c:1201
 msgid "Delete the selected user account"
 msgstr "删除选中的用户帐号"
 
-#: ../panels/user-accounts/um-user-panel.c:1407
-#: ../panels/user-accounts/um-user-panel.c:1682
+#: panels/user-accounts/um-user-panel.c:1213
+#: panels/user-accounts/um-user-panel.c:1375
 msgid ""
 "To delete the selected user account,\n"
 "click the * icon first"
-msgstr ""
-"要删除选中的用户帐号,\n"
+msgstr "要删除选中的用户帐号,\n"
 "请先点击 * 图标"
 
-#: ../panels/user-accounts/um-user-panel.c:1591
-msgid "My Account"
-msgstr "我的帐号"
+#: panels/user-accounts/um-utils.c:496
+msgid "Sorry, that user name isn’t available. Please try another."
+msgstr "对不起,该用户名不可用。请换一个。"
 
-#: ../panels/user-accounts/um-utils.c:563
-msgid "Sorry, that user name isn't available. Please try another."
-msgstr "抱歉,该用户名不可用。请试下别的。"
-
-#: ../panels/user-accounts/um-utils.c:566
+#: panels/user-accounts/um-utils.c:499
 #, c-format
 msgid "The username is too long."
 msgstr "用户名太长。"
 
-#: ../panels/user-accounts/um-utils.c:569
-msgid "The username cannot start with a '-'."
+#: panels/user-accounts/um-utils.c:502
+msgid "The username cannot start with a “-”."
 msgstr "用户名不能以“-”开头。"
 
-#: ../panels/user-accounts/um-utils.c:572
+#: panels/user-accounts/um-utils.c:505
 msgid ""
 "The username should only consist of upper and lower case letters from a-z, "
 "digits and the following characters: . - _"
 msgstr "用户名只能包含大小写英文字母(a 至 z)、数字和“.”“-”“_”符号"
 
-#: ../panels/user-accounts/um-utils.c:576
-msgid "This will be used to name your home folder and can't be changed."
-msgstr "将作为您主文件夹的名称且不可再次更改。"
+#: panels/user-accounts/um-utils.c:509
+msgid "This will be used to name your home folder and can’t be changed."
+msgstr "这将作来命名您的主文件夹且不可再次更改。"
 
-#: ../panels/wacom/button-mapping.ui.h:1
+#: panels/wacom/button-mapping.ui:9
 msgid "Map Buttons"
 msgstr "映射按键"
 
-#: ../panels/wacom/button-mapping.ui.h:3
+#: panels/wacom/button-mapping.ui:37 panels/wacom/cc-wacom-page.c:547
+#: panels/wacom/gnome-wacom-properties.ui:60
+msgid "_Close"
+msgstr "关闭(_C)"
+
+#: panels/wacom/button-mapping.ui:71
 msgid "Map buttons to functions"
 msgstr "将功能映射到按键"
 
-#: ../panels/wacom/button-mapping.ui.h:4
+#: panels/wacom/button-mapping.ui:119
 msgid ""
-"To edit a shortcut, choose the \"Send Keystroke\" action, press the keyboard "
+"To edit a shortcut, choose the “Send Keystroke” action, press the keyboard "
 "shortcut button and hold down the new keys or press Backspace to clear."
-msgstr ""
-"要编辑快捷键,请选择“发送按键”动作,按下键盘快捷键,然后输入新按键组合,或按"
-"退格键清除。"
+msgstr "要编辑快捷键,选择“Send Keystroke”动操作,按键盘快捷键,然后输入新按键组合,或按退格键清除。"
 
-#: ../panels/wacom/calibrator/calibrator-gui.c:83
+#: panels/wacom/calibrator/calibrator-gui.c:83
 msgid ""
 "Please tap the target markers as they appear on screen to calibrate the "
 "tablet."
 msgstr "请触摸屏幕上出现的标记以校准平板电脑。"
 
-#: ../panels/wacom/calibrator/calibrator-gui.c:87
-msgid "Mis-click detected, restarting..."
-msgstr "检测到误点击,重新开始校准…"
-
-#: ../panels/wacom/cc-wacom-button-row.c:442
-msgctxt "Wacom tablet button"
-msgid "Up"
-msgstr "上键"
+#: panels/wacom/calibrator/calibrator-gui.c:87
+msgid "Mis-click detected, restarting…"
+msgstr "检测到误点击,重新开始...…"
 
-#: ../panels/wacom/cc-wacom-button-row.c:443
-msgctxt "Wacom tablet button"
-msgid "Down"
-msgstr "下键"
+#: panels/wacom/cc-wacom-button-row.c:266
+#, c-format
+msgid "Button %d"
+msgstr "键 %d"
 
-#: ../panels/wacom/cc-wacom-button-row.h:54
+#: panels/wacom/cc-wacom-button-row.h:53
 msgctxt "Wacom action-type"
-msgid "None"
-msgstr "无"
+msgid "Application defined"
+msgstr "定义了应用程序"
 
-#: ../panels/wacom/cc-wacom-button-row.h:55
+#: panels/wacom/cc-wacom-button-row.h:54
 msgctxt "Wacom action-type"
 msgid "Send Keystroke"
 msgstr "发送按键"
 
-#: ../panels/wacom/cc-wacom-button-row.h:56
+#: panels/wacom/cc-wacom-button-row.h:55
 msgctxt "Wacom action-type"
 msgid "Switch Monitor"
 msgstr "切换显示器"
 
-#: ../panels/wacom/cc-wacom-button-row.h:57
+#: panels/wacom/cc-wacom-button-row.h:56
 msgctxt "Wacom action-type"
 msgid "Show On-Screen Help"
 msgstr "显示屏幕帮助"
 
-#: ../panels/wacom/cc-wacom-mapping-panel.c:263
+#: panels/wacom/cc-wacom-mapping-panel.c:260
 msgid "Output:"
 msgstr "输出:"
 
 #. Keep ratio switch
-#: ../panels/wacom/cc-wacom-mapping-panel.c:275
+#: panels/wacom/cc-wacom-mapping-panel.c:272
 msgid "Keep aspect ratio (letterbox):"
 msgstr "保持长宽比(黑边):"
 
 #. Whole-desktop checkbox
-#: ../panels/wacom/cc-wacom-mapping-panel.c:286
+#: panels/wacom/cc-wacom-mapping-panel.c:283
 msgid "Map to single monitor"
 msgstr "映射到单个显示器…"
 
-#: ../panels/wacom/cc-wacom-nav-button.c:88
+#: panels/wacom/cc-wacom-nav-button.c:86
 #, c-format
 msgid "%d of %d"
 msgstr "%d/%d"
 
-#: ../panels/wacom/cc-wacom-page.c:522
+#: panels/wacom/cc-wacom-page.c:544
 msgid "Display Mapping"
 msgstr "显示映射"
 
-#: ../panels/wacom/cc-wacom-stylus-page.c:377
+#: panels/wacom/cc-wacom-panel.c:834 panels/wacom/wacom-stylus-page.ui:127
+msgid "Stylus"
+msgstr "手写笔"
+
+#: panels/wacom/cc-wacom-stylus-page.c:362
 msgid "Button"
 msgstr "按键"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2
-msgid "Wa­com Tab­let"
+#: panels/wacom/gnome-wacom-panel.desktop.in.in:3
+#: panels/wacom/gnome-wacom-properties.ui:198
+msgid "Wacom Tablet"
 msgstr "Wacom 手写板"
 
-#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3
+#: panels/wacom/gnome-wacom-panel.desktop.in.in:4
 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets"
 msgstr "为绘图用平板设备设置按键映射并调整触摸笔灵敏度"
 
-#. Translators: those are keywords for the wacom tablet control-center panel
-#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/wacom/gnome-wacom-panel.desktop.in.in:7
+msgid "input-tablet"
+msgstr "input-tablet"
+
+#. Translators: Search terms to find the Wacom Tablet panel. Do NOT translate or localize the semicolons! 
The list MUST also end with a semicolon!
+#: panels/wacom/gnome-wacom-panel.desktop.in.in:19
 msgid "Tablet;Wacom;Stylus;Eraser;Mouse;"
 msgstr "Tablet;Wacom;Stylus;Eraser;Mouse;手写板;手写板;写字笔;擦除器;鼠标;"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:1
+#: panels/wacom/gnome-wacom-properties.ui:15
 msgid "Tablet (absolute)"
 msgstr "手写板(绝对)"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:2
+#: panels/wacom/gnome-wacom-properties.ui:19
 msgid "Touchpad (relative)"
 msgstr "触摸板(相对)"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:3
+#: panels/wacom/gnome-wacom-properties.ui:27
 msgid "Tablet Preferences"
 msgstr "手写板首选项"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:4
+#: panels/wacom/gnome-wacom-properties.ui:44
 msgid "_Help"
 msgstr "帮助(_H)"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:6
+#: panels/wacom/gnome-wacom-properties.ui:123
 msgid "No tablet detected"
 msgstr "未检测到手写板"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:7
+#: panels/wacom/gnome-wacom-properties.ui:139
 msgid "Please plug in or turn on your Wacom tablet"
 msgstr "请插入并打开您的 Wacom 手写板"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:8
+#: panels/wacom/gnome-wacom-properties.ui:159
 msgid "Bluetooth Settings"
 msgstr "蓝牙设置"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:9
-msgid "Wacom Tablet"
-msgstr "Wacom 手写板"
-
-#: ../panels/wacom/gnome-wacom-properties.ui.h:10
+#: panels/wacom/gnome-wacom-properties.ui:231
 msgid "Map to Monitor…"
 msgstr "映射到显示器…"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:11
+#: panels/wacom/gnome-wacom-properties.ui:247
 msgid "Map Buttons…"
 msgstr "映射按键…"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:12
+#: panels/wacom/gnome-wacom-properties.ui:263
 msgid "Calibrate…"
 msgstr "校准…"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:13
+#: panels/wacom/gnome-wacom-properties.ui:284
 msgid "Adjust display resolution"
 msgstr "调整显示分辨率"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:14
+#: panels/wacom/gnome-wacom-properties.ui:300
 msgid "Adjust mouse settings"
 msgstr "调整鼠标设置"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:15
+#: panels/wacom/gnome-wacom-properties.ui:328
 msgid "Tracking Mode"
 msgstr "跟踪模式"
 
 # 左撇子有歧视色彩。
-#: ../panels/wacom/gnome-wacom-properties.ui.h:16
+#: panels/wacom/gnome-wacom-properties.ui:356
 msgid "Left-Handed Orientation"
 msgstr "惯用左手"
 
-#. If no mode is available, we use "left-ring-mode-1" for backward compat
-#: ../panels/wacom/gsd-wacom-device.c:1028
-msgid "Left Ring"
-msgstr "左环模式"
-
-#: ../panels/wacom/gsd-wacom-device.c:1039
-#, c-format
-msgid "Left Ring Mode #%d"
-msgstr "左环模式 #%d"
-
-#. If no mode is available, we use "right-ring-mode-1" for backward compat
-#: ../panels/wacom/gsd-wacom-device.c:1059
-msgid "Right Ring"
-msgstr "右环模式"
-
-#: ../panels/wacom/gsd-wacom-device.c:1070
-#, c-format
-msgid "Right Ring Mode #%d"
-msgstr "右环模式 #%d"
-
-# Touchstrip和touchring都是商标。
-#. If no mode is available, we use "left-strip-mode-1" for backward compat
-#: ../panels/wacom/gsd-wacom-device.c:1112
-msgid "Left Touchstrip"
-msgstr "左 Touchstrip 模式"
-
-# Touchstrip和touchring都是商标。
-#: ../panels/wacom/gsd-wacom-device.c:1123
-#, c-format
-msgid "Left Touchstrip Mode #%d"
-msgstr "左 Touchstrip 模式 #%d"
-
-#. If no mode is available, we use "right-strip-mode-1" for backward compat
-#: ../panels/wacom/gsd-wacom-device.c:1143
-msgid "Right Touchstrip"
-msgstr "右 Touchstrip"
-
-#: ../panels/wacom/gsd-wacom-device.c:1154
-#, c-format
-msgid "Right Touchstrip Mode #%d"
-msgstr "右 Touchstrip 模式 #%d"
-
-#: ../panels/wacom/gsd-wacom-device.c:1180
-#, c-format
-msgid "Left Touchring Mode Switch"
-msgstr "左 Touchring 模式切换"
-
-#: ../panels/wacom/gsd-wacom-device.c:1182
-#, c-format
-msgid "Right Touchring Mode Switch"
-msgstr "右 Touchring 模式切换"
-
-#: ../panels/wacom/gsd-wacom-device.c:1185
-#, c-format
-msgid "Left Touchstrip Mode Switch"
-msgstr "左 Touchstrip 模式切换"
-
-#: ../panels/wacom/gsd-wacom-device.c:1187
-#, c-format
-msgid "Right Touchstrip Mode Switch"
-msgstr "右 Touchstrip 模式切换"
-
-#: ../panels/wacom/gsd-wacom-device.c:1192
-#, c-format
-msgid "Mode Switch #%d"
-msgstr "模式切换 #%d"
-
-#: ../panels/wacom/gsd-wacom-device.c:1238
-#, c-format
-msgid "Left Button #%d"
-msgstr "左键 #%d"
-
-#: ../panels/wacom/gsd-wacom-device.c:1241
-#, c-format
-msgid "Right Button #%d"
-msgstr "右键 #%d"
-
-#: ../panels/wacom/gsd-wacom-device.c:1244
-#, c-format
-msgid "Top Button #%d"
-msgstr "上键 #%d"
-
-#: ../panels/wacom/gsd-wacom-device.c:1247
-#, c-format
-msgid "Bottom Button #%d"
-msgstr "底键 #%d"
-
-#: ../panels/wacom/gsd-wacom-key-shortcut-button.c:263
+#: panels/wacom/gsd-wacom-key-shortcut-button.c:263
 msgid "New shortcut…"
 msgstr "新建快捷键…"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:1
-msgid "No Action"
-msgstr "无动作"
-
-#: ../panels/wacom/wacom-stylus-page.ui.h:2
-msgid "Left Mouse Button Click"
-msgstr "鼠标左键单击"
-
-#: ../panels/wacom/wacom-stylus-page.ui.h:3
+#: panels/wacom/wacom-stylus-page.ui:29
 msgid "Middle Mouse Button Click"
 msgstr "鼠标中键单击"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:4
+#: panels/wacom/wacom-stylus-page.ui:33
 msgid "Right Mouse Button Click"
 msgstr "鼠标右键单击"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:5
-msgid "Scroll Up"
-msgstr "向上滚动"
-
-#: ../panels/wacom/wacom-stylus-page.ui.h:6
-msgid "Scroll Down"
-msgstr "向下滚动"
-
-#: ../panels/wacom/wacom-stylus-page.ui.h:7
-msgid "Scroll Left"
-msgstr "向左滚动"
-
-#: ../panels/wacom/wacom-stylus-page.ui.h:8
-msgid "Scroll Right"
-msgstr "向右滚动"
-
-#: ../panels/wacom/wacom-stylus-page.ui.h:9
+#: panels/wacom/wacom-stylus-page.ui:37
 msgid "Back"
 msgstr "后退"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:10
+#: panels/wacom/wacom-stylus-page.ui:41
 msgid "Forward"
 msgstr "前进"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:11
-msgid "Stylus"
-msgstr "手写笔"
+#: panels/wacom/wacom-stylus-page.ui:77
+msgid "No stylus found"
+msgstr "没有找到触控笔"
+
+#: panels/wacom/wacom-stylus-page.ui:91
+msgid "Please move your stylus to the proximity of the tablet to configure it"
+msgstr "请将您的触控笔移至平板电脑附近进行配置"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:12
+#: panels/wacom/wacom-stylus-page.ui:167
 msgid "Eraser Pressure Feel"
 msgstr "擦除压力感应"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:13
+#: panels/wacom/wacom-stylus-page.ui:188 panels/wacom/wacom-stylus-page.ui:348
 msgid "Soft"
 msgstr "软"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:14
+#: panels/wacom/wacom-stylus-page.ui:218 panels/wacom/wacom-stylus-page.ui:378
 msgid "Firm"
 msgstr "硬"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:15
+#: panels/wacom/wacom-stylus-page.ui:241
 msgid "Top Button"
 msgstr "上键"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:16
+#: panels/wacom/wacom-stylus-page.ui:270
 msgid "Lower Button"
 msgstr "下键"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:17
+#: panels/wacom/wacom-stylus-page.ui:299
+msgid "Lowest Button"
+msgstr "最低键"
+
+#: panels/wacom/wacom-stylus-page.ui:328
 msgid "Tip Pressure Feel"
 msgstr "指尖压力感应"
 
-#: ../shell/alt/cc-window.c:765 ../shell/cc-window.c:53
-#: ../shell/cc-window.c:1478
-msgid "All Settings"
-msgstr "全部设置"
+#: panels/wacom/wacom-stylus-page.ui:440
+msgid "page 3"
+msgstr "第 3 页"
 
-#: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1
+#: shell/appdata/gnome-control-center.appdata.xml.in:7
 msgid "GNOME Control Center"
 msgstr "GNOME 控制中心"
 
-#: ../shell/appdata/gnome-control-center.appdata.xml.in.h:2
+#: shell/appdata/gnome-control-center.appdata.xml.in:8
 msgid "Utilities to configure the GNOME desktop"
 msgstr "用来配置 GNOME 桌面的工具"
 
-#: ../shell/appdata/gnome-control-center.appdata.xml.in.h:3
+#: shell/appdata/gnome-control-center.appdata.xml.in:10
 msgid ""
-"The control center is GNOME's main interface for configuration of various "
+"The control center is GNOME’s main interface for configuration of various "
 "aspects of your desktop."
 msgstr "控制中心是 GNOME 用于配置桌面各方面设置的主要界面。"
 
-#: ../shell/cc-application.c:45
+#: shell/cc-application.c:47
 msgid "Display version number"
 msgstr "显示版本号"
 
-#: ../shell/cc-application.c:46
+#: shell/cc-application.c:48
 msgid "Enable verbose mode"
 msgstr "启用详细模式"
 
-#: ../shell/cc-application.c:47
+#: shell/cc-application.c:49
 msgid "Show the overview"
 msgstr "显示摘要"
 
-#: ../shell/cc-application.c:48
+#: shell/cc-application.c:50
 msgid "Search for the string"
 msgstr "搜索字符串"
 
-#: ../shell/cc-application.c:49
+#: shell/cc-application.c:51
 msgid "List possible panel names and exit"
 msgstr "列出所有面板名称并退出"
 
-#: ../shell/cc-application.c:50
+#: shell/cc-application.c:52
 msgid "Panel to display"
 msgstr "要显示的面板"
 
-#: ../shell/cc-application.c:50
+#: shell/cc-application.c:52
 msgid "[PANEL] [ARGUMENT…]"
 msgstr "[面板] [参数…]"
 
-#: ../shell/cc-application.c:113
+#: shell/cc-application.c:117
 msgid "Available panels:"
 msgstr "可用面板"
 
-#: ../shell/cc-application.c:252
+#: shell/cc-application.c:256
 msgid "Help"
 msgstr "帮助"
 
-#: ../shell/cc-application.c:253
+#: shell/cc-application.c:257
 msgid "Quit"
 msgstr "退出"
 
-#. Add categories
-#: ../shell/cc-window.c:871
-msgctxt "category"
-msgid "Personal"
-msgstr "个人"
-
-#: ../shell/cc-window.c:872
-msgctxt "category"
-msgid "Hardware"
-msgstr "硬件"
-
-#: ../shell/cc-window.c:873
-msgctxt "category"
-msgid "System"
-msgstr "系统"
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: shell/gnome-control-center.desktop.in.in:5
+msgid "gnome-control-center"
+msgstr "gnome-control-center"
 
-#: ../shell/gnome-control-center.desktop.in.in.h:2
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+#: shell/gnome-control-center.desktop.in.in:17
 msgid "Preferences;Settings;"
 msgstr "Preferences;Settings;首选项;设置;"
 
-#: ../shell/help-overlay.ui.h:1
+#: shell/help-overlay.ui:15
 msgctxt "shortcut window"
 msgid "General"
 msgstr "常规"
 
-#: ../shell/help-overlay.ui.h:2
+#: shell/help-overlay.ui:20
 msgctxt "shortcut window"
 msgid "Quit"
 msgstr "退出"
 
-#: ../shell/help-overlay.ui.h:3
+#: shell/help-overlay.ui:27 shell/help-overlay.ui:48
 msgctxt "shortcut window"
 msgid "Search"
 msgstr "搜索"
 
-#: ../shell/help-overlay.ui.h:4
+#: shell/help-overlay.ui:35
 msgctxt "shortcut window"
 msgid "Panels"
 msgstr "面板"
 
-#: ../shell/help-overlay.ui.h:5
+#: shell/help-overlay.ui:40
 msgctxt "shortcut window"
 msgid "Go back to the overview"
 msgstr "后退到总览视图"
 
-#: ../shell/help-overlay.ui.h:6
+#: shell/help-overlay.ui:53
 msgctxt "shortcut window"
 msgid "Cancel search"
 msgstr "取消搜索"
 
 #. translators: This is the default hotspot name, need to be less than 32-bytes
-#: ../shell/hostname-helper.c:189
+#: shell/hostname-helper.c:189
 msgctxt "hotspot"
 msgid "Hotspot"
 msgstr "热点"
 
-#: ../shell/panel-list.ui.h:3
-#, fuzzy
-#| msgid "No regions found"
+#: shell/org.gnome.ControlCenter.gschema.xml:5
+msgid "The identifier for the last Settings panel to be opened"
+msgstr "最后打开的设置面板的标识符。"
+
+#: 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 "最后一个要打开的设置面板的标识符,未识别的值将被忽略,列表中的第一个面板被选择。"
+
+#: shell/panel-list.ui:195
 msgid "No results found"
-msgstr "无可用区域"
+msgstr "没有找到结果"
+
+#: shell/window.ui:141
+msgid "All Settings"
+msgstr "全部设置"
+
+#. translators:
+#. * The number of sound outputs on a particular device
+#: subprojects/gvc/gvc-mixer-control.c:1873
+#, c-format
+msgid "%u Output"
+msgid_plural "%u Outputs"
+msgstr[0] "%u 路输出"
+
+#. translators:
+#. * The number of sound inputs on a particular device
+#: subprojects/gvc/gvc-mixer-control.c:1883
+#, c-format
+msgid "%u Input"
+msgid_plural "%u Inputs"
+msgstr[0] "%u 路输入"
+
+#: subprojects/gvc/gvc-mixer-control.c:2738
+msgid "System Sounds"
+msgstr "系统声音"
+
+#~ msgid "Back­ground"
+#~ msgstr "背景"
+
+#~ msgid "Blue­tooth"
+#~ msgstr "蓝牙"
+
+#~ msgid "Co­lor"
+#~ msgstr "色彩"
+
+#~ msgid "Lid Closed"
+#~ msgstr "上盖已合上"
+
+#~ msgid "Mirrored"
+#~ msgstr "镜像显示"
+
+#~ msgid "Primary"
+#~ msgstr "主显示器"
+
+#~ msgid "Secondary"
+#~ msgstr "副显示器"
+
+#~ msgid "Arrange Combined Displays"
+#~ msgstr "安排多个显示"
+
+#~ msgid "Drag displays to rearrange them"
+#~ msgstr "拖动以重新排列显示屏拖动以重新排列显示屏"
+
+#~ msgid "%d Hz (NTSC)"
+#~ msgstr "%d Hz (NTSC)"
+
+#~ msgid "%d Hz"
+#~ msgstr "%d Hz"
+
+#~ msgid "Rotate counterclockwise by 90°"
+#~ msgstr "逆时针旋转 90°"
+
+#~ msgid "Rotate by 180°"
+#~ msgstr "旋转 180°"
+
+#~ msgid "Rotate clockwise by 90°"
+#~ msgstr "顺时针旋转 90°"
+
+#~ msgid "Size"
+#~ msgstr "大小"
+
+#~ msgid "Aspect Ratio"
+#~ msgstr "宽高比"
+
+#~ msgid "Show the top bar and Activities Overview on this display"
+#~ msgstr "在此显示器上显示顶栏和活动概览"
+
+#~ msgid "Join this display with another to create an extra workspace"
+#~ msgstr "将该显示器与另一显示器合并以扩展工作空间"
+
+# 左撇子有歧视色彩。
+#~ msgid "Presentation"
+#~ msgstr "演示"
+
+#~ msgid "Show slideshows and media only"
+#~ msgstr "只显示幻灯片和多媒体"
+
+#~ msgid "Show your existing view on both displays"
+#~ msgstr "在两块显示器上同时显示当前视图"
+
+#~ msgid "Turn Off"
+#~ msgstr "关闭"
+
+#~ msgid "Don't use this display"
+#~ msgstr "不使用该显示器"
+
+#~ msgid "_Arrange Combined Displays"
+#~ msgstr "安排多个显示(_A)"
+
+#~ msgid "%s %d-bit (Build ID: %s)"
+#~ msgstr "%s %d 位(构建 ID:%s)"
+
+#~ msgid "%s %d-bit"
+#~ msgstr "%s %d 位"
+
+#~ msgid "Section"
+#~ msgstr "节"
+
+#~ msgid "Overview"
+#~ msgstr "总览"
+
+#~ msgid "De­tails"
+#~ msgstr "详细信息"
+
+#~ msgid "Base system"
+#~ msgstr "基本系统"
+
+#~ msgid "Check for updates"
+#~ msgstr "检查更新"
+
+#~ msgid "Shortcut;Repeat;Blink;"
+#~ msgstr "Shortcut;Repeat;Blink;快捷键;重复;闪烁;"
+
+#~ msgid "Press Esc to cancel."
+#~ msgstr "按 Esc 键取消。"
+
+#~ msgid "Edit"
+#~ msgstr "编辑"
+
+#~ msgid "Server"
+#~ msgstr "服务器"
+
+#~ msgid "Delete DNS Server"
+#~ msgstr "删除 DNS 服务器"
+
+#~ msgid "Make available to other _users"
+#~ msgstr "对其他用户可用(_U)"
+
+#~ msgid "Firewall _Zone"
+#~ msgstr "防火墙区域(_Z)"
+
+#~ msgctxt "Firewall zone"
+#~ msgid "Default"
+#~ msgstr "默认"
+
+#~ msgid "The zone defines the trust level of the connection"
+#~ msgstr "此区域定义了对连接的信任级别"
+
+#~ msgid ""
+#~ "Reset the settings for this network, including passwords, but remember it "
+#~ "as a preferred network"
+#~ msgstr "重置这个网络包括密码在内的设置,但仍作为首选连接"
+
+#~ msgid ""
+#~ "Remove all details relating to this network and do not try to "
+#~ "automatically connect"
+#~ msgstr "删除关于这个网络的所有细节,不再尝试自动连接"
+
+#~ msgid "Net­work"
+#~ msgstr "网络"
+
+#~ msgid ""
+#~ "If you have a connection to the Internet other than wireless, you can set "
+#~ "up a wireless hotspot to share the connection with others."
+#~ msgstr ""
+#~ "如果有无线网络以外的方式连接互联网,您可以配置无线热点并与他人共享网络连"
+#~ "接。"
+
+#~ msgid "History"
+#~ msgstr "历史"
+
+#~ msgid "Proxy"
+#~ msgstr "代理"
+
+#~ msgid "_Add Profile…"
+#~ msgstr "添加配置(_A)…"
+
+#~ msgctxt "proxy method"
+#~ msgid "None"
+#~ msgstr "无"
+
+#~ msgctxt "proxy method"
+#~ msgid "Manual"
+#~ msgstr "手动"
+
+#~ msgctxt "proxy method"
+#~ msgid "Automatic"
+#~ msgstr "自动"
+
+#~ msgid "Add Device"
+#~ msgstr "添加设备"
+
+#~ msgid "Remove Device"
+#~ msgstr "移除设备"
+
+#~ msgid "VPN Type"
+#~ msgstr "VPN 类型"
+
+#~ msgid "Group Password"
+#~ msgstr "组密码"
+
+#~ msgid "_Use as Hotspot…"
+#~ msgstr "用作热点(_U)…"
+
+#~ msgid "_History"
+#~ msgstr "历史(_H)"
+
+#~ msgid "invalid EAP-TLS password: missing"
+#~ msgstr "无效的 EAP-TLS 密码:缺失"
+
+#~ msgid "2"
+#~ msgstr "2"
+
+#~ msgid "3"
+#~ msgstr "3"
+
+#~ msgid "4"
+#~ msgstr "4"
+
+#~ msgctxt "notifications"
+#~ msgid "Notification _Banners"
+#~ msgstr "通知条幅(_B)"
+
+#~ msgid "No­ti­fi­ca­tions"
+#~ msgstr "通知"
+
+#~ msgid "Notification _Banners"
+#~ msgstr "通知条幅"
+
+#~ msgid "Mail"
+#~ msgstr "邮件"
+
+#~ msgid "Calendar"
+#~ msgstr "日历"
+
+#~ msgid "Contacts"
+#~ msgstr "联系人"
+
+#~ msgid "Chat"
+#~ msgstr "聊天"
+
+#~ msgid "Resources"
+#~ msgstr "资源"
+
+#~ msgid "Error creating account"
+#~ msgstr "创建帐号出错"
+
+#~ msgid "Are you sure you want to remove the account?"
+#~ msgstr "确定要移除这个帐号吗?"
+
+#~ msgid "This will not remove the account on the server."
+#~ msgstr "这不会将该帐号从服务器上移除。"
+
+#~ msgid "_Remove"
+#~ msgstr "移除(_R)"
+
+#~ msgid "No online accounts configured"
+#~ msgstr "未设置在线帐号"
+
+# 统一下翻译
+#~ msgid ""
+#~ "Adding an account allows your applications to access it for documents, "
+#~ "mail, contacts, calendar, chat and more."
+#~ msgstr ""
+#~ "添加一个帐号以让您的应用访问帐号的文档、邮件、联系人、日历、聊天等。"
+
+#~ msgid "Po­wer"
+#~ msgstr "电源"
+
+#~ msgctxt "printer state"
+#~ msgid "Configuring"
+#~ msgstr "正在配置"
+
+# 以下几个level似乎译为“量”更好
+#~ msgid "Toner Level"
+#~ msgstr "碳粉量"
+
+#~ msgid "Supply Level"
+#~ msgstr "耗材量"
+
+#~ msgctxt "printer state"
+#~ msgid "Installing"
+#~ msgstr "正在安装"
+
+#~ msgid "%u active"
+#~ msgid_plural "%u active"
+#~ msgstr[0] "%u 项活动任务"
+
+#~ msgid "Add a New Printer"
+#~ msgstr "添加打印机"
+
+#~ msgid "Loading options…"
+#~ msgstr "正在载入选项…"
+
+#~ msgid "Supply"
+#~ msgstr "耗材"
+
+#~ msgid "_Default printer"
+#~ msgstr "默认打印机(_D)"
+
+#~ msgid "Jobs"
+#~ msgstr "任务"
+
+#~ msgid "Show _Jobs"
+#~ msgstr "显示任务(_J)"
+
+#~ msgid "label"
+#~ msgstr "标签"
+
+#~ msgid "Setting new driver…"
+#~ msgstr "正在设置新驱动…"
+
+#~ msgid "Print _Test Page"
+#~ msgstr "打印测试页(_T)"
+
+#~ msgid "Pri­va­cy"
+#~ msgstr "隐私"
+
+#~ msgid "Sha­ring"
+#~ msgstr "共享"
+
+#~ msgid "Uni­ver­sal Access"
+#~ msgstr "通用辅助功能"
+
+#~ msgctxt "Password hint"
+#~ msgid "Try to add more letters, numbers and symbols."
+#~ msgstr "请使用更多字母、数字和符号。"
+
+#~ msgctxt "Password strength"
+#~ msgid "Strength: Weak"
+#~ msgstr "强度:较弱"
+
+#~ msgctxt "Password strength"
+#~ msgid "Strength: Low"
+#~ msgstr "强度:较低"
+
+#~ msgctxt "Password strength"
+#~ msgid "Strength: Medium"
+#~ msgstr "强度:中等"
+
+#~ msgctxt "Password strength"
+#~ msgid "Strength: Good"
+#~ msgstr "强度:良好"
+
+#~ msgctxt "Password strength"
+#~ msgid "Strength: High"
+#~ msgstr "强度:较高"
+
+#~ msgctxt "login history week label"
+#~ msgid "%s - %s"
+#~ msgstr "%s - %s"
+
+#~ msgid "Disable image"
+#~ msgstr "禁用图像"
+
+#~ msgid "Browse for more pictures…"
+#~ msgstr "浏览更多图片…"
+
+#~ msgid "Used by %s"
+#~ msgstr "已被 %s 使用"
+
+#~ msgid "Other Accounts"
+#~ msgstr "其他帐号"
+
+#~ msgctxt "Wacom tablet button"
+#~ msgid "Up"
+#~ msgstr "上键"
+
+#~ msgctxt "Wacom tablet button"
+#~ msgid "Down"
+#~ msgstr "下键"
+
+#~ msgctxt "Wacom action-type"
+#~ msgid "None"
+#~ msgstr "无"
+
+#~ msgid "Wa­com Tab­let"
+#~ msgstr "Wacom 手写板"
+
+#~ msgid "Left Ring"
+#~ msgstr "左环模式"
+
+#~ msgid "Left Ring Mode #%d"
+#~ msgstr "左环模式 #%d"
+
+#~ msgid "Right Ring Mode #%d"
+#~ msgstr "右环模式 #%d"
+
+# Touchstrip和touchring都是商标。
+#~ msgid "Left Touchstrip"
+#~ msgstr "左 Touchstrip 模式"
+
+# Touchstrip和touchring都是商标。
+#~ msgid "Left Touchstrip Mode #%d"
+#~ msgstr "左 Touchstrip 模式 #%d"
+
+#~ msgid "Right Touchstrip"
+#~ msgstr "右 Touchstrip"
+
+#~ msgid "Right Touchstrip Mode #%d"
+#~ msgstr "右 Touchstrip 模式 #%d"
+
+#~ msgid "Left Touchring Mode Switch"
+#~ msgstr "左 Touchring 模式切换"
+
+#~ msgid "Right Touchring Mode Switch"
+#~ msgstr "右 Touchring 模式切换"
+
+#~ msgid "Left Touchstrip Mode Switch"
+#~ msgstr "左 Touchstrip 模式切换"
+
+#~ msgid "Right Touchstrip Mode Switch"
+#~ msgstr "右 Touchstrip 模式切换"
+
+#~ msgid "Mode Switch #%d"
+#~ msgstr "模式切换 #%d"
+
+#~ msgid "Left Button #%d"
+#~ msgstr "左键 #%d"
+
+#~ msgid "Right Button #%d"
+#~ msgstr "右键 #%d"
+
+#~ msgid "Top Button #%d"
+#~ msgstr "上键 #%d"
+
+#~ msgid "Bottom Button #%d"
+#~ msgstr "底键 #%d"
+
+#~ msgid "No Action"
+#~ msgstr "无动作"
+
+#~ msgid "Left Mouse Button Click"
+#~ msgstr "鼠标左键单击"
+
+#~ msgid "Scroll Up"
+#~ msgstr "向上滚动"
+
+#~ msgid "Scroll Down"
+#~ msgstr "向下滚动"
+
+#~ msgid "Scroll Left"
+#~ msgstr "向左滚动"
+
+#~ msgid "Scroll Right"
+#~ msgstr "向右滚动"
+
+#~ msgctxt "category"
+#~ msgid "Personal"
+#~ msgstr "个人"
+
+#~ msgctxt "category"
+#~ msgid "Hardware"
+#~ msgstr "硬件"
+
+#~ msgctxt "category"
+#~ msgid "System"
+#~ msgstr "系统"
 
 #~ msgid "Wayland"
 #~ msgstr "Wayland"
@@ -7285,12 +7997,6 @@ msgstr "无可用区域"
 #~ msgid "Set Shortcut"
 #~ msgstr "设置快捷键"
 
-#~ msgid "_Unlock"
-#~ msgstr "解锁(_U)"
-
-#~ msgid "Color"
-#~ msgstr "色彩"
-
 #~ msgid "_Name:"
 #~ msgstr "名称(_N):"
 
@@ -7419,12 +8125,6 @@ msgstr "无可用区域"
 #~ msgid "_Sign In"
 #~ msgstr "登录(_S)"
 
-#~ msgid "Power"
-#~ msgstr "电源"
-
-#~ msgid "Privacy"
-#~ msgstr "隐私"
-
 #~ msgctxt "Search Location"
 #~ msgid "Other"
 #~ msgstr "其他"
@@ -7444,12 +8144,6 @@ msgstr "无可用区域"
 #~ msgid "Add User Account"
 #~ msgstr "添加用户帐号"
 
-#~ msgid "Remove User Account"
-#~ msgstr "移除用户帐号"
-
-#~ msgid "Login Options"
-#~ msgstr "登录选项"
-
 #~ msgid "A user with the username '%s' already exists."
 #~ msgstr "用户“%s”已存在。"
 
@@ -7459,9 +8153,6 @@ msgstr "无可用区域"
 #~ msgid "Time _Zone"
 #~ msgstr "时区(_Z)"
 
-#~ msgid "Active Jobs"
-#~ msgstr "活动的任务"
-
 #~ msgid "Close"
 #~ msgstr "关闭"
 
@@ -7471,9 +8162,6 @@ msgstr "无可用区域"
 #~ msgid "Pause Printing"
 #~ msgstr "暂停打印"
 
-#~ msgid "Cancel Print Job"
-#~ msgstr "取消打印任务"
-
 #~ msgctxt "print job"
 #~ msgid "Held"
 #~ msgstr "挂起"
@@ -7589,9 +8277,6 @@ msgstr "无可用区域"
 #~ msgid "When battery power is _critical"
 #~ msgstr "电量严重不足时(_C)"
 
-#~ msgid "Power Off"
-#~ msgstr "电源关闭"
-
 #~ msgid "Power off"
 #~ msgstr "电源关闭"
 
@@ -7612,9 +8297,3 @@ msgstr "无可用区域"
 #~ msgid "- Settings"
 #~ msgstr "- 设置"
 
-#~ msgid ""
-#~ "%s\n"
-#~ "Run '%s --help' to see a full list of available command line options.\n"
-#~ msgstr ""
-#~ "%s\n"
-#~ "运行 %s --help 查看所有可用的命令行选项。\n"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]