diff --git a/po/gl.po b/po/gl.po
index d09c8fa6d..940986dc2 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -12,24 +12,24 @@
 # Antón Méixome <meixome@mancomun.org>, 2009.
 # Antón Méixome <meixome@certima.net>, 2010.
 # Leandro Regueiro <leandro.regueiro@gmail.com>, 2011, 2012.
-# Fran Dieguez <fran.dieguez@gnome.org>, 2012-2022.
 # Fran Diéguez <frandieguez@gnome.org>, 2009-2022.
+# Fran Dieguez <fran.dieguez@gnome.org>, 2012-2022.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center-master-po-gl-72290.merged\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-control-center/"
 "issues\n"
-"POT-Creation-Date: 2022-02-05 13:13+0000\n"
-"PO-Revision-Date: 2022-02-07 07:28+0100\n"
-"Last-Translator: Fran Diéguez <frandieguez@gnome.org>\n"
+"POT-Creation-Date: 2022-02-08 13:35+0000\n"
+"PO-Revision-Date: 2022-02-08 22:54+0100\n"
+"Last-Translator: Fran Dieguez <fran.dieguez@gnome.org>\n"
 "Language-Team: Galician <proxecto@trasno.gal>\n"
 "Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"X-Generator: Gtranslator 41.0\n"
+"X-Generator: Gtranslator 40.0\n"
 "X-Launchpad-Export-Date: 2014-05-09 14:44+0000\n"
 "X-Project-Style: gnome\n"
 "X-DL-Team: gl\n"
@@ -180,8 +180,8 @@ msgstr "Recibir as buscas do sistema e enviar resultados."
 #: panels/keyboard/cc-keyboard-shortcut-editor.ui:118
 #: panels/keyboard/cc-xkb-modifier-dialog.c:344
 #: panels/keyboard/keyboard-shortcuts.c:367 panels/network/network-proxy.ui:105
-#: panels/user-accounts/cc-user-panel.c:857
-#: panels/user-accounts/cc-user-panel.c:955
+#: panels/user-accounts/cc-user-panel.c:761
+#: panels/user-accounts/cc-user-panel.c:865
 #: panels/wwan/cc-wwan-device-page.c:478
 #: subprojects/gvc/gvc-mixer-control.c:1900
 msgid "Disabled"
@@ -343,11 +343,11 @@ msgstr "Controla os distintos permisos e preferencias da aplicación"
 msgid "application;flatpak;permission;setting;"
 msgstr "application;flatpak;permission;setting;"
 
-#: panels/background/cc-background-chooser.c:293
+#: panels/background/cc-background-chooser.c:309
 msgid "Select a picture"
 msgstr "Seleccione unha imaxe"
 
-#: panels/background/cc-background-chooser.c:296
+#: panels/background/cc-background-chooser.c:312
 #: panels/color/cc-color-calibrate.ui:22 panels/color/cc-color-panel.c:284
 #: panels/color/cc-color-panel.c:844 panels/common/cc-language-chooser.ui:21
 #: panels/display/cc-display-panel.ui:31
@@ -364,44 +364,44 @@ msgstr "Seleccione unha imaxe"
 #: panels/region/cc-format-chooser.ui:24
 #: panels/search/cc-search-locations-dialog.c:639
 #: panels/sharing/cc-sharing-panel.c:432 panels/usage/cc-usage-panel.c:133
-#: panels/user-accounts/cc-add-user-dialog.ui:28
-#: panels/user-accounts/cc-avatar-chooser.c:105
-#: panels/user-accounts/cc-avatar-chooser.c:228
-#: panels/user-accounts/cc-fingerprint-dialog.ui:36
-#: panels/user-accounts/cc-password-dialog.ui:20
-#: panels/user-accounts/cc-user-panel.c:647
-#: panels/user-accounts/cc-user-panel.c:665
-#: panels/user-accounts/data/join-dialog.ui:20
+#: panels/user-accounts/cc-add-user-dialog.ui:25
+#: panels/user-accounts/cc-avatar-chooser.c:94
+#: panels/user-accounts/cc-avatar-chooser.c:165
+#: panels/user-accounts/cc-fingerprint-dialog.ui:30
+#: panels/user-accounts/cc-password-dialog.ui:18
+#: panels/user-accounts/cc-user-panel.c:551
+#: panels/user-accounts/cc-user-panel.c:569
+#: panels/user-accounts/data/join-dialog.ui:17
 #: panels/wwan/cc-wwan-mode-dialog.ui:32
 #: panels/wwan/cc-wwan-network-dialog.ui:139
 #: panels/wwan/cc-wwan-sim-lock-dialog.ui:268
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: panels/background/cc-background-chooser.c:297
+#: panels/background/cc-background-chooser.c:313
 #: panels/network/connection-editor/vpn-helpers.c:227
 #: panels/printers/pp-details-dialog.c:264
 #: panels/sharing/cc-sharing-panel.c:433
-#: panels/user-accounts/cc-avatar-chooser.c:229
+#: panels/user-accounts/cc-avatar-chooser.c:166
 msgid "_Open"
 msgstr "_Abrir"
 
-#: panels/background/cc-background-item.c:140
+#: panels/background/cc-background-item.c:169
 msgid "multiple sizes"
 msgstr "tamaños múltiples"
 
 #. translators: 100 × 100px
 #. * Note that this is not an "x", but U+00D7 MULTIPLICATION SIGN
-#: panels/background/cc-background-item.c:144
+#: panels/background/cc-background-item.c:173
 #, c-format
 msgid "%d × %d"
 msgstr "%d × %d"
 
-#: panels/background/cc-background-item.c:289
+#: panels/background/cc-background-item.c:325
 msgid "No Desktop Background"
 msgstr "Sen fondo de escritorio"
 
-#: panels/background/cc-background-panel.c:173
+#: panels/background/cc-background-panel.c:177
 msgid "Current background"
 msgstr "Fondo actual"
 
@@ -623,7 +623,7 @@ msgstr "_Continuar"
 
 #. This button returns the user back to the color control panel
 #: panels/color/cc-color-calibrate.ui:40 panels/region/cc-format-chooser.ui:49
-#: panels/user-accounts/cc-fingerprint-dialog.ui:73
+#: panels/user-accounts/cc-fingerprint-dialog.ui:58
 msgid "_Done"
 msgstr "_Feito"
 
@@ -902,7 +902,7 @@ msgstr "_Importar ficheiro…"
 #: panels/color/cc-color-panel.ui:390 panels/keyboard/cc-input-chooser.ui:18
 #: panels/network/connection-editor/net-connection-editor.c:497
 #: panels/printers/new-printer-dialog.ui:84
-#: panels/user-accounts/cc-add-user-dialog.ui:47
+#: panels/user-accounts/cc-add-user-dialog.ui:39
 msgid "_Add"
 msgstr "_Engadir"
 
@@ -2332,7 +2332,10 @@ msgstr ""
 "Prema Esc para cancelar ou Borrar para restabelecer o atallo de teclado."
 
 #: panels/keyboard/cc-keyboard-shortcut-editor.ui:153
