Download as
Browse Code »

Commit bf27e8227037143b2049197265fa75aa061d7ad5

Authored by Sergio Oliveira
2 parents 8c92837a e7ff7b51
Exists in 1.12.x

Merge branch '1.12.x' of github.com:colab/colab into 1.12.x

Showing 11 changed files with 415 additions and 405 deletions   Show diff stats
colab/accounts/templates/search/user_search_preview.html
  Diff comments   View file @bf27e82
1   -{% load i18n tz highlight gravatar date_format %}
  1 +{% load i18n tz highlight gravatar %}
2 2  
3 3 <div class="row">
4 4 <div class="col-md-2 center">
... ... @@ -16,7 +16,7 @@
16 16 {% endif %}
17 17  
18 18 </strong>
19   - <small><strong>{% trans "Since" %}: {% date_format result.date_joined %}</strong></small><br>
  19 + <small><strong>{% trans "Since" %}: {{ result.date_joined|date:"d F Y" }}</strong></small><br>
20 20 <small>{% trans "Registered in" %}: <strong>{% trans "User" %}</strong></small><br>
21 21 </div>
22 22 </div>
... ...
colab/accounts/templatetags/date_format.py
View file @8c92837
... ... @@ -1,20 +0,0 @@
1   -from django import template
2   -from django.utils.translation import ugettext as _
3   -register = template.Library()
4   -
5   -
6   -@register.simple_tag(takes_context=True)
7   -def date_format(context, date):
8   - formatted_date = _('%(m)s %(d)s %(y)s' % {'m': date.strftime('%B'),
9   - 'd': date.day,
10   - 'y': date.year})
11   - return formatted_date
12   -
13   -
14   -@register.simple_tag(takes_context=True)
15   -def datetime_format(context, date):
16   - formatted_date = date_format(context, date)
17   - formatted_time = _('%(hour)s:%(min)s' % {'hour': date.hour,
18   - 'min': date.strftime('%I')})
19   - formatted_datetime = _('%s at %s' % (formatted_date, formatted_time))
20   - return formatted_datetime
colab/locale/en/LC_MESSAGES/django.mo
View file @bf27e82
No preview for this file type
colab/locale/en/LC_MESSAGES/django.po
  Diff comments   View file @bf27e82
... ... @@ -7,7 +7,7 @@ msgid &quot;&quot;
7 7 msgstr ""
8 8 "Project-Id-Version: colab\n"
9 9 "Report-Msgid-Bugs-To: \n"
10   -"POT-Creation-Date: 2015-11-24 17:46+0000\n"
  10 +"POT-Creation-Date: 2015-12-11 14:07+0000\n"
11 11 "PO-Revision-Date: 2015-09-04 19:21+0000\n"
12 12 "Last-Translator: Lucas Kanashiro Duarte <kanashiro.duarte@gmail.com>\n"
13 13 "Language-Team: English (http://www.transifex.com/colab/colab/language/en/)\n"
... ... @@ -17,30 +17,6 @@ msgstr &quot;&quot;
17 17 "Content-Transfer-Encoding: 8bit\n"
18 18 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
19 19  
20   -#: colab-noosfero-plugin/tests/plugins.d/noosfero.py:21
21   -msgid "Social"
22   -msgstr ""
23   -
24   -#: colab-noosfero-plugin/tests/plugins.d/noosfero.py:26
25   -#, fuzzy
26   -#| msgid "Username"
27   -msgid "Users"
28   -msgstr "Username"
29   -
30   -#: colab-noosfero-plugin/tests/plugins.d/noosfero.py:28
31   -msgid "Communities"
32   -msgstr "Communities"
33   -
34   -#: colab-noosfero-plugin/tests/plugins.d/noosfero.py:30
35   -#, fuzzy
36   -#| msgid "My Profile"
37   -msgid "Profile"
38   -msgstr "My Profile"
39   -
40   -#: colab-noosfero-plugin/tests/plugins.d/noosfero.py:32
41   -msgid "Control Panel"
42   -msgstr ""
43   -
44 20 #: colab/accounts/admin.py:18
45 21 msgid "Personal info"
46 22 msgstr "Personal info"
... ... @@ -54,14 +30,14 @@ msgid &quot;Important dates&quot;
54 30 msgstr "Important dates"
55 31  
56 32 #: colab/accounts/filters.py:7
57   -#: colab/accounts/templates/search/user_search_preview.html:12
  33 +#: colab/accounts/templates/search/user_search_preview.html:20
58 34 #, fuzzy
59 35 #| msgid "Username"
60 36 msgid "User"
61 37 msgstr "Username"
62 38  
63   -#: colab/accounts/filters.py:12 colab/accounts/forms.py:175
64   -#: colab/accounts/forms.py:246
  39 +#: colab/accounts/filters.py:12 colab/accounts/forms.py:212
  40 +#: colab/accounts/forms.py:290
65 41 #, fuzzy
66 42 #| msgid "Filename"
67 43 msgid "Username"
... ... @@ -79,58 +55,58 @@ msgstr &quot;Institution&quot;
79 55 msgid "Role"
80 56 msgstr "Role"
81 57  
82   -#: colab/accounts/forms.py:30
  58 +#: colab/accounts/forms.py:33
83 59 msgid "Social account does not exist"
84 60 msgstr "Social account does not exist"
85 61  
86   -#: colab/accounts/forms.py:58 colab/accounts/forms.py:64
87   -#: colab/accounts/forms.py:70
  62 +#: colab/accounts/forms.py:61 colab/accounts/forms.py:67
  63 +#: colab/accounts/forms.py:73
88 64 msgid "This field cannot be blank."
89 65 msgstr "This field cannot be blank."
90 66  
91   -#: colab/accounts/forms.py:111
  67 +#: colab/accounts/forms.py:114
92 68 #: colab/accounts/templates/accounts/user_detail.html:38
93 69 msgid "Bio"
94 70 msgstr "Bio"
95 71  
96   -#: colab/accounts/forms.py:112
  72 +#: colab/accounts/forms.py:115
97 73 msgid "Write something about you in 200 characters or less."
98 74 msgstr "Write something about you in 200 characters or less."
99 75  
100   -#: colab/accounts/forms.py:157
  76 +#: colab/accounts/forms.py:160
101 77 msgid "Mailing lists"
102 78 msgstr "Mailing lists"
103 79  
104   -#: colab/accounts/forms.py:170
  80 +#: colab/accounts/forms.py:207
105 81 #, python-format
106 82 msgid "Email already used. Is it you? Please <a href='%(url)s'>login</a>"
107 83 msgstr "Email already used. Is it you? Please <a href='%(url)s'>login</a>"
108 84  
109   -#: colab/accounts/forms.py:172
  85 +#: colab/accounts/forms.py:209
110 86 msgid "A user with that username already exists."
111 87 msgstr "A user with that username already exists."
112 88  
113   -#: colab/accounts/forms.py:173
  89 +#: colab/accounts/forms.py:210
114 90 msgid "The two password fields didn't match."
115 91 msgstr "The two password fields didn't match."
116 92  
117   -#: colab/accounts/forms.py:183 colab/accounts/forms.py:251
  93 +#: colab/accounts/forms.py:220 colab/accounts/forms.py:295
118 94 msgid "Password"
119 95 msgstr "Password"
120 96  
121   -#: colab/accounts/forms.py:185
  97 +#: colab/accounts/forms.py:222
122 98 msgid "Password confirmation"
123 99 msgstr "Password confirmation"
124 100  
125   -#: colab/accounts/forms.py:247 colab/accounts/models.py:77
  101 +#: colab/accounts/forms.py:291 colab/accounts/models.py:91
126 102 msgid "Required. 30 characters or fewer. Letters and digits."
127 103 msgstr "Required. 30 characters or fewer. Letters and digits."
128 104  
129   -#: colab/accounts/forms.py:249
  105 +#: colab/accounts/forms.py:293
130 106 msgid "This value may contain only letters and numbers."
131 107 msgstr "This value may contain only letters and numbers."
132 108  
133   -#: colab/accounts/forms.py:252
  109 +#: colab/accounts/forms.py:296
134 110 msgid ""
135 111 "Raw passwords are not stored, so there is no way to see this user's "
136 112 "password, but you can change the password using <a href=\"password/\">this "
... ... @@ -250,76 +226,76 @@ msgstr &quot;No contributions of this user so far.&quot;
250 226 msgid "View more contributions..."
251 227 msgstr "View more contributions..."
252 228  
253   -#: colab/accounts/templates/accounts/user_update_form.html:70
  229 +#: colab/accounts/templates/accounts/user_update_form.html:65
254 230 msgid "We sent a verification email to "
255 231 msgstr "We sent a verification email to "
256 232  
257   -#: colab/accounts/templates/accounts/user_update_form.html:71
  233 +#: colab/accounts/templates/accounts/user_update_form.html:66
258 234 msgid "Please follow the instructions in it."
259 235 msgstr "Please follow the instructions in it."
260 236  
261   -#: colab/accounts/templates/accounts/user_update_form.html:123
  237 +#: colab/accounts/templates/accounts/user_update_form.html:109
262 238 msgid "profile information"
263 239 msgstr "profile information"
264 240  
265   -#: colab/accounts/templates/accounts/user_update_form.html:128
  241 +#: colab/accounts/templates/accounts/user_update_form.html:114
