Permalink
Browse files

Merge release/tucker into develop

  • Loading branch information...
benoitg committed Sep 12, 2012
2 parents a5cc991 + 090ee59 commit 5deffbb2f14351dee11e964617980d722196e32d
Showing with 1,967 additions and 2,193 deletions.
  1. +1 −0 README.rst
  2. +152 −68 apps/i4p_base/locale/de/LC_MESSAGES/django.po
  3. +131 −128 apps/i4p_base/locale/el/LC_MESSAGES/django.po
  4. +49 −57 apps/i4p_base/locale/en/LC_MESSAGES/django.po
  5. +131 −128 apps/i4p_base/locale/es/LC_MESSAGES/django.po
  6. +102 −236 apps/i4p_base/locale/fr/LC_MESSAGES/django.po
  7. +107 −122 apps/i4p_base/locale/it/LC_MESSAGES/django.po
  8. +153 −67 apps/i4p_base/locale/pt/LC_MESSAGES/django.po
  9. +132 −71 apps/i4p_base/locale/ru/LC_MESSAGES/django.po
  10. +131 −68 apps/i4p_base/locale/zh/LC_MESSAGES/django.po
  11. +1 −1 apps/i4p_base/templates/pages/contrib.html
  12. +6 −5 apps/member/locale/de/LC_MESSAGES/django.po
  13. +40 −15 apps/member/locale/el/LC_MESSAGES/django.po
  14. +1 −1 apps/member/locale/en/LC_MESSAGES/django.po
  15. +31 −12 apps/member/locale/es/LC_MESSAGES/django.po
  16. +41 −17 apps/member/locale/fr/LC_MESSAGES/django.po
  17. +23 −11 apps/member/locale/it/LC_MESSAGES/django.po
  18. +4 −4 apps/member/locale/pt/LC_MESSAGES/django.po
  19. +8 −6 apps/member/locale/ru/LC_MESSAGES/django.po
  20. +4 −4 apps/member/locale/zh/LC_MESSAGES/django.po
  21. +1 −1 apps/partner/locale/de/LC_MESSAGES/django.po
  22. +1 −1 apps/partner/locale/el/LC_MESSAGES/django.po
  23. +1 −1 apps/partner/locale/en/LC_MESSAGES/django.po
  24. +1 −1 apps/partner/locale/es/LC_MESSAGES/django.po
  25. +1 −1 apps/partner/locale/fr/LC_MESSAGES/django.po
  26. +1 −1 apps/partner/locale/it/LC_MESSAGES/django.po
  27. +1 −1 apps/partner/locale/pt/LC_MESSAGES/django.po
  28. +1 −1 apps/partner/locale/ru/LC_MESSAGES/django.po
  29. +1 −1 apps/partner/locale/zh/LC_MESSAGES/django.po
  30. +16 −32 apps/project_sheet/locale/de/LC_MESSAGES/django.po
  31. +28 −122 apps/project_sheet/locale/el/LC_MESSAGES/django.po
  32. +1 −1 apps/project_sheet/locale/en/LC_MESSAGES/django.po
  33. +28 −106 apps/project_sheet/locale/es/LC_MESSAGES/django.po
  34. +35 −122 apps/project_sheet/locale/fr/LC_MESSAGES/django.po
  35. +25 −87 apps/project_sheet/locale/it/LC_MESSAGES/django.po
  36. +15 −30 apps/project_sheet/locale/pt/LC_MESSAGES/django.po
  37. +16 −33 apps/project_sheet/locale/ru/LC_MESSAGES/django.po
  38. +15 −30 apps/project_sheet/locale/zh/LC_MESSAGES/django.po
  39. +2 −2 apps/project_sheet/templates/project_sheet/projects_for_tag.html
  40. +36 −24 apps/workgroup/locale/de/LC_MESSAGES/django.po
  41. +37 −26 apps/workgroup/locale/el/LC_MESSAGES/django.po
  42. +27 −14 apps/workgroup/locale/en/LC_MESSAGES/django.po
  43. +50 −35 apps/workgroup/locale/es/LC_MESSAGES/django.po
  44. +37 −29 apps/workgroup/locale/fr/LC_MESSAGES/django.po
  45. +48 −35 apps/workgroup/locale/it/LC_MESSAGES/django.po
  46. +36 −24 apps/workgroup/locale/pt/LC_MESSAGES/django.po
  47. +36 −25 apps/workgroup/locale/ru/LC_MESSAGES/django.po
  48. +36 −23 apps/workgroup/locale/zh/LC_MESSAGES/django.po
  49. +1 −1 fabfile.py
  50. +2 −0 requirements.txt
  51. +1 −1 settings.py
  52. +11 −19 static/compiled_sass/backcap.css
  53. +1 −2 static/compiled_sass/black_page.css
  54. +6 −11 static/compiled_sass/filters.css
  55. +4 −6 static/compiled_sass/generals.css
  56. +20 −26 static/compiled_sass/homepage.css
  57. +4 −6 static/compiled_sass/login-slide.css
  58. +7 −84 static/compiled_sass/pages/contrib.css
  59. +23 −1 static/compiled_sass/pages/onemenu.css
  60. +6 −10 static/compiled_sass/profile.css
  61. +31 −49 static/compiled_sass/project.css
  62. +7 −12 static/compiled_sass/project_card.css
  63. +2 −2 static/compiled_sass/screen.css
  64. +13 −20 static/compiled_sass/style.css
  65. +8 −12 static/compiled_sass/support-panel.css
  66. +2 −4 static/compiled_sass/usermessages.css
  67. +4 −7 static/compiled_sass/workgroup.css
  68. +5 −1 static/sass/homepage.scss
  69. +2 −84 static/sass/pages/contrib.scss
  70. +26 −5 static/sass/pages/onemenu.scss