-#: panels/printers/pp-details-dialog.ui:36 panels/wwan/cc-wwan-apn-dialog.ui:96
+#: panels/printers/pp-details-dialog.ui:36
+#: panels/user-accounts/cc-add-user-dialog.ui:67
+#: panels/user-accounts/cc-user-panel.ui:125
+#: panels/wwan/cc-wwan-apn-dialog.ui:96
 msgid "Name"
 msgstr "Nome"
 
@@ -2895,7 +2898,9 @@ msgstr "Nobre de rede"
 #: panels/printers/authentication-dialog.ui:55
 #: panels/printers/new-printer-dialog.ui:330
 #: panels/printers/pp-jobs-dialog.ui:52
-#: panels/user-accounts/cc-add-user-dialog.ui:249
+#: panels/user-accounts/cc-add-user-dialog.ui:142
+#: panels/user-accounts/cc-add-user-dialog.ui:175
+#: panels/user-accounts/cc-add-user-dialog.ui:355
 #: panels/wwan/cc-wwan-apn-dialog.ui:172
 msgid "Password"
 msgstr "Contrasinal"
@@ -4044,8 +4049,6 @@ msgstr "falta o contrasinal EAP-LEAP"
 #: panels/network/wireless-security/eap-method-leap.ui:11
 #: panels/network/wireless-security/eap-method-simple.ui:11
 #: panels/network/wireless-security/ws-leap.ui:11
-#: panels/user-accounts/cc-add-user-dialog.ui:146
-#: panels/user-accounts/cc-add-user-dialog.ui:527
 msgid "_Username"
 msgstr "Nome de u_suario"
 
@@ -4055,9 +4058,7 @@ msgstr "Nome de u_suario"
 #: panels/network/wireless-security/ws-sae.ui:10
 #: panels/network/wireless-security/ws-wpa-psk.ui:10
 #: panels/sharing/cc-sharing-panel.ui:152
-#: panels/user-accounts/cc-add-user-dialog.ui:310
-#: panels/user-accounts/cc-add-user-dialog.ui:547
-#: panels/user-accounts/cc-user-panel.ui:365
+#: panels/user-accounts/cc-user-panel.ui:168
 msgid "_Password"
 msgstr "_Contrasinal"
 
@@ -4215,8 +4216,7 @@ msgid "CHAP"
 msgstr "CHAP"
 
 #: panels/network/wireless-security/eap-method-ttls.ui:68
-#: panels/user-accounts/cc-add-user-dialog.ui:507
-#: panels/user-accounts/data/join-dialog.ui:116
+#: panels/user-accounts/data/join-dialog.ui:90
 msgid "_Domain"
 msgstr "_Dominio"
 
@@ -4892,7 +4892,10 @@ msgstr "Autenticar"
 #. Translators: This is a username on a print server.
 #: panels/printers/authentication-dialog.ui:41
 #: panels/printers/new-printer-dialog.ui:310
-#: panels/printers/pp-jobs-dialog.ui:41 panels/wwan/cc-wwan-apn-dialog.ui:148
+#: panels/printers/pp-jobs-dialog.ui:41
+#: panels/user-accounts/cc-add-user-dialog.ui:92
+#: panels/user-accounts/cc-add-user-dialog.ui:335
+#: panels/wwan/cc-wwan-apn-dialog.ui:148
 msgid "Username"
 msgstr "Nome de usuario"
 
@@ -5027,7 +5030,7 @@ msgid "Loading drivers database…"
 msgstr "Cargando a base de datos dos controladores…"
 
 #: panels/printers/ppd-selection-dialog.ui:91
-#: panels/user-accounts/cc-avatar-chooser.c:107
+#: panels/user-accounts/cc-avatar-chooser.c:96
 msgid "Select"
 msgstr "Seleccionar"
 
@@ -5155,6 +5158,7 @@ msgstr "Escriba as credenciais para imprimir desde %s."
 
 #. Translators: This is a windows domain used with SMB protocol.
 #: panels/printers/pp-jobs-dialog.ui:30
+#: panels/user-accounts/cc-add-user-dialog.ui:293
 msgid "Domain"
 msgstr "Dominio"
 
@@ -5560,45 +5564,35 @@ msgstr ""
 "semella que non está dispoñíbel."
 
 #: panels/region/cc-format-chooser.c:148 panels/region/cc-format-chooser.c:196
-#: panels/region/cc-format-chooser.ui:4 panels/region/cc-region-panel.ui:160
+#: panels/region/cc-format-chooser.ui:4
 msgid "Formats"
 msgstr "Formatos"
 
-#: panels/region/cc-format-chooser.ui:37
-#: panels/user-accounts/cc-fingerprint-dialog.ui:53
-#: panels/wwan/cc-wwan-apn-dialog.ui:21
+#: panels/region/cc-format-chooser.ui:37 panels/wwan/cc-wwan-apn-dialog.ui:21
 msgid "Back"
 msgstr "Atrás"
 
 #: panels/region/cc-format-chooser.ui:76
-msgid ""
-"Choose the format for numbers, dates and currencies. Changes take effect on "
-"next login."
-msgstr ""
-"Seleccione o formato para os números, datas e moedas. Os cambios aplicaranse "
-"no seguinte inicio de sesión."
-
-#: panels/region/cc-format-chooser.ui:90
 msgid "Search locales…"
 msgstr "Buscar configuracións rexionais…"
 
-#: panels/region/cc-format-chooser.ui:127
+#: panels/region/cc-format-chooser.ui:113
 msgid "Common Formats"
 msgstr "Formatos comúns"
 
-#: panels/region/cc-format-chooser.ui:155
+#: panels/region/cc-format-chooser.ui:140
 msgid "All Formats"
 msgstr "Todos os formatos"
 
-#: panels/region/cc-format-chooser.ui:203
+#: panels/region/cc-format-chooser.ui:188
 msgid "No Search Results"
 msgstr "Non se atoparon resultados"
 
-#: panels/region/cc-format-chooser.ui:215
+#: panels/region/cc-format-chooser.ui:200
 msgid "Searches can be for countries or languages."
 msgstr "As buscas poden ser por países ou por idiomas."
 
-#: panels/region/cc-format-chooser.ui:253
+#: panels/region/cc-format-chooser.ui:236
 msgid "Preview"
 msgstr "Previsualizar"
 
@@ -5632,48 +5626,40 @@ msgstr "Medida"
 msgid "Paper"
 msgstr "Papel"
 
-#: panels/region/cc-region-panel.ui:32
-msgid "My Account"
-msgstr "A miña conta"
+#: panels/region/cc-region-panel.ui:19
+msgid "Language and format will be changed after next login"
+msgstr "O idioma e formato cambiaranse no seguinte inicio de sesión"
 
-#: panels/region/cc-region-panel.ui:38
-msgid "Login Screen"
-msgstr "Pantalla de inicio de sesión"
+#: panels/region/cc-region-panel.ui:29
+msgid "Logout…"
+msgstr "Saír da sesión…"
+
+#: panels/region/cc-region-panel.ui:45
+#| msgid "The format used for numbers, dates, and currencies."
+msgid ""
+"The language setting is used for interface text and web pages. Formats is "
+"used for numbers, dates, and currencies."
+msgstr ""
+"A configuración de idioma úsase no texto da interface e nas páxinas web. Os "
+"formatos úsanse para os números, datas e moedas."
 
 #: panels/region/cc-region-panel.ui:51
