diff --git a/data/applications/pamac-install.desktop b/data/applications/pamac-install.desktop index eeef2c6..2412ffd 100644 --- a/data/applications/pamac-install.desktop +++ b/data/applications/pamac-install.desktop @@ -128,4 +128,4 @@ Type=Application Icon=system-software-install StartupNotify=true NoDisplay=true -MimeType=application/x-xz-compressed-tar; +MimeType=application/x-alpm-package; diff --git a/data/mime/x-alpm-package.xml b/data/mime/x-alpm-package.xml new file mode 100644 index 0000000..a9fefce --- /dev/null +++ b/data/mime/x-alpm-package.xml @@ -0,0 +1,8 @@ + + + + + Alpm Package + + + diff --git a/pamac.pot b/pamac.pot index 50718a4..a50f569 100644 --- a/pamac.pot +++ b/pamac.pot @@ -21,7 +21,6 @@ msgstr "" msgid "Authentication is required" msgstr "" - #: resources/choose_provider_dialog.ui:7 msgid "Choose a Provider" msgstr "" @@ -91,7 +90,7 @@ msgstr "" msgid "Search" msgstr "" -#: resources/manager_window.ui:279 src/manager_window.vala:337 +#: resources/manager_window.ui:279 src/manager_window.vala:339 msgid "Groups" msgstr "" @@ -111,7 +110,7 @@ msgstr "" msgid "Version" msgstr "" -#: resources/manager_window.ui:463 src/manager_window.vala:329 +#: resources/manager_window.ui:463 src/manager_window.vala:331 msgid "Repository" msgstr "" @@ -187,7 +186,7 @@ msgid "Options" msgstr "" #: src/packages_chooser_dialog.vala:32 -msgid "Packages" +msgid "Alpm Package" msgstr "" #: src/daemon.vala:64 @@ -273,8 +272,8 @@ msgstr "" msgid "Choose a provider for %s" msgstr "" -#: src/transaction.vala:389 src/manager_window.vala:188 -#: src/manager_window.vala:731 +#: src/transaction.vala:389 src/manager_window.vala:190 +#: src/manager_window.vala:739 msgid "To remove" msgstr "" @@ -286,8 +285,8 @@ msgstr "" msgid "To build" msgstr "" -#: src/transaction.vala:428 src/manager_window.vala:187 -#: src/manager_window.vala:720 +#: src/transaction.vala:428 src/manager_window.vala:189 +#: src/manager_window.vala:728 msgid "To install" msgstr "" @@ -460,88 +459,88 @@ msgstr "" msgid "Show available updates" msgstr "" -#: src/manager_window.vala:180 src/manager_window.vala:777 +#: src/manager_window.vala:182 src/manager_window.vala:785 msgid "local" msgstr "" -#: src/manager_window.vala:184 src/manager_window.vala:251 -#: src/manager_window.vala:263 src/manager_window.vala:737 +#: src/manager_window.vala:186 src/manager_window.vala:253 +#: src/manager_window.vala:265 src/manager_window.vala:745 msgid "Installed" msgstr "" -#: src/manager_window.vala:186 src/manager_window.vala:751 +#: src/manager_window.vala:188 src/manager_window.vala:759 msgid "Orphans" msgstr "" -#: src/manager_window.vala:211 +#: src/manager_window.vala:213 msgid "Licenses" msgstr "" -#: src/manager_window.vala:233 +#: src/manager_window.vala:235 msgid "Depends On" msgstr "" -#: src/manager_window.vala:253 +#: src/manager_window.vala:255 msgid "Optional Dependencies" msgstr "" -#: src/manager_window.vala:273 +#: src/manager_window.vala:275 msgid "Required By" msgstr "" -#: src/manager_window.vala:287 +#: src/manager_window.vala:289 msgid "Provides" msgstr "" -#: src/manager_window.vala:300 +#: src/manager_window.vala:302 msgid "Replaces" msgstr "" -#: src/manager_window.vala:313 +#: src/manager_window.vala:315 msgid "Conflicts With" msgstr "" -#: src/manager_window.vala:347 +#: src/manager_window.vala:349 msgid "Packager" msgstr "" -#: src/manager_window.vala:353 +#: src/manager_window.vala:355 msgid "Install Date" msgstr "" -#: src/manager_window.vala:357 +#: src/manager_window.vala:359 msgid "Explicitly installed" msgstr "" -#: src/manager_window.vala:359 +#: src/manager_window.vala:361 msgid "Installed as a dependency for another package" msgstr "" -#: src/manager_window.vala:361 +#: src/manager_window.vala:363 msgid "Unknown" msgstr "" -#: src/manager_window.vala:363 +#: src/manager_window.vala:365 msgid "Install Reason" msgstr "" -#: src/manager_window.vala:368 +#: src/manager_window.vala:370 msgid "Signatures" msgstr "" -#: src/manager_window.vala:376 +#: src/manager_window.vala:378 msgid "Backup files" msgstr "" -#: src/manager_window.vala:497 +#: src/manager_window.vala:499 msgid "No package found" msgstr "" -#: src/manager_window.vala:739 +#: src/manager_window.vala:747 msgid "Uninstalled" msgstr "" -#: src/manager_window.vala:888 +#: src/manager_window.vala:896 msgid "A Gtk3 frontend for libalpm" msgstr "" diff --git a/src/packages_chooser_dialog.vala b/src/packages_chooser_dialog.vala index bcdc3a8..e3edaf6 100644 --- a/src/packages_chooser_dialog.vala +++ b/src/packages_chooser_dialog.vala @@ -29,8 +29,7 @@ namespace Pamac { Object (transient_for: window, use_header_bar: 0); Gtk.FileFilter package_filter = new Gtk.FileFilter (); - package_filter.set_filter_name (dgettext (null, "Packages")); - package_filter.add_pattern ("*.pkg.tar.gz"); + package_filter.set_filter_name (dgettext (null, "Alpm Package")); package_filter.add_pattern ("*.pkg.tar.xz"); this.add_filter (package_filter); diff --git a/src/transaction.vala b/src/transaction.vala index a03f44d..51c3dc4 100644 --- a/src/transaction.vala +++ b/src/transaction.vala @@ -647,7 +647,7 @@ namespace Pamac { case Event.SCRIPTLET_INFO: progress_dialog.action_label.set_text (dgettext (null, "Configuring %s").printf (previous_filename) + "..."); progress_dialog.expander.set_expanded (true); - spawn_in_term ({"/usr/bin/echo", details[0]}); + spawn_in_term ({"/usr/bin/echo", "-n", details[0]}); break; case Event.RETRIEVE_START: progress_dialog.cancel_button.set_visible (true); @@ -755,11 +755,11 @@ namespace Pamac { string? line = null; TextIter end_iter; if ((Alpm.LogLevel) level == Alpm.LogLevel.WARNING) { - line = dgettext (null, "Warning") + ": " + msg; + line = dgettext (null, "Warning") + ": " + previous_filename + ": " + msg; transaction_info_dialog.textbuffer.get_end_iter (out end_iter); transaction_info_dialog.textbuffer.insert (ref end_iter, msg, msg.length); } else if ((Alpm.LogLevel) level == Alpm.LogLevel.ERROR) { - line = dgettext (null, "Error") + ": " + msg; + line = dgettext (null, "Error") + ": " + previous_filename + ": " + msg; } if (line != null) { progress_dialog.expander.set_expanded (true);