Commit f0a19dc8 authored by guinux's avatar guinux

Merge branch 'master' into development

parents 2083c152 c7284d94
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -12,6 +12,7 @@
# francesco <francesco987@gmail.com>, 2015
# Guillaume Benoit <guillaume@manjaro.org>, 2013
# Italwizzie, 2014
# l3nn4rt, 2018
# Luca Allulli <l.allulli@gmail.com>, 2015
# Luca Allulli <l.allulli@gmail.com>, 2015
# l3nn4rt, 2017
......@@ -28,8 +29,8 @@ msgstr ""
"Project-Id-Version: manjaro-pamac\n"
"Report-Msgid-Bugs-To: guillaume@manjaro.org\n"
"POT-Creation-Date: 2018-10-18 11:38+0200\n"
"PO-Revision-Date: 2018-10-21 07:46+0000\n"
"Last-Translator: Pietro Francesco Fontana\n"
"PO-Revision-Date: 2018-10-31 20:59+0000\n"
"Last-Translator: l3nn4rt\n"
"Language-Team: Italian (http://www.transifex.com/manjarolinux/manjaro-pamac/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
......@@ -717,7 +718,7 @@ msgstr "s"
#: src/transaction-cli.vala
msgid "yes"
msgstr "si"
msgstr "sì"
#: src/transaction-cli.vala resources/transaction_sum_dialog.ui
msgid "Edit build files"
......@@ -746,7 +747,7 @@ msgstr "Non è permesso compilare pacchetti come root"
#: src/cli.vala
msgid "No PKGBUILD file found in current directory"
msgstr "Non è stato alcun file PKGBUILD nella cartella attuale"
msgstr "Non è stato trovato alcun file PKGBUILD nella cartella attuale"
#: src/cli.vala
msgid "Available actions"
......@@ -943,7 +944,7 @@ msgstr "Dimensione"
#: src/cli.vala
#, c-format
msgid "No package owns %s"
msgstr "Nessun pacchetto possiede%s"
msgstr "Nessun pacchetto possiede %s"
#: src/cli.vala
#, c-format
......
......@@ -784,13 +784,6 @@ namespace Pamac {
}
syncdbs.next ();
}
// git is needed to build pkgs
if (Alpm.find_satisfier (alpm_handle.localdb.pkgcache, "git") == null) {
to_install += "git";
} else {
// remove the needed pkg from to_remove
backup_to_remove.remove ("git");
}
to_remove = {};
foreach (unowned string name in backup_to_remove) {
to_remove += name;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment