From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 14 Nov 2011 14:37:07 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire
X-Git-Tag: 0.9.18~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3cd0a8bec8b6cc5f4a8cd840d922217979dcd41c;p=pakfire.git

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

Conflicts:
	po/pakfire.pot
---

3cd0a8bec8b6cc5f4a8cd840d922217979dcd41c
diff --cc po/pakfire.pot
index 3e7eae62f,bdb8c8db5..5cac680ae
--- 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-11-02 11:14+0100\n"
 -"POT-Creation-Date: 2011-11-14 15:18+0100\n"
++"POT-Creation-Date: 2011-11-14 15:36+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"
@@@ -126,16 -126,16 +126,21 @@@ msgstr "
  
  #. Package the result.
  #. Make all these little package from the build environment.
--#: ../python/pakfire/builder.py:690
++#: ../python/pakfire/builder.py:693
  msgid "Creating packages:"
  msgstr ""
  
  #. Execute the buildscript of this stage.
--#: ../python/pakfire/builder.py:710
++#: ../python/pakfire/builder.py:713
  #, python-format
  msgid "Running stage %s:"
  msgstr ""
  
++#: ../python/pakfire/builder.py:731
++#, python-format
++msgid "Could not remove static libraries: %s"
++msgstr ""
++
  #: ../python/pakfire/cli.py:43
  msgid "Pakfire command line interface."
  msgstr ""