-msgid "Language"
-msgstr "Idioma"
+#| msgid "Your account"
+msgid "Your Account"
+msgstr "A súa conta"
 
-#: panels/region/cc-region-panel.ui:60
-msgid "The language used for text in windows and web pages."
-msgstr "O idioma usado para o texto en xanelas e páxinas web."
-
-#: panels/region/cc-region-panel.ui:90
-#: panels/user-accounts/cc-user-panel.ui:311
+#: panels/region/cc-region-panel.ui:56 panels/region/cc-region-panel.ui:95
+#: panels/user-accounts/cc-user-panel.ui:292
 msgid "_Language"
 msgstr "_Idioma"
 
-#: panels/region/cc-region-panel.ui:126
-msgid "Restart the session for changes to take effect"
-msgstr "Reinicie a sesión para que se apliquen os cambios"
-
-#: panels/region/cc-region-panel.ui:140
-msgid "Restart…"
-msgstr "Reiniciar…"
-
-#: panels/region/cc-region-panel.ui:169
-msgid "The format used for numbers, dates, and currencies."
-msgstr "Seleccione o formato para os números, datas e moedas."
-
-#: panels/region/cc-region-panel.ui:194
+#: panels/region/cc-region-panel.ui:72 panels/region/cc-region-panel.ui:111
 msgid "_Formats"
 msgstr "_Formatos"
 
-#: panels/region/cc-region-panel.ui:224
-msgid "Login settings are used by all users when logging into the system"
-msgstr ""
-"As preferencias de inicio de sesión úsanas todos os usuarios ao iniciar a "
-"sesión no sistema"
+#: panels/region/cc-region-panel.ui:90
+msgid "Login Screen"
+msgstr "Pantalla de inicio de sesión"
 
 #: panels/region/gnome-region-panel.desktop.in.in:3
 msgid "Region & Language"
@@ -6898,11 +6884,6 @@ msgstr "Faga máis doado ver, escoitar, escribir, apuntar e clicar"
 
 #. Translators: Search terms to find the Accessibility 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;Universal Access;Contrast;Cursor;Sound;"
-#| "Zoom;Screen;Reader;big;high;large;text;font;size;AccessX;Sticky;Keys;Slow;"
-#| "Bounce;Mouse;Double;click;Delay;Speed;Assist;Repeat;Blink;visual;hearing;"
-#| "audio;typing;"
 msgid ""
 "Keyboard;Mouse;a11y;Accessibility;Universal Access;Contrast;Cursor;Sound;"
 "Zoom;Screen;Reader;big;high;large;text;font;size;AccessX;Sticky;Keys;Slow;"
@@ -7090,34 +7071,34 @@ msgid "Don't leave traces"
 msgstr "Non deixar rastro"
 
 #. FIXME
-#: panels/user-accounts/cc-add-user-dialog.c:34
+#: panels/user-accounts/cc-add-user-dialog.c:35
 msgid "Should match the web address of your login provider."
 msgstr "Debería coincidir co enderezo web do seu fornecedor de conta."
 
-#: panels/user-accounts/cc-add-user-dialog.c:204
+#: panels/user-accounts/cc-add-user-dialog.c:215
 msgid "Failed to add account"
 msgstr "Produciuse un erro ao engadir a conta"
 
-#: panels/user-accounts/cc-add-user-dialog.c:661
-#: panels/user-accounts/cc-password-dialog.c:261
+#: panels/user-accounts/cc-add-user-dialog.c:672
+#: panels/user-accounts/cc-password-dialog.c:258
 msgid "The passwords do not match."
 msgstr "Os contrasinais non coinciden."
 
-#: panels/user-accounts/cc-add-user-dialog.c:875
-#: panels/user-accounts/cc-add-user-dialog.c:914
-#: panels/user-accounts/cc-add-user-dialog.c:932
+#: panels/user-accounts/cc-add-user-dialog.c:876
+#: panels/user-accounts/cc-add-user-dialog.c:915
+#: panels/user-accounts/cc-add-user-dialog.c:933
 msgid "Failed to register account"
 msgstr "Produciuse un erro ao rexistrar a conta"
 
-#: panels/user-accounts/cc-add-user-dialog.c:1047
+#: panels/user-accounts/cc-add-user-dialog.c:1048
 msgid "No supported way to authenticate with this domain"
 msgstr "Non hai unha maneira admitida de autenticar con este dominio"
 
-#: panels/user-accounts/cc-add-user-dialog.c:1111
+#: panels/user-accounts/cc-add-user-dialog.c:1112
 msgid "Failed to join domain"
 msgstr "Produciuse un erro ao unirse ao dominio"
 
-#: panels/user-accounts/cc-add-user-dialog.c:1166
+#: panels/user-accounts/cc-add-user-dialog.c:1167
 msgid ""
 "That login name didn’t work.\n"
 "Please try again."
@@ -7125,7 +7106,7 @@ msgstr ""
 "Ese nome de inicio de sesión non funcionou.\n"
 "Ténteo de novo."
 
-#: panels/user-accounts/cc-add-user-dialog.c:1173
+#: panels/user-accounts/cc-add-user-dialog.c:1174
 msgid ""
 "That login password didn’t work.\n"
 "Please try again."
@@ -7133,51 +7114,65 @@ msgstr ""
 "Ese contrasinal de inicio de sesión non funcionou.\n"
 "Ténteo de novo."
 
-#: panels/user-accounts/cc-add-user-dialog.c:1181
+#: panels/user-accounts/cc-add-user-dialog.c:1182
 msgid "Failed to log into domain"
 msgstr "Produciuse un erro ao iniciar sesión no dominio"
 
-#: panels/user-accounts/cc-add-user-dialog.c:1236
+#: panels/user-accounts/cc-add-user-dialog.c:1237
 msgid "Unable to find the domain. Maybe you misspelled it?"
 msgstr "Non foi posíbel atopar o dominio. Pode ser que o escribira mal?"
 
-#: panels/user-accounts/cc-add-user-dialog.ui:18
-#: panels/user-accounts/data/join-dialog.ui:11
+#: panels/user-accounts/cc-add-user-dialog.ui:15
+#: panels/user-accounts/data/join-dialog.ui:9
 msgid "Add User"
 msgstr "Engadir usuario"
 
-#: panels/user-accounts/cc-add-user-dialog.ui:180
-msgid "_Full Name"
-msgstr "Nome _completo"
-
-#: panels/user-accounts/cc-add-user-dialog.ui:206
-msgid "Standard"
-msgstr "Estándar"
-
-#: panels/user-accounts/cc-add-user-dialog.ui:216
+#: panels/user-accounts/cc-add-user-dialog.ui:128
 msgid "Administrator"
 msgstr "Administrador"
 
-#: panels/user-accounts/cc-add-user-dialog.ui:232
-msgid "Account _Type"
-msgstr "_Tipo de conta"
-
-#: panels/user-accounts/cc-add-user-dialog.ui:269
-msgid "Allow user to set a password when they next _login"
+#: panels/user-accounts/cc-add-user-dialog.ui:129
+#| msgid ""
+#| "Administrators can add and remove other users, and can change settings "
+#| "for all users."
+msgid ""
+"Administrators can add and remove other users, and can change settings for "
+"all users. Parental controls cannot be applied to administrators."
 msgstr ""