266 242 msgid "Change your avatar at Gravatar.com"
267 243 msgstr "Change your avatar at Gravatar.com"
268 244  
269   -#: colab/accounts/templates/accounts/user_update_form.html:178
270   -#: colab/search/utils.py:56
  245 +#: colab/accounts/templates/accounts/user_update_form.html:152
  246 +#: colab/plugins/utils/collaborations.py:27
271 247 msgid "Emails"
272 248 msgstr "Emails"
273 249  
274   -#: colab/accounts/templates/accounts/user_update_form.html:187
  250 +#: colab/accounts/templates/accounts/user_update_form.html:161
275 251 msgid "Primary"
276 252 msgstr "Primary"
277 253  
278   -#: colab/accounts/templates/accounts/user_update_form.html:190
  254 +#: colab/accounts/templates/accounts/user_update_form.html:164
279 255 msgid "Setting..."
280 256 msgstr "Setting..."
281 257  
282   -#: colab/accounts/templates/accounts/user_update_form.html:190
  258 +#: colab/accounts/templates/accounts/user_update_form.html:164
283 259 msgid "Set as Primary"
284 260 msgstr "Set as Primary"
285 261  
286   -#: colab/accounts/templates/accounts/user_update_form.html:191
  262 +#: colab/accounts/templates/accounts/user_update_form.html:165
287 263 msgid "Deleting..."
288 264 msgstr "Deleting..."
289 265  
290   -#: colab/accounts/templates/accounts/user_update_form.html:191
291   -#: colab/accounts/templates/accounts/user_update_form.html:203
  266 +#: colab/accounts/templates/accounts/user_update_form.html:165
  267 +#: colab/accounts/templates/accounts/user_update_form.html:177
292 268 msgid "Delete"
293 269 msgstr "Delete"
294 270  
295   -#: colab/accounts/templates/accounts/user_update_form.html:202
  271 +#: colab/accounts/templates/accounts/user_update_form.html:176
296 272 msgid "Sending verification..."
297 273 msgstr "Sending verification..."
298 274  
299   -#: colab/accounts/templates/accounts/user_update_form.html:202
  275 +#: colab/accounts/templates/accounts/user_update_form.html:176
300 276 msgid "Verify"
301 277 msgstr "Verify"
302 278  
303   -#: colab/accounts/templates/accounts/user_update_form.html:210
  279 +#: colab/accounts/templates/accounts/user_update_form.html:184
304 280 msgid "Add another email address:"
305 281 msgstr "Add another email address:"
306 282  
307   -#: colab/accounts/templates/accounts/user_update_form.html:213
  283 +#: colab/accounts/templates/accounts/user_update_form.html:187
308 284 msgid "Add"
309 285 msgstr "Add"
310 286  
311   -#: colab/accounts/templates/accounts/user_update_form.html:221
312   -#: colab/accounts/templates/accounts/user_update_form.html:225
  287 +#: colab/accounts/templates/accounts/user_update_form.html:195
  288 +#: colab/accounts/templates/accounts/user_update_form.html:199
313 289 #: colab/accounts/templates/registration/password_change_form_custom.html:26
314 290 #: colab/accounts/templates/registration/password_reset_confirm_custom.html:28
315 291 msgid "Change Password"
316 292 msgstr "Change Password"
317 293  
318   -#: colab/accounts/templates/accounts/user_update_form.html:233
  294 +#: colab/accounts/templates/accounts/user_update_form.html:207
319 295 msgid "Update"
320 296 msgstr "Update"
321 297  
322   -#: colab/accounts/templates/accounts/user_update_form.html:234
  298 +#: colab/accounts/templates/accounts/user_update_form.html:208
323 299 msgid "Go to profile panel"
324 300 msgstr ""
325 301  
... ... @@ -365,7 +341,7 @@ msgstr &quot;Email address:&quot;
365 341 msgid "Reset password"
366 342 msgstr "Reset password"
367 343  
368   -#: colab/accounts/templates/search/user_search_preview.html:11
  344 +#: colab/accounts/templates/search/user_search_preview.html:19
369 345 #: colab/search/forms.py:19
370 346 #: colab/search/templates/search/includes/search_filters.html:134
371 347 #: colab/search/templates/search/includes/search_filters.html:136
... ... @@ -374,7 +350,7 @@ msgstr &quot;Reset password&quot;
374 350 msgid "Since"
375 351 msgstr "Since"
376 352  
377   -#: colab/accounts/templates/search/user_search_preview.html:12
  353 +#: colab/accounts/templates/search/user_search_preview.html:20
378 354 #, fuzzy
379 355 #| msgid "Register"
380 356 msgid "Registered in"
... ... @@ -392,18 +368,18 @@ msgstr &quot;&quot;
392 368  
393 369 #: colab/accounts/templatetags/date_format.py:19
394 370 #, python-format
395   -msgid "%s at %s"
  371 +msgid "%(formatted_date)s at %(formatted_time)s"
396 372 msgstr ""
397 373  
398   -#: colab/accounts/views.py:126
  374 +#: colab/accounts/views.py:127
399 375 msgid "Your profile has been created!"
400 376 msgstr "Your profile has been created!"
401 377  
402   -#: colab/accounts/views.py:186
  378 +#: colab/accounts/views.py:187
403 379 msgid "Your password was changed."
404 380 msgstr "Your password was changed."
405 381  
406   -#: colab/accounts/views.py:202
  382 +#: colab/accounts/views.py:203
407 383 msgid "Your password has been set. You may go ahead and log in now."
408 384 msgstr "Your password has been set. You may go ahead and log in now."
409 385  
... ... @@ -428,7 +404,7 @@ msgstr &quot;Latest collaborations&quot;
428 404 msgid "Search"
429 405 msgstr "Search"
430 406  
431   -#: colab/search/forms.py:18
  407 +#: colab/search/forms.py:18 colab/settings.py:144
432 408 msgid "Type"
433 409 msgstr "Type"
434 410  
... ... @@ -477,11 +453,11 @@ msgstr &quot;Search here&quot;
477 453 msgid "Filters"
478 454 msgstr "Filters"
479 455  
480   -#: colab/search/templates/search/search.html:76
  456 +#: colab/search/templates/search/search.html:77
481 457 msgid "No results for your search."
482 458 msgstr "No results for your search."
483 459  
484   -#: colab/search/templates/search/search.html:78
  460 +#: colab/search/templates/search/search.html:79
485 461 msgid "You are searching for"
486 462 msgstr "You are searching for"
487 463  
... ... @@ -505,31 +481,31 @@ msgstr &quot;Recent activity&quot;
505 481 msgid "Relevance"
506 482 msgstr "Relevance"
507 483  
508   -#: colab/settings.py:149
  484 +#: colab/settings.py:153
509 485 msgid "Document"
510 486 msgstr "Document"
511 487  
512   -#: colab/settings.py:151
  488 +#: colab/settings.py:155
513 489 msgid "Presentation"
514 490 msgstr "Presentation"
515 491  
516   -#: colab/settings.py:152
  492 +#: colab/settings.py:156
517 493 msgid "Text"
518 494 msgstr "Text"
519 495  
520   -#: colab/settings.py:153
  496 +#: colab/settings.py:157
521 497 msgid "Code"
522 498 msgstr "Code"
523 499  
524   -#: colab/settings.py:155
  500 +#: colab/settings.py:159
525 501 msgid "Compressed"
526 502 msgstr "Compressed"
527 503  
528   -#: colab/settings.py:156
  504 +#: colab/settings.py:160
529 505 msgid "Image"
530 506 msgstr "Image"
531 507  
532   -#: colab/settings.py:158
  508 +#: colab/settings.py:162
533 509 msgid "Spreadsheet"
534 510 msgstr "Spreadsheet"
535 511  
... ... @@ -541,7 +517,7 @@ msgstr &quot;Not found. Keep searching! :)&quot;
541 517 msgid "Ooopz... something went wrong!"
542 518 msgstr "Ooopz... something went wrong!"
543 519  
544   -#: colab/templates/base.html:74
  520 +#: colab/templates/base.html:79
545 521 msgid "The login has failed. Please, try again."
546 522 msgstr "The login has failed. Please, try again."
547 523  
... ... @@ -617,6 +593,11 @@ msgstr &quot;RSS - Latest Threads&quot;
617 593 #~ msgstr "Gitlab Projects"
618 594  
619 595 #, fuzzy
  596 +#~| msgid "My Profile"
  597 +#~ msgid "Profile"
  598 +#~ msgstr "My Profile"
  599 +
  600 +#, fuzzy
620 601 #~| msgid "Gitlab Project"
621 602 #~ msgid "New Project"
622 603 #~ msgstr "Gitlab Project"
... ... @@ -636,6 +617,14 @@ msgstr &quot;RSS - Latest Threads&quot;
636 617 #~ msgid "Merge Requests"
637 618 #~ msgstr "Gitlab Merge Requests"
638 619  
  620 +#, fuzzy
  621 +#~| msgid "Username"
  622 +#~ msgid "Users"
  623 +#~ msgstr "Username"
  624 +
  625 +#~ msgid "Communities"
  626 +#~ msgstr "Communities"
  627 +
