merge
authorSandrine Ribeau <sandrine.ribeau@logilab.fr>
Tue, 23 Dec 2008 10:45:38 -0800
changeset 281 09c4a0065b4f
parent 280 ce829abf7c29 (current diff)
parent 279 81be37e89801 (diff)
child 282 fe06f5e828c5
merge
--- a/__pkginfo__.py	Tue Dec 23 10:43:51 2008 -0800
+++ b/__pkginfo__.py	Tue Dec 23 10:45:38 2008 -0800
@@ -6,7 +6,7 @@
 distname = "cubicweb"
 modname = "cubicweb"
 
-numversion = (2, 99, 99)
+numversion = (3, 0, 0)
 version = '.'.join(str(num) for num in numversion)
 
 license = 'LCL'
--- a/debian/changelog	Tue Dec 23 10:43:51 2008 -0800
+++ b/debian/changelog	Tue Dec 23 10:45:38 2008 -0800
@@ -1,3 +1,9 @@
+cubicweb (3.0.0-1) DISTRIBUTION; urgency=low
+
+  * new upstream release
+
+ -- Adrien Di Mascio <Adrien.DiMascio@logilab.fr>  Tue, 23 Dec 2008 18:42:43 +0100
+
 cubicweb (2.99.99-1) DISTRIBUTION; urgency=low
 
   * new upstream release
--- a/i18n/en.po	Tue Dec 23 10:43:51 2008 -0800
+++ b/i18n/en.po	Tue Dec 23 10:45:38 2008 -0800
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: 2.0\n"
 "POT-Creation-Date: 2006-01-12 17:35+CET\n"
-"PO-Revision-Date: 2008-11-13 12:32+0100\n"
+"PO-Revision-Date: 2008-12-23 18:43+0100\n"
 "Last-Translator: Sylvain Thenault <sylvain.thenault@logilab.fr>\n"
 "Language-Team: English <devel@logilab.fr.org>\n"
 "MIME-Version: 1.0\n"
@@ -59,10 +59,6 @@
 msgstr ""
 
 #, python-format
-msgid "%s"
-msgstr ""
-
-#, python-format
 msgid "%s days"
 msgstr ""
 
@@ -977,6 +973,12 @@
 msgid "boxes_bookmarks_box_description"
 msgstr "box listing the user's bookmarks"
 
+msgid "boxes_download_box"
+msgstr "download box"
+
+msgid "boxes_download_box_description"
+msgstr ""
+
 msgid "boxes_edit_box"
 msgstr "actions box"
 
--- a/i18n/es.po	Tue Dec 23 10:43:51 2008 -0800
+++ b/i18n/es.po	Tue Dec 23 10:45:38 2008 -0800
@@ -64,10 +64,6 @@
 msgstr "%d años"
 
 #, python-format
-msgid "%s"
-msgstr ""
-
-#, python-format
 msgid "%s days"
 msgstr "%d días"
 
@@ -1002,6 +998,12 @@
 msgid "boxes_bookmarks_box_description"
 msgstr "Caja que contiene los atajos del usuario"
 
+msgid "boxes_download_box"
+msgstr ""
+
+msgid "boxes_download_box_description"
+msgstr ""
+
 msgid "boxes_edit_box"
 msgstr "caja de acciones"
 
--- a/i18n/fr.po	Tue Dec 23 10:43:51 2008 -0800
+++ b/i18n/fr.po	Tue Dec 23 10:45:38 2008 -0800
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: cubicweb 2.46.0\n"
-"PO-Revision-Date: 2008-11-13 12:28+0100\n"
+"PO-Revision-Date: 2008-12-23 18:41+0100\n"
 "Last-Translator: Logilab Team <contact@logilab.fr>\n"
 "Language-Team: fr <contact@logilab.fr>\n"
 "MIME-Version: 1.0\n"
@@ -64,10 +64,6 @@
 msgstr "%d années"
 
 #, python-format
-msgid "%s"
-msgstr ""
-
-#, python-format
 msgid "%s days"
 msgstr "%d jours"
 
@@ -1004,6 +1000,12 @@
 msgid "boxes_bookmarks_box_description"
 msgstr "boîte contenant les signets de l'utilisateur"
 
+msgid "boxes_download_box"
+msgstr "boîte de téléchargement"
+
+msgid "boxes_download_box_description"
+msgstr "boîte contenant un lien permettant de télécharger la ressource"
+
 msgid "boxes_edit_box"
 msgstr "boîte d'actions"