-"Permitirlle ao usuario estabelecer o contrasinal no seguinte _inicio de "
-"sesión"
+"Os administradores poden engadir ou eliminar usuarios e poden cambiar as "
+"preferencias para todos os usuarios. Os controles parentais non se aplican "
+"aos administradores."
 
-#: panels/user-accounts/cc-add-user-dialog.ui:283
-msgid "Set a password _now"
-msgstr "Estabelecer un contrasinal _agora"
+#: panels/user-accounts/cc-add-user-dialog.ui:145
+#| msgid "Allow user to change their password on next login"
+msgid "User sets password on first login"
+msgstr "O usuario estabelece o seu contrasinal no primeiro inicio de sesión"
 
-#: panels/user-accounts/cc-add-user-dialog.ui:405
-msgid "_Confirm"
-msgstr "_Confirmar"
+#: panels/user-accounts/cc-add-user-dialog.ui:156
+#| msgid "Set a password now"
+msgid "Set password now"
+msgstr "Estabelecer contrasinal agora"
 
-#: panels/user-accounts/cc-add-user-dialog.ui:485
-#: panels/user-accounts/cc-add-user-dialog.ui:692
+#: panels/user-accounts/cc-add-user-dialog.ui:217
+#| msgid "_Confirm"
+msgid "Confirm"
+msgstr "Confirmar"
+
+#: panels/user-accounts/cc-add-user-dialog.ui:271
+#| msgid "_Enterprise Login"
+msgid "Enterprise Login"
+msgstr "Inicio de sesión corporativo"
+
+#: panels/user-accounts/cc-add-user-dialog.ui:272
+msgid "User accounts which are managed by a company or organisation."
+msgstr ""
+"Contas de usuario que están xestionadas por unha empresa ou organización."
+
+#: panels/user-accounts/cc-add-user-dialog.ui:378
+msgid "You are Offline"
+msgstr "Vostede está desconectado"
+
+#: panels/user-accounts/cc-add-user-dialog.ui:379
 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 "
@@ -7187,27 +7182,11 @@ msgstr ""
 "xestionada de forma centralizada para usala neste dispositivo. Tamén pode "
 "usar esta conta para acceder a recursos corporativos en internet."
 
-#: panels/user-accounts/cc-add-user-dialog.ui:732
-msgid "You are Offline"
-msgstr "Vostede está desconectado"
-
-#: panels/user-accounts/cc-add-user-dialog.ui:751
-msgid "You must be online in order to add enterprise users."
-msgstr "Debe estar en liña para engadir usuarios corporativos."
-
-#: panels/user-accounts/cc-add-user-dialog.ui:782
-msgid "_Enterprise Login"
-msgstr "Inicio de s_esión corporativo"
-
-#: panels/user-accounts/cc-avatar-chooser.c:225
+#: panels/user-accounts/cc-avatar-chooser.c:162
 msgid "Browse for more pictures"
 msgstr "Explorar para buscar máis imaxes"
 
-#: panels/user-accounts/cc-avatar-chooser.ui:39
-msgid "Take a Picture…"
-msgstr "Sacar unha foto…"
-
-#: panels/user-accounts/cc-avatar-chooser.ui:46
+#: panels/user-accounts/cc-avatar-chooser.ui:32
 msgid "Select a File…"
 msgstr "Seleccionar un ficheiro…"
 
@@ -7215,19 +7194,19 @@ msgstr "Seleccionar un ficheiro…"
 msgid "Fingerprint Manager"
 msgstr "Xestión das pegadas dixitais"
 
-#: panels/user-accounts/cc-fingerprint-dialog.ui:23
+#: panels/user-accounts/cc-fingerprint-dialog.ui:18
 msgid "Fingerprint"
 msgstr "Pegada dixital"
 
-#: panels/user-accounts/cc-fingerprint-dialog.ui:118
+#: panels/user-accounts/cc-fingerprint-dialog.ui:86
 msgid "_No"
 msgstr "_Non"
 
-#: panels/user-accounts/cc-fingerprint-dialog.ui:128
+#: panels/user-accounts/cc-fingerprint-dialog.ui:94
 msgid "_Yes"
 msgstr "_Sí"
 
-#: panels/user-accounts/cc-fingerprint-dialog.ui:155
+#: panels/user-accounts/cc-fingerprint-dialog.ui:114
 msgid ""
 "Do you want to delete your registered fingerprints so fingerprint login is "
 "disabled?"
@@ -7235,28 +7214,32 @@ msgstr ""
 "Desexa eliminar as súas pegadas dixitais rexistradas para desactivar o "
 "inicio de sesión con pegadas dixitais?"
 
-#. Translators: This is the empty state page label which states that there are no devices ready.
-#: panels/user-accounts/cc-fingerprint-dialog.ui:249
-msgid "No Fingerprint device"
-msgstr "Non hai ningún dispositivo de pegada dixital"
-
-#: panels/user-accounts/cc-fingerprint-dialog.ui:259
-msgid "Ensure the device is properly connected."
-msgstr "Asegúrese que o dispositivo está conectado correctamente"
-
-#: panels/user-accounts/cc-fingerprint-dialog.ui:264
+#: panels/user-accounts/cc-fingerprint-dialog.ui:170
 msgid "No fingerprint device"
 msgstr "Non hai ningún dispositivo de pegada dixital"
 
-#: panels/user-accounts/cc-fingerprint-dialog.ui:280
-msgid "Choose the fingerprint device you want to configure"
-msgstr "Seleccione o dispositivo de pegada dixital que quere configurar"
+#. Translators: This is the empty state page label which states that there are no devices ready.
+#: panels/user-accounts/cc-fingerprint-dialog.ui:185
+msgid "No Fingerprint device"
+msgstr "Non hai ningún dispositivo de pegada dixital"
 
-#: panels/user-accounts/cc-fingerprint-dialog.ui:309
+#: panels/user-accounts/cc-fingerprint-dialog.ui:194
+msgid "Ensure the device is properly connected."
+msgstr "Asegúrese que o dispositivo está conectado correctamente"
+
+#: panels/user-accounts/cc-fingerprint-dialog.ui:202
 msgid "Fingerprint Device"
 msgstr "Dispositivo de pegada dixital"
 
-#: panels/user-accounts/cc-fingerprint-dialog.ui:322
+#: panels/user-accounts/cc-fingerprint-dialog.ui:211
+msgid "Choose the fingerprint device you want to configure"
+msgstr "Seleccione o dispositivo de pegada dixital que quere configurar"
+
+#: panels/user-accounts/cc-fingerprint-dialog.ui:242
+msgid "Fingerprint Login"
+msgstr "Inicio de sesión con pegada dixital"
+
+#: panels/user-accounts/cc-fingerprint-dialog.ui:249
 msgid ""
 "Fingerprint login allows you to unlock and log into your computer with your "
 "finger"
@@ -7264,19 +7247,15 @@ msgstr ""
 "O inicio de sesión con pegada dixital permítelle desbloquear e iniciar "
 "sesión no seu computador co seu dedo"
 