639 628 #~ msgid ""
640 629 #~ "Please enter a correct %(username)s and password. Note that both fields "
641 630 #~ "may be case-sensitive."
... ...
colab/locale/pt_BR/LC_MESSAGES/django.mo
View file @bf27e82
No preview for this file type
colab/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @bf27e82
... ... @@ -10,7 +10,7 @@ msgid &quot;&quot;
10 10 msgstr ""
11 11 "Project-Id-Version: colab\n"
12 12 "Report-Msgid-Bugs-To: \n"
13   -"POT-Creation-Date: 2015-11-24 17:46+0000\n"
  13 +"POT-Creation-Date: 2015-12-11 14:10+0000\n"
14 14 "PO-Revision-Date: 2015-09-07 19:13+0000\n"
15 15 "Last-Translator: Lucas Kanashiro Duarte <kanashiro.duarte@gmail.com>\n"
16 16 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/colab/colab/"
... ... @@ -21,30 +21,6 @@ msgstr &quot;&quot;
21 21 "Content-Transfer-Encoding: 8bit\n"
22 22 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
23 23  
24   -#: colab-noosfero-plugin/tests/plugins.d/noosfero.py:21
25   -msgid "Social"
26   -msgstr "Social"
27   -
28   -#: colab-noosfero-plugin/tests/plugins.d/noosfero.py:26
29   -#, fuzzy
30   -#| msgid "Username"
31   -msgid "Users"
32   -msgstr "Usuário"
33   -
34   -#: colab-noosfero-plugin/tests/plugins.d/noosfero.py:28
35   -msgid "Communities"
36   -msgstr "Comunidades"
37   -
38   -#: colab-noosfero-plugin/tests/plugins.d/noosfero.py:30
39   -#, fuzzy
40   -#| msgid "My Profile"
41   -msgid "Profile"
42   -msgstr "Meu Perfil"
43   -
44   -#: colab-noosfero-plugin/tests/plugins.d/noosfero.py:32
45   -msgid "Control Panel"
46   -msgstr "Painel de Controle"
47   -
48 24 #: colab/accounts/admin.py:18
49 25 msgid "Personal info"
50 26 msgstr "Informações Pessoais"
... ... @@ -58,14 +34,14 @@ msgid &quot;Important dates&quot;
58 34 msgstr "Datas importantes"
59 35  
60 36 #: colab/accounts/filters.py:7
61   -#: colab/accounts/templates/search/user_search_preview.html:12
  37 +#: colab/accounts/templates/search/user_search_preview.html:20
62 38 #, fuzzy
63 39 #| msgid "Username"
64 40 msgid "User"
65 41 msgstr "Usuário"
66 42  
67   -#: colab/accounts/filters.py:12 colab/accounts/forms.py:175
68   -#: colab/accounts/forms.py:246
  43 +#: colab/accounts/filters.py:12 colab/accounts/forms.py:212
  44 +#: colab/accounts/forms.py:290
69 45 #, fuzzy
70 46 #| msgid "Filename"
71 47 msgid "Username"
... ... @@ -83,60 +59,60 @@ msgstr &quot;Instituição&quot;
83 59 msgid "Role"
84 60 msgstr "Papel"
85 61  
86   -#: colab/accounts/forms.py:30
  62 +#: colab/accounts/forms.py:33
87 63 msgid "Social account does not exist"
88 64 msgstr "Conta social não existe"
89 65  
90   -#: colab/accounts/forms.py:58 colab/accounts/forms.py:64
91   -#: colab/accounts/forms.py:70
  66 +#: colab/accounts/forms.py:61 colab/accounts/forms.py:67
  67 +#: colab/accounts/forms.py:73
92 68 msgid "This field cannot be blank."
93 69 msgstr "Este campo não pode ficar em branco."
94 70  
95   -#: colab/accounts/forms.py:111
  71 +#: colab/accounts/forms.py:114
96 72 #: colab/accounts/templates/accounts/user_detail.html:38
97 73 msgid "Bio"
98 74 msgstr "Bio"
99 75  
100   -#: colab/accounts/forms.py:112
  76 +#: colab/accounts/forms.py:115
101 77 msgid "Write something about you in 200 characters or less."
102 78 msgstr "Escreva algo sobre você em 200 caracteres ou menos."
103 79  
104   -#: colab/accounts/forms.py:157
  80 +#: colab/accounts/forms.py:160
105 81 msgid "Mailing lists"
106 82 msgstr "Listas de e-mail"
107 83  
108   -#: colab/accounts/forms.py:170
  84 +#: colab/accounts/forms.py:207
109 85 #, python-format
110 86 msgid "Email already used. Is it you? Please <a href='%(url)s'>login</a>"
111 87 msgstr ""
112 88 "Este email ja está sendo utilizado.Caso seja o seu efetue o <a "
113 89 "href='%(url)s'>login</a>"
114 90  
115   -#: colab/accounts/forms.py:172
  91 +#: colab/accounts/forms.py:209
116 92 msgid "A user with that username already exists."
117 93 msgstr "Já existe um usuário com este nome."
118 94  
119   -#: colab/accounts/forms.py:173
  95 +#: colab/accounts/forms.py:210
120 96 msgid "The two password fields didn't match."
121 97 msgstr "Os dois campos de senha não conferem."
122 98  
123   -#: colab/accounts/forms.py:183 colab/accounts/forms.py:251
  99 +#: colab/accounts/forms.py:220 colab/accounts/forms.py:295
124 100 msgid "Password"
125 101 msgstr "Senha"
126 102  
127   -#: colab/accounts/forms.py:185
  103 +#: colab/accounts/forms.py:222
128 104 msgid "Password confirmation"
129 105 msgstr "Confirmação de senha"
130 106  
131   -#: colab/accounts/forms.py:247 colab/accounts/models.py:77
  107 +#: colab/accounts/forms.py:291 colab/accounts/models.py:91
132 108 msgid "Required. 30 characters or fewer. Letters and digits."
133 109 msgstr "Obrigatório. 30 caracteres ou menos. Letras ou digitos."
134 110  
135   -#: colab/accounts/forms.py:249
  111 +#: colab/accounts/forms.py:293
136 112 msgid "This value may contain only letters and numbers."
137 113 msgstr "Este campo pode conter apenas letras e números."
138 114  
139   -#: colab/accounts/forms.py:252
  115 +#: colab/accounts/forms.py:296
140 116 msgid ""
141 117 "Raw passwords are not stored, so there is no way to see this user's "
142 118 "password, but you can change the password using <a href=\"password/\">this "
... ... @@ -256,77 +232,76 @@ msgstr &quot;Não há contribuições deste usuário até agora.&quot;
256 232 msgid "View more contributions..."
257 233 msgstr "Ver mais colaborações..."
258 234  
259   -#: colab/accounts/templates/accounts/user_update_form.html:70
  235 +#: colab/accounts/templates/accounts/user_update_form.html:65
260 236 msgid "We sent a verification email to "
261 237 msgstr "Enviamos um email de verificação para "
262 238  
263   -#: colab/accounts/templates/accounts/user_update_form.html:71
  239 +#: colab/accounts/templates/accounts/user_update_form.html:66
264 240 msgid "Please follow the instructions in it."
265 241 msgstr "Por favor, siga as instruções."
266 242  
267   -#: colab/accounts/templates/accounts/user_update_form.html:123
  243 +#: colab/accounts/templates/accounts/user_update_form.html:109
268 244 msgid "profile information"
269 245 msgstr "informações do perfil"
270 246  
271   -#: colab/accounts/templates/accounts/user_update_form.html:128
  247 +#: colab/accounts/templates/accounts/user_update_form.html:114
272 248 msgid "Change your avatar at Gravatar.com"
273 249 msgstr "Troque seu avatar em Gravatar.com"
274 250  
275   -#: colab/accounts/templates/accounts/user_update_form.html:178
276   -#: colab/search/utils.py:56
  251 +#: colab/accounts/templates/accounts/user_update_form.html:152
  252 +#: colab/plugins/utils/collaborations.py:27
277 253 msgid "Emails"
278 254 msgstr "Emails"
279 255  
280   -#: colab/accounts/templates/accounts/user_update_form.html:187
  256 +#: colab/accounts/templates/accounts/user_update_form.html:161
281 257 msgid "Primary"
282 258 msgstr "Primário"
283 259  
284   -#: colab/accounts/templates/accounts/user_update_form.html:190
  260 +#: colab/accounts/templates/accounts/user_update_form.html:164
285 261 msgid "Setting..."
286 262 msgstr "Definindo..."
287 263  
288   -#: colab/accounts/templates/accounts/user_update_form.html:190
  264 +#: colab/accounts/templates/accounts/user_update_form.html:164
289 265 msgid "Set as Primary"
290 266 msgstr "Definir como Primário"
291 267  
292   -#: colab/accounts/templates/accounts/user_update_form.html:191
  268 +#: colab/accounts/templates/accounts/user_update_form.html:165
293 269 msgid "Deleting..."
294 270 msgstr "Apagando..."
295 271  
296   -#: colab/accounts/templates/accounts/user_update_form.html:191
297   -#: colab/accounts/templates/accounts/user_update_form.html:203
  272 +#: colab/accounts/templates/accounts/user_update_form.html:165
  273 +#: colab/accounts/templates/accounts/user_update_form.html:177
298 274 msgid "Delete"
299 275 msgstr "Apagar"
300 276  
301   -#: colab/accounts/templates/accounts/user_update_form.html:202
  277 +#: colab/accounts/templates/accounts/user_update_form.html:176
302 278 msgid "Sending verification..."
303 279 msgstr "Enviando verificação..."
304 280  
305   -#: colab/accounts/templates/accounts/user_update_form.html:202
  281 +#: colab/accounts/templates/accounts/user_update_form.html:176
306 282 msgid "Verify"
307 283 msgstr "Verificar"
308 284  
309   -#: colab/accounts/templates/accounts/user_update_form.html:210
  285 +#: colab/accounts/templates/accounts/user_update_form.html:184
310 286 msgid "Add another email address:"
311 287 msgstr "Adicionar outro endereço de email"
312 288  
313   -#: colab/accounts/templates/accounts/user_update_form.html:213
  289 +#: colab/accounts/templates/accounts/user_update_form.html:187
314 290 msgid "Add"
315 291 msgstr "Adicionar"
316 292  
317   -#: colab/accounts/templates/accounts/user_update_form.html:221
318   -#: colab/accounts/templates/accounts/user_update_form.html:225
  293 +#: colab/accounts/templates/accounts/user_update_form.html:195
  294 +#: colab/accounts/templates/accounts/user_update_form.html:199
319 295 #: colab/accounts/templates/registration/password_change_form_custom.html:26
320 296 #: colab/accounts/templates/registration/password_reset_confirm_custom.html:28
321 297 msgid "Change Password"
322 298 msgstr "Trocar senha"
323 299  
324   -#: colab/accounts/templates/accounts/user_update_form.html:233
  300 +#: colab/accounts/templates/accounts/user_update_form.html:207
325 301 msgid "Update"
326 302 msgstr "Atualizar"
327 303  
328   -#: colab/accounts/templates/accounts/user_update_form.html:234
329   -#| msgid "Control Panel"
  304 +#: colab/accounts/templates/accounts/user_update_form.html:208
330 305 msgid "Go to profile panel"
331 306 msgstr "Ir para meu perfil"
332 307  
... ... @@ -372,7 +347,7 @@ msgstr &quot;Endereço de email: &quot;
372 347 msgid "Reset password"
373 348 msgstr "Redefinir senha"
374 349  
375   -#: colab/accounts/templates/search/user_search_preview.html:11
  350 +#: colab/accounts/templates/search/user_search_preview.html:19
376 351 #: colab/search/forms.py:19
377 352 #: colab/search/templates/search/includes/search_filters.html:134
378 353 #: colab/search/templates/search/includes/search_filters.html:136
... ... @@ -381,36 +356,35 @@ msgstr &quot;Redefinir senha&quot;
381 356 msgid "Since"
382 357 msgstr "Desde"
383 358  
384   -#: colab/accounts/templates/search/user_search_preview.html:12
385   -#, fuzzy
386   -#| msgid "Register"
  359 +
  360 +#: colab/accounts/templates/search/user_search_preview.html
387 361 msgid "Registered in"
388   -msgstr "Cadastre-se"
  362 +msgstr "Registrado em"
389 363  
390 364 #: colab/accounts/templatetags/date_format.py:8
391 365 #, python-format
392 366 msgid "%(m)s %(d)s %(y)s"
393   -msgstr ""
  367 +msgstr "%(d)s %(m)s %(y)s"
394 368  
395 369 #: colab/accounts/templatetags/date_format.py:17
396 370 #, python-format
397 371 msgid "%(hour)s:%(min)s"
398   -msgstr ""
  372 +msgstr "%(hour)s:%(min)s"
399 373  
400 374 #: colab/accounts/templatetags/date_format.py:19
401 375 #, python-format
402   -msgid "%s at %s"
403   -msgstr ""
  376 +msgid "%(formatted_date)s at %(formatted_time)s"
  377 +msgstr "%(formatted_date)s as %(formatted_time)s"
404 378  
405   -#: colab/accounts/views.py:126
  379 +#: colab/accounts/views.py:127
406 380 msgid "Your profile has been created!"
407 381 msgstr "Seu perfil foi criado!"
408 382  
409   -#: colab/accounts/views.py:186
  383 +#: colab/accounts/views.py:187
410 384 msgid "Your password was changed."
411 385 msgstr "Sua senha foi modificada."
412 386  
413   -#: colab/accounts/views.py:202
  387 +#: colab/accounts/views.py:203
414 388 msgid "Your password has been set. You may go ahead and log in now."
415 389 msgstr "Sua senha foi modificada. Você já pode efetuar o login agora."
416 390  
... ... @@ -435,7 +409,7 @@ msgstr &quot;Últimas colaborações&quot;
435 409 msgid "Search"
436 410 msgstr "Busca"
437 411  
438   -#: colab/search/forms.py:18
  412 +#: colab/search/forms.py:18 colab/settings.py:144
439 413 msgid "Type"
440 414 msgstr "Tipo"
441 415  
... ... @@ -484,11 +458,11 @@ msgstr &quot;Pesquise aqui&quot;
484 458 msgid "Filters"
485 459 msgstr "Filtros"
486 460  
487   -#: colab/search/templates/search/search.html:76
  461 +#: colab/search/templates/search/search.html:77
488 462 msgid "No results for your search."
489 463 msgstr "Não há resultados para sua busca."
490 464  
491   -#: colab/search/templates/search/search.html:78
  465 +#: colab/search/templates/search/search.html:79
492 466 msgid "You are searching for"
493 467 msgstr "Você está procurando por"
494 468  
... ... @@ -512,31 +486,31 @@ msgstr &quot;Atividade recente&quot;
512 486 msgid "Relevance"
513 487 msgstr "Relevância"
514 488  
515   -#: colab/settings.py:149
  489 +#: colab/settings.py:153
516 490 msgid "Document"
517 491 msgstr "Documento"
518 492  
519   -#: colab/settings.py:151
  493 +#: colab/settings.py:155
520 494 msgid "Presentation"
521 495 msgstr "Apresentação"
522 496  
523   -#: colab/settings.py:152
  497 +#: colab/settings.py:156
524 498 msgid "Text"
525 499 msgstr "Texto"
526 500  
527   -#: colab/settings.py:153
  501 +#: colab/settings.py:157
528 502 msgid "Code"
529 503 msgstr "Código"
530 504  
531   -#: colab/settings.py:155
  505 +#: colab/settings.py:159
532 506 msgid "Compressed"
533 507 msgstr "Compactado"
534 508  
535   -#: colab/settings.py:156
  509 +#: colab/settings.py:160
536 510 msgid "Image"
537 511 msgstr "Imagem"
538 512  
539   -#: colab/settings.py:158
  513 +#: colab/settings.py:162
540 514 msgid "Spreadsheet"
541 515 msgstr "Planilha"
542 516  
... ... @@ -548,7 +522,7 @@ msgstr &quot;Não encontrado. Continue procurando! :)&quot;
548 522 msgid "Ooopz... something went wrong!"
549 523 msgstr "Ooopa... algo saiu errado!"
550 524  
551   -#: colab/templates/base.html:74
  525 +#: colab/templates/base.html:79
552 526 msgid "The login has failed. Please, try again."
553 527 msgstr "O login falhou. Por favor, tente novamente."
554 528  
... ... @@ -569,7 +543,6 @@ msgid &quot;Groups&quot;
569 543 msgstr "Grupos"
570 544  
571 545 #: colab/templates/header.html:57
572   -#| msgid "My Profile"
573 546 msgid "My Profile"
574 547 msgstr "Meu Perfil"
575 548  
... ... @@ -618,132 +591,154 @@ msgid &quot;RSS - Latest Threads&quot;
618 591 msgstr "RSS - Últimas Discussões"
619 592  
620 593 #, fuzzy
621   -#~| msgid "Gitlab Projects"
622   -#~ msgid "Public Projects"
623   -#~ msgstr "Projetos no Gitlab"
  594 +# ~| msgid "Gitlab Projects"
  595 +msgid "Public Projects"
  596 +msgstr "Projetos no Gitlab"
624 597  
625 598 #, fuzzy
626   -#~| msgid "Gitlab Project"
627   -#~ msgid "New Project"
628   -#~ msgstr "Projeto no Gitlab"
  599 +# ~| msgid "My Profile"
  600 +msgid "Profile"
  601 +msgstr "Meu Perfil"
  602 +
  603 +#, fuzzy
  604 +# ~| msgid "Gitlab Project"
  605 +msgid "New Project"
  606 +msgstr "Projeto no Gitlab"
629 607  
630 608 #, fuzzy
631   -#~| msgid "Gitlab Projects"
632   -#~ msgid "Projects"
633   -#~ msgstr "Projetos no Gitlab"
  609 +# ~| msgid "Gitlab Projects"
  610 +msgid "Projects"
  611 +msgstr "Projetos no Gitlab"
634 612  
635 613 #, fuzzy
636   -#~| msgid "Gitlab Issues"
637   -#~ msgid "Issues"
638   -#~ msgstr "Tíquetes no Gitlab"
  614 +# ~| msgid "Gitlab Issues"
  615 +msgid "Issues"
  616 +msgstr "Tíquetes no Gitlab"
  617 +
  618 +#, fuzzy
  619 +# ~| msgid "Gitlab Merge Requests"
  620 +msgid "Merge Requests"
  621 +msgstr "Envio de Contribuições no Gitlab"
  622 +
  623 +msgid "Social"
  624 +msgstr "Social"
639 625  
640 626 #, fuzzy
641   -#~| msgid "Gitlab Merge Requests"
642   -#~ msgid "Merge Requests"
643   -#~ msgstr "Envio de Contribuições no Gitlab"
  627 +# ~| msgid "Username"
  628 +msgid "Users"
  629 +msgstr "Usuário"
  630 +
  631 +msgid "Communities"
  632 +msgstr "Comunidades"
  633 +
  634 +msgid "Control Panel"
  635 +msgstr "Painel de Controle"
  636 +
  637 +msgid ""
  638 +"Please enter a correct %(username)s and password. Note that both fields "
  639 +"may be case-sensitive."
  640 +msgstr ""
  641 +"Por favor entre com um %(username)s e senha. Note que ambos os campos "
  642 +"diferenciam letras maiúsculas de minúsculas"
644 643  
645   -#~ msgid ""
646   -#~ "Please enter a correct %(username)s and password. Note that both fields "
647   -#~ "may be case-sensitive."
648   -#~ msgstr ""
649   -#~ "Por favor entre com um %(username)s e senha. Note que ambos os campos "
650   -#~ "diferenciam letras maiúsculas de minúsculas"
  644 +msgid "This account is inactive."
  645 +msgstr "Esta conta está inativa."
651 646  
652   -#~ msgid "This account is inactive."
653   -#~ msgstr "Esta conta está inativa."
  647 +msgid "Email"
  648 +msgstr "Email"
654 649  
655   -#~ msgid "Email"
656   -#~ msgstr "Email"
  650 +msgid "New password"
  651 +msgstr "Nova senha"
657 652  
658   -#~ msgid "New password"
659   -#~ msgstr "Nova senha"
  653 +msgid "New password confirmation"
  654 +msgstr "Confirmar nova senha"
660 655  
661   -#~ msgid "New password confirmation"
662   -#~ msgstr "Confirmar nova senha"
  656 +msgid "Your old password was entered incorrectly. Please enter it again."
  657 +msgstr "Sua senha atual está incorreta. Por favor tente novamente."
663 658  
664   -#~ msgid "Your old password was entered incorrectly. Please enter it again."
665   -#~ msgstr "Sua senha atual está incorreta. Por favor tente novamente."
  659 +msgid "Old password"
  660 +msgstr "Senha atual"
666 661  
667   -#~ msgid "Old password"
668   -#~ msgstr "Senha atual"
  662 +msgid "Password (again)"
  663 +msgstr "Senha (novamente)"
669 664  
670   -#~ msgid "Password (again)"
671   -#~ msgstr "Senha (novamente)"
  665 +msgid "Enter a valid username."
  666 +msgstr "Insira um nome de usuário válido."
672 667  
673   -#~ msgid "Enter a valid username."
674   -#~ msgstr "Insira um nome de usuário válido."
  668 +msgid "Gitlab Group"
  669 +msgstr "Grupo no Gitlab"
675 670  
676   -#~ msgid "Gitlab Group"
677   -#~ msgstr "Grupo no Gitlab"
  671 +msgid "Gitlab Groups"
  672 +msgstr "Grupos no Gitlab"
678 673  
679   -#~ msgid "Gitlab Groups"
680   -#~ msgstr "Grupos no Gitlab"
  674 +msgid "Gitlab Merge Request"
  675 +msgstr "Envio de Contribuição no Gitlab"
681 676  
682   -#~ msgid "Gitlab Merge Request"
683   -#~ msgstr "Envio de Contribuição no Gitlab"
  677 +msgid "Gitlab Issue"
  678 +msgstr "Tíquete no Gitlab"
684 679  
685   -#~ msgid "Gitlab Issue"
686   -#~ msgstr "Tíquete no Gitlab"
  680 +msgid "Gitlab Comments"
  681 +msgstr "Comentários no Gitlab"
687 682  
688   -#~ msgid "Gitlab Comments"
689   -#~ msgstr "Comentários no Gitlab"
  683 +msgid "Community"
  684 +msgstr "Comunidade"
690 685  
691   -#~ msgid "Community"
692   -#~ msgstr "Comunidade"
  686 +msgid "Article"
  687 +msgstr "Artigo"
693 688  
694   -#~ msgid "Article"
695   -#~ msgstr "Artigo"
  689 +msgid "Articles"
  690 +msgstr "Artigos"
696 691  
697   -#~ msgid "Articles"
698   -#~ msgstr "Artigos"
  692 +msgid "Author"
  693 +msgstr "Autor"
699 694  
700   -#~ msgid "Author"
701   -#~ msgstr "Autor"
  695 +msgid "Modified by"
  696 +msgstr "Modificado por"
702 697  
703   -#~ msgid "Modified by"
704   -#~ msgstr "Modificado por"
  698 +msgid "Status"
  699 +msgstr "Status"
705 700  
706   -#~ msgid "Status"
707   -#~ msgstr "Status"
  701 +msgid "Mailinglist"
  702 +msgstr "Lista de discussão"
708 703  
709   -#~ msgid "Mailinglist"
710   -#~ msgstr "Lista de discussão"
  704 +msgid "Milestone"
  705 +msgstr "Marco"
711 706  
712   -#~ msgid "Milestone"
713   -#~ msgstr "Marco"
  707 +msgid "Priority"
  708 +msgstr "Prioridade"
714 709  
715   -#~ msgid "Priority"
716   -#~ msgstr "Prioridade"
  710 +msgid "Component"
  711 +msgstr "Componente"
717 712  
718   -#~ msgid "Component"
719   -#~ msgstr "Componente"
  713 +msgid "Severity"
  714 +msgstr "Severidade"
720 715  
721   -#~ msgid "Severity"
722   -#~ msgstr "Severidade"
  716 +msgid "Reporter"
  717 +msgstr "Relator"
723 718  
724   -#~ msgid "Reporter"
725   -#~ msgstr "Relator"
  719 +msgid "Keywords"
  720 +msgstr "Palavras chave"
726 721  
727   -#~ msgid "Keywords"
728   -#~ msgstr "Palavras chave"
  722 +msgid "Collaborators"
  723 +msgstr "Colaboradores"
729 724  
730   -#~ msgid "Collaborators"
731   -#~ msgstr "Colaboradores"
  725 +msgid "Repository"
  726 +msgstr "Repositório"
732 727  
733   -#~ msgid "Repository"
734   -#~ msgstr "Repositório"
  728 +msgid "Used by"
  729 +msgstr "Usado por"
735 730  
736   -#~ msgid "Used by"
737   -#~ msgstr "Usado por"
  731 +msgid "File type"
  732 +msgstr "Tipo do arquivo"
738 733  
739   -#~ msgid "File type"
740   -#~ msgstr "Tipo do arquivo"
  734 +msgid "Size"
  735 +msgstr "Tamanho"
741 736  
742   -#~ msgid "Size"
743   -#~ msgstr "Tamanho"
  737 +msgid "Paste"
  738 +msgstr "Cole aqui"
744 739  
745   -#~ msgid "Discussion"
746   -#~ msgstr "Discussão"
  740 +msgid "Discussion"
  741 +msgstr "Discussão"
747 742  
748   -#~ msgid "Paste"
749   -#~ msgstr "Cole aqui"
  743 +msgid "at"
  744 +msgstr "às"
... ...
colab/super_archives/locale/en/LC_MESSAGES/django.mo
View file @bf27e82
No preview for this file type
colab/super_archives/locale/en/LC_MESSAGES/django.po
  Diff comments   View file @bf27e82
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2015-09-01 13:15+0000\n"
  11 +"POT-Creation-Date: 2015-12-11 14:07+0000\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -17,137 +17,158 @@ msgstr &quot;&quot;
17 17 "Content-Type: text/plain; charset=UTF-8\n"
18 18 "Content-Transfer-Encoding: 8bit\n"
19 19  
20   -#: super_archives/management/commands/import_emails.py:213
  20 +#: colab/super_archives/filters.py:8
  21 +#: colab/super_archives/templates/search/thread_search_preview.html:30
  22 +msgid "Discussion"
  23 +msgstr ""
  24 +
  25 +#: colab/super_archives/filters.py:11
  26 +msgid "Author"
  27 +msgstr ""
  28 +
  29 +#: colab/super_archives/filters.py:14
  30 +msgid "Mailinglist"
  31 +msgstr ""
  32 +
  33 +#: colab/super_archives/management/commands/import_emails.py:213
21 34 msgid "[Colab] Warning - Email sent with a blank subject."
22 35 msgstr ""
23 36  
24   -#: super_archives/models.py:77
25   -#: super_archives/templates/message-preview.html:62
26   -#: super_archives/templates/message-thread.html:4
  37 +#: colab/super_archives/models.py:77
  38 +#: colab/super_archives/templates/dashboard/thread_search_preview.html:62
  39 +#: colab/super_archives/templates/message-thread.html:4
27 40 msgid "Anonymous"
28 41 msgstr ""
29 42  
30   -#: super_archives/models.py:133
  43 +#: colab/super_archives/models.py:149
31 44 msgid "Mailing List"
32 45 msgstr ""
33 46  
34   -#: super_archives/models.py:134
  47 +#: colab/super_archives/models.py:150
35 48 msgid "The Mailing List where is the thread"
36 49 msgstr ""
37 50  
38   -#: super_archives/models.py:137
  51 +#: colab/super_archives/models.py:153
39 52 msgid "Latest message"
40 53 msgstr ""
41 54  
42   -#: super_archives/models.py:138
  55 +#: colab/super_archives/models.py:154
43 56 msgid "Latest message posted"
44 57 msgstr ""
45 58  
46   -#: super_archives/models.py:139
  59 +#: colab/super_archives/models.py:155
47 60 msgid "Score"
48 61 msgstr ""
49 62  
50   -#: super_archives/models.py:140
  63 +#: colab/super_archives/models.py:156
51 64 msgid "Thread score"
52 65 msgstr ""
53 66  
54   -#: super_archives/models.py:153
  67 +#: colab/super_archives/models.py:169
55 68 msgid "Thread"
56 69 msgstr ""
57 70  
58   -#: super_archives/models.py:154
  71 +#: colab/super_archives/models.py:170
59 72 msgid "Threads"
60 73 msgstr ""
61 74  
62   -#: super_archives/models.py:267
  75 +#: colab/super_archives/models.py:283
63 76 msgid "Subject"
64 77 msgstr ""
65 78  
66   -#: super_archives/models.py:268
  79 +#: colab/super_archives/models.py:284
67 80 msgid "Please enter a message subject"
68 81 msgstr ""
69 82  
70   -#: super_archives/models.py:271
  83 +#: colab/super_archives/models.py:287
71 84 msgid "Message body"
72 85 msgstr ""
73 86  
74   -#: super_archives/models.py:272
  87 +#: colab/super_archives/models.py:288
75 88 msgid "Please enter a message body"
76 89 msgstr ""
77 90  
78   -#: super_archives/models.py:282
  91 +#: colab/super_archives/models.py:298
79 92 msgid "Message"
80 93 msgstr ""
81 94  
82   -#: super_archives/models.py:283
  95 +#: colab/super_archives/models.py:299
83 96 msgid "Messages"
84 97 msgstr ""
85 98  
86   -#: super_archives/templates/message-preview.html:42
87   -#: super_archives/templates/message-preview.html:62
  99 +#: colab/super_archives/templates/dashboard/thread_search_preview.html:42
  100 +#: colab/super_archives/templates/dashboard/thread_search_preview.html:62
88 101 msgid "by"
89 102 msgstr ""
90 103  
91   -#: super_archives/templates/message-preview.html:65
92   -#: super_archives/templates/message-thread.html:161
  104 +#: colab/super_archives/templates/dashboard/thread_search_preview.html:65
  105 +#: colab/super_archives/templates/message-thread.html:161
93 106 msgid "ago"
94 107 msgstr ""
95 108  
96   -#: super_archives/templates/message-thread.html:35
  109 +#: colab/super_archives/templates/message-thread.html:35
97 110 msgid "You must login before voting."
98 111 msgstr ""
99 112  
100   -#: super_archives/templates/message-thread.html:132
  113 +#: colab/super_archives/templates/message-thread.html:132
101 114 msgid "Order by"
102 115 msgstr ""
103 116  
104   -#: super_archives/templates/message-thread.html:136
  117 +#: colab/super_archives/templates/message-thread.html:136
105 118 msgid "Votes"
106 119 msgstr ""
107 120  
108   -#: super_archives/templates/message-thread.html:140
  121 +#: colab/super_archives/templates/message-thread.html:140
109 122 msgid "Date"
110 123 msgstr ""
111 124  
112   -#: super_archives/templates/message-thread.html:145
  125 +#: colab/super_archives/templates/message-thread.html:145
113 126 msgid "Related:"
114 127 msgstr ""
115 128  
116   -#: super_archives/templates/message-thread.html:156
  129 +#: colab/super_archives/templates/message-thread.html:156
117 130 msgid "Statistics:"
118 131 msgstr ""
119 132  
120   -#: super_archives/templates/message-thread.html:160
  133 +#: colab/super_archives/templates/message-thread.html:160
121 134 msgid "started at"
122 135 msgstr ""
123 136  
124   -#: super_archives/templates/message-thread.html:166
  137 +#: colab/super_archives/templates/message-thread.html:166
125 138 msgid "viewed"
126 139 msgstr ""
127 140  
128   -#: super_archives/templates/message-thread.html:167
129   -#: super_archives/templates/message-thread.html:172
130   -#: super_archives/templates/message-thread.html:177
  141 +#: colab/super_archives/templates/message-thread.html:167
  142 +#: colab/super_archives/templates/message-thread.html:172
  143 +#: colab/super_archives/templates/message-thread.html:177
131 144 msgid "times"
132 145 msgstr ""
133 146  
134   -#: super_archives/templates/message-thread.html:171
  147 +#: colab/super_archives/templates/message-thread.html:171
135 148 msgid "answered"
136 149 msgstr ""
137 150  
138   -#: super_archives/templates/message-thread.html:176
  151 +#: colab/super_archives/templates/message-thread.html:176
139 152 msgid "voted"
140 153 msgstr ""
141 154  
142   -#: super_archives/templates/message-thread.html:182
  155 +#: colab/super_archives/templates/message-thread.html:182
143 156 msgid "Tags:"
144 157 msgstr ""
145 158  
146   -#: super_archives/templates/superarchives/emails/email_blank_subject.txt:2
  159 +#: colab/super_archives/templates/search/thread_search_preview.html:5
  160 +msgid "at"
  161 +msgstr ""
  162 +
  163 +#: colab/super_archives/templates/search/thread_search_preview.html:30
  164 +msgid "Registred in"
  165 +msgstr ""
  166 +
  167 +#: colab/super_archives/templates/superarchives/emails/email_blank_subject.txt:2
147 168 msgid "Hello"
148 169 msgstr ""
149 170  
150   -#: super_archives/templates/superarchives/emails/email_blank_subject.txt:3
  171 +#: colab/super_archives/templates/superarchives/emails/email_blank_subject.txt:3
151 172 #, python-format
152 173 msgid ""
153 174 "\n"
... ... @@ -161,109 +182,109 @@ msgid &quot;&quot;
161 182 "Thank you.\n"
162 183 msgstr ""
163 184  
164   -#: super_archives/templates/superarchives/emails/email_verification.txt:2
  185 +#: colab/super_archives/templates/superarchives/emails/email_verification.txt:2
165 186 #, python-format
166 187 msgid ""
167 188 "Hey, we want to verify that you are indeed \"%(fullname)s (%(username)s)\". "
168 189 "If that's the case, please follow the link below:"
169 190 msgstr ""
170 191  
171   -#: super_archives/templates/superarchives/emails/email_verification.txt:6
  192 +#: colab/super_archives/templates/superarchives/emails/email_verification.txt:6
172 193 #, python-format
173 194 msgid ""
174 195 "If you're not %(username)s or didn't request verification you can ignore "
175 196 "this email."
176 197 msgstr ""
177 198  
178   -#: super_archives/templates/superarchives/includes/message.html:17
179   -#: super_archives/templates/superarchives/includes/message.html:18
  199 +#: colab/super_archives/templates/superarchives/includes/message.html:17
  200 +#: colab/super_archives/templates/superarchives/includes/message.html:18
180 201 msgid "Link to this message"
181 202 msgstr ""
182 203  
183   -#: super_archives/templates/superarchives/includes/message.html:46
  204 +#: colab/super_archives/templates/superarchives/includes/message.html:46
184 205 msgid "Reply"
185 206 msgstr ""
186 207  
187   -#: super_archives/templates/superarchives/includes/message.html:63
  208 +#: colab/super_archives/templates/superarchives/includes/message.html:63
188 209 msgid "Send a message"
189 210 msgstr ""
190 211  
191   -#: super_archives/templates/superarchives/includes/message.html:66
  212 +#: colab/super_archives/templates/superarchives/includes/message.html:66
192 213 msgid ""
193 214 "After sending a message it will take few minutes before it shows up in here. "
194 215 "Why don't you grab a coffee?"
195 216 msgstr ""
196 217  
197   -#: super_archives/templates/superarchives/includes/message.html:69
  218 +#: colab/super_archives/templates/superarchives/includes/message.html:69
198 219 msgid "Send"
199 220 msgstr ""
200 221  
201   -#: super_archives/templates/superarchives/thread-dashboard.html:4
202   -#: super_archives/templates/superarchives/thread-dashboard.html:7
  222 +#: colab/super_archives/templates/superarchives/thread-dashboard.html:4
  223 +#: colab/super_archives/templates/superarchives/thread-dashboard.html:7
203 224 msgid "Groups"
204 225 msgstr ""
205 226  
206   -#: super_archives/templates/superarchives/thread-dashboard.html:14
  227 +#: colab/super_archives/templates/superarchives/thread-dashboard.html:13
207 228 #, python-format
208 229 msgid "%(number_of_users)s members"
209 230 msgstr ""
210 231  
211   -#: super_archives/templates/superarchives/thread-dashboard.html:20
  232 +#: colab/super_archives/templates/superarchives/thread-dashboard.html:19
212 233 msgid "latest"
213 234 msgstr ""
214 235  
215   -#: super_archives/templates/superarchives/thread-dashboard.html:28
216   -#: super_archives/templates/superarchives/thread-dashboard.html:42
  236 +#: colab/super_archives/templates/superarchives/thread-dashboard.html:27
  237 +#: colab/super_archives/templates/superarchives/thread-dashboard.html:41
217 238 msgid "more..."
218 239 msgstr ""
219 240  
220   -#: super_archives/templates/superarchives/thread-dashboard.html:34
  241 +#: colab/super_archives/templates/superarchives/thread-dashboard.html:33
221 242 msgid "most relevant"
222 243 msgstr ""
223 244  
224   -#: super_archives/utils/email.py:14
  245 +#: colab/super_archives/utils/email.py:14
225 246 msgid "Please verify your email "
226 247 msgstr ""
227 248  
228   -#: super_archives/views.py:112
  249 +#: colab/super_archives/views.py:113
229 250 msgid "Error trying to connect to Mailman API"
230 251 msgstr ""
231 252  
232   -#: super_archives/views.py:115
  253 +#: colab/super_archives/views.py:116
233 254 msgid "Timeout trying to connect to Mailman API"
234 255 msgstr ""
235 256  
236   -#: super_archives/views.py:119
  257 +#: colab/super_archives/views.py:120
237 258 msgid ""
238 259 "Your message was sent to this topic. It may take some minutes before it's "
239 260 "delivered by email to the group. Why don't you breath some fresh air in the "
240 261 "meanwhile?"
241 262 msgstr ""
242 263  
243   -#: super_archives/views.py:128
  264 +#: colab/super_archives/views.py:129
244 265 msgid "You cannot send an empty email"
245 266 msgstr ""
246 267  
247   -#: super_archives/views.py:130
  268 +#: colab/super_archives/views.py:131
248 269 msgid "Mailing list does not exist"
249 270 msgstr ""
250 271  
251   -#: super_archives/views.py:133
  272 +#: colab/super_archives/views.py:134
252 273 msgid "Unknown error trying to connect to Mailman API"
253 274 msgstr ""
254 275  
255   -#: super_archives/views.py:188
  276 +#: colab/super_archives/views.py:170
256 277 msgid ""
257 278 "The email address you are trying to verify either has already been verified "
258 279 "or does not exist."
259 280 msgstr ""
260 281  
261   -#: super_archives/views.py:199
  282 +#: colab/super_archives/views.py:181
262 283 msgid ""
263 284 "The email address you are trying to verify is already an active email "
264 285 "address."
265 286 msgstr ""
266 287  
267   -#: super_archives/views.py:213
  288 +#: colab/super_archives/views.py:195
268 289 msgid "Email address verified!"
269 290 msgstr ""
... ...
colab/super_archives/locale/pt_BR/LC_MESSAGES/django.mo
View file @bf27e82
No preview for this file type
colab/super_archives/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @bf27e82
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: colab\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2015-09-01 13:15+0000\n"
  11 +"POT-Creation-Date: 2015-12-11 14:10+0000\n"
12 12 "PO-Revision-Date: 2014-11-21 17:38+0000\n"
13 13 "Last-Translator: Sergio Oliveira <seocam@seocam.com>\n"
14 14 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
... ... @@ -19,137 +19,162 @@ msgstr &quot;&quot;
19 19 "Content-Transfer-Encoding: 8bit\n"
20 20 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
21 21  
22   -#: super_archives/management/commands/import_emails.py:213
  22 +#: colab/super_archives/filters.py:8
  23 +#: colab/super_archives/templates/search/thread_search_preview.html:30
  24 +msgid "Discussion"
  25 +msgstr ""
  26 +
  27 +#: colab/super_archives/filters.py:11
  28 +msgid "Author"
  29 +msgstr ""
  30 +
  31 +#: colab/super_archives/filters.py:14
  32 +#, fuzzy
  33 +#| msgid "Mailing List"
  34 +msgid "Mailinglist"
  35 +msgstr "Lista de discussão"
  36 +
  37 +#: colab/super_archives/management/commands/import_emails.py:213
23 38 msgid "[Colab] Warning - Email sent with a blank subject."
24 39 msgstr "[Colab] Atenção - Email enviado sem assunto."
25 40  
26   -#: super_archives/models.py:77
27   -#: super_archives/templates/message-preview.html:62
28   -#: super_archives/templates/message-thread.html:4
  41 +#: colab/super_archives/models.py:77
  42 +#: colab/super_archives/templates/dashboard/thread_search_preview.html:62
  43 +#: colab/super_archives/templates/message-thread.html:4
29 44 msgid "Anonymous"
30 45 msgstr "Anônimo"
31 46  
32   -#: super_archives/models.py:133
  47 +#: colab/super_archives/models.py:149
33 48 msgid "Mailing List"
34 49 msgstr "Lista de discussão"
35 50  
36   -#: super_archives/models.py:134
  51 +#: colab/super_archives/models.py:150
37 52 msgid "The Mailing List where is the thread"
38 53 msgstr "Lista de emails da discussão"
39 54  
40   -#: super_archives/models.py:137
  55 +#: colab/super_archives/models.py:153
41 56 msgid "Latest message"
42 57 msgstr "Última mensagem"
43 58  
44   -#: super_archives/models.py:138
  59 +#: colab/super_archives/models.py:154
45 60 msgid "Latest message posted"
46 61 msgstr "Última mensagem enviada"
47 62  
48   -#: super_archives/models.py:139
  63 +#: colab/super_archives/models.py:155
49 64 msgid "Score"
50 65 msgstr "Pontuação"
51 66  
52   -#: super_archives/models.py:140
  67 +#: colab/super_archives/models.py:156
53 68 msgid "Thread score"
54 69 msgstr "Pontuação da discussão"
55 70  
56   -#: super_archives/models.py:153
  71 +#: colab/super_archives/models.py:169
57 72 msgid "Thread"
58 73 msgstr "Discussão"
59 74  
60   -#: super_archives/models.py:154
  75 +#: colab/super_archives/models.py:170
61 76 msgid "Threads"
62 77 msgstr "Discussões"
63 78  
64   -#: super_archives/models.py:267
  79 +#: colab/super_archives/models.py:283
65 80 msgid "Subject"
66 81 msgstr "Assuntos"
67 82  
68   -#: super_archives/models.py:268
  83 +#: colab/super_archives/models.py:284
69 84 msgid "Please enter a message subject"
70 85 msgstr "Por favor digite um assunto de email"
71 86  
72   -#: super_archives/models.py:271
  87 +#: colab/super_archives/models.py:287
73 88 msgid "Message body"
74 89 msgstr "Corpo do email"
75 90  
76   -#: super_archives/models.py:272
  91 +#: colab/super_archives/models.py:288
77 92 msgid "Please enter a message body"
78 93 msgstr "Por favor digite o corpo do email"
79 94  
80   -#: super_archives/models.py:282
  95 +#: colab/super_archives/models.py:298
81 96 msgid "Message"
82 97 msgstr "Mensagem"
83 98  
84   -#: super_archives/models.py:283
  99 +#: colab/super_archives/models.py:299
85 100 msgid "Messages"
86 101 msgstr "Mensagens"
87 102  
88   -#: super_archives/templates/message-preview.html:42
89   -#: super_archives/templates/message-preview.html:62
  103 +#: colab/super_archives/templates/dashboard/thread_search_preview.html:42
  104 +#: colab/super_archives/templates/dashboard/thread_search_preview.html:62
90 105 msgid "by"
91 106 msgstr "por"
92 107  
93   -#: super_archives/templates/message-preview.html:65
94   -#: super_archives/templates/message-thread.html:161
  108 +#: colab/super_archives/templates/dashboard/thread_search_preview.html:65
  109 +#: colab/super_archives/templates/message-thread.html:161
95 110 msgid "ago"
96 111 msgstr "atrás"
97 112  
98   -#: super_archives/templates/message-thread.html:35
  113 +#: colab/super_archives/templates/message-thread.html:35
99 114 msgid "You must login before voting."
100 115 msgstr "Você deve logar antes de votar."
101 116  
102   -#: super_archives/templates/message-thread.html:132
  117 +#: colab/super_archives/templates/message-thread.html:132
103 118 msgid "Order by"
104 119 msgstr "Ordenar por"
105 120  
106   -#: super_archives/templates/message-thread.html:136
  121 +#: colab/super_archives/templates/message-thread.html:136
107 122 msgid "Votes"
108 123 msgstr "Votos"
109 124  
110   -#: super_archives/templates/message-thread.html:140
  125 +#: colab/super_archives/templates/message-thread.html:140
111 126 msgid "Date"
112 127 msgstr "Data"
113 128  
114   -#: super_archives/templates/message-thread.html:145
  129 +#: colab/super_archives/templates/message-thread.html:145
115 130 msgid "Related:"
116 131 msgstr "Relacionado:"
117 132  
118   -#: super_archives/templates/message-thread.html:156
  133 +#: colab/super_archives/templates/message-thread.html:156
119 134 msgid "Statistics:"
120 135 msgstr "Estatísticas:"
121 136  
122   -#: super_archives/templates/message-thread.html:160
  137 +#: colab/super_archives/templates/message-thread.html:160
123 138 msgid "started at"
124 139 msgstr "iniciada em"
125 140  
126   -#: super_archives/templates/message-thread.html:166
  141 +#: colab/super_archives/templates/message-thread.html:166
127 142 msgid "viewed"
128 143 msgstr "vizualizada"
129 144  
130   -#: super_archives/templates/message-thread.html:167
131   -#: super_archives/templates/message-thread.html:172
132   -#: super_archives/templates/message-thread.html:177
  145 +#: colab/super_archives/templates/message-thread.html:167
  146 +#: colab/super_archives/templates/message-thread.html:172
  147 +#: colab/super_archives/templates/message-thread.html:177
133 148 msgid "times"
134 149 msgstr "vezes"
135 150  
136   -#: super_archives/templates/message-thread.html:171
  151 +#: colab/super_archives/templates/message-thread.html:171
137 152 msgid "answered"
138 153 msgstr "respondida"
139 154  
140   -#: super_archives/templates/message-thread.html:176
  155 +#: colab/super_archives/templates/message-thread.html:176
141 156 msgid "voted"
142 157 msgstr "votada"
143 158  
144   -#: super_archives/templates/message-thread.html:182
  159 +#: colab/super_archives/templates/message-thread.html:182
145 160 msgid "Tags:"
146 161 msgstr "Tags:"
147 162  
148   -#: super_archives/templates/superarchives/emails/email_blank_subject.txt:2
  163 +#: colab/super_archives/templates/search/thread_search_preview.html:5
  164 +#, fuzzy
  165 +#| msgid "Date"
  166 +msgid "at"
  167 +msgstr "Data"
  168 +
  169 +#: colab/super_archives/templates/search/thread_search_preview.html:30
  170 +msgid "Registred in"
  171 +msgstr ""
  172 +
  173 +#: colab/super_archives/templates/superarchives/emails/email_blank_subject.txt:2
149 174 msgid "Hello"
150 175 msgstr "Olá"
151 176  
152   -#: super_archives/templates/superarchives/emails/email_blank_subject.txt:3
  177 +#: colab/super_archives/templates/superarchives/emails/email_blank_subject.txt:3
153 178 #, python-format
154 179 msgid ""
155 180 "\n"
... ... @@ -172,7 +197,7 @@ msgstr &quot;&quot;
172 197 "\n"
173 198 "Obrigado.\n"
174 199  
175   -#: super_archives/templates/superarchives/emails/email_verification.txt:2
  200 +#: colab/super_archives/templates/superarchives/emails/email_verification.txt:2
176 201 #, python-format
177 202 msgid ""
178 203 "Hey, we want to verify that you are indeed \"%(fullname)s (%(username)s)\". "
... ... @@ -181,7 +206,7 @@ msgstr &quot;&quot;
181 206 "Ei, nós queremos verificar que você é realmente \"%(fullname)s "
182 207 "(%(username)s)\". Se este for o caso, por favor clique no link abaixo:"
183 208  
184   -#: super_archives/templates/superarchives/emails/email_verification.txt:6
  209 +#: colab/super_archives/templates/superarchives/emails/email_verification.txt:6
185 210 #, python-format
186 211 msgid ""
187 212 "If you're not %(username)s or didn't request verification you can ignore "
... ... @@ -190,20 +215,20 @@ msgstr &quot;&quot;
190 215 "Se você não é %(username)s ou não solicitou verificação apenas ignore este "
191 216 "email."
192 217  
193   -#: super_archives/templates/superarchives/includes/message.html:17
194   -#: super_archives/templates/superarchives/includes/message.html:18
  218 +#: colab/super_archives/templates/superarchives/includes/message.html:17
  219 +#: colab/super_archives/templates/superarchives/includes/message.html:18
195 220 msgid "Link to this message"
196 221 msgstr "Link para esta mensagem"
197 222  
198   -#: super_archives/templates/superarchives/includes/message.html:46
  223 +#: colab/super_archives/templates/superarchives/includes/message.html:46
199 224 msgid "Reply"
200 225 msgstr "Responder"
201 226  
202   -#: super_archives/templates/superarchives/includes/message.html:63
  227 +#: colab/super_archives/templates/superarchives/includes/message.html:63
203 228 msgid "Send a message"
204 229 msgstr "Enviar mensagem"
205 230  
206   -#: super_archives/templates/superarchives/includes/message.html:66
  231 +#: colab/super_archives/templates/superarchives/includes/message.html:66
207 232 msgid ""
208 233 "After sending a message it will take few minutes before it shows up in here. "
209 234 "Why don't you grab a coffee?"
... ... @@ -211,46 +236,46 @@ msgstr &quot;&quot;
211 236 "Após enviar uma mensagem pode levar alguns minutos até que ela seja exibida "
212 237 "aqui. Por que você não busca um café enquanto isso?"
213 238  
214   -#: super_archives/templates/superarchives/includes/message.html:69
  239 +#: colab/super_archives/templates/superarchives/includes/message.html:69
215 240 msgid "Send"
216 241 msgstr "Enviar"
217 242  
218   -#: super_archives/templates/superarchives/thread-dashboard.html:4
219   -#: super_archives/templates/superarchives/thread-dashboard.html:7
  243 +#: colab/super_archives/templates/superarchives/thread-dashboard.html:4
  244 +#: colab/super_archives/templates/superarchives/thread-dashboard.html:7
220 245 msgid "Groups"
221 246 msgstr "Grupos"
222 247  
223   -#: super_archives/templates/superarchives/thread-dashboard.html:14
  248 +#: colab/super_archives/templates/superarchives/thread-dashboard.html:13
224 249 #, python-format
225 250 msgid "%(number_of_users)s members"
226 251 msgstr "%(number_of_users)s membros"
227 252  
228   -#: super_archives/templates/superarchives/thread-dashboard.html:20
  253 +#: colab/super_archives/templates/superarchives/thread-dashboard.html:19
229 254 msgid "latest"
230 255 msgstr "última"
231 256  
232   -#: super_archives/templates/superarchives/thread-dashboard.html:28
233   -#: super_archives/templates/superarchives/thread-dashboard.html:42
  257 +#: colab/super_archives/templates/superarchives/thread-dashboard.html:27
  258 +#: colab/super_archives/templates/superarchives/thread-dashboard.html:41
234 259 msgid "more..."
235 260 msgstr "mais..."
236 261  
237   -#: super_archives/templates/superarchives/thread-dashboard.html:34
  262 +#: colab/super_archives/templates/superarchives/thread-dashboard.html:33
238 263 msgid "most relevant"
239 264 msgstr "Mais relevante"
240 265  
241   -#: super_archives/utils/email.py:14
  266 +#: colab/super_archives/utils/email.py:14
242 267 msgid "Please verify your email "
243 268 msgstr "Por favor verifique seu email"
244 269  
245   -#: super_archives/views.py:112
  270 +#: colab/super_archives/views.py:113
246 271 msgid "Error trying to connect to Mailman API"
247 272 msgstr "Erro tentando conectar à API do Mailman"
248 273  
249   -#: super_archives/views.py:115
  274 +#: colab/super_archives/views.py:116
250 275 msgid "Timeout trying to connect to Mailman API"
251 276 msgstr "Tempo excedido tentando conectar à API do Mailman"
252 277  
253   -#: super_archives/views.py:119
  278 +#: colab/super_archives/views.py:120
254 279 msgid ""
255 280 "Your message was sent to this topic. It may take some minutes before it's "
256 281 "delivered by email to the group. Why don't you breath some fresh air in the "
... ... @@ -260,19 +285,19 @@ msgstr &quot;&quot;
260 285 "minutos até que ela seja enviada por email para o grupo. Por que você não "
261 286 "respira um ar fresco enquanto isso?"
262 287  
263   -#: super_archives/views.py:128
  288 +#: colab/super_archives/views.py:129
264 289 msgid "You cannot send an empty email"
265 290 msgstr "Você não pode enviar um email vazio"
266 291  
267   -#: super_archives/views.py:130
  292 +#: colab/super_archives/views.py:131
268 293 msgid "Mailing list does not exist"
269 294 msgstr "Lista de email inexistente"
270 295  
271   -#: super_archives/views.py:133
  296 +#: colab/super_archives/views.py:134
272 297 msgid "Unknown error trying to connect to Mailman API"
273 298 msgstr "Erro desconhecido tentando conectar à API do Mailman"
274 299  
275   -#: super_archives/views.py:188
  300 +#: colab/super_archives/views.py:170
276 301 msgid ""
277 302 "The email address you are trying to verify either has already been verified "
278 303 "or does not exist."
... ... @@ -280,12 +305,12 @@ msgstr &quot;&quot;
280 305 "O email que você está tentando verificar não existe ou já foi verificado "
281 306 "anteriormente. "
282 307  
283   -#: super_archives/views.py:199
  308 +#: colab/super_archives/views.py:181
284 309 msgid ""
285 310 "The email address you are trying to verify is already an active email "
286 311 "address."
287 312 msgstr "O email que você está tentando verificar já é um email ativo."
288 313  
289   -#: super_archives/views.py:213
  314 +#: colab/super_archives/views.py:195
290 315 msgid "Email address verified!"
291 316 msgstr "Endereço de email verificado!"
... ...
colab/super_archives/templates/search/thread_search_preview.html
  Diff comments   View file @bf27e82
1   -{% load i18n tz highlight date_format %}
  1 +{% load i18n tz highlight %}
2 2  
3 3 <div class="row">
4 4 <div class="col-md-12">
5   - <small>{% datetime_format result.modified %} -
  5 + <small>{{ result.modified|date:"d F Y" }} {% trans "at" %} {{result.modified|date:"h:m" }} -
6 6  
7 7 {% if query %}
8 8 <a href="{{result.modified_by_url}}">{% highlight result.modified_by with query max_length "1000" %}</a>
... ...