diff options
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | gnome-initial-setup/pages/privacy/gis-privacy-page.c | 50 | ||||
| -rw-r--r-- | gnome-initial-setup/pages/privacy/gis-privacy-page.ui | 1 | ||||
| -rw-r--r-- | po/ka.po | 49 |
4 files changed, 52 insertions, 52 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5b15a62..bdb78a2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ include: - - remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/c5626190ec14b475271288dda7a7dae8dbe0cd76/templates/arch.yml' + - remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/7811ba9814a3bad379377241c6c6b62d78b20eac/templates/arch.yml' variables: FDO_UPSTREAM_REPO: gnome/gnome-initial-setup @@ -14,7 +14,7 @@ stages: # to the release number/branch to ensure that # a new image will be created, tailored for the # stable branch. - FDO_DISTRIBUTION_TAG: '2022-12-02.02-main' + FDO_DISTRIBUTION_TAG: '2023-04-05.01-main' # See also https://gitlab.freedesktop.org/freedesktop/ci-templates build.container.arch@x86_64: diff --git a/gnome-initial-setup/pages/privacy/gis-privacy-page.c b/gnome-initial-setup/pages/privacy/gis-privacy-page.c index 8c9f47e..b910651 100644 --- a/gnome-initial-setup/pages/privacy/gis-privacy-page.c +++ b/gnome-initial-setup/pages/privacy/gis-privacy-page.c @@ -52,7 +52,7 @@ typedef struct _GisPrivacyPagePrivate GisPrivacyPagePrivate; G_DEFINE_TYPE_WITH_PRIVATE (GisPrivacyPage, gis_privacy_page, GIS_TYPE_PAGE); -static void +static gboolean update_os_data (GisPrivacyPage *page) { GisPrivacyPagePrivate *priv = gis_privacy_page_get_instance_private (page); @@ -61,28 +61,27 @@ update_os_data (GisPrivacyPage *page) g_autofree char *subtitle = NULL; if (!name) - name = g_strdup ("GNOME"); + return FALSE; if (privacy_policy) { /* Translators: the first parameter here is the name of a distribution, - * like "Fedora" or "Ubuntu". It falls back to "GNOME" if we can't - * detect any distribution. + * like "Fedora" or "Ubuntu". */ - subtitle = g_strdup_printf (_("Sends technical reports that have personal information automatically " - "removed. Data is collected by %1$s (<a href='%2$s'>privacy policy</a>)."), - name, privacy_policy); + subtitle = g_strdup_printf (_("Sends technical reports that do not contain personal information. " + "Data is collected by %1$s (<a href='%2$s'>privacy policy</a>)."), + name, privacy_policy); } else { /* Translators: the parameter here is the name of a distribution, - * like "Fedora" or "Ubuntu". It falls back to "GNOME" if we can't - * detect any distribution. + * like "Fedora" or "Ubuntu". */ - subtitle = g_strdup_printf (_("Sends technical reports that have personal information automatically " - "removed. Data is collected by %s."), name); + subtitle = g_strdup_printf (_("Sends technical reports that do not contain personal information. " + "Data is collected by %s."), name); } gtk_label_set_markup (GTK_LABEL (priv->reporting_label), subtitle); + return TRUE; } static void @@ -124,15 +123,16 @@ gis_privacy_page_constructed (GObject *object) gtk_switch_set_active (GTK_SWITCH (priv->location_switch), TRUE); gtk_switch_set_active (GTK_SWITCH (priv->reporting_switch), TRUE); - update_os_data (page); - - priv->abrt_watch_id = g_bus_watch_name (G_BUS_TYPE_SYSTEM, - "org.freedesktop.problems.daemon", - G_BUS_NAME_WATCHER_FLAGS_NONE, - abrt_appeared_cb, - abrt_vanished_cb, - page, - NULL); + if (update_os_data (page)) + { + priv->abrt_watch_id = g_bus_watch_name (G_BUS_TYPE_SYSTEM, + "org.freedesktop.problems.daemon", + G_BUS_NAME_WATCHER_FLAGS_NONE, + abrt_appeared_cb, + abrt_vanished_cb, + page, + NULL); + } } static void @@ -144,11 +144,7 @@ gis_privacy_page_dispose (GObject *object) g_clear_object (&priv->location_settings); g_clear_object (&priv->privacy_settings); - if (priv->abrt_watch_id > 0) - { - g_bus_unwatch_name (priv->abrt_watch_id); - priv->abrt_watch_id = 0; - } + g_clear_handle_id (&priv->abrt_watch_id, g_bus_unwatch_name); G_OBJECT_CLASS (gis_privacy_page_parent_class)->dispose (object); } @@ -161,10 +157,10 @@ gis_privacy_page_apply (GisPage *gis_page, GisPrivacyPagePrivate *priv = gis_privacy_page_get_instance_private (page); gboolean active; - active = gtk_switch_get_active (GTK_SWITCH (priv->location_switch)); + active = gtk_widget_is_visible (priv->location_switch) && gtk_switch_get_active (GTK_SWITCH (priv->location_switch)); g_settings_set_boolean (priv->location_settings, "enabled", active); - active = gtk_switch_get_active (GTK_SWITCH (priv->reporting_switch)); + active = gtk_widget_is_visible (priv->reporting_switch) && gtk_switch_get_active (GTK_SWITCH (priv->reporting_switch)); g_settings_set_boolean (priv->privacy_settings, "report-technical-problems", active); return FALSE; diff --git a/gnome-initial-setup/pages/privacy/gis-privacy-page.ui b/gnome-initial-setup/pages/privacy/gis-privacy-page.ui index 6c48d5f..9ce8447 100644 --- a/gnome-initial-setup/pages/privacy/gis-privacy-page.ui +++ b/gnome-initial-setup/pages/privacy/gis-privacy-page.ui @@ -54,6 +54,7 @@ <child> <object class="AdwPreferencesGroup" id="reporting_group"> <property name="margin-top">12</property> + <property name="visible">False</property> <child> <object class="AdwActionRow" id="reporting_row"> <property name="title" translatable="yes">Automatic Problem Reporting</property> @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-initial-setup/" "issues\n" -"POT-Creation-Date: 2023-02-17 20:28+0000\n" -"PO-Revision-Date: 2023-02-17 22:16+0100\n" +"POT-Creation-Date: 2023-03-25 11:16+0000\n" +"PO-Revision-Date: 2023-04-10 18:45+0200\n" "Last-Translator: Ekaterine Papava <papava.e@gtu.ge>\n" "Language-Team: \n" "Language: ka\n" @@ -88,7 +88,7 @@ msgid "_Domain" msgstr "_დომენი" #: gnome-initial-setup/pages/account/gis-account-page-enterprise.ui:40 -#: gnome-initial-setup/pages/account/gis-account-page-local.ui:67 +#: gnome-initial-setup/pages/account/gis-account-page-local.ui:81 msgid "_Username" msgstr "_მომხმარებელი" @@ -149,28 +149,28 @@ msgstr "ადმინისტრატორი" msgid "Failed to create user '%s': " msgstr "მომხმარებლის (\"%s\") შექმნის შეცდომა: " -#: gnome-initial-setup/pages/account/gis-account-page-local.ui:17 -msgid "Avatar image" -msgstr "ავატარის სურათი" +#: gnome-initial-setup/pages/account/gis-account-page-local.ui:30 +msgid "Edit avatar" +msgstr "ავატარის ჩასწორება" -#: gnome-initial-setup/pages/account/gis-account-page-local.ui:31 +#: gnome-initial-setup/pages/account/gis-account-page-local.ui:45 #: gnome-initial-setup/pages/account/gis-account-page.c:274 msgid "About You" msgstr "თქვენს შესახებ" -#: gnome-initial-setup/pages/account/gis-account-page-local.ui:32 +#: gnome-initial-setup/pages/account/gis-account-page-local.ui:46 msgid "Please provide a name and username. You can choose a picture too." msgstr "შეიყვანეთ სახელი და მომხმარებელი. ასევე შეგიძლიათ სურათის არჩევაც." -#: gnome-initial-setup/pages/account/gis-account-page-local.ui:44 +#: gnome-initial-setup/pages/account/gis-account-page-local.ui:58 msgid "_Full Name" msgstr "_სრული სახელი" -#: gnome-initial-setup/pages/account/gis-account-page-local.ui:119 +#: gnome-initial-setup/pages/account/gis-account-page-local.ui:133 msgid "Set up _parental controls for this user" msgstr "ამ მომხმარებლისთვის _მშობლის კონტროლის ჩართვა" -#: gnome-initial-setup/pages/account/gis-account-page-local.ui:125 +#: gnome-initial-setup/pages/account/gis-account-page-local.ui:139 msgid "For use by a parent or supervisor, who must set up their own password." msgstr "თუ მშობელი ან მეურვე ბრძანდებით, რომელსაც საკუთარი პაროლი სჭირდება." @@ -276,7 +276,7 @@ msgstr "ანგარიშის წაშლა" msgid "Preview" msgstr "მინიატურა" -#: gnome-initial-setup/pages/keyboard/cc-input-chooser.c:295 +#: gnome-initial-setup/pages/keyboard/cc-input-chooser.c:303 #: gnome-initial-setup/pages/language/cc-language-chooser.c:222 msgid "More…" msgstr "მეტი…" @@ -284,11 +284,11 @@ msgstr "მეტი…" #. Translators: a search for input methods or keyboard layouts #. * did not yield any results #. -#: gnome-initial-setup/pages/keyboard/cc-input-chooser.c:317 +#: gnome-initial-setup/pages/keyboard/cc-input-chooser.c:325 msgid "No inputs found" msgstr "შემოტანა ნაპოვნი არაა" -#: gnome-initial-setup/pages/keyboard/gis-keyboard-page.c:504 +#: gnome-initial-setup/pages/keyboard/gis-keyboard-page.c:502 #: gnome-initial-setup/pages/keyboard/gis-keyboard-page.ui:15 msgid "Typing" msgstr "აკრეფა" @@ -552,11 +552,11 @@ msgstr "" "გააგზავნის ტექნიკურ ანგარიშებს, რომლებიდანაც პირადი ინფორმაცია ავტომატურად " "წაიშლება. მონაცემები გროვდება %1$s -ის მიერ." -#: gnome-initial-setup/pages/privacy/gis-privacy-page.c:200 +#: gnome-initial-setup/pages/privacy/gis-privacy-page.c:204 msgid "Privacy Policy" msgstr "პირადულობის დაცვა" -#: gnome-initial-setup/pages/privacy/gis-privacy-page.c:235 +#: gnome-initial-setup/pages/privacy/gis-privacy-page.c:236 #: gnome-initial-setup/pages/privacy/gis-privacy-page.ui:14 msgid "Privacy" msgstr "პირადი ინფორმაცია" @@ -565,7 +565,7 @@ msgstr "პირადი ინფორმაცია" msgid "Location Services" msgstr "მდებარეობის სერვისები" -#: gnome-initial-setup/pages/privacy/gis-privacy-page.ui:28 +#: gnome-initial-setup/pages/privacy/gis-privacy-page.ui:44 msgid "" "Allows applications to determine your geographical location. Uses the " "Mozilla Location Service (<a href='https://location.services.mozilla.com/" @@ -575,23 +575,23 @@ msgstr "" "იყენებს Mozilla-ის მდებარეობის სერვისს (<a href='https://location.services." "mozilla.com/privacy'>კონფიდენციალობა</a>)." -#: gnome-initial-setup/pages/privacy/gis-privacy-page.ui:44 +#: gnome-initial-setup/pages/privacy/gis-privacy-page.ui:59 msgid "Automatic Problem Reporting" msgstr "პრობლემის ავტომატური ანგარიში" -#: gnome-initial-setup/pages/privacy/gis-privacy-page.ui:62 +#: gnome-initial-setup/pages/privacy/gis-privacy-page.ui:91 msgid "" "Privacy controls can be changed at any time from the Settings application." msgstr "" "პირადულობის დაცვის წესების შეცვლა ნებისმიერ დროსაა შესაძლებელი მორგების " "აპლიკაციიდან." -#: gnome-initial-setup/pages/software/gis-software-page.c:109 +#: gnome-initial-setup/pages/software/gis-software-page.c:111 #: gnome-initial-setup/pages/software/gis-software-page.ui:11 msgid "Third-Party Repositories" msgstr "მესამე პირის მიერ მოწოდებული რეპოზიტორიები" -#: gnome-initial-setup/pages/software/gis-software-page.c:110 +#: gnome-initial-setup/pages/software/gis-software-page.c:112 msgid "" "Third-party repositories provide access to additional software from selected " "external sources, including popular apps and drivers that are important for " @@ -601,11 +601,11 @@ msgstr "" "პროგრამებთან მიიღოთ წვდომა. მაგალითად დრაივერებთან და ზოგჯერ დახურული კოდის " "მქონე პროგრამებთანაც კი." -#: gnome-initial-setup/pages/software/gis-software-page.c:120 +#: gnome-initial-setup/pages/software/gis-software-page.c:122 msgid "_Disable Third-Party Repositories" msgstr "_მესამე პირის მიერ მოწოდებული რეპოზიტორიების გამორთვა" -#: gnome-initial-setup/pages/software/gis-software-page.c:125 +#: gnome-initial-setup/pages/software/gis-software-page.c:127 msgid "_Enable Third-Party Repositories" msgstr "_მესამე პირის მიერ მოწოდებული რეპოზიტორიების _ჩართვა" @@ -730,6 +730,9 @@ msgstr "" msgid "_Start Setup" msgstr "_მორგების დასაწყისი" +#~ msgid "Avatar image" +#~ msgstr "ავატარის სურათი" + #~ msgid "Take a Picture…" #~ msgstr "სურათის გადაღება…" |