From 3f13780dd7e1e5cab8c6375982a0a7c617bd9afe Mon Sep 17 00:00:00 2001 From: Heliguy Date: Mon, 23 Oct 2023 02:26:22 -0400 Subject: [PATCH] Finallize strings and reuse as much as reasonable --- po/warehouse.pot | 381 ++++++++++++++++------------------ src/downgrade.blp | 2 +- src/downgrade_window.py | 2 +- src/filter.blp | 19 +- src/gtk/help-overlay.blp | 2 +- src/orphans.blp | 2 +- src/orphans_window.py | 4 +- src/popular_remotes_window.py | 2 +- src/properties_window.py | 4 +- src/window.blp | 11 +- src/window.py | 29 +-- 11 files changed, 211 insertions(+), 247 deletions(-) diff --git a/po/warehouse.pot b/po/warehouse.pot index c9900b4..1e57467 100644 --- a/po/warehouse.pot +++ b/po/warehouse.pot @@ -8,13 +8,13 @@ msgid "" msgstr "" "Project-Id-Version: io.github.flattool.heliguy.Warehouse\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-21 05:42-0400\n" +"POT-Creation-Date: 2023-10-23 02:25-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "Language: \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #: data/io.github.flattool.Warehouse.desktop.in:3 @@ -63,7 +63,7 @@ msgstr "" msgid "Reinstall apps that have leftover data" msgstr "" -#: src/main.py:86 +#: src/main.py:87 msgid "Flatpaks" msgstr "" @@ -92,27 +92,27 @@ msgstr "" msgid "Keep" msgstr "" -#: src/window.py:167 src/window.py:240 -msgid "Allow restoring app settings and content" +#: src/window.py:167 +msgid "Allow restoring these apps' settings and content" msgstr "" #: src/window.py:168 src/window.py:241 src/orphans.blp:70 msgid "Trash" msgstr "" -#: src/window.py:168 src/window.py:241 -msgid "Send app settings and content to the trash" +#: src/window.py:168 +msgid "Send these apps' settings and content to the trash" msgstr "" -#: src/window.py:195 src/window.py:259 src/window.py:495 src/window.py:654 -#: src/properties_window.py:84 src/remotes_window.py:59 -#: src/remotes_window.py:138 src/remotes_window.py:285 +#: src/window.py:195 src/window.py:259 src/window.py:426 src/window.py:457 +#: src/window.py:551 src/window.py:710 src/properties_window.py:87 +#: src/remotes_window.py:59 src/remotes_window.py:138 src/remotes_window.py:285 #: src/orphans_window.py:108 src/orphans_window.py:162 src/filter.blp:17 #: src/downgrade.blp:16 msgid "Cancel" msgstr "" -#: src/window.py:196 src/window.py:260 +#: src/window.py:196 src/window.py:260 src/window.py:354 msgid "Uninstall" msgstr "" @@ -129,197 +129,239 @@ msgstr "" msgid "It will not be possible to use {} after removal." msgstr "" -#: src/window.py:300 src/window.py:304 -msgid "EOL" +#: src/window.py:240 +msgid "Allow restoring this app's settings and content" msgstr "" -#: src/window.py:300 src/properties_window.py:19 +#: src/window.py:241 +msgid "Send this app's settings and content to the trash" +msgstr "" + +#: src/window.py:300 +msgid "App EOL" +msgstr "" + +#: src/window.py:300 src/properties_window.py:26 msgid "" -"This Flatpak has reached its End of Life and will not receive any security " +"{} has reached its End of Life and will not receive any security updates" +msgstr "" + +#: src/window.py:304 +msgid "Runtime EOL" +msgstr "" + +#: src/window.py:304 src/properties_window.py:27 +msgid "" +"{}'s runtime has reached its End of Life and will not receive any security " "updates" msgstr "" -#: src/window.py:304 src/properties_window.py:20 -msgid "" -"The runtime used by this app has reached its End of Life and will not " -"receive any security updates" -msgstr "" - #: src/window.py:308 -msgid "Masked" +msgid "Updates Disabled" msgstr "" -#: src/window.py:308 -msgid "This Flatpak is masked and will not be updated" +#: src/window.py:308 src/properties_window.py:28 +msgid "{} is masked and will not be updated" msgstr "" -#: src/window.py:314 src/properties_window.py:156 +#. ^ This is up here as we need to add this to flatpak_rows regardless of if its visible or not +#: src/window.py:313 src/properties_window.py:159 msgid "View Properties" msgstr "" #. {Row visibility, Row selected, the row itself, properties, menu button, select, the flatpak row from `flatpak list`, mask label, the dropdown menu model} #. -#: src/window.py:339 +#: src/window.py:334 msgid "Copied name" msgstr "" -#: src/window.py:340 +#: src/window.py:335 msgid "Copy Name" msgstr "" -#: src/window.py:342 +#: src/window.py:337 msgid "Copied ID" msgstr "" -#: src/window.py:343 +#: src/window.py:338 msgid "Copy ID" msgstr "" -#: src/window.py:345 +#: src/window.py:340 msgid "Copied ref" msgstr "" -#: src/window.py:346 +#: src/window.py:341 msgid "Copy Ref" msgstr "" -#: src/window.py:348 +#: src/window.py:343 msgid "Copied launch command" msgstr "" -#: src/window.py:349 +#: src/window.py:344 msgid "Copy Launch Command" msgstr "" -#: src/window.py:351 src/window.py:418 +#: src/window.py:346 src/window.py:474 msgid "Copy" msgstr "" -#: src/window.py:353 +#: src/window.py:349 msgid "Opened {}" msgstr "" -#: src/window.py:354 -msgid "Open {}" +#: src/window.py:350 +msgid "Open" msgstr "" -#: src/window.py:359 -msgid "Toggle Mask" +#: src/window.py:358 src/window.py:459 src/downgrade.blp:40 +msgid "Disable Updates" msgstr "" -#: src/window.py:368 -msgid "Uninstall {}" +#: src/window.py:363 src/properties_window.py:187 +msgid "Enable Updates" msgstr "" -#: src/window.py:372 src/downgrade_window.py:142 -msgid "Downgrade {}" +#: src/window.py:377 src/properties_window.py:134 +msgid "Open User Data Folder" msgstr "" -#: src/window.py:396 -msgid "Could not toggle {}'s mask" +#: src/window.py:382 src/properties_window.py:139 +msgid "Trash User Data" msgstr "" -#: src/window.py:417 -msgid "Could not Run App" +#: src/window.py:389 src/downgrade.blp:21 +msgid "Downgrade" msgstr "" -#: src/window.py:423 -msgid "OK" +#: src/window.py:410 src/properties_window.py:98 src/orphans_window.py:171 +msgid "Could not open folder" msgstr "" -#: src/window.py:441 -msgid "List refreshed" +#: src/window.py:418 src/window.py:543 +msgid "Could not trash user data" msgstr "" -#: src/window.py:484 -msgid "No user data for {}" -msgstr "" - -#: src/window.py:487 -msgid "Can't trash user data for {}" -msgstr "" - -#: src/window.py:489 src/properties_window.py:74 +#: src/window.py:422 src/window.py:545 src/properties_window.py:77 msgid "Trashed user data" msgstr "" -#: src/window.py:493 -msgid "Trash Selected Apps' User Data?" +#: src/window.py:424 +msgid "Send {}'s User Data to the trash?" msgstr "" -#: src/window.py:493 -msgid "Your files and data for these apps will be sent to the trash." +#: src/window.py:425 src/properties_window.py:85 +msgid "Your files and data for this app will be sent to the trash." msgstr "" -#: src/window.py:496 src/properties_window.py:85 +#: src/window.py:428 src/window.py:552 src/properties_window.py:88 msgid "Trash Data" msgstr "" -#: src/window.py:547 +#: src/window.py:440 src/downgrade_window.py:108 +msgid "Could disable updates for {}" +msgstr "" + +#: src/window.py:455 +msgid "Disable Updates for {}?" +msgstr "" + +#: src/window.py:456 +msgid "" +"This will mask {} ensuring it will never recieve any feature or security " +"updates." +msgstr "" + +#: src/window.py:473 +msgid "Could not Run App" +msgstr "" + +#: src/window.py:479 +msgid "OK" +msgstr "" + +#: src/window.py:497 +msgid "List refreshed" +msgstr "" + +#: src/window.py:540 +msgid "No user data for {}" +msgstr "" + +#: src/window.py:549 +msgid "Trash Selected Apps' User Data?" +msgstr "" + +#: src/window.py:549 +msgid "Your files and data for these apps will be sent to the trash." +msgstr "" + +#: src/window.py:603 msgid "Copied selected app names" msgstr "" -#: src/window.py:555 +#: src/window.py:611 msgid "Copied selected app IDs" msgstr "" -#: src/window.py:563 +#: src/window.py:619 msgid "Copied selected app refs" msgstr "" -#: src/window.py:624 src/orphans_window.py:76 +#: src/window.py:680 src/orphans_window.py:76 msgid "Installed successfully" msgstr "" -#: src/window.py:627 +#: src/window.py:683 msgid "Could not install app" msgstr "" -#: src/window.py:652 +#: src/window.py:708 msgid "Install {}?" msgstr "" -#: src/window.py:655 src/orphans_window.py:109 src/orphans.blp:75 +#: src/window.py:711 src/orphans_window.py:109 src/orphans.blp:75 msgid "Install" msgstr "" -#: src/window.py:662 src/remotes_window.py:212 src/remotes_window.py:296 +#: src/window.py:718 src/remotes_window.py:212 src/remotes_window.py:296 msgid "User" msgstr "" -#: src/window.py:662 +#: src/window.py:718 msgid "The app will be available to only you" msgstr "" -#: src/window.py:663 src/remotes_window.py:218 src/remotes_window.py:297 +#: src/window.py:719 src/remotes_window.py:218 src/remotes_window.py:297 msgid "System" msgstr "" -#: src/window.py:663 +#: src/window.py:719 msgid "The app will be available to every user on the system" msgstr "" -#: src/window.py:692 +#: src/window.py:748 msgid "File type not supported" msgstr "" #: src/window.blp:12 -msgid "Refresh the List of Installed Apps" +msgid "Refresh the List" msgstr "" #: src/window.blp:18 src/orphans.blp:14 -msgid "Search for an Installed App" +msgid "Search the List" msgstr "" #: src/window.blp:24 -msgid "Filter Apps List" +msgid "Filter the List" msgstr "" #: src/window.blp:30 msgid "Main Menu" msgstr "" -#: src/window.blp:37 +#: src/window.blp:37 src/gtk/help-overlay.blp:29 msgid "Toggle Selection Mode" msgstr "" @@ -333,226 +375,175 @@ msgid "" "see the list of installed Flatpaks, or the system has no Flatpaks installed." msgstr "" -#. label: _("Uninstall"); -#: src/window.blp:92 +#: src/window.blp:85 src/orphans.blp:66 +msgid "Select All" +msgstr "" + +#: src/window.blp:90 msgid "Uninstall Selected Apps" msgstr "" -#. label: _("Trash User Data"); -#: src/window.blp:98 +#: src/window.blp:95 msgid "Send Selected Apps' Data to the Trash" msgstr "" -#: src/window.blp:103 +#: src/window.blp:100 msgid "Open Copy Menu" msgstr "" -#: src/window.blp:114 +#: src/window.blp:111 src/gtk/help-overlay.blp:47 msgid "Install From File" msgstr "" -#: src/window.blp:119 src/orphans_window.py:24 +#: src/window.blp:116 src/gtk/help-overlay.blp:37 src/orphans_window.py:24 msgid "Manage Leftover Data" msgstr "" -#: src/window.blp:129 src/remotes_window.py:349 +#: src/window.blp:126 src/gtk/help-overlay.blp:42 src/remotes_window.py:349 msgid "Manage Remotes" msgstr "" -#: src/window.blp:134 +#: src/window.blp:131 msgid "_Keyboard Shortcuts" msgstr "" -#: src/window.blp:139 +#: src/window.blp:136 msgid "_About Warehouse" msgstr "" -#: src/window.blp:148 +#: src/window.blp:145 msgid "Copy Names" msgstr "" -#: src/window.blp:153 +#: src/window.blp:150 msgid "Copy IDs" msgstr "" -#: src/window.blp:158 +#: src/window.blp:155 msgid "Copy Refs" msgstr "" -#: src/window.blp:167 +#: src/window.blp:164 msgid "Open app" msgstr "" #: src/gtk/help-overlay.blp:11 -msgctxt "shortcut window" msgid "App Management" msgstr "" #: src/gtk/help-overlay.blp:14 -msgctxt "shortcut window" msgid "Search" msgstr "" -#: src/gtk/help-overlay.blp:19 -msgctxt "shortcut window" -msgid "Set a Filter" +#: src/gtk/help-overlay.blp:19 src/filter.blp:7 +msgid "Set Filters" msgstr "" #: src/gtk/help-overlay.blp:24 -msgctxt "shortcut window" msgid "Refresh" msgstr "" -#: src/gtk/help-overlay.blp:29 -msgctxt "shortcut window" -msgid "Toggle Selection Mode" -msgstr "" - #: src/gtk/help-overlay.blp:34 -msgctxt "shortcut window" msgid "More Functions" msgstr "" -#: src/gtk/help-overlay.blp:37 -msgctxt "shortcut window" -msgid "Manage Leftover Data" -msgstr "" - -#: src/gtk/help-overlay.blp:42 -msgctxt "shortcut window" -msgid "Manage Remotes" -msgstr "" - -#: src/gtk/help-overlay.blp:47 -msgctxt "shortcut window" -msgid "Install From File" -msgstr "" - #: src/gtk/help-overlay.blp:52 -msgctxt "shortcut window" msgid "General" msgstr "" #: src/gtk/help-overlay.blp:55 -msgctxt "shortcut window" msgid "Open Menu" msgstr "" #: src/gtk/help-overlay.blp:60 -msgctxt "shortcut window" msgid "Show Shortcuts" msgstr "" #: src/gtk/help-overlay.blp:65 -msgctxt "shortcut window" msgid "Quit" msgstr "" -#: src/properties_window.py:7 +#: src/properties_window.py:14 msgid "{} Properties" msgstr "" -#: src/properties_window.py:21 -msgid "This Flatpak has been masked and will not be updated" -msgstr "" - -#: src/properties_window.py:52 +#: src/properties_window.py:60 msgid "Show Apps Using this Runtime" msgstr "" -#: src/properties_window.py:78 -msgid "Can't trash data" +#: src/properties_window.py:81 +msgid "Could not trash data" msgstr "" -#: src/properties_window.py:81 +#: src/properties_window.py:84 msgid "Send {}'s User Data to the Trash?" msgstr "" -#: src/properties_window.py:82 -msgid "Your files and data for this app will be sent to the trash." -msgstr "" - -#: src/properties_window.py:95 src/orphans_window.py:171 -msgid "Can't open folder" -msgstr "" - -#: src/properties_window.py:99 src/remotes_window.py:72 +#: src/properties_window.py:102 src/remotes_window.py:72 msgid "Copied {}" msgstr "" -#: src/properties_window.py:131 -msgid "Open Data Folder" -msgstr "" - -#: src/properties_window.py:136 -msgid "Send User Data to the Trash" -msgstr "" - -#: src/properties_window.py:143 src/remotes_window.py:197 +#: src/properties_window.py:146 src/remotes_window.py:197 #: src/remotes_window.py:294 msgid "Name" msgstr "" -#: src/properties_window.py:143 +#: src/properties_window.py:146 msgid "Description" msgstr "" -#: src/properties_window.py:143 +#: src/properties_window.py:146 msgid "App ID" msgstr "" -#: src/properties_window.py:143 +#: src/properties_window.py:146 msgid "Version" msgstr "" -#: src/properties_window.py:143 +#: src/properties_window.py:146 msgid "Branch" msgstr "" -#: src/properties_window.py:143 +#: src/properties_window.py:146 msgid "Arch" msgstr "" -#: src/properties_window.py:143 +#: src/properties_window.py:146 msgid "Origin" msgstr "" -#: src/properties_window.py:143 +#: src/properties_window.py:146 msgid "Installation" msgstr "" -#: src/properties_window.py:143 +#: src/properties_window.py:146 msgid "Ref" msgstr "" -#: src/properties_window.py:143 +#: src/properties_window.py:146 msgid "Active Commit" msgstr "" -#: src/properties_window.py:143 +#: src/properties_window.py:146 msgid "Latest Commit" msgstr "" -#: src/properties_window.py:143 +#: src/properties_window.py:146 msgid "Installed Size" msgstr "" -#: src/properties_window.py:143 +#: src/properties_window.py:146 msgid "Options" msgstr "" -#: src/properties_window.py:143 +#: src/properties_window.py:146 msgid "Runtime" msgstr "" -#: src/properties_window.py:151 +#: src/properties_window.py:154 msgid "Copy {}" msgstr "" -#: src/properties_window.py:183 -msgid "Unmask" -msgstr "" - #: src/remotes_window.py:48 msgid "Could not remove {}" msgstr "" @@ -652,7 +643,7 @@ msgid "" msgstr "" #: src/popular_remotes_window.py:31 -msgid "Flatpaks Repos" +msgid "Flatpak Repos" msgstr "" #: src/popular_remotes.blp:18 @@ -672,11 +663,11 @@ msgid "Add a Custom Remote" msgstr "" #: src/orphans_window.py:78 -msgid "Some apps didn't install" +msgid "Could not install some apps" msgstr "" #: src/orphans_window.py:81 -msgid "Installing... This could take a while" +msgid "Installing… This could take a while" msgstr "" #. Make window unable to close @@ -712,22 +703,14 @@ msgstr "" msgid "Open the User Data Folder" msgstr "" -#: src/orphans.blp:57 src/filter.blp:85 +#: src/orphans.blp:57 msgid "No Leftover Data" msgstr "" -#: src/orphans.blp:58 src/filter.blp:86 +#: src/orphans.blp:58 msgid "There is no leftover user data" msgstr "" -#: src/orphans.blp:66 -msgid "Select All" -msgstr "" - -#: src/filter.blp:7 -msgid "Set Filters" -msgstr "" - #: src/filter.blp:21 msgid "Apply" msgstr "" @@ -748,10 +731,6 @@ msgstr "" msgid "Filter Apps by Runtime" msgstr "" -#: src/filter.blp:76 -msgid "Clear Filters" -msgstr "" - #: src/downgrade_window.py:76 msgid "Commit Hash: {}" msgstr "" @@ -760,35 +739,27 @@ msgstr "" msgid "Could not downgrade {}" msgstr "" -#: src/downgrade_window.py:108 -msgid "Could not mask {}" +#: src/downgrade_window.py:116 +msgid "Downgrading…" msgstr "" -#: src/downgrade_window.py:116 -msgid "Downgrading..." +#: src/downgrade_window.py:142 +msgid "Downgrade {}" msgstr "" #: src/downgrade_window.py:153 -msgid "Fetching Releases..." +msgid "Fetching Releases…" msgstr "" -#: src/downgrade.blp:21 -msgid "Downgrade" +#: src/downgrade_window.py:155 +msgid "Ensure that {} will never be updated to a newer version" msgstr "" -#: src/downgrade.blp:40 -msgid "Mask this Flatpak" -msgstr "" - -#: src/downgrade.blp:41 -msgid "Ensure that the flatpak will never be updated to a newer version" -msgstr "" - -#: src/downgrade.blp:47 +#: src/downgrade.blp:46 msgid "Select a Release" msgstr "" -#: src/downgrade.blp:48 +#: src/downgrade.blp:47 msgid "" "This will uninstall the current release and install the chosen one instead. " "Note that downgrading can cause issues." diff --git a/src/downgrade.blp b/src/downgrade.blp index 4b2191c..fde194e 100644 --- a/src/downgrade.blp +++ b/src/downgrade.blp @@ -37,7 +37,7 @@ template DowngradeWindow : Adw.Window { Adw.PreferencesGroup { Adw.SwitchRow mask_row { - title: _("Stop Updates"); + title: _("Disable Updates"); active: true; } } diff --git a/src/downgrade_window.py b/src/downgrade_window.py index 160c066..6f39b3e 100644 --- a/src/downgrade_window.py +++ b/src/downgrade_window.py @@ -105,7 +105,7 @@ class DowngradeWindow(Adw.Window): if self.my_utils.maskFlatpak(self.app_id, self.install_type) == 0: self.flatpak_row[7].set_visible(True) else: - self.parent_window.toast_overlay.add_toast(Adw.Toast.new(_("Could not mask {}").format(self.app_name))) + self.parent_window.toast_overlay.add_toast(Adw.Toast.new(_("Could disable updates for {}").format(name))) self.close() diff --git a/src/filter.blp b/src/filter.blp index f2ebfb6..c1ae00a 100644 --- a/src/filter.blp +++ b/src/filter.blp @@ -69,23 +69,18 @@ template FilterWindow : Adw.Window { title: _("Filter Apps by Runtime"); } } - Button remove_filters_button { - visible: false; - margin-bottom: 18; - halign: center; - label: _("Clear Filters"); - styles ["pill"] - } + // Button remove_filters_button { + // visible: false; + // margin-bottom: 18; + // halign: center; + // label: _("Clear Filters"); + // styles ["pill"] + // } } } } } - Adw.StatusPage no_data { - icon-name: "check-plain-symbolic"; - title: _("No Leftover Data"); - description: _("There is no leftover user data"); } - } }; } } \ No newline at end of file diff --git a/src/gtk/help-overlay.blp b/src/gtk/help-overlay.blp index 5c14ce2..dac10e0 100644 --- a/src/gtk/help-overlay.blp +++ b/src/gtk/help-overlay.blp @@ -16,7 +16,7 @@ ShortcutsWindow help_overlay { } ShortcutsShortcut { - title: _("Set a Filter"); + title: _("Set Filters"); action-name: "app.set-filter"; } diff --git a/src/orphans.blp b/src/orphans.blp index 1f57924..74b8f54 100644 --- a/src/orphans.blp +++ b/src/orphans.blp @@ -11,7 +11,7 @@ template OrphansWindow : Adw.Window { [start] ToggleButton search_button { icon-name: "system-search-symbolic"; - tooltip-text: _("Search for an Installed App"); + tooltip-text: _("Search the List"); } [end] Button oepn_folder_button { diff --git a/src/orphans_window.py b/src/orphans_window.py index d97ec0d..feb8695 100644 --- a/src/orphans_window.py +++ b/src/orphans_window.py @@ -75,7 +75,7 @@ class OrphansWindow(Adw.Window): if self.my_utils.install_success: self.toast_overlay.add_toast(Adw.Toast.new(_("Installed successfully"))) else: - self.toast_overlay.add_toast(Adw.Toast.new(_("Some apps didn't install"))) + self.toast_overlay.add_toast(Adw.Toast.new(_("Could not install some apps"))) def installHandler(self): self.set_title(_("Installing… This could take a while")) @@ -168,7 +168,7 @@ class OrphansWindow(Adw.Window): try: Gio.AppInfo.launch_default_for_uri(f"file://{path}", None) except GLib.GError: - properties_toast_overlay.add_toast(Adw.Toast.new(_("Can't open folder"))) + properties_toast_overlay.add_toast(Adw.Toast.new(_("Could not open folder"))) def sizeCallBack(self, row_index): row = self.list_of_data.get_row_at_index(row_index) diff --git a/src/popular_remotes_window.py b/src/popular_remotes_window.py index 50558d4..5d85d17 100644 --- a/src/popular_remotes_window.py +++ b/src/popular_remotes_window.py @@ -28,7 +28,7 @@ class PopularRemotesWindow(Adw.Window): pass def addFromFileHandler(self, widet): - filter = Gtk.FileFilter(name=_("Flatpaks Repos")) + filter = Gtk.FileFilter(name=_("Flatpak Repos")) filter.add_suffix("flatpakrepo") filters = Gio.ListStore.new(Gtk.FileFilter) filters.append(filter) diff --git a/src/properties_window.py b/src/properties_window.py index e7bc6f8..2b7b891 100644 --- a/src/properties_window.py +++ b/src/properties_window.py @@ -131,12 +131,12 @@ def show_properties_window(widget, index, window): # user_data_row.set_subtitle(f"{path}\n~{my_utils.getSizeWithFormat(path)}") calc_size(path) - open_button = Gtk.Button(icon_name="document-open-symbolic", valign=Gtk.Align.CENTER, tooltip_text=_("Open Data Folder")) + open_button = Gtk.Button(icon_name="document-open-symbolic", valign=Gtk.Align.CENTER, tooltip_text=_("Open User Data Folder")) open_button.add_css_class("flat") open_button.connect("clicked", open_button_handler) user_data_row.add_suffix(open_button) - clean_button = Gtk.Button(icon_name="brush-symbolic", valign=Gtk.Align.CENTER, tooltip_text=_("Send User Data to the Trash")) + clean_button = Gtk.Button(icon_name="brush-symbolic", valign=Gtk.Align.CENTER, tooltip_text=_("Trash User Data")) clean_button.add_css_class("flat") clean_button.connect("clicked", clean_button_handler) user_data_row.add_suffix(clean_button) diff --git a/src/window.blp b/src/window.blp index 5136262..3bc87a4 100644 --- a/src/window.blp +++ b/src/window.blp @@ -9,19 +9,19 @@ template WarehouseWindow : Adw.ApplicationWindow { [start] Button refresh_button { icon-name: "view-refresh-symbolic"; - tooltip-text: _("Refresh the List of Installed Apps"); + tooltip-text: _("Refresh the List"); } [start] ToggleButton search_button { icon-name: "system-search-symbolic"; - tooltip-text: _("Search for an Installed App"); + tooltip-text: _("Search the List"); } [start] ToggleButton filter_button { icon-name: "funnel-symbolic"; - tooltip-text: _("Filter Apps List"); + tooltip-text: _("Filter the List"); } [end] @@ -82,19 +82,16 @@ template WarehouseWindow : Adw.ApplicationWindow { revealed: false; [start] ToggleButton batch_select_all_button { - label: "Select All"; - // tooltip-text: _("Select all Apps"); + label: _("Select All"); } [end] Button batch_uninstall_button { icon-name: "user-trash-symbolic"; - // label: _("Uninstall"); tooltip-text: _("Uninstall Selected Apps"); } [end] Button batch_clean_button { icon-name: "brush-symbolic"; - // label: _("Trash User Data"); tooltip-text: _("Send Selected Apps' Data to the Trash"); } [end] diff --git a/src/window.py b/src/window.py index afd0017..cd639df 100644 --- a/src/window.py +++ b/src/window.py @@ -164,8 +164,8 @@ class WarehouseWindow(Adw.ApplicationWindow): options_box = Gtk.Box(orientation="vertical") header = Gtk.Label(label=_("App Settings & Data"), halign="start", margin_top=10) options_list = Gtk.ListBox(selection_mode="none", margin_top=15) - keep_data = Adw.ActionRow(title=_("Keep"), subtitle=_("Allow restoring app settings and content")) - trash_data = Adw.ActionRow(title=_("Trash"), subtitle=_("Send app settings and content to the trash")) + keep_data = Adw.ActionRow(title=_("Keep"), subtitle=_("Allow restoring these apps' settings and content")) + trash_data = Adw.ActionRow(title=_("Trash"), subtitle=_("Send these apps' settings and content to the trash")) keep_check = Gtk.CheckButton() trash_check = Gtk.CheckButton() @@ -237,8 +237,8 @@ class WarehouseWindow(Adw.ApplicationWindow): options_box = Gtk.Box(orientation="vertical") header = Gtk.Label(label=_("App Settings & Data"), halign="start", margin_top=10) options_list = Gtk.ListBox(selection_mode="none", margin_top=15) - keep_data = Adw.ActionRow(title=_("Keep"), subtitle=_("Allow restoring app settings and content")) - trash_data = Adw.ActionRow(title=_("Trash"), subtitle=_("Send app settings and content to the trash")) + keep_data = Adw.ActionRow(title=_("Keep"), subtitle=_("Allow restoring this app's settings and content")) + trash_data = Adw.ActionRow(title=_("Trash"), subtitle=_("Send this app's settings and content to the trash")) keep_check = Gtk.CheckButton(active=True) trash_check = Gtk.CheckButton() @@ -297,11 +297,11 @@ class WarehouseWindow(Adw.ApplicationWindow): flatpak_row.set_subtitle(app_id) if "eol" in self.host_flatpaks[index][12]: - eol_app_label = Gtk.Label(label=_("EOL"), hexpand=True, wrap=True, justify=Gtk.Justification.RIGHT, valign=Gtk.Align.CENTER, tooltip_text=_("{} has reached its End of Life and will not receive any security updates").format(app_name)) + eol_app_label = Gtk.Label(label=_("App EOL"), hexpand=True, wrap=True, justify=Gtk.Justification.RIGHT, valign=Gtk.Align.CENTER, tooltip_text=_("{} has reached its End of Life and will not receive any security updates").format(app_name)) eol_app_label.add_css_class("error") if self.host_flatpaks[index][13] in self.eol_list: - eol_runtime_label = Gtk.Label(label=_("EOL"), hexpand=True, wrap=True, justify=Gtk.Justification.RIGHT, valign=Gtk.Align.CENTER, tooltip_text=_("{}'s runtime has reached its End of Life and will not receive any security updates").format(app_name)) + eol_runtime_label = Gtk.Label(label=_("Runtime EOL"), hexpand=True, wrap=True, justify=Gtk.Justification.RIGHT, valign=Gtk.Align.CENTER, tooltip_text=_("{}'s runtime has reached its End of Life and will not receive any security updates").format(app_name)) eol_runtime_label.add_css_class("error") flatpak_row.add_suffix(eol_runtime_label) @@ -347,11 +347,11 @@ class WarehouseWindow(Adw.ApplicationWindow): if "runtime" not in self.host_flatpaks[index][12]: self.create_action(("run" + str(index)), lambda *_a, ref=app_ref, name=app_name: self.runAppThread(ref, _("Opened {}").format(name))) - run_item = Gio.MenuItem.new(_("Open").format(app_name), f"win.run{index}") + run_item = Gio.MenuItem.new(_("Open"), f"win.run{index}") row_menu_model.append_item(run_item) self.create_action(("uninstall" + str(index)), lambda *_, index=index: self.uninstallButtonHandler(self, index)) - uninstall_item = Gio.MenuItem.new(_("Uninstall").format(app_name), f"win.uninstall{index}") + uninstall_item = Gio.MenuItem.new(_("Uninstall"), f"win.uninstall{index}") row_menu_model.append_item(uninstall_item) self.create_action(("mask" + str(index)), lambda *_, id=app_id, type=install_type, index=index: self.maskFlatpak(id, type, index)) @@ -386,7 +386,7 @@ class WarehouseWindow(Adw.ApplicationWindow): row_menu_model.append_section(None, data_menu_model) self.create_action(("downgrade" + str(index)), lambda *_, row=self.flatpak_rows[index]: DowngradeWindow(self, row)) - downgrade_item = Gio.MenuItem.new(_("Downgrade").format(app_name), f"win.downgrade{index}") + downgrade_item = Gio.MenuItem.new(_("Downgrade"), f"win.downgrade{index}") advanced_menu_model.append_item(downgrade_item) row_menu_model.append_section(None, advanced_menu_model) @@ -415,10 +415,11 @@ class WarehouseWindow(Adw.ApplicationWindow): return result = self.my_utils.trashFolder(f"{self.user_data_path}{id}") if result != 0: - self.toast_overlay.add_toast(Adw.Toast.new(_("Could not trash data"))) + self.toast_overlay.add_toast(Adw.Toast.new(_("Could not trash user data"))) return self.lookup_action(f"open-data{index}").set_enabled(False) self.lookup_action(f"trash{index}").set_enabled(False) + self.toast_overlay.add_toast(Adw.Toast.new(_("Trashed user data"))) dialog = Adw.MessageDialog.new(self,_("Send {}'s User Data to the trash?").format(name)) dialog.set_body(_("Your files and data for this app will be sent to the trash.")) @@ -436,7 +437,7 @@ class WarehouseWindow(Adw.ApplicationWindow): def callback(): if result[0] == 1: - self.toast_overlay.add_toast(Adw.Toast.new(_("Could not toggle {}'s mask").format(name))) + self.toast_overlay.add_toast(Adw.Toast.new(_("Could disable updates for {}").format(name))) return self.flatpak_rows[index][7].set_visible(not is_masked) self.lookup_action(f"mask{index}").set_enabled(is_masked) @@ -464,7 +465,7 @@ class WarehouseWindow(Adw.ApplicationWindow): if to_toast: self.toast_overlay.add_toast(Adw.Toast.new(to_toast)) - def test(self, _a, _b): + def runCallback(self, _a, _b): if not self.my_utils.run_app_error: return @@ -481,7 +482,7 @@ class WarehouseWindow(Adw.ApplicationWindow): def runAppThread(self, ref, to_toast=None): self.run_app_error = False - task = Gio.Task.new(None, None, self.test) + task = Gio.Task.new(None, None, self.runCallback) task.run_in_thread(lambda *_: self.my_utils.runApp(ref)) if to_toast: self.toast_overlay.add_toast(Adw.Toast.new(to_toast)) @@ -539,7 +540,7 @@ class WarehouseWindow(Adw.ApplicationWindow): self.toast_overlay.add_toast(Adw.Toast.new(_("No user data for {}").format(app_name))) elif trash == 2: show_success = False - self.toast_overlay.add_toast(Adw.Toast.new(_("Can't trash user data for {}").format(app_name))) + self.toast_overlay.add_toast(Adw.Toast.new(_("Could not trash user data"))) if show_success: self.toast_overlay.add_toast(Adw.Toast.new(_("Trashed user data"))) #self.refresh_list_of_flatpaks(_a, False)