diff -Nru quickly-0.4.1/data/templates/ubuntu-application/help/po/en_GB.po quickly-0.4.2/data/templates/ubuntu-application/help/po/en_GB.po --- quickly-0.4.1/data/templates/ubuntu-application/help/po/en_GB.po 2010-04-23 15:27:49.000000000 +0100 +++ quickly-0.4.2/data/templates/ubuntu-application/help/po/en_GB.po 2010-04-26 18:35:12.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: quickly\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2010-03-27 12:11+0100\n" +"POT-Creation-Date: 2010-04-14 18:57+0200\n" "PO-Revision-Date: 2010-04-13 18:31+0000\n" "Last-Translator: Launchpad Translations Administrators " "\n" @@ -15,7 +15,7 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-04-14 03:54+0000\n" +"X-Launchpad-Export-Date: 2010-04-24 03:57+0000\n" "X-Generator: Launchpad (build Unknown)\n" #: data/templates/ubuntu-application/help/tutorial.xml:13(firstname) @@ -639,7 +639,7 @@ " for result in results: \n" " document = result.value \n" " if document[\"title\"] == title: \n" -" key = result.key \n" +" key = document[\"_id\"]\n" " self.database.update_fields(key, {\"text\":text}) \n" " return\n" " \n" @@ -1930,7 +1930,7 @@ #: data/templates/ubuntu-application/help/tutorial.xml:946(programlisting) #, no-wrap -msgid "Quickly dialog dialog_name" +msgid "Quickly add dialog dialog_name" msgstr "" #: data/templates/ubuntu-application/help/tutorial.xml:947(para) diff -Nru quickly-0.4.1/data/templates/ubuntu-application/help/po/es.po quickly-0.4.2/data/templates/ubuntu-application/help/po/es.po --- quickly-0.4.1/data/templates/ubuntu-application/help/po/es.po 2010-04-23 15:27:49.000000000 +0100 +++ quickly-0.4.2/data/templates/ubuntu-application/help/po/es.po 2010-04-26 18:35:12.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: quickly\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2010-03-27 12:11+0100\n" +"POT-Creation-Date: 2010-04-14 18:57+0200\n" "PO-Revision-Date: 2010-04-07 07:21+0000\n" "Last-Translator: Launchpad Translations Administrators " "\n" @@ -15,7 +15,7 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-04-08 07:23+0000\n" +"X-Launchpad-Export-Date: 2010-04-24 03:57+0000\n" "X-Generator: Launchpad (build Unknown)\n" #: data/templates/ubuntu-application/help/tutorial.xml:13(firstname) @@ -639,7 +639,7 @@ " for result in results: \n" " document = result.value \n" " if document[\"title\"] == title: \n" -" key = result.key \n" +" key = document[\"_id\"]\n" " self.database.update_fields(key, {\"text\":text}) \n" " return\n" " \n" @@ -1930,7 +1930,7 @@ #: data/templates/ubuntu-application/help/tutorial.xml:946(programlisting) #, no-wrap -msgid "Quickly dialog dialog_name" +msgid "Quickly add dialog dialog_name" msgstr "" #: data/templates/ubuntu-application/help/tutorial.xml:947(para) @@ -2297,4 +2297,6 @@ msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" -" Pablo Rubianes https://launchpad.net/~pablorubianes-uy" +" Jose Ernesto Davila https://launchpad.net/~josernestodavila\n" +" Pablo Rubianes https://launchpad.net/~pablorubianes-uy\n" +" Ricardo Moreno https://launchpad.net/~rmpossin" diff -Nru quickly-0.4.1/data/templates/ubuntu-application/help/po/hu.po quickly-0.4.2/data/templates/ubuntu-application/help/po/hu.po --- quickly-0.4.1/data/templates/ubuntu-application/help/po/hu.po 2010-04-23 15:27:49.000000000 +0100 +++ quickly-0.4.2/data/templates/ubuntu-application/help/po/hu.po 2010-04-26 18:35:12.000000000 +0100 @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: quickly\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2010-03-27 12:11+0100\n" +"POT-Creation-Date: 2010-04-14 18:57+0200\n" "PO-Revision-Date: 2010-04-13 16:47+0000\n" "Last-Translator: Boobek \n" "Language-Team: Hungarian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-04-14 03:54+0000\n" +"X-Launchpad-Export-Date: 2010-04-24 03:57+0000\n" "X-Generator: Launchpad (build Unknown)\n" #: data/templates/ubuntu-application/help/tutorial.xml:13(firstname) @@ -642,7 +642,7 @@ " for result in results: \n" " document = result.value \n" " if document[\"title\"] == title: \n" -" key = result.key \n" +" key = document[\"_id\"]\n" " self.database.update_fields(key, {\"text\":text}) \n" " return\n" " \n" @@ -1933,7 +1933,7 @@ #: data/templates/ubuntu-application/help/tutorial.xml:946(programlisting) #, no-wrap -msgid "Quickly dialog dialog_name" +msgid "Quickly add dialog dialog_name" msgstr "" #: data/templates/ubuntu-application/help/tutorial.xml:947(para) diff -Nru quickly-0.4.1/data/templates/ubuntu-application/internal/quicklyutils.py quickly-0.4.2/data/templates/ubuntu-application/internal/quicklyutils.py --- quickly-0.4.1/data/templates/ubuntu-application/internal/quicklyutils.py 2010-04-23 15:27:49.000000000 +0100 +++ quickly-0.4.2/data/templates/ubuntu-application/internal/quicklyutils.py 2010-04-26 18:35:12.000000000 +0100 @@ -387,7 +387,7 @@ os.putenv('DEBFULLNAME', author_name) if not os.getenv('DEBEMAIL'): os.putenv('DEBEMAIL', email) - if verbose(): + if verbose: print "Selected key_id: %s, author: %s, email: %s" % (key_id, author_name, email) # set upstream author and email try: diff -Nru quickly-0.4.1/debian/changelog quickly-0.4.2/debian/changelog --- quickly-0.4.1/debian/changelog 2010-04-26 18:48:17.000000000 +0100 +++ quickly-0.4.2/debian/changelog 2010-04-26 18:48:17.000000000 +0100 @@ -1,3 +1,13 @@ +quickly (0.4.2-0ubuntu1) lucid; urgency=low + + * New bugfix upstream release: + ubuntu-application template (and inherited): + - fix verbose check in quicklyutils making release and share fail + (LP: #570239) + - updated translations + + -- Didier Roche Mon, 26 Apr 2010 19:33:33 +0200 + quickly (0.4.1-0ubuntu1) lucid; urgency=low * New bugfix upstream release: diff -Nru quickly-0.4.1/NEWS quickly-0.4.2/NEWS --- quickly-0.4.1/NEWS 2010-04-23 15:27:49.000000000 +0100 +++ quickly-0.4.2/NEWS 2010-04-26 18:35:12.000000000 +0100 @@ -1,3 +1,11 @@ +Quickly 0.4.2 +------------------------------------ + + ubuntu-application template (and inherited): + - fix verbose check in quicklyutils making release and share fail + (LP: #570239) + - updated translations + Quickly 0.4.1 ------------------------------------ diff -Nru quickly-0.4.1/po/ar.po quickly-0.4.2/po/ar.po --- quickly-0.4.1/po/ar.po 2010-04-23 15:27:49.000000000 +0100 +++ quickly-0.4.2/po/ar.po 2010-04-26 18:35:12.000000000 +0100 @@ -7,266 +7,259 @@ msgstr "" "Project-Id-Version: quickly\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2009-10-12 19:47+0200\n" +"POT-Creation-Date: 2010-04-14 18:57+0200\n" "PO-Revision-Date: 2010-03-13 18:52+0000\n" "Last-Translator: Nawaf Alsallami \n" "Language-Team: Arabic \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-03-14 05:06+0000\n" +"X-Launchpad-Export-Date: 2010-04-24 03:57+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../quickly/launchpadaccess.py:30 -msgid "Fatal: " -msgstr "في حالة حرجة: " - -#: ../quickly/launchpadaccess.py:38 +#: ../quickly/launchpadaccess.py:39 msgid "Check whether python-launchpadlib is installed" msgstr "تأكد من ما إذا كان python-launchpadlib مثبتً" -#: ../quickly/launchpadaccess.py:85 +#: ../quickly/launchpadaccess.py:88 msgid "" "WARNING: you are using staging and not launchpad real production server" msgstr "" -#: ../quickly/launchpadaccess.py:92 +#: ../quickly/launchpadaccess.py:96 msgid "Get Launchpad Settings" msgstr "" -#: ../quickly/launchpadaccess.py:99 +#: ../quickly/launchpadaccess.py:111 +msgid "" +"Previous Launchpad values seems to have been removed. You must choose again " +"\"Change Anything\"" +msgstr "" + +#: ../quickly/launchpadaccess.py:113 msgid "Initial Launchpad binding. You must choose \"Change Anything\"" msgstr "" -#: ../quickly/launchpadaccess.py:111 +#: ../quickly/launchpadaccess.py:126 msgid "Unknown reason" msgstr "" -#: ../quickly/launchpadaccess.py:113 +#: ../quickly/launchpadaccess.py:128 #, python-format msgid "Couldn't setup Launchpad for quickly ; %s" msgstr "" -#: ../quickly/launchpadaccess.py:114 -msgid "Launchpad connexion is ok" +#: ../quickly/launchpadaccess.py:129 +msgid "Launchpad connection is ok" msgstr "" -#: ../quickly/launchpadaccess.py:130 -msgid "No launchpad project give, aborting." +#: ../quickly/launchpadaccess.py:150 +msgid "No launchpad project given, aborting." msgstr "" -#: ../quickly/launchpadaccess.py:140 -#, python-format -msgid "Project name: %s" -msgstr "إسم المشروع: %s" - -#: ../quickly/launchpadaccess.py:141 +#: ../quickly/launchpadaccess.py:156 #, python-format -msgid "Launchpad url: %s/%s" +msgid "" +"---------------- [%s] ----------------\n" +" %s\n" +"--------------------------------------\n" +"Project name: %s\n" +"Launchpad url: %s/%s\n" +"%s\n" msgstr "" -#: ../quickly/launchpadaccess.py:148 +#: ../quickly/launchpadaccess.py:167 msgid "No project found" msgstr "" -#: ../quickly/launchpadaccess.py:150 +#: ../quickly/launchpadaccess.py:169 msgid "Choose your project number" msgstr "" -#: ../quickly/launchpadaccess.py:160 +#: ../quickly/launchpadaccess.py:179 msgid "No right number given, aborting." msgstr "" -#: ../quickly/bzrbinding.py:52 -msgid "Bzr not properly installed" +#: ../quickly/launchpadaccess.py:186 +#, python-format +msgid "" +"Can't find %s project on Launchpad. You can try to find it interactively " +"without providing a project name." msgstr "" -#: ../bin/quickly.py:40 +#: ../data/templates/ubuntu-application/add.py:33 msgid "" "Usage:\n" -" quickly [OPTIONS] command ...\n" +"$ quickly add [dialog dialog_name]\n" +"add something to your project_bin\n" "\n" -"Options:\n" -" -t, --template