-#: panels/user-accounts/cc-fingerprint-dialog.ui:352
+#: panels/user-accounts/cc-fingerprint-dialog.ui:276
 msgid "_Delete Fingerprints"
 msgstr "_Eliminar pegadas dixitais"
 
-#: panels/user-accounts/cc-fingerprint-dialog.ui:363
-msgid "Fingerprint Login"
-msgstr "Inicio de sesión con pegada dixital"
-
-#: panels/user-accounts/cc-fingerprint-dialog.ui:412
+#: panels/user-accounts/cc-fingerprint-dialog.ui:290
 msgid "Fingerprint Enroll"
 msgstr "Rexistrar pegada dixital"
 
-#: panels/user-accounts/cc-fingerprint-dialog.ui:436
+#: panels/user-accounts/cc-fingerprint-dialog.ui:349
 msgid "_Re-enroll this finger…"
 msgstr "_Volver a rexistrar este dedo…"
 
@@ -7308,93 +7287,93 @@ msgstr "Produciuse un fallo ao comunicarse co lector de pegadas dixitais"
 msgid "Failed to communicate with the fingerprint daemon"
 msgstr "Produciuse un fallo ao comunicarse co «daemon» de pegada dixital"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:585
+#: panels/user-accounts/cc-fingerprint-dialog.c:606
 #, c-format
 msgid "Failed to list fingerprints: %s"
 msgstr "Produciuse un erro ao listar as pegadas dixitais: %s"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:652
+#: panels/user-accounts/cc-fingerprint-dialog.c:673
 #, c-format
 msgid "Failed to delete saved fingerprints: %s"
 msgstr "Produciuse un erro ao eliminar as pegadas dixitais gardadas: %s"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:683
+#: panels/user-accounts/cc-fingerprint-dialog.c:704
 msgid "Left thumb"
 msgstr "Dedo gordo esquerdo"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:685
+#: panels/user-accounts/cc-fingerprint-dialog.c:706
 msgid "Left middle finger"
 msgstr "Dedo corazón esquerdo"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:687
+#: panels/user-accounts/cc-fingerprint-dialog.c:708
 msgid "_Left index finger"
 msgstr "Dedo índice _esquerdo"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:689
+#: panels/user-accounts/cc-fingerprint-dialog.c:710
 msgid "Left ring finger"
 msgstr "Dedo anular esquerdo"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:691
+#: panels/user-accounts/cc-fingerprint-dialog.c:712
 msgid "Left little finger"
 msgstr "Dedo maimiño esquerdo"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:693
+#: panels/user-accounts/cc-fingerprint-dialog.c:714
 msgid "Right thumb"
 msgstr "Dedo gordo dereito"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:695
+#: panels/user-accounts/cc-fingerprint-dialog.c:716
 msgid "Right middle finger"
 msgstr "Dedo corazón dereito"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:697
+#: panels/user-accounts/cc-fingerprint-dialog.c:718
 msgid "_Right index finger"
 msgstr "_Dedo índice dereito"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:699
+#: panels/user-accounts/cc-fingerprint-dialog.c:720
 msgid "Right ring finger"
 msgstr "Dedo anular dereito"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:701
+#: panels/user-accounts/cc-fingerprint-dialog.c:722
 msgid "Right little finger"
 msgstr "Dedo maimiño dereito"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:703
+#: panels/user-accounts/cc-fingerprint-dialog.c:724
 msgid "Unknown Finger"
 msgstr "Dedo descoñecido"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:837
+#: panels/user-accounts/cc-fingerprint-dialog.c:858
 msgctxt "Fingerprint enroll state"
 msgid "Complete"
 msgstr "Completado"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:848
+#: panels/user-accounts/cc-fingerprint-dialog.c:869
 msgid "Fingerprint device disconnected"
 msgstr "Dispositivo de pegada dixital desconectado"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:854
+#: panels/user-accounts/cc-fingerprint-dialog.c:875
 msgid "Fingerprint device storage is full"
 msgstr "O almacenamento do dispositivo de pegada dixital está cheo"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:858
+#: panels/user-accounts/cc-fingerprint-dialog.c:879
 msgid "Failed to enroll new fingerprint"
 msgstr "Produciuse un erro ao rexistrar unha nova pegada dixital"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:889
+#: panels/user-accounts/cc-fingerprint-dialog.c:910
 #, c-format
 msgid "Failed to start enrollment: %s"
 msgstr "Produciuse un erro ao iniciar o rexistro: %s"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:897
+#: panels/user-accounts/cc-fingerprint-dialog.c:918
 msgctxt "Fingerprint enroll state"
 msgid "Failed to enroll new fingerprint"
 msgstr "Produciuse un erro ao rexistrar unha nova pegada dixital"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:928
+#: panels/user-accounts/cc-fingerprint-dialog.c:949
 #, c-format
 msgid "Failed to stop enrollment: %s"
 msgstr "Produciuse un erro ao deter o rexistro: %s"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:974
+#: panels/user-accounts/cc-fingerprint-dialog.c:995
 msgid ""
 "Repeatedly lift and place your finger on the reader to enroll your "
 "fingerprint"
@@ -7403,35 +7382,35 @@ msgstr ""
 "pegada dixital"
 
 #. TRANSLATORS: This is the label for the button to enroll a new finger
-#: panels/user-accounts/cc-fingerprint-dialog.c:1118
+#: panels/user-accounts/cc-fingerprint-dialog.c:1147
 msgid "Scan new fingerprint"
 msgstr "Analizar nova pegada dixital"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:1157
+#: panels/user-accounts/cc-fingerprint-dialog.c:1185
 #, c-format
 msgid "Failed to release fingerprint device %s: %s"
 msgstr "Produciuse un fallo ao liberar o dispositivo de pegada dixital %s: %s"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:1229
+#: panels/user-accounts/cc-fingerprint-dialog.c:1257
 msgctxt "Fingerprint enroll state"
 msgid "Problem Reading Device"
 msgstr "Problema ao ler o dispositivo"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:1264
+#: panels/user-accounts/cc-fingerprint-dialog.c:1292
 #, c-format
 msgid "Failed to claim fingerprint device %s: %s"
 msgstr "Produciuse un fallo ao reclamar o dispositivo de pegada dixital %s: %s"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:1413
+#: panels/user-accounts/cc-fingerprint-dialog.c:1441
 #, c-format
 msgid "Failed to get fingerprint devices: %s"
 msgstr "Produciuse un fallo ao obter os dispositivos de pegada dixital: %s"
 
-#: panels/user-accounts/cc-login-history-dialog.c:69
+#: panels/user-accounts/cc-login-history-dialog.c:71
 msgid "This Week"
 msgstr "Esta semana"
 
-#: panels/user-accounts/cc-login-history-dialog.c:72
+#: panels/user-accounts/cc-login-history-dialog.c:74
 msgid "Last Week"
 msgstr "Última semana"
 
@@ -7439,22 +7418,22 @@ msgstr "Última semana"
 #. 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/cc-login-history-dialog.c:82
-#: panels/user-accounts/cc-login-history-dialog.c:86
+#: panels/user-accounts/cc-login-history-dialog.c:84
+#: panels/user-accounts/cc-login-history-dialog.c:88
 msgctxt "login history week label"
 msgid "%b %e"
 msgstr "%e de %b"
 
 #. 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/cc-login-history-dialog.c:91
