From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 23 Dec 2011 20:12:45 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire
X-Git-Tag: 0.9.20~33
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8bf57e898099dc5c87ff56660df02e00af09c0f6;p=pakfire.git

Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire

Conflicts:
	po/pakfire.pot
---

8bf57e898099dc5c87ff56660df02e00af09c0f6
diff --cc po/pakfire.pot
index 4c40ffa57,37c18e635..ffd851cb3
--- a/po/pakfire.pot
+++ b/po/pakfire.pot
@@@ -8,7 -8,7 +8,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2011-12-23 21:08+0100\n"
 -"POT-Creation-Date: 2011-12-21 20:32+0100\n"
++"POT-Creation-Date: 2011-12-23 21:12+0100\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  "Language-Team: LANGUAGE <LL@li.org>\n"
@@@ -634,7 -630,7 +634,7 @@@ msgstr "
  msgid "Not set"
  msgstr ""
  
--#: ../python/pakfire/packages/base.py:500
++#: ../python/pakfire/packages/base.py:526
  #, python-format
  msgid "Config file saved as %s."
  msgstr ""
@@@ -672,6 -668,11 +672,11 @@@ msgstr "
  msgid "Package version is undefined."
  msgstr ""
  
 -#: ../python/pakfire/packages/make.py:402
++#: ../python/pakfire/packages/make.py:407
+ #, python-format
+ msgid "Searching for automatic dependencies for %s..."
+ msgstr ""
+ 
  #. Load progressbar.
  #: ../python/pakfire/packages/packager.py:362
  msgid "Packaging"