cromer/pamac-classic
Archived
2
0
Fork 2
Code Issues Pull Requests 1 Releases 13 Wiki Activity

fix a bad commit

Browse Source
This commit is contained in:
guinux
2014-11-22 15:10:42 +01:00
parent bd63874d2a
commit da70da90da
56 changed files with 5 additions and 31429 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/daemon.vala
View File

@@ -462,11 +462,7 @@ namespace Pamac {
new Thread<int>.try ("commit thread", (ThreadFunc) trans_commit_real);
} else {
ErrorInfos err = ErrorInfos ();
<<<<<<< HEAD
err.str = _("Authentication failed");
=======
err.str = dgettext (null, "Authentication failed");
>>>>>>> b8153ea47435633a8eb825f30c0976245b417a7e
emit_trans_committed (err);
trans_release ();
}

4
src/manager_window.vala
View File

@@ -650,13 +650,9 @@ namespace Pamac {
nb += 1;
}
}
<<<<<<< HEAD
choose_dep_dialog.label.set_markup ("<b>%s</b>".printf (
dngettext (null, "%s has %u uninstalled optional dependency.\nChoose if you would like to install it:",
"%s has %u uninstalled optional dependencies.\nChoose those you would like to install:", nb).printf (pkg.name, nb)));
=======
choose_dep_dialog.label.set_markup ("<b>%s</b>".printf (dgettext (null, "%s has %u uninstalled optional dependencies.\nChoose those you would like to install:").printf (pkg.name, nb)));
>>>>>>> b8153ea47435633a8eb825f30c0976245b417a7e
choose_dep_dialog.run ();
choose_dep_dialog.hide ();
while (Gtk.events_pending ())