Download as
Browse Code »

Commit 76d89ceb9b2b266bb511ed7d5d0400be15d3a946

Authored by Sergio Oliveira
2 parents 16b82c80 d0ccf307
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Merge branch 'xmpp' of github.com:TracyWebTech/colab into xmpp

Showing 3 changed files with 52 additions and 9 deletions   Show diff stats
src/planet/locale/pt_BR/LC_MESSAGES/django.mo
View file @76d89ce
No preview for this file type
src/planet/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @76d89ce
@@ -7,7 +7,7 @@ msgid "" @@ -7,7 +7,7 @@ msgid ""
7 msgstr "" 7 msgstr ""
8 "Project-Id-Version: PACKAGE VERSION\n" 8 "Project-Id-Version: PACKAGE VERSION\n"
9 "Report-Msgid-Bugs-To: \n" 9 "Report-Msgid-Bugs-To: \n"
10 -"POT-Creation-Date: 2013-07-24 18:36-0300\n" 10 +"POT-Creation-Date: 2013-07-26 11:28-0300\n"
11 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 11 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 "Language-Team: LANGUAGE <LL@li.org>\n" 13 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -41,7 +41,7 @@ msgstr &quot;Ler original&quot; @@ -41,7 +41,7 @@ msgstr &quot;Ler original&quot;
41 msgid "Planet" 41 msgid "Planet"
42 msgstr "Planet" 42 msgstr "Planet"
43 43
44 -#: templates/feedzilla/base.html:15 44 +#: templates/feedzilla/base.html:15 templates/feedzilla/submit_blog.html:5
45 msgid "Submit a blog" 45 msgid "Submit a blog"
46 msgstr "Solicite a inclusão de um blog" 46 msgstr "Solicite a inclusão de um blog"
47 47
@@ -53,6 +53,46 @@ msgstr &quot;Tags&quot; @@ -53,6 +53,46 @@ msgstr &quot;Tags&quot;
53 msgid "Source Blogs" 53 msgid "Source Blogs"
54 msgstr "Blogs Fonte" 54 msgstr "Blogs Fonte"
55 55
  56 +#: templates/feedzilla/submit_blog.html:8
  57 +msgid ""
  58 +"Thank you. Your application has been accepted and will be reviewed by admin "
  59 +"in the near time."
  60 +msgstr ""
  61 +
  62 +#: templates/feedzilla/submit_blog.html:10
  63 +msgid "Required fields"
  64 +msgstr ""
  65 +
  66 +#: templates/feedzilla/submit_blog.html:14
  67 +msgid "Blog Information"
  68 +msgstr "Informações do blog"
  69 +
  70 +#: templates/feedzilla/submit_blog.html:15
  71 +msgid "Blog URL"
  72 +msgstr ""
  73 +
  74 +#: templates/feedzilla/submit_blog.html:16
  75 +#, fuzzy
  76 +msgid "Blog name"
  77 +msgstr "Blogs"
  78 +
  79 +#: templates/feedzilla/submit_blog.html:17
  80 +msgid "Name of author of the blog"
  81 +msgstr ""
  82 +
  83 +#: templates/feedzilla/submit_blog.html:18
  84 +msgid "Feed URL"
  85 +msgstr ""
  86 +
  87 +#: templates/feedzilla/submit_blog.html:18
  88 +msgid "You can specify what exactly feed you want submit"
  89 +msgstr ""
  90 +
  91 +#: templates/feedzilla/submit_blog.html:19
  92 +#, fuzzy
  93 +msgid "Submit"
  94 +msgstr "Solicite a inclusão de um blog"
  95 +
56 #: templates/feedzilla/tag.html:5 96 #: templates/feedzilla/tag.html:5
57 #, python-format 97 #, python-format
58 msgid "Posts with &laquo;%(tag)s&raquo; label" 98 msgid "Posts with &laquo;%(tag)s&raquo; label"
@@ -61,7 +101,3 @@ msgstr &quot;&quot; @@ -61,7 +101,3 @@ msgstr &quot;&quot;
61 #: templates/feedzilla/tag.html:14 101 #: templates/feedzilla/tag.html:14
62 msgid "No posts with such label" 102 msgid "No posts with such label"
63 msgstr "" 103 msgstr ""
64 -  
65 -#, fuzzy  
66 -#~ msgid "Blogs fonte"  
67 -#~ msgstr "Blogs"  
src/planet/templates/feedzilla/submit_blog.html
  Diff comments   View file @76d89ce
@@ -7,10 +7,17 @@ @@ -7,10 +7,17 @@
7 {% if success %} 7 {% if success %}
8 <p>{% trans "Thank you. Your application has been accepted and will be reviewed by admin in the near time." %}</p> 8 <p>{% trans "Thank you. Your application has been accepted and will be reviewed by admin in the near time." %}</p>
9 {% else %} 9 {% else %}
10 -<form method="post" class="common-form"> 10 +<p class="required span-11 last"><label>{% trans "Required fields" %}</label></p>
  11 +<form method="post" class="span-12">
11 {% csrf_token %} 12 {% csrf_token %}
12 - {{ form.as_p }}  
13 - <p><input type="submit" value="{% trans "Submit" %}" /></p> 13 + <fieldset class="box span-11">
  14 + <legend>{% trans "Blog Information" %}</legend>
  15 + <p class=" required"><label for="id_url">{% trans "Blog URL" %}:</label><br /><input id="id_url" maxlength="255" name="url" type="text" /></p>
  16 + <p class=" required"><label for="id_title">{% trans "Blog name" %}:</label><br /><input id="id_title" maxlength="255" name="title" type="text" /></p>
  17 + <p class=""><label for="id_author">{% trans "Name of author of the blog" %}:</label><br /><input id="id_author" maxlength="50" name="author" type="text" /></p>
  18 + <p class=""><label for="id_feed_url">{% trans "Feed URL" %}:</label><br /><input id="id_feed_url" maxlength="255" name="feed_url" type="text" /><br /><span class="helptext">{% trans "You can specify what exactly feed you want submit" %}</span></p>
  19 + <p><input type="submit" value="{% trans "Submit" %}"></p>
  20 + </fieldset>
14 </form> 21 </form>
15 {% endif %} 22 {% endif %}
16 {% endblock %} 23 {% endblock %}