+#: panels/user-accounts/cc-login-history-dialog.c:93
 msgctxt "login history week label"
 msgid "%b %e, %Y"
 msgstr "%e de %b de %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/cc-login-history-dialog.c:96
+#: panels/user-accounts/cc-login-history-dialog.c:98
 #, c-format
 msgctxt "login history week label"
 msgid "%s — %s"
@@ -7462,74 +7441,77 @@ 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/cc-login-history-dialog.c:173
-#: panels/user-accounts/cc-user-panel.c:780
+#: panels/user-accounts/cc-login-history-dialog.c:179
+#: panels/user-accounts/cc-user-panel.c:684
 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/cc-login-history-dialog.c:176
-#: panels/user-accounts/cc-user-panel.c:784
+#: panels/user-accounts/cc-login-history-dialog.c:182
+#: panels/user-accounts/cc-user-panel.c:688
 #, c-format
 msgctxt "login date-time"
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: panels/user-accounts/cc-login-history-dialog.c:243
+#: panels/user-accounts/cc-login-history-dialog.c:238
 msgid "Session Ended"
 msgstr "Sesión rematada"
 
-#: panels/user-accounts/cc-login-history-dialog.c:249
+#: panels/user-accounts/cc-login-history-dialog.c:244
 msgid "Session Started"
 msgstr "Sesión iniciada"
 
 #. Translators: This is the title of the "Account Activity" dialog.
 #. The %s is the user real name.
-#: panels/user-accounts/cc-login-history-dialog.c:343
+#: panels/user-accounts/cc-login-history-dialog.c:339
 #, c-format
 msgid "%s — Account Activity"
 msgstr "%s — Actividade da conta"
 
-#: panels/user-accounts/cc-password-dialog.c:125
+#: panels/user-accounts/cc-password-dialog.c:133
 msgid "Please choose another password."
 msgstr "Seleccione outro contrasinal."
 
-#: panels/user-accounts/cc-password-dialog.c:134
+#: panels/user-accounts/cc-password-dialog.c:142
 msgid "Please type your current password again."
 msgstr "Escriba o seu contrasinal actual de novo."
 
-#: panels/user-accounts/cc-password-dialog.c:140
+#: panels/user-accounts/cc-password-dialog.c:148
 msgid "Password could not be changed"
 msgstr "Non foi posíbel cambiar o contrasinal"
 
-#: panels/user-accounts/cc-password-dialog.ui:7
+#: panels/user-accounts/cc-password-dialog.ui:4
 msgid "Change Password"
 msgstr "Cambiar contrasinal"
 
-#: panels/user-accounts/cc-password-dialog.ui:37
+#: panels/user-accounts/cc-password-dialog.ui:32
 msgid "Ch_ange"
 msgstr "C_ambiar"
 
-#: panels/user-accounts/cc-password-dialog.ui:145
-msgid "_Confirm New Password"
-msgstr "_Confirmar o novo contrasinal"
+#: panels/user-accounts/cc-password-dialog.ui:51
+#| msgid "Current _Password"
+msgid "Current Password"
+msgstr "Contrasinal actual"
 
-#: panels/user-accounts/cc-password-dialog.ui:162
-msgid "_New Password"
-msgstr "Contrasinal _novo"
+#: panels/user-accounts/cc-password-dialog.ui:76
+#| msgid "_New Password"
+msgid "New Password"
+msgstr "Contrasinal novo"
 
-#: panels/user-accounts/cc-password-dialog.ui:216
-msgid "Current _Password"
-msgstr "_Contrasinal actual"
+#: panels/user-accounts/cc-password-dialog.ui:121
+#| msgid "_Confirm New Password"
+msgid "Confirm Password"
+msgstr "Confirmar contrasinal"
 
-#: panels/user-accounts/cc-password-dialog.ui:254
+#: panels/user-accounts/cc-password-dialog.ui:175
 msgid "Allow user to change their password on next login"
 msgstr ""
 "Permitirlle ao usuario cambiar o seu contrasinal no seguinte inicio de sesión"
 
-#: panels/user-accounts/cc-password-dialog.ui:267
+#: panels/user-accounts/cc-password-dialog.ui:186
 msgid "Set a password now"
 msgstr "Estabelecer un contrasinal agora"
 
@@ -7556,30 +7538,26 @@ msgstr "Contrasinal incorrecto, ténteo de novo"
 msgid "Couldn’t connect to the %s domain: %s"
 msgstr "Non foi posíbel conectarse ao dominio %s: %s"
 
-#: panels/user-accounts/cc-user-panel.c:222
-msgid "Your account"
-msgstr "A súa conta"
-
-#: panels/user-accounts/cc-user-panel.c:411
+#: panels/user-accounts/cc-user-panel.c:313
 msgid "Failed to delete user"
 msgstr "Produciuse un erro ao eliminar o usuario"
 
-#: panels/user-accounts/cc-user-panel.c:466
-#: panels/user-accounts/cc-user-panel.c:521
-#: panels/user-accounts/cc-user-panel.c:567
+#: panels/user-accounts/cc-user-panel.c:370
+#: panels/user-accounts/cc-user-panel.c:425
+#: panels/user-accounts/cc-user-panel.c:471
 msgid "Failed to revoke remotely managed user"
 msgstr "Produciuse un fallo ao revocar o usuario xestionado remotamente"
 
-#: panels/user-accounts/cc-user-panel.c:616
+#: panels/user-accounts/cc-user-panel.c:520
 msgid "You cannot delete your own account."
 msgstr "Non pode eliminar a súa propia conta."
 
-#: panels/user-accounts/cc-user-panel.c:625
+#: panels/user-accounts/cc-user-panel.c:529
 #, c-format
 msgid "%s is still logged in"
 msgstr "%s aínda ten a sesión iniciada"
 
-#: panels/user-accounts/cc-user-panel.c:629
+#: panels/user-accounts/cc-user-panel.c:533
 msgid ""
 "Deleting a user while they are logged in can leave the system in an "
 "inconsistent state."
@@ -7587,12 +7565,12 @@ msgstr ""
 "Se elimina un usuario mentres ten a sesión iniciada pode poñer deixar o "
 "sistema nun estado inconsistente."
 
-#: panels/user-accounts/cc-user-panel.c:638
+#: panels/user-accounts/cc-user-panel.c:542
 #, c-format
 msgid "Do you want to keep %s’s files?"
 msgstr "Desexa manter os ficheiros de %s?"
 
-#: panels/user-accounts/cc-user-panel.c:642
+#: panels/user-accounts/cc-user-panel.c:546
 msgid ""
 "It is possible to keep the home directory, mail spool and temporary files "
 "around when deleting a user account."
@@ -7600,75 +7578,67 @@ msgstr ""
 "É posíbel manter o cartafol persoal, a caixa de correo e os ficheiros "
 "temporais ao eliminar unha conta de usuario."
 
-#: panels/user-accounts/cc-user-panel.c:645
+#: panels/user-accounts/cc-user-panel.c:549
 msgid "_Delete Files"
 msgstr "_Eliminar os ficheiros"
 
-#: panels/user-accounts/cc-user-panel.c:646
+#: panels/user-accounts/cc-user-panel.c:550
 msgid "_Keep Files"
 msgstr "_Manter os ficheiros"
 
-#: panels/user-accounts/cc-user-panel.c:660
+#: panels/user-accounts/cc-user-panel.c:564
 #, c-format
 msgid "Are you sure you want to revoke remotely managed %s’s account?"
 msgstr "Ten certeza que quere revocar a conta de %s xestionada remotamente?"
 
-#: panels/user-accounts/cc-user-panel.c:664
+#: panels/user-accounts/cc-user-panel.c:568
 msgid "_Delete"
 msgstr "_Eliminar"
 
-#: panels/user-accounts/cc-user-panel.c:714
+#: panels/user-accounts/cc-user-panel.c:618
 msgctxt "Password mode"
 msgid "Account disabled"
 msgstr "Conta desactivada"
 
-#: panels/user-accounts/cc-user-panel.c:722
+#: panels/user-accounts/cc-user-panel.c:626
 msgctxt "Password mode"
 msgid "To be set at next login"
 msgstr "Para configurar no seguinte inicio de sesión"
 
-#: panels/user-accounts/cc-user-panel.c:725
+#: panels/user-accounts/cc-user-panel.c:629
 msgctxt "Password mode"
 msgid "None"
 msgstr "Ningún"
 
-#: panels/user-accounts/cc-user-panel.c:768
+#: panels/user-accounts/cc-user-panel.c:672
 msgid "Logged in"
 msgstr "Conectado"
 
 #. TRANSLATORS: Status of Parental Controls setup
-#: panels/user-accounts/cc-user-panel.c:855
-#: panels/user-accounts/cc-user-panel.c:952
+#: panels/user-accounts/cc-user-panel.c:759
+#: panels/user-accounts/cc-user-panel.c:862
 #: panels/wwan/cc-wwan-device-page.c:476
 msgid "Enabled"
 msgstr "Activado"
 
-#: panels/user-accounts/cc-user-panel.c:1276
+#: panels/user-accounts/cc-user-panel.c:1184
 msgid "Failed to contact the accounts service"
 msgstr "Produciuse un erro ao contactar co servizo de contas"
 
-#: panels/user-accounts/cc-user-panel.c:1278
+#: panels/user-accounts/cc-user-panel.c:1186
 msgid "Please make sure that the AccountService is installed and enabled."
 msgstr "Asegúrese de que o servizo de contas está instalado e activado."
 
-#. 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/cc-user-panel.c:1310
-msgid ""
-"To make changes,\n"
-"click the * icon first"
-msgstr ""
-"Para realizar os cambios,\n"
-"primeiro prema na icona *"
+#: panels/user-accounts/cc-user-panel.c:1207
+msgid "This panel must be unlocked to change this setting"
+msgstr "Este panel debe desbloquearse para cambiar esta configuración"
 
-#: panels/user-accounts/cc-user-panel.c:1383
+#: panels/user-accounts/cc-user-panel.c:1274
 msgid "Delete the selected user account"
 msgstr "Eliminar a conta de usuario seleccionada"
 
-#: panels/user-accounts/cc-user-panel.c:1395
-#: panels/user-accounts/cc-user-panel.c:1506
+#: panels/user-accounts/cc-user-panel.c:1278
+#: panels/user-accounts/cc-user-panel.c:1387
 msgid ""
 "To delete the selected user account,\n"
 "click the * icon first"
@@ -7676,40 +7646,41 @@ msgstr ""
 "Para eliminar a conta de usuario seleccionada,\n"
 "primeiro prema na icona *"
 
-#: panels/user-accounts/cc-user-panel.c:1552
+#: panels/user-accounts/cc-user-panel.c:1427
 msgid "Unlock to Add Users and Change Settings"
 msgstr "Desbloquear para engadir usuarios e cambiar as preferencias"
 
-#: panels/user-accounts/cc-user-panel.ui:6
-msgid "_Add User…"
-msgstr "_Engadir usuario…"
+#: panels/user-accounts/cc-user-panel.ui:23
+#: panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in:3
+msgid "Users"
+msgstr "Usuarios"
 
-#: panels/user-accounts/cc-user-panel.ui:9
-msgid "Create a user account"
-msgstr "Crear unha conta de usuario"
-
-#: panels/user-accounts/cc-user-panel.ui:64
+#: panels/user-accounts/cc-user-panel.ui:60
 msgid "Your session needs to be restarted for changes to take effect"
 msgstr "A súa sesión debe reiniciarse para que se apliquen os cambios"
 
-#: panels/user-accounts/cc-user-panel.ui:72
+#: panels/user-accounts/cc-user-panel.ui:67
 msgid "Restart Now"
 msgstr "Reiniciar agora"
 
-#: panels/user-accounts/cc-user-panel.ui:157
-#: panels/user-accounts/cc-user-panel.ui:173
-msgid "User Icon"
-msgstr "Icona de usuario"
+#. FIXME
+#: panels/user-accounts/cc-user-panel.ui:188
+msgid "_Fingerprint Login"
+msgstr "Inicio de sesión con _pegadas dixitais"
 
-#: panels/user-accounts/cc-user-panel.ui:249
-msgid "Account Settings"
-msgstr "Preferencias da conta"
+#: panels/user-accounts/cc-user-panel.ui:211
+msgid "A_utomatic Login"
+msgstr "_Inicio de sesión automático"
 
-#: panels/user-accounts/cc-user-panel.ui:267
+#: panels/user-accounts/cc-user-panel.ui:224
+msgid "Account Activity"
+msgstr "Actividade da conta"
+
+#: panels/user-accounts/cc-user-panel.ui:252
 msgid "_Administrator"
 msgstr "_Administrador"
 
-#: panels/user-accounts/cc-user-panel.ui:268
+#: panels/user-accounts/cc-user-panel.ui:253
 msgid ""
 "Administrators can add and remove other users, and can change settings for "
 "all users."
@@ -7717,47 +7688,37 @@ msgstr ""
 "Os administradores poden engadir ou eliminar usuarios e poden cambiar as "
 "preferencias para todos os usuarios."
 
-#: panels/user-accounts/cc-user-panel.ui:284
+#: panels/user-accounts/cc-user-panel.ui:269
 msgid "_Parental Controls"
 msgstr "Controis _parentais"
 
-#: panels/user-accounts/cc-user-panel.ui:285
+#: panels/user-accounts/cc-user-panel.ui:270
 msgid "Open the Parental Controls application."
 msgstr "Abrir a aplicación de Control Parental."
 
-#: panels/user-accounts/cc-user-panel.ui:347
-msgid "Authentication & Login"
-msgstr "Autenticación e inicio de sesión"
-
-#: panels/user-accounts/cc-user-panel.ui:390
-msgid "_Fingerprint Login"
-msgstr "Inicio de sesión con _pegadas dixitais"
-
-#: panels/user-accounts/cc-user-panel.ui:415
-msgid "A_utomatic Login"
-msgstr "_Inicio de sesión automático"
-
-#: panels/user-accounts/cc-user-panel.ui:430
-msgid "Account Activity"
-msgstr "Actividade da conta"
-
-#: panels/user-accounts/cc-user-panel.ui:461
+#: panels/user-accounts/cc-user-panel.ui:321
 msgid "Remove User…"
 msgstr "Eliminar usuario…"
 
+#: panels/user-accounts/cc-user-panel.ui:333
+#| msgid "Other Files"
+msgid "Other Users"
+msgstr "Outros usuarios"
+
+#: panels/user-accounts/cc-user-panel.ui:346
+#| msgid "_Add User…"
+msgid "Add User…"
+msgstr "Engadir usuario…"
+
 #. Translators: This is the empty state page label which states that there are no users to show in the panel.
-#: panels/user-accounts/cc-user-panel.ui:502
+#: panels/user-accounts/cc-user-panel.ui:374
 msgid "No Users Found"
 msgstr "Non se atoparon usuarios"
 
-#: panels/user-accounts/cc-user-panel.ui:512
+#: panels/user-accounts/cc-user-panel.ui:383
 msgid "Unlock to add a user account."
 msgstr "Desbloquear para engadir unha conta de usuario."
 
-#: panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in:3
-msgid "Users"
-msgstr "Usuarios"
-
 #: panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in:4
 msgid "Add or remove users and change your password"
 msgstr "Engadir ou quitar usuarios e cambiar os seus contrasinais"
@@ -7773,15 +7734,15 @@ msgstr ""
 "web;Uso;Límite de uso;Rapaz;Neno;"
 
 #. Translators: This button enrolls the computer in the domain in order to use enterprise logins.
-#: panels/user-accounts/data/join-dialog.ui:39
+#: panels/user-accounts/data/join-dialog.ui:30
 msgid "_Enroll"
 msgstr "_Unirse"
 
-#: panels/user-accounts/data/join-dialog.ui:75
+#: panels/user-accounts/data/join-dialog.ui:59
 msgid "Domain Administrator Login"
 msgstr "Inicio de sesión do administrador do dominio"
 
-#: panels/user-accounts/data/join-dialog.ui:93
+#: panels/user-accounts/data/join-dialog.ui:72
 msgid ""
 "In order to use enterprise logins, this computer needs to be\n"
 "enrolled in the domain. Please have your network administrator\n"
@@ -7791,11 +7752,11 @@ msgstr ""
 "formar parte dun dominio. Pida ao administrador do seu sistema \n"
 "que escriba aquí o contrasinal do dominio."
 
-#: panels/user-accounts/data/join-dialog.ui:150
+#: panels/user-accounts/data/join-dialog.ui:112
 msgid "Administrator _Name"
 msgstr "_Nome do administrador"
 
-#: panels/user-accounts/data/join-dialog.ui:185
+#: panels/user-accounts/data/join-dialog.ui:135
 msgid "Administrator Password"
 msgstr "Contrasinal do administrador"
 
@@ -7963,7 +7924,7 @@ msgstr "O novo contrasinal non contén suficientes caracteres diferentes"
 msgid "Unknown error"
 msgstr "Erro descoñecido"
 
-#: panels/user-accounts/user-utils.c:432
+#: panels/user-accounts/user-utils.c:144
 msgid ""
 "The username should usually only consist of lower case letters from a-z, "
 "digits and the following characters: - _"
@@ -7971,18 +7932,14 @@ msgstr ""
 "O nome de usuario debe estar formado por letras en maiúsculas desde o «a» ao "
 "«z», díxitos, e o caracteres: - _"
 
-#: panels/user-accounts/user-utils.c:436
+#: panels/user-accounts/user-utils.c:148
 msgid "Sorry, that user name isn’t available. Please try another."
 msgstr "Desculpe, o nome de usuario non está dispoñíbel. Probe outro."
 
-#: panels/user-accounts/user-utils.c:478
+#: panels/user-accounts/user-utils.c:190
 msgid "The username is too long."
 msgstr "O nome de usuario é demasiado longo."
 
-#: panels/user-accounts/user-utils.c:537
-msgid "This will be used to name your home folder and can’t be changed."
-msgstr "Usarase como nome para o seu cartafol persoal e non pode cambiarse."
-
 #: panels/wacom/button-mapping.ui:7 panels/wacom/cc-wacom-page.ui:38
 msgid "Map Buttons"
 msgstr "Mapear botóns"
@@ -8767,6 +8724,78 @@ msgstr[1] "%u entradas"
 msgid "System Sounds"
 msgstr "Sons do sistema"
 
+#~ msgid ""
+#~ "Choose the format for numbers, dates and currencies. Changes take effect "
+#~ "on next login."
+#~ msgstr ""
+#~ "Seleccione o formato para os números, datas e moedas. Os cambios "
+#~ "aplicaranse no seguinte inicio de sesión."
+
+#~ msgid "My Account"
+#~ msgstr "A miña conta"
+
+#~ msgid "Language"
+#~ msgstr "Idioma"
+
+#~ msgid "The language used for text in windows and web pages."
+#~ msgstr "O idioma usado para o texto en xanelas e páxinas web."
+
+#~ msgid "Restart the session for changes to take effect"
+#~ msgstr "Reinicie a sesión para que se apliquen os cambios"
+
+#~ msgid "Restart…"
+#~ msgstr "Reiniciar…"
+
+#~ msgid "Login settings are used by all users when logging into the system"
+#~ msgstr ""
+#~ "As preferencias de inicio de sesión úsanas todos os usuarios ao iniciar a "
+#~ "sesión no sistema"
+
+#~ msgid "_Full Name"
+#~ msgstr "Nome _completo"
+
+#~ msgid "Standard"
+#~ msgstr "Estándar"
+
+#~ msgid "Account _Type"
+#~ msgstr "_Tipo de conta"
+
+#~ msgid "Allow user to set a password when they next _login"
+#~ msgstr ""
+#~ "Permitirlle ao usuario estabelecer o contrasinal no seguinte _inicio de "
+#~ "sesión"
+
+#~ msgid "Set a password _now"
+#~ msgstr "Estabelecer un contrasinal _agora"
+
+#~ msgid "You must be online in order to add enterprise users."
+#~ msgstr "Debe estar en liña para engadir usuarios corporativos."
+
+#~ msgid "Take a Picture…"
+#~ msgstr "Sacar unha foto…"
+
+#~ msgid ""
+#~ "To make changes,\n"
+#~ "click the * icon first"
+#~ msgstr ""
+#~ "Para realizar os cambios,\n"
+#~ "primeiro prema na icona *"
+
+#~ msgid "Create a user account"
+#~ msgstr "Crear unha conta de usuario"
+
+#~ msgid "User Icon"
+#~ msgstr "Icona de usuario"
+
+#~ msgid "Account Settings"
+#~ msgstr "Preferencias da conta"
+
+#~ msgid "Authentication & Login"
+#~ msgstr "Autenticación e inicio de sesión"
+
+#~ msgid "This will be used to name your home folder and can’t be changed."
+#~ msgstr "Usarase como nome para o seu cartafol persoal e non pode cambiarse."
+
 #~ msgid "Output:"
 #~ msgstr "Saída:"
 
@@ -8917,9 +8946,6 @@ msgstr "Sons do sistema"
 #~ msgid "Video Files"
 #~ msgstr "Ficheiros de vídeo"
 
-#~ msgid "Other Files"
-#~ msgstr "Outros ficheiros"
-
 #~ msgid "Permissions & Access"
 #~ msgstr "Permisos e acceso"