Merge branch 'master' of github.com:manjaro/pamac

Conflicts:
	po/ar.po
	po/ast.po
	po/bg.po
	po/ca.po
	po/create_pot_file.sh
	po/cs.po
	po/da.po
	po/de.po
	po/el.po
	po/en_GB.po
	po/eo.po
	po/es.po
	po/et.po
	po/fa.po
	po/fi.po
	po/fo.po
	po/fr.po
	po/he.po
	po/hi.po
	po/hr.po
	po/hu.po
	po/id.po
	po/it.po
	po/ja.po
	po/ko.po
	po/ms.po
	po/nb.po
	po/nl.po
	po/pamac.pot
	po/pl.po
	po/pot_head
	po/pt_BR.po
	po/pt_PT.po
	po/ro.po
	po/ru.po
	po/si.po
	po/sk.po
	po/sl.po
	po/sr.po
	po/sr@latin.po
	po/sv.po
	po/tr.po
	po/uk.po
	po/update_po_files.sh
	po/uz.po
	po/vi.po
	po/zh.po
	po/zh_TW.po
	src/daemon.vala
	src/manager_window.vala

src/daemon.vala

@@ -462,7 +462,11 @@ 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 ();
 							}

src/manager_window.vala

@@ -650,9 +650,13 @@ 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 ())