forked from cromer/pamac-classic
Merge branch 'master' of github.com:manjaro/pamac
This commit is contained in:
commit
7b0f23b7b3
4
po/fr.po
4
po/fr.po
@ -412,6 +412,10 @@ msgstr "Dépendances optionnelles"
|
|||||||
msgid "Required By"
|
msgid "Required By"
|
||||||
msgstr "Requis par"
|
msgstr "Requis par"
|
||||||
|
|
||||||
|
#: ../src/manager_window.vala
|
||||||
|
msgid "Optional For"
|
||||||
|
msgstr "Optionnel pour"
|
||||||
|
|
||||||
#: ../src/manager_window.vala
|
#: ../src/manager_window.vala
|
||||||
msgid "Provides"
|
msgid "Provides"
|
||||||
msgstr "Fournit"
|
msgstr "Fournit"
|
||||||
|
@ -401,6 +401,10 @@ msgstr ""
|
|||||||
msgid "Required By"
|
msgid "Required By"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
#: ../src/manager_window.vala
|
||||||
|
msgid "Optional For"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: ../src/manager_window.vala
|
#: ../src/manager_window.vala
|
||||||
msgid "Provides"
|
msgid "Provides"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
|
|
||||||
for i in `ls ./ | sed s'|.po||'` ; do
|
for i in `ls ./ | sed s'|.po||'` ; do
|
||||||
msgmerge --update --no-fuzzy-matching --add-location=file --backup=none ./$i.po pamac.pot
|
msgmerge --update --no-fuzzy-matching --no-wrap --add-location=file --backup=none ./$i.po pamac.pot
|
||||||
done
|
done
|
||||||
|
@ -637,6 +637,7 @@ namespace Pamac {
|
|||||||
string[] depends = {};
|
string[] depends = {};
|
||||||
string[] optdepends = {};
|
string[] optdepends = {};
|
||||||
string[] requiredby = {};
|
string[] requiredby = {};
|
||||||
|
string[] optionalfor = {};
|
||||||
string[] provides = {};
|
string[] provides = {};
|
||||||
string[] replaces = {};
|
string[] replaces = {};
|
||||||
string[] conflicts = {};
|
string[] conflicts = {};
|
||||||
@ -671,11 +672,21 @@ namespace Pamac {
|
|||||||
}
|
}
|
||||||
Alpm.List.free_all (list);
|
Alpm.List.free_all (list);
|
||||||
}
|
}
|
||||||
|
if (alpm_pkg.db.name == "local") {
|
||||||
|
Alpm.List<string?> *list = alpm_pkg.compute_optionalfor ();
|
||||||
|
int i = 0;
|
||||||
|
while (i < list->length) {
|
||||||
|
optionalfor += list->nth_data (i);
|
||||||
|
i++;
|
||||||
|
}
|
||||||
|
Alpm.List.free_all (list);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
deps.repo = repo;
|
deps.repo = repo;
|
||||||
deps.depends = depends;
|
deps.depends = depends;
|
||||||
deps.optdepends = optdepends;
|
deps.optdepends = optdepends;
|
||||||
deps.requiredby = requiredby;
|
deps.requiredby = requiredby;
|
||||||
|
deps.optionalfor = optionalfor;
|
||||||
deps.provides = provides;
|
deps.provides = provides;
|
||||||
deps.replaces = replaces;
|
deps.replaces = replaces;
|
||||||
deps.conflicts = conflicts;
|
deps.conflicts = conflicts;
|
||||||
|
@ -308,6 +308,19 @@ namespace Pamac {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (deps.repo == "local") {
|
||||||
|
if (deps.optionalfor.length != 0) {
|
||||||
|
deps_list.insert_with_values (out iter, -1,
|
||||||
|
0, dgettext (null, "Optional For") + ":",
|
||||||
|
1, deps.optionalfor[0]);
|
||||||
|
i = 1;
|
||||||
|
while (i < deps.optionalfor.length) {
|
||||||
|
deps_list.insert_with_values (out iter, -1,
|
||||||
|
1, deps.optionalfor[i]);
|
||||||
|
i++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
if (deps.provides.length != 0) {
|
if (deps.provides.length != 0) {
|
||||||
deps_list.insert_with_values (out iter, -1,
|
deps_list.insert_with_values (out iter, -1,
|
||||||
0, dgettext (null, "Provides") + ":",
|
0, dgettext (null, "Provides") + ":",
|
||||||
|
@ -87,6 +87,7 @@ namespace Pamac {
|
|||||||
string[] depends;
|
string[] depends;
|
||||||
string[] optdepends;
|
string[] optdepends;
|
||||||
string[] requiredby;
|
string[] requiredby;
|
||||||
|
string[] optionalfor;
|
||||||
string[] provides;
|
string[] provides;
|
||||||
string[] replaces;
|
string[] replaces;
|
||||||
string[] conflicts;
|
string[] conflicts;
|
||||||
|
@ -948,7 +948,12 @@ namespace Pamac {
|
|||||||
progress_dialog.spawn_in_term ({"echo", msg});
|
progress_dialog.spawn_in_term ({"echo", msg});
|
||||||
break;
|
break;
|
||||||
case Alpm.Event.Type.OPTDEP_REMOVAL:
|
case Alpm.Event.Type.OPTDEP_REMOVAL:
|
||||||
progress_dialog.spawn_in_term ({"echo", dgettext (null, "%s optionally requires %s").printf (details[0], details[1])});
|
msg = dgettext (null, "%s optionally requires %s").printf (details[0], details[1]);
|
||||||
|
progress_dialog.spawn_in_term ({"echo", msg});
|
||||||
|
Gtk.TextIter end_iter;
|
||||||
|
msg += "\n";
|
||||||
|
transaction_info_dialog.textbuffer.get_end_iter (out end_iter);
|
||||||
|
transaction_info_dialog.textbuffer.insert (ref end_iter, msg, msg.length);
|
||||||
break;
|
break;
|
||||||
case Alpm.Event.Type.DATABASE_MISSING:
|
case Alpm.Event.Type.DATABASE_MISSING:
|
||||||
progress_dialog.spawn_in_term ({"echo", dgettext (null, "Database file for %s does not exist").printf (details[0])});
|
progress_dialog.spawn_in_term ({"echo", dgettext (null, "Database file for %s does not exist").printf (details[0])});
|
||||||
|
Loading…
Reference in New Issue
Block a user