View
@@ -13,6 +13,7 @@ find it at http://imaginationforpeople.org
You can find the full documentation at: http://i4p.readthedocs.org/en/develop/
image:: https://secure.travis-ci.org/ImaginationForPeople/imaginationforpeople.png
+
:alt: Build Status
:target: http://travis-ci.org/ImaginationForPeople/imaginationforpeople
@@ -1,24 +1,23 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
-#
+#
# Translators:
# Translators:
# Simon Sarazin <simon.sarazin@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: Imagination For People\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-20 11:48+0200\n"
-"PO-Revision-Date: 2012-05-21 13:14+0000\n"
+"Report-Msgid-Bugs-To: http://github.com/ImaginationForPeople/imaginationforpeople/issues\n"
+"POT-Creation-Date: 2012-09-05 16:35+0200\n"
+"PO-Revision-Date: 2012-09-05 14:38+0000\n"
"Last-Translator: Guillaume <glibersat@sigill.org>\n"
-"Language-Team: German (http://www.transifex.net/projects/p/"
-"imaginationforpeople/language/de/)\n"
-"Language: de\n"
+"Language-Team: German (http://www.transifex.com/projects/p/imaginationforpeople/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: cms_app.py:6
msgid "I4PBase App"
@@ -1176,13 +1175,11 @@ msgstr ""
msgid "Follow us on"
msgstr ""
-#: templates/footer.html:98
+#: templates/footer.html:60
#, python-format
msgid ""
"\n"
-" \"<strong>%(url)s</strong> is powered by a set of free "
-"components licensed under <strong>AGPL</strong> and <strong>Creative "
-"Commons</strong>.\"\n"
+" \"<strong>%(url)s</strong> is powered by a set of free components licensed under <strong>AGPL</strong> and <strong>Creative Commons</strong>.\"\n"
"\t "
msgstr ""
@@ -1388,7 +1385,8 @@ msgid "Feedbacks"
msgstr ""
#: templates/backcap/feedback_list.html:61
-msgid "This is all the feedbacks submitted by you, the users. Thanks for that."
+msgid ""
+"This is all the feedbacks submitted by you, the users. Thanks for that."
msgstr ""
#: templates/backcap/feedback_list.html:73
@@ -1535,103 +1533,62 @@ msgstr ""
msgid "Twitter"
msgstr ""
-#: templates/pages/contrib.html:32
+#: templates/pages/contrib.html:45
msgid "A community dedicated to"
msgstr ""
-#: templates/pages/contrib.html:33
+#: templates/pages/contrib.html:46
msgid "citizen imagination"
msgstr ""
-#: templates/pages/contrib.html:44 templates/pages/footer.html:25
+#: templates/pages/contrib.html:57
msgid "Translator"
msgstr ""
-#: templates/pages/contrib.html:46 templates/pages/footer.html:26
+#: templates/pages/contrib.html:59
msgid "Developer"
msgstr ""
-#: templates/pages/contrib.html:48 templates/pages/footer.html:27
+#: templates/pages/contrib.html:61
msgid "Designer"
msgstr ""
-#: templates/pages/contrib.html:50 templates/pages/footer.html:28
+#: templates/pages/contrib.html:63
msgid "Writer"
msgstr ""
-#: templates/pages/contrib.html:52 templates/pages/footer.html:29
+#: templates/pages/contrib.html:65
msgid "Animator"
msgstr ""
-#: templates/pages/contrib.html:54 templates/pages/footer.html:30
-msgid "Imaginer"
-msgstr ""
-
-#: templates/pages/contrib.html:69
-msgid "Get the code"
+#: templates/pages/contrib.html:67
+msgid "Imagine"
msgstr ""
-#: templates/pages/contrib.html:90
-msgid "Report a bug"
-msgstr ""
-
-#: templates/pages/contrib.html:96
+#: templates/pages/contrib.html:107
msgid "Une communauté dédiée à l'imagination citoyenne"
msgstr ""
-#: templates/pages/contrib.html:104
+#: templates/pages/contrib.html:115
msgid "Latest activities"
msgstr ""
-#: templates/pages/contrib.html:115
+#: templates/pages/contrib.html:126
msgid "Latest commits"
msgstr ""
-#: templates/pages/contrib.html:128 templates/pages/homepage.html:135
+#: templates/pages/contrib.html:139 templates/pages/homepage.html:135
msgid "Join the community"
msgstr ""
-#: templates/pages/contrib.html:138
+#: templates/pages/contrib.html:149
msgid "News"
msgstr ""
#: templates/pages/flatpage.html:34
msgid "There is no content yet. Switch to edit mode and add a widget."
msgstr ""
-#: templates/pages/footer.html:12
-msgid "Network"
-msgstr ""
-
-#: templates/pages/footer.html:19
-msgid "About"
-msgstr ""
-
-#: templates/pages/footer.html:24
-msgid "Get Involved"
-msgstr ""
-
-#: templates/pages/header.html:10
-msgid "About us"
-msgstr ""
-
-#: templates/pages/header.html:11
-msgid "Projects"
-msgstr ""
-
-#: templates/pages/header.html:13 templates/pages/home-blocks/slider.html:36
-#: templates/pages/home-blocks/slider.html:49
-msgid "Add a project"
-msgstr ""
-
-#: templates/pages/header.html:14
-msgid "Workgroups"
-msgstr ""
-
-#: templates/pages/header.html:15
-msgid "Contribute"
-msgstr ""
-
#: templates/pages/homepage.html:37
msgid "My project title"
msgstr ""
@@ -1767,5 +1724,132 @@ msgstr ""
msgid "Add"
msgstr ""
+#: templates/pages/home-blocks/slider.html:36
+#: templates/pages/home-blocks/slider.html:49
+msgid "Add a project"
+msgstr ""
+
+#~ msgid "Get the code"
+#~ msgstr "Get the code"
+
+#~ msgid "Report a bug"
+#~ msgstr "Report a bug"
+
+#~ msgid "Network"
+#~ msgstr "Network"
+
+#~ msgid "About"
+#~ msgstr "About"
+
+#~ msgid "Get Involved"
+#~ msgstr "Get Involved"
+
+#~ msgid "About us"
+#~ msgstr "About us"
+
+#~ msgid "Projects"
+#~ msgstr "Projects"
+
+#~ msgid "Workgroups"
+#~ msgstr "Workgroups"
+
+#~ msgid "Contribute"
+#~ msgstr "Contribute"
+
+#~ msgid "Explore and contribute to social projects around the world."
+#~ msgstr "Explore and contribute to social projects around the world."
+
+#~ msgid "Groups"
+#~ msgstr "Groupes"
+
+#~ msgid "Connect with a community of citizens from over 30 countries."
+#~ msgstr "Connect with a community of citizens from over 30 countries."
+
+#~ msgid "The community"
+#~ msgstr "The community"
+
+#~ msgid "Ressources"
+#~ msgstr "Ressources"
+
+#~ msgid "Resources"
+#~ msgstr "Ressources"
+
+#~ msgid ""
+#~ "Discover the latest tools, methods and debates in the world of social "
+#~ "innovation."
+#~ msgstr ""
+#~ "Discover the latest tools, methods and debates in the world of social "
+#~ "innovation."
+
+#~ msgid "Seeder"
+#~ msgstr "Seeder"
+
+#~ msgid "Q&A"
+#~ msgstr "Q&A"
+
+#~ msgid "projects"
+#~ msgstr "projects"
+
+#~ msgid "Projects &gt;"
+#~ msgstr "Projects &gt;"
+
+#~ msgid "Add a new project &gt;"
+#~ msgstr "Add a new project &gt;"
+
+#~ msgid "community"
+#~ msgstr "community"
+
+#~ msgid "The community &gt;"
+#~ msgstr "The community &gt;"
+
+#~ msgid "Join the community &gt;"
+#~ msgstr "Join the community &gt;"
+
+#~ msgid "resources"
+#~ msgstr "resources"
+
+#~ msgid ""
+#~ "Discover the latest tools, methods and debates in the world of social "
+#~ "innovation"
+#~ msgstr ""
+#~ "Discover the latest tools, methods and debates in the world of social "
+#~ "innovation"
+
+#~ msgid "Work-in-Progress"
+#~ msgstr "Work-in-Progress"
+
+#~ msgid "Resources (WIP)"
+#~ msgstr "Resources (WIP)"
+
+#~ msgid "Join a group &gt;"
+#~ msgstr "Join a group &gt;"
+
+#~ msgid "Read the manifesto &gt;"
+#~ msgstr "Read the manifesto &gt;"
+
+#~ msgid "About IP &gt;"
+#~ msgstr "About IP &gt;"
+
+#~ msgid "All the projects"
+#~ msgstr "All the projects"
+
+#~ msgid "All the tags"
+#~ msgstr "All the tags"
+
+#~ msgid "Grid view"
+#~ msgstr "Grid view"
+
+#~ msgid "Map view"
+#~ msgstr "Map view"
+
+#~ msgid "My favorites"
+#~ msgstr "My favorites"
+
+#~ msgid "Discover projects"
+#~ msgstr "Recent projects"
+
+#~ msgid "Last projects"
+#~ msgstr "projects"
+
#~ msgid "Ressources (WIP)"
#~ msgstr "Ressources (WIP)"
Oops, something went wrong.

0 comments on commit 5deffbb

Please sign in to comment.