Hello community,
here is the log from the commit of package gnome-initial-setup for
openSUSE:Factory checked in at 2020-07-10 15:31:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnome-initial-setup (Old)
and /work/SRC/openSUSE:Factory/.gnome-initial-setup.new.3060 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-initial-setup"
Fri Jul 10 15:31:54 2020 rev:5 rq:819945 version:3.36.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/gnome-initial-setup/gnome-initial-setup.changes
2020-06-27 23:22:36.385827438 +0200
+++
/work/SRC/openSUSE:Factory/.gnome-initial-setup.new.3060/gnome-initial-setup.changes
2020-07-10 15:32:06.903066591 +0200
@@ -1,0 +2,7 @@
+Sun Jul 5 14:55:33 UTC 2020 - Bjørn Lie <[email protected]>
+
+- Update to version 3.36.4:
+ + Bugs fixed: timezone: Don't set timezone if tz page is skipped.
+ + Updated translations.
+
+-------------------------------------------------------------------
Old:
----
gnome-initial-setup-3.36.3.tar.xz
New:
----
gnome-initial-setup-3.36.4.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-initial-setup.spec ++++++
--- /var/tmp/diff_new_pack.UyNhxz/_old 2020-07-10 15:32:07.971070105 +0200
+++ /var/tmp/diff_new_pack.UyNhxz/_new 2020-07-10 15:32:07.971070105 +0200
@@ -17,7 +17,7 @@
Name: gnome-initial-setup
-Version: 3.36.3
+Version: 3.36.4
Release: 0
Summary: GNOME Initial Setup Assistant
License: GPL-2.0-or-later
++++++ gnome-initial-setup-3.36.3.tar.xz -> gnome-initial-setup-3.36.4.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-initial-setup-3.36.3/NEWS
new/gnome-initial-setup-3.36.4/NEWS
--- old/gnome-initial-setup-3.36.3/NEWS 2020-05-29 22:44:47.000000000 +0200
+++ new/gnome-initial-setup-3.36.4/NEWS 2020-07-05 14:27:24.000000000 +0200
@@ -1,3 +1,12 @@
+3.36.4
+------
+
+* Bugs fixed:
+ - #106 timezone: Don't set timezone if tz page is skipped
+
+* Translation updates:
+ - Kazakh
+
3.36.3
------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-initial-setup-3.36.3/gnome-initial-setup/pages/timezone/gis-timezone-page.c
new/gnome-initial-setup-3.36.4/gnome-initial-setup/pages/timezone/gis-timezone-page.c
---
old/gnome-initial-setup-3.36.3/gnome-initial-setup/pages/timezone/gis-timezone-page.c
2020-05-29 22:44:47.000000000 +0200
+++
new/gnome-initial-setup-3.36.4/gnome-initial-setup/pages/timezone/gis-timezone-page.c
2020-07-05 14:27:24.000000000 +0200
@@ -388,6 +388,18 @@
}
static void
+page_added (GisTimezonePage *page)
+{
+ GisTimezonePagePrivate *priv = gis_timezone_page_get_instance_private (page);
+
+ if (priv->geoclue_cancellable == NULL)
+ {
+ priv->geoclue_cancellable = g_cancellable_new ();
+ get_location_from_geoclue_async (page);
+ }
+}
+
+static void
gis_timezone_page_constructed (GObject *object)
{
GisTimezonePage *page = GIS_TIMEZONE_PAGE (object);
@@ -418,10 +430,7 @@
priv->clock_format = g_settings_get_enum (settings, CLOCK_FORMAT_KEY);
g_object_unref (settings);
- priv->geoclue_cancellable = g_cancellable_new ();
-
set_location (page, NULL);
- get_location_from_geoclue_async (page);
priv->search_entry_text_changed_id =
g_signal_connect (priv->search_entry, "changed",
@@ -432,6 +441,8 @@
G_CALLBACK (entry_mapped), page);
g_signal_connect (priv->map, "location-changed",
G_CALLBACK (map_location_changed), page);
+ g_signal_connect (GTK_WIDGET (page), "parent-set",
+ G_CALLBACK (page_added), NULL);
gtk_widget_show (GTK_WIDGET (page));
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-initial-setup-3.36.3/meson.build
new/gnome-initial-setup-3.36.4/meson.build
--- old/gnome-initial-setup-3.36.3/meson.build 2020-05-29 22:44:47.000000000
+0200
+++ new/gnome-initial-setup-3.36.4/meson.build 2020-07-05 14:27:24.000000000
+0200
@@ -1,6 +1,6 @@
project('gnome-initial-setup',
['c'],
- version: '3.36.3',
+ version: '3.36.4',
license: 'GPLv2',
meson_version: '>= 0.47.0',
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-initial-setup-3.36.3/po/kk.po
new/gnome-initial-setup-3.36.4/po/kk.po
--- old/gnome-initial-setup-3.36.3/po/kk.po 2020-05-29 22:44:47.000000000
+0200
+++ new/gnome-initial-setup-3.36.4/po/kk.po 2020-07-05 14:27:24.000000000
+0200
@@ -1,59 +1,53 @@
# Kazakh translation for gnome-initial-setup.
# Copyright (C) 2013 gnome-initial-setup's COPYRIGHT HOLDER
# This file is distributed under the same license as the gnome-initial-setup
package.
-# Baurzhan Muftakhidinov <[email protected]>, 2013-2017.
+# Baurzhan Muftakhidinov <[email protected]>, 2013-2020.
#
msgid ""
msgstr ""
"Project-Id-Version: gnome-initial-setup master\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-initial-setup/";
"issues\n"
-"POT-Creation-Date: 2019-02-07 08:37+0000\n"
-"PO-Revision-Date: 2019-02-16 19:22+0500\n"
+"POT-Creation-Date: 2020-05-29 20:46+0000\n"
+"PO-Revision-Date: 2020-06-24 12:53+0500\n"
"Last-Translator: Baurzhan Muftakhidinov <[email protected]>\n"
"Language-Team: Kazakh <[email protected]>\n"
"Language: kk\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2.1\n"
+"X-Generator: Poedit 2.3.1\n"
-#: data/gnome-initial-setup.desktop.in.in:3
#: data/gnome-initial-setup-first-login.desktop.in.in:3
+#: data/gnome-initial-setup.desktop.in.in:3
msgid "Initial Setup"
msgstr "Бастапқы баптау"
-#. Translators: Do NOT translate or transliterate this text (this is an icon
file name)!
-#: data/gnome-initial-setup.desktop.in.in:5
-#: data/gnome-initial-setup-first-login.desktop.in.in:5
-msgid "preferences-system"
-msgstr "preferences-system"
-
-#: gnome-initial-setup/gis-assistant.c:423
+#: gnome-initial-setup/gis-assistant.c:419
msgid "_Next"
msgstr "_Келесі"
-#: gnome-initial-setup/gis-assistant.c:424
+#: gnome-initial-setup/gis-assistant.c:420
msgid "_Accept"
msgstr "Қ_абылдау"
-#: gnome-initial-setup/gis-assistant.c:425
+#: gnome-initial-setup/gis-assistant.c:421
msgid "_Skip"
msgstr "Атта_п кету"
-#: gnome-initial-setup/gis-assistant.c:426
+#: gnome-initial-setup/gis-assistant.c:422
msgid "_Previous"
msgstr "А_лдыңғы"
-#: gnome-initial-setup/gis-assistant.c:427
+#: gnome-initial-setup/gis-assistant.c:423
msgid "_Cancel"
msgstr "Ба_с тарту"
-#: gnome-initial-setup/gnome-initial-setup.c:259
+#: gnome-initial-setup/gnome-initial-setup.c:241
msgid "Force existing user mode"
msgstr "Бар пайдаланушы режимін мәжбүрлету"
-#: gnome-initial-setup/gnome-initial-setup.c:265
+#: gnome-initial-setup/gnome-initial-setup.c:247
msgid "— GNOME initial setup"
msgstr "— GNOME бастапқы баптау"
@@ -61,32 +55,27 @@
msgid "Take a Picture…"
msgstr "Фотоны түсіру…"
-#: gnome-initial-setup/pages/account/gis-account-page.c:264
-#: gnome-initial-setup/pages/account/gis-account-page-local.ui:41
-msgid "About You"
-msgstr "Өзіңіз туралы"
-
-#: gnome-initial-setup/pages/account/gis-account-page-enterprise.c:182
+#: gnome-initial-setup/pages/account/gis-account-page-enterprise.c:184
msgid "Failed to register account"
msgstr "Тіркелгіні тіркеу сәтсіз"
-#: gnome-initial-setup/pages/account/gis-account-page-enterprise.c:376
+#: gnome-initial-setup/pages/account/gis-account-page-enterprise.c:378
msgid "No supported way to authenticate with this domain"
msgstr "Бұл доменде аутентификациялаудың қолдауы бар тәсілдері жоқ"
-#: gnome-initial-setup/pages/account/gis-account-page-enterprise.c:416
+#: gnome-initial-setup/pages/account/gis-account-page-enterprise.c:418
msgid "Failed to join domain"
msgstr "Доменде тіркеу сәтсіз"
-#: gnome-initial-setup/pages/account/gis-account-page-enterprise.c:484
+#: gnome-initial-setup/pages/account/gis-account-page-enterprise.c:486
msgid "Failed to log into domain"
msgstr "Доменге кіру сәтсіз"
-#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:31
+#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:17
msgid "Enterprise Login"
msgstr "Кәсіпорын тіркелгісі"
-#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:45
+#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:18
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 "
@@ -97,34 +86,34 @@
"тіркелгіні кәсіпорынның интернеттегі ресурстарына қатынау үшін қолдана "
"аласыз."
-#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:65
-#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:316
+#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:36
+#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:287
msgid "_Domain"
msgstr "До_мен"
-#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:82
-#: gnome-initial-setup/pages/account/gis-account-page-local.ui:101
+#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:53
+#: gnome-initial-setup/pages/account/gis-account-page-local.ui:84
msgid "_Username"
msgstr "_Пайдаланушы аты"
-#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:99
-#: gnome-initial-setup/pages/password/gis-password-page.ui:66
+#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:70
+#: gnome-initial-setup/pages/password/gis-password-page.ui:34
msgid "_Password"
msgstr "_Пароль"
-#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:175
+#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:146
msgid "Enterprise domain or realm name"
msgstr "Кәсіпорын доменінің (realm) аты"
-#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:240
+#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:211
msgid "C_ontinue"
msgstr "Жа_лғастыру"
-#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:275
+#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:246
msgid "Domain Administrator Login"
msgstr "Домен әкімшісінің логині"
-#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:295
+#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:266
msgid ""
"In order to use enterprise logins, this computer needs to be enrolled in a "
"domain. Please have your network administrator type the domain password "
@@ -134,42 +123,59 @@
"Желілік әкімшісі осында өз домендік паролін енгізуі тиіс және компьютеріңіз "
"үшін бірегей атауды таңдау керек."
-#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:350
+#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:321
msgid "_Computer"
msgstr "_Компьютер"
-#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:382
+#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:353
msgid "Administrator _Name"
msgstr "Әкімші а_ты"
-#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:416
+#: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:387
msgid "Administrator Password"
msgstr "Әкімші паролі"
-#: gnome-initial-setup/pages/account/gis-account-page-local.c:203
+#: gnome-initial-setup/pages/account/gis-account-page-local.c:207
msgid "Please check the name and username. You can choose a picture too."
msgstr ""
"Атыңыз және пайдаланушы атын таңдаңыз. Сонымен қатар, сіз суретті де таңдай "
"аласыз."
-#: gnome-initial-setup/pages/account/gis-account-page-local.c:422
+#: gnome-initial-setup/pages/account/gis-account-page-local.c:453
msgid "We need a few details to complete setup."
msgstr "Орнатуды аяқтау үшін біраз ақпарат керек."
+#: gnome-initial-setup/pages/account/gis-account-page-local.c:558
+msgid "Administrator"
+msgstr "Әкімші"
+
#: gnome-initial-setup/pages/account/gis-account-page-local.ui:21
msgid "Avatar image"
msgstr "Аватар суреті"
-#: gnome-initial-setup/pages/account/gis-account-page-local.ui:53
+#: gnome-initial-setup/pages/account/gis-account-page-local.ui:38
+#: gnome-initial-setup/pages/account/gis-account-page.c:281
+msgid "About You"
+msgstr "Өзіңіз туралы"
+
+#: gnome-initial-setup/pages/account/gis-account-page-local.ui:39
msgid "Please provide a name and username. You can choose a picture too."
msgstr ""
"Атыңыз және пайдаланушы атын енгізіңіз. Сонымен қатар, сіз суретті де таңдай "
"аласыз."
-#: gnome-initial-setup/pages/account/gis-account-page-local.ui:70
+#: gnome-initial-setup/pages/account/gis-account-page-local.ui:53
msgid "_Full Name"
msgstr "Тол_ық аты"
+#: gnome-initial-setup/pages/account/gis-account-page-local.ui:149
+msgid "Set up _parental controls for this user"
+msgstr "Бұл пайдаланушы үшін ат_а-ана бақылауын орнату"
+
+#: gnome-initial-setup/pages/account/gis-account-page-local.ui:156
+msgid "For use by a parent or supervisor, who must set up their own password."
+msgstr "Ата-ана немесе басқарушы қолдануы үшін, олар өз паролін орнатуы тиіс."
+
#: gnome-initial-setup/pages/account/gis-account-page.ui:43
msgid "_Enterprise Login"
msgstr "Кә_сіпорын тіркелгісі"
@@ -202,20 +208,24 @@
msgid "Couldn’t connect to the %s domain: %s"
msgstr "%s доменіне байланысу мүмкін емес: %s"
-#: gnome-initial-setup/pages/account/um-utils.c:245
+#: gnome-initial-setup/pages/account/um-utils.c:248
msgid "Sorry, that user name isn’t available. Please try another."
msgstr "Кешіріңіз, бұл пайдаланушы аты қолжетерсіз. Басқасын көріңіз."
-#: gnome-initial-setup/pages/account/um-utils.c:248
+#: gnome-initial-setup/pages/account/um-utils.c:251
#, c-format
msgid "The username is too long."
msgstr "Пайдаланушы аты тым ұзын."
-#: gnome-initial-setup/pages/account/um-utils.c:251
+#: gnome-initial-setup/pages/account/um-utils.c:254
msgid "The username cannot start with a “-”."
msgstr "Пайдаланушы аты \"-\" таңбасынан басталмауы тиіс."
-#: gnome-initial-setup/pages/account/um-utils.c:254
+#: gnome-initial-setup/pages/account/um-utils.c:257
+msgid "That username isn’t available. Please try another."
+msgstr "Бұл пайдаланушы аты қолжетімсіз. Басқасын көріңіз."
+
+#: gnome-initial-setup/pages/account/um-utils.c:260
msgid ""
"The username should only consist of upper and lower case letters from a-z, "
"digits and the following characters: . - _"
@@ -223,37 +233,25 @@
"Пайдаланушы атында тек ағылшын әліппесінің a-z арасындағы бас/кіші әріптері, "
"сандар, және келесі таңбалар болуы мүмкін: . - _"
-#: gnome-initial-setup/pages/account/um-utils.c:258
+#: gnome-initial-setup/pages/account/um-utils.c:264
msgid "This will be used to name your home folder and can’t be changed."
msgstr ""
"Бұл сіздің үй бумаңыздың аты ретінде қолданылады, және оны кейін өзгертуге "
"болмайды."
-#: gnome-initial-setup/pages/eulas/gis-eula-page.c:301
-#: gnome-initial-setup/pages/eulas/gis-eula-page.ui:21
-msgid "License Agreements"
-msgstr "Лицензиялық келісім-шарт"
-
-#: gnome-initial-setup/pages/eulas/gis-eula-page.ui:50
-msgid ""
-"I have _agreed to the terms and conditions in this end user license "
-"agreement."
-msgstr ""
-"Мен осы түпкі пайдаланушы келісімшартындағы барлық шарттармен к_елісемін."
-
-#: gnome-initial-setup/pages/goa/gis-goa-page.c:87
+#: gnome-initial-setup/pages/goa/gis-goa-page.c:92
msgid "Add Account"
msgstr "Тіркелгіні қосу"
-#: gnome-initial-setup/pages/goa/gis-goa-page.c:339
+#: gnome-initial-setup/pages/goa/gis-goa-page.c:357
msgid "Online Accounts"
msgstr "Желідегі тіркелгілер"
-#: gnome-initial-setup/pages/goa/gis-goa-page.ui:39
+#: gnome-initial-setup/pages/goa/gis-goa-page.ui:17
msgid "Connect Your Online Accounts"
msgstr "Желідегі тіркелгілерді байланыстыру"
-#: gnome-initial-setup/pages/goa/gis-goa-page.ui:58
+#: gnome-initial-setup/pages/goa/gis-goa-page.ui:18
msgid ""
"Connect your accounts to easily access your email, online calendar, "
"contacts, documents and photos."
@@ -261,7 +259,7 @@
"Эл. пошта, онлайн күнтізбе, контакттар, құжаттар және фотоларға оңай қатынау "
"үшін желілік тіркелгілерді қосыңыз."
-#: gnome-initial-setup/pages/goa/gis-goa-page.ui:95
+#: gnome-initial-setup/pages/goa/gis-goa-page.ui:48
msgid ""
"Accounts can be added and removed at any time from the Settings application."
msgstr ""
@@ -272,8 +270,7 @@
msgstr "Алдын-ала қарау"
#: gnome-initial-setup/pages/keyboard/cc-input-chooser.c:299
-#: gnome-initial-setup/pages/language/cc-language-chooser.c:222
-#: gnome-initial-setup/pages/region/cc-region-chooser.c:210
+#: gnome-initial-setup/pages/language/cc-language-chooser.c:227
msgid "More…"
msgstr "Көбірек…"
@@ -284,20 +281,20 @@
msgid "No inputs found"
msgstr "Кіріс көздері табылмады"
-#: gnome-initial-setup/pages/keyboard/gis-keyboard-page.c:480
-#: gnome-initial-setup/pages/keyboard/gis-keyboard-page.ui:30
+#: gnome-initial-setup/pages/keyboard/gis-keyboard-page.c:505
+#: gnome-initial-setup/pages/keyboard/gis-keyboard-page.ui:15
msgid "Typing"
msgstr "Теру"
-#: gnome-initial-setup/pages/keyboard/gis-keyboard-page.ui:42
+#: gnome-initial-setup/pages/keyboard/gis-keyboard-page.ui:16
msgid "Select your keyboard layout or an input method."
msgstr "Пернетақта жаймасын не енгізу тәсілін таңдау."
-#: gnome-initial-setup/pages/language/cc-language-chooser.c:238
+#: gnome-initial-setup/pages/language/cc-language-chooser.c:243
msgid "No languages found"
msgstr "Тілдер табылмады"
-#: gnome-initial-setup/pages/language/gis-language-page.c:308
+#: gnome-initial-setup/pages/language/gis-language-page.c:262
msgid "Welcome"
msgstr "Қош келдіңіз"
@@ -305,32 +302,32 @@
#. * like greeting somebody at the door. If the exclamation mark is not
#. * suitable for this in your language you may replace it.
#.
-#: gnome-initial-setup/pages/language/gis-welcome-widget.c:123
+#: gnome-initial-setup/pages/language/gis-welcome-widget.c:136
msgid "Welcome!"
msgstr "Қош келдіңіз!"
-#: gnome-initial-setup/pages/network/gis-network-page.c:313
+#: gnome-initial-setup/pages/network/gis-network-page.c:318
msgctxt "Wireless access point"
msgid "Other…"
msgstr "Басқа…"
-#: gnome-initial-setup/pages/network/gis-network-page.c:398
+#: gnome-initial-setup/pages/network/gis-network-page.c:403
msgid "Wireless networking is disabled"
msgstr "Сымсыз желі сөндірілген"
-#: gnome-initial-setup/pages/network/gis-network-page.c:405
+#: gnome-initial-setup/pages/network/gis-network-page.c:410
msgid "Checking for available wireless networks"
msgstr "Қолжетерлік сымсыз желілерді іздеу"
-#: gnome-initial-setup/pages/network/gis-network-page.c:713
+#: gnome-initial-setup/pages/network/gis-network-page.c:805
msgid "Network"
msgstr "Желі"
-#: gnome-initial-setup/pages/network/gis-network-page.ui:33
+#: gnome-initial-setup/pages/network/gis-network-page.ui:18
msgid "Wi-Fi"
msgstr "Wi-Fi"
-#: gnome-initial-setup/pages/network/gis-network-page.ui:45
+#: gnome-initial-setup/pages/network/gis-network-page.ui:19
msgid ""
"Connecting to the Internet will enable you to set the time, add your "
"details, and enable you to access your email, calendar, and contacts. It is "
@@ -340,35 +337,69 @@
"қосу, және эл. пошта, күнтізбе және контакттарға қатынауға мүмкін етеді. "
"Сонымен қатар, ол кәсіпорын тіркелгісін қолдану үшін керек."
-#: gnome-initial-setup/pages/network/gis-network-page.ui:103
+#: gnome-initial-setup/pages/network/gis-network-page.ui:76
msgid "No wireless available"
msgstr "Қолжетерлік сымсыз желілер жоқ"
-#: gnome-initial-setup/pages/network/gis-network-page.ui:118
+#: gnome-initial-setup/pages/network/gis-network-page.ui:91
msgid "Turn On"
msgstr "Іске қосу"
-#: gnome-initial-setup/pages/password/gis-password-page.c:142
-msgid "This is a weak password."
-msgstr "Бұл пароль әлсіз."
+#. Translators: The placeholder is the user’s full name.
+#: gnome-initial-setup/pages/parental-controls/gis-parental-controls-page.c:110
+#, c-format
+msgid "Parental Controls for %s"
+msgstr "%s үшін ата-ана бақылауы"
-#: gnome-initial-setup/pages/password/gis-password-page.c:148
-msgid "The passwords do not match."
-msgstr "Парольдер өзара сәйкес келмейді."
+#: gnome-initial-setup/pages/parental-controls/gis-parental-controls-page.c:112
+msgid "Set restrictions on what this user can run or install."
+msgstr ""
+"Бұл пайдаланушы нені іске қоса немесе орната алатынын анықтайтын шектеулерін "
+"орнату."
-#: gnome-initial-setup/pages/password/gis-password-page.c:270
-msgid "Password"
-msgstr "Пароль"
+#: gnome-initial-setup/pages/parental-controls/gis-parental-controls-page.c:207
+msgid "Parental Controls"
+msgstr "Ата-ана бақылауы"
-#: gnome-initial-setup/pages/password/gis-password-page.ui:34
+#. Don’t break UI compatibility if parental controls are disabled.
+#: gnome-initial-setup/pages/password/gis-password-page.c:79
msgid "Set a Password"
msgstr "Парольді орнату"
-#: gnome-initial-setup/pages/password/gis-password-page.ui:47
+#: gnome-initial-setup/pages/password/gis-password-page.c:80
+#: gnome-initial-setup/pages/password/gis-password-page.c:89
msgid "Be careful not to lose your password."
msgstr "Пароліңізді жоғалтпауға тырысыңыз."
-#: gnome-initial-setup/pages/password/gis-password-page.ui:98
+#. Translators: The placeholder is for the user’s full name.
+#: gnome-initial-setup/pages/password/gis-password-page.c:87
+#, c-format
+msgid "Set a Password for %s"
+msgstr "%s үшін парольді орнату"
+
+#: gnome-initial-setup/pages/password/gis-password-page.c:95
+msgid "Set a Parent Password"
+msgstr "Ата-ана бақылау паролін орнату"
+
+#. Translators: The placeholder is the full name of the child user on the
system.
+#: gnome-initial-setup/pages/password/gis-password-page.c:97
+#, c-format
+msgid "This password will control access to the parental controls for %s."
+msgstr "Бұл пароль %s үшін ата-ана бақылауына қатынауды басқаратын болады."
+
+#: gnome-initial-setup/pages/password/gis-password-page.c:226
+msgid "This is a weak password."
+msgstr "Бұл пароль әлсіз."
+
+#: gnome-initial-setup/pages/password/gis-password-page.c:232
+msgid "The passwords do not match."
+msgstr "Парольдер өзара сәйкес келмейді."
+
+#: gnome-initial-setup/pages/password/gis-password-page.c:418
+msgid "Password"
+msgstr "Пароль"
+
+#: gnome-initial-setup/pages/password/gis-password-page.ui:66
msgid "_Confirm"
msgstr "Ра_стау"
@@ -507,7 +538,7 @@
#. * like "Fedora" or "Ubuntu". It falls back to "GNOME" if we can't
#. * detect any distribution.
#.
-#: gnome-initial-setup/pages/privacy/gis-privacy-page.c:110
+#: gnome-initial-setup/pages/privacy/gis-privacy-page.c:68
#, c-format
msgid ""
"Sending reports of technical problems helps us to improve %s. Reports are "
@@ -521,31 +552,31 @@
#. * like "Fedora" or "Ubuntu". It falls back to "GNOME" if we can't
#. * detect any distribution.
#.
-#: gnome-initial-setup/pages/privacy/gis-privacy-page.c:120
+#: gnome-initial-setup/pages/privacy/gis-privacy-page.c:78
#, c-format
msgid "Problem data will be collected by %s:"
msgstr "Мәселе деректерін %s жинайды:"
-#: gnome-initial-setup/pages/privacy/gis-privacy-page.c:121
-#: gnome-initial-setup/pages/privacy/gis-privacy-page.c:181
-#: gnome-initial-setup/pages/privacy/gis-privacy-page.c:256
+#: gnome-initial-setup/pages/privacy/gis-privacy-page.c:79
+#: gnome-initial-setup/pages/privacy/gis-privacy-page.c:135
+#: gnome-initial-setup/pages/privacy/gis-privacy-page.c:210
msgid "Privacy Policy"
msgstr "Жекелік саясаты"
-#: gnome-initial-setup/pages/privacy/gis-privacy-page.c:181
+#: gnome-initial-setup/pages/privacy/gis-privacy-page.c:135
msgid "Uses Mozilla Location Service:"
msgstr "Mozilla орналасулар қызметін қолданады:"
-#: gnome-initial-setup/pages/privacy/gis-privacy-page.c:292
-#: gnome-initial-setup/pages/privacy/gis-privacy-page.ui:32
+#: gnome-initial-setup/pages/privacy/gis-privacy-page.c:246
+#: gnome-initial-setup/pages/privacy/gis-privacy-page.ui:16
msgid "Privacy"
msgstr "Жекелік"
-#: gnome-initial-setup/pages/privacy/gis-privacy-page.ui:49
+#: gnome-initial-setup/pages/privacy/gis-privacy-page.ui:31
msgid "Location Services"
msgstr "Орналасулар қызметі"
-#: gnome-initial-setup/pages/privacy/gis-privacy-page.ui:70
+#: gnome-initial-setup/pages/privacy/gis-privacy-page.ui:52
msgid ""
"Allows applications to determine your geographical location. An indication "
"is shown when location services are in use."
@@ -553,95 +584,42 @@
"Қолданбаларға сіздің географиялық орналасуыңызды білуді рұқсат ету. "
"Орналасулар қызметі қолданылған кезде арнайы индикатор көрсетіледі."
-#: gnome-initial-setup/pages/privacy/gis-privacy-page.ui:92
+#: gnome-initial-setup/pages/privacy/gis-privacy-page.ui:74
msgid "Automatic Problem Reporting"
msgstr "Мәселелер жөнінде автохабарлау"
-#: gnome-initial-setup/pages/privacy/gis-privacy-page.ui:128
+#: gnome-initial-setup/pages/privacy/gis-privacy-page.ui:110
msgid ""
"Privacy controls can be changed at any time from the Settings application."
msgstr ""
"Жекелік баптауларын кез-кезген кезде Баптаулар ішінен өзгертуге болады."
-#: gnome-initial-setup/pages/region/cc-region-chooser.c:227
-msgid "No regions found"
-msgstr "Аймақтар табылмады"
-
-#: gnome-initial-setup/pages/region/gis-region-page.c:226
-#: gnome-initial-setup/pages/region/gis-region-page.ui:31
-msgid "Region"
-msgstr "Аймақ"
-
-#: gnome-initial-setup/pages/region/gis-region-page.ui:44
-msgid "Choose your country or region."
-msgstr "Ел не аймағыңызды таңдаңыз."
-
-#: gnome-initial-setup/pages/software/gis-software-page.c:184
-msgid "Software Repositories"
-msgstr "БҚ репозиторийлері"
-
-#. TRANSLATORS: this is the third party repositories info bar.
-#: gnome-initial-setup/pages/software/gis-software-page.c:188
-msgid "Access additional software from selected third party sources."
-msgstr "Таңдалған үшінші жақты ұсынушыларынан қосымша БҚ-ға қол жеткізу."
-
-#. TRANSLATORS: this is the third party repositories info bar.
-#: gnome-initial-setup/pages/software/gis-software-page.c:192
-msgid ""
-"Some of this software is proprietary and therefore has restrictions on use, "
-"sharing, and access to source code."
-msgstr ""
-"Бұл БҚ ішінен кейбірі проприетарлы БҚ, оның қолданылу және бастапқы кодтарға "
-"қатынау бойынша шектеулері бар."
-
-#: gnome-initial-setup/pages/software/gis-software-page.ui:31
-msgid "Additional Software Repositories"
-msgstr "Қосымша БҚ репозиторийлері"
-
-#: gnome-initial-setup/pages/software/gis-software-page.ui:55
-msgid "<a href=\"more\">Find out more…</a>"
-msgstr "<a href=\"more\">Көбірек білу…</a>"
-
-#: gnome-initial-setup/pages/software/gis-software-page.ui:69
-msgid "Third Party Repositories"
-msgstr "Үшінші жақты БҚ репозиторийлері"
-
-#: gnome-initial-setup/pages/software/gis-software-page.ui:165
-msgid ""
-"Proprietary software typically has restrictions on how it can be used and on "
-"access to source code. This prevents anyone but the software owner from "
-"inspecting, improving or learning from its code."
-msgstr ""
-"Проприетарлы БҚ әдетте қолдану және бастапқы кодтарын алуда шектеулері бар. "
-"Бұл шектеу оның кодын бақылау, жақсарту немесе одан үйренуді тек өз иесіне "
-"мүмкін қылады."
-
-#: gnome-initial-setup/pages/software/gis-software-page.ui:177
-msgid ""
-"In contrast, Free Software can be freely run, copied, distributed, studied "
-"and modified."
-msgstr ""
-"Ал, еркін БҚ болса, оны еркін түрде орындау, көшіріп алу, тарату, одан оқу "
-"және оны түзетуге болады."
-
#. Translators: the parameter here is the name of a distribution,
#. * like "Fedora" or "Ubuntu". It falls back to "GNOME 3" if we can't
#. * detect any distribution.
-#: gnome-initial-setup/pages/summary/gis-summary-page.c:304
+#: gnome-initial-setup/pages/summary/gis-summary-page.c:227
#, c-format
msgid "_Start Using %s"
msgstr "%s қолдануд_ы бастау"
-#: gnome-initial-setup/pages/summary/gis-summary-page.c:334
-msgid "Ready to Go"
-msgstr "Жұмысқа дайын"
-
-#: gnome-initial-setup/pages/summary/gis-summary-page.ui:64
-msgid "You’re ready to go!"
-msgstr "Бәрі де дайын!"
+#. Translators: the parameter here is the name of a distribution,
+#. * like "Fedora" or "Ubuntu". It falls back to "GNOME 3" if we can't
+#. * detect any distribution.
+#: gnome-initial-setup/pages/summary/gis-summary-page.c:234
+#, c-format
+msgid "%s is ready to be used. We hope that you love it!"
+msgstr "%s қолдануға дайын. Оны ұнатасыз деп үміттенеміз!"
+
+#: gnome-initial-setup/pages/summary/gis-summary-page.c:258
+msgid "Setup Complete"
+msgstr "Баптау аяқталды"
+
+#: gnome-initial-setup/pages/summary/gis-summary-page.ui:70
+msgid "All done!"
+msgstr "Бәрі дайын!"
#. Translators: "city, country"
-#: gnome-initial-setup/pages/timezone/gis-timezone-page.c:236
+#: gnome-initial-setup/pages/timezone/gis-timezone-page.c:261
#, c-format
msgctxt "timezone loc"
msgid "%s, %s"
@@ -650,33 +628,33 @@
#. Translators: UTC here means the Coordinated Universal Time.
#. * %:::z will be replaced by the offset from UTC e.g. UTC+02
#.
-#: gnome-initial-setup/pages/timezone/gis-timezone-page.c:273
+#: gnome-initial-setup/pages/timezone/gis-timezone-page.c:298
msgid "UTC%:::z"
msgstr "UTC%:::z"
#. Translators: This is the time format used in 12-hour mode.
-#: gnome-initial-setup/pages/timezone/gis-timezone-page.c:277
+#: gnome-initial-setup/pages/timezone/gis-timezone-page.c:302
msgid "%l:%M %p"
msgstr "%l:%M %p"
#. Translators: This is the time format used in 24-hour mode.
-#: gnome-initial-setup/pages/timezone/gis-timezone-page.c:280
+#: gnome-initial-setup/pages/timezone/gis-timezone-page.c:305
msgid "%R"
msgstr "%R"
#. Translators: "timezone (utc shift)"
-#: gnome-initial-setup/pages/timezone/gis-timezone-page.c:283
+#: gnome-initial-setup/pages/timezone/gis-timezone-page.c:308
#, c-format
msgctxt "timezone map"
msgid "%s (%s)"
msgstr "%s (%s)"
-#: gnome-initial-setup/pages/timezone/gis-timezone-page.c:426
-#: gnome-initial-setup/pages/timezone/gis-timezone-page.ui:33
+#: gnome-initial-setup/pages/timezone/gis-timezone-page.c:462
+#: gnome-initial-setup/pages/timezone/gis-timezone-page.ui:17
msgid "Time Zone"
msgstr "Уақыт белдеуі"
-#: gnome-initial-setup/pages/timezone/gis-timezone-page.ui:53
+#: gnome-initial-setup/pages/timezone/gis-timezone-page.ui:18
msgid ""
"The time zone will be set automatically if your location can be found. You "
"can also search for a city to set it yourself."
@@ -684,10 +662,75 @@
"Сіздің орналасуыңыз табылған кезде уақыт белдеу автоматты түрде орнатылады. "
"Сонымен қатар, сіз өз қалаңызды орнату үшін қолмен да іздей аласыз."
-#: gnome-initial-setup/pages/timezone/gis-timezone-page.ui:82
+#: gnome-initial-setup/pages/timezone/gis-timezone-page.ui:56
msgid "Please search for a nearby city"
msgstr "Жақын қаланы іздеңіз"
+#~ msgid "preferences-system"
+#~ msgstr "preferences-system"
+
+#~ msgid "License Agreements"
+#~ msgstr "Лицензиялық келісім-шарт"
+
+#~ msgid ""
+#~ "I have _agreed to the terms and conditions in this end user license "
+#~ "agreement."
+#~ msgstr ""
+#~ "Мен осы түпкі пайдаланушы келісімшартындағы барлық шарттармен к_елісемін."
+
+#~ msgid "No regions found"
+#~ msgstr "Аймақтар табылмады"
+
+#~ msgid "Region"
+#~ msgstr "Аймақ"
+
+#~ msgid "Choose your country or region."
+#~ msgstr "Ел не аймағыңызды таңдаңыз."
+
+#~ msgid "Software Repositories"
+#~ msgstr "БҚ репозиторийлері"
+
+#~ msgid "Access additional software from selected third party sources."
+#~ msgstr "Таңдалған үшінші жақты ұсынушыларынан қосымша БҚ-ға қол жеткізу."
+
+#~ msgid ""
+#~ "Some of this software is proprietary and therefore has restrictions on "
+#~ "use, sharing, and access to source code."
+#~ msgstr ""
+#~ "Бұл БҚ ішінен кейбірі проприетарлы БҚ, оның қолданылу және бастапқы "
+#~ "кодтарға қатынау бойынша шектеулері бар."
+
+#~ msgid "Additional Software Repositories"
+#~ msgstr "Қосымша БҚ репозиторийлері"
+
+#~ msgid "<a href=\"more\">Find out more…</a>"
+#~ msgstr "<a href=\"more\">Көбірек білу…</a>"
+
+#~ msgid "Third Party Repositories"
+#~ msgstr "Үшінші жақты БҚ репозиторийлері"
+
+#~ msgid ""
+#~ "Proprietary software typically has restrictions on how it can be used and "
+#~ "on access to source code. This prevents anyone but the software owner "
+#~ "from inspecting, improving or learning from its code."
+#~ msgstr ""
+#~ "Проприетарлы БҚ әдетте қолдану және бастапқы кодтарын алуда шектеулері "
+#~ "бар. Бұл шектеу оның кодын бақылау, жақсарту немесе одан үйренуді тек өз "
+#~ "иесіне мүмкін қылады."
+
+#~ msgid ""
+#~ "In contrast, Free Software can be freely run, copied, distributed, "
+#~ "studied and modified."
+#~ msgstr ""
+#~ "Ал, еркін БҚ болса, оны еркін түрде орындау, көшіріп алу, тарату, одан "
+#~ "оқу және оны түзетуге болады."
+
+#~ msgid "Ready to Go"
+#~ msgstr "Жұмысқа дайын"
+
+#~ msgid "You’re ready to go!"
+#~ msgstr "Бәрі де дайын!"
+
#~ msgid "Disable image"
#~ msgstr "Суретті сөндіру"
@@ -754,13 +797,6 @@
#~ "(және басқаларын қоса аласыз)."
#~ msgid ""
-#~ "Thank you for choosing %s.\n"
-#~ "We hope that you love it."
-#~ msgstr ""
-#~ "%s таңдағаныңыз үшін рахмет.\n"
-#~ "Оны ұнатасыз деп үміттенеміз."
-
-#~ msgid ""
#~ "We think that your time zone is %s. Press Next to continue or search for "
#~ "a city to manually set the time zone."
#~ msgstr ""
