From 7821056b646e066c5edac988b13aa0f9fca178df Mon Sep 17 00:00:00 2001 From: Martin Mahner Date: Tue, 28 Oct 2014 12:05:47 +0100 Subject: [PATCH] =?UTF-8?q?Further=20cleanup=20of=20all=20=E2=80=9EOne-Tim?= =?UTF-8?q?e=20snippet=E2=80=9C=20strings.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG | 2 +- docs/settings.rst | 2 +- dpaste/forms.py | 2 +- dpaste/locale/de/LC_MESSAGES/django.mo | Bin 3559 -> 3435 bytes dpaste/locale/de/LC_MESSAGES/django.po | 34 +++++------ dpaste/locale/en/LC_MESSAGES/django.mo | Bin 378 -> 378 bytes dpaste/locale/en/LC_MESSAGES/django.po | 30 ++++------ dpaste/locale/es/LC_MESSAGES/django.mo | Bin 3600 -> 3458 bytes dpaste/locale/es/LC_MESSAGES/django.po | 59 ++++++++++--------- dpaste/locale/pt_BR/LC_MESSAGES/django.mo | Bin 3549 -> 3407 bytes dpaste/locale/pt_BR/LC_MESSAGES/django.po | 53 +++++++++-------- dpaste/templates/dpaste/snippet_details.html | 2 +- dpaste/templates/dpaste/snippet_form.html | 2 +- dpaste/tests/test_snippet.py | 2 +- 14 files changed, 94 insertions(+), 94 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index cacad4d..abf97d3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -36,7 +36,7 @@ Changelog ---------------- * IRC lexer is now in the default lexer list. -* One-time snippet support. Snippets get automatically deleted after the +* One-Time snippet support. Snippets get automatically deleted after the another user looks at it. * Toggle wordwrap for code snippets. * General UI and readability improvements. diff --git a/docs/settings.rst b/docs/settings.rst index 4f6c83d..9adc951 100644 --- a/docs/settings.rst +++ b/docs/settings.rst @@ -61,7 +61,7 @@ behavior without touching the code: (3600 * 24 * 30 * 12 * 100, ugettext(u'100 Years')), ) - **One-time snippets** are supported. One-Time snippets are automatically + **One-Time snippets** are supported. One-Time snippets are automatically deleted once a defined view count has reached (Default: ``2``). To enable one-time snippets you have to add a choice ``onetime`` to the expire choices:: diff --git a/dpaste/forms.py b/dpaste/forms.py index b5e42a9..3bb7542 100644 --- a/dpaste/forms.py +++ b/dpaste/forms.py @@ -8,7 +8,7 @@ from dpaste.models import Snippet from dpaste.highlight import LEXER_LIST, LEXER_DEFAULT, LEXER_KEYS EXPIRE_CHOICES = getattr(settings, 'DPASTE_EXPIRE_CHOICES', ( - ('onetime', _(u'One Time Snippet')), + ('onetime', _(u'One-Time snippet')), (3600, _(u'In one hour')), (3600 * 24 * 7, _(u'In one week')), (3600 * 24 * 30, _(u'In one month')), diff --git a/dpaste/locale/de/LC_MESSAGES/django.mo b/dpaste/locale/de/LC_MESSAGES/django.mo index 1f283bfaec42efe591bbfe9b1b5082cffb74ba8e..be42be52bba458cc9cf500f8e3755850b694a06c 100644 GIT binary patch delta 1050 zcmXxjPe>GD7{~Ev#&vhKUCr%}wf@Pnb~9aD>9Q1BP@*73U__{tP#vV$R*@hAmxbsc z5rT;n!9oNb4Td1>(jgS;ptm9_3WE+Vb?DTs?{A%b*=IiU&g{JJ^FHs)ucpm-{#z`t zV6+s`Ox$zKda>kkpnb10%i<4=;`xACHD1QOcnw21gWK`G-(SRf`bDh8CESL~xC2+P z#w>52Ine+=aVM6LpE=B;2ZE^kF~1+j2>pcLKZbGoC$SGlFpZB<|9g-8?4$2j)VLei z#r*b%lVL722e(#`!!Z2u*lq8@mPd+-@5^EaqUts-;S7gVV?unzyC5^*`~$0+K# zqsT2gfm%pE=2hxZPL$C&l7mg42Ao6gY37V==amND$gSt+11*G*#%Z z*ARH(x~U7^S}^N`GHpFQ$J1%=O!&D|b@A4eSE_m8daoh@Cp?^;$mOn2chA3#CjSG4 Cl2#J{ delta 1161 zcmZA1T}abW7{~Evb8bzywB?+0tClTSzT^t*4H`vVL{NhBw(bV4mu0x>aufv7U9G%` zE((RZ9~mMDK@?OFfe}%3B^XHs-2_1|-`_fe=-~7J{Lj(zoO7PDx!k>!sC>n!*~UoaT4Qr8v{6l?KtoHFR_jO8*ITPY{hT58h>HXtYQ(e zDM1oDFpd1qcA+NZ-0u&${wRhRKj!);v77z{%;9y+;w#kOdHsJk+~$m;@+NSA^)16o zo`Esc3GO>*ozHLu`a!XjSe8ouIr`e(_$5vIl#NO85em@V#>x`|1BceP(*ex)V>J?sy8dp@*nE^Qh0z z6WogntD0tZhNEYJm<^Ws=AmHjLWXK3s#B zol~g1kHXZS9QKrf2reL%uO|mf6Dn<^DQSx6aRa?h_hqRst`DP{@(mE$;95eJP}@js zCRE{o?q4PCB-928T}h+qTC_p!zMs(PR}pGk2vyCi4ozRjMpLym5W0p&%QRkah}cBL z`*^4n9K3$_`X8{4h}GUU-SVbWW5v^jRK8RkA1{<`q*NHJ4@~?sP_CWxmpp;t)Yk0o m?DpEHz_iCVQ7D#c*Mj%F?f*}yp7F=3dqTehE=Bb~IP(YDdv5vw diff --git a/dpaste/locale/de/LC_MESSAGES/django.po b/dpaste/locale/de/LC_MESSAGES/django.po index d6ecd36..d8fcf34 100644 --- a/dpaste/locale/de/LC_MESSAGES/django.po +++ b/dpaste/locale/de/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: dpaste\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-25 10:06+0000\n" +"POT-Creation-Date: 2014-10-28 11:00+0000\n" "PO-Revision-Date: 2014-10-28 11:20+0100\n" "Last-Translator: Martin Mahner \n" "Language-Team: DE \n" @@ -18,8 +18,8 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 1.6.10\n" -#: forms.py:11 -msgid "One Time Snippet" +#: forms.py:11 models.py:38 templates/dpaste/snippet_details.html:59 +msgid "One-Time snippet" msgstr "One-Time snippet" #: forms.py:12 @@ -74,10 +74,6 @@ msgstr "Nach Zeitstempel auslaufen lassen" msgid "Keep Forever" msgstr "Für immer behalten" -#: models.py:38 -msgid "One-Time snippet" -msgstr "One-Time snippet" - #: models.py:41 msgid "Secret ID" msgstr "Geheime ID" @@ -94,15 +90,11 @@ msgstr "Auslauftyp" msgid "View count" msgstr "Anzahl der Besuche" -#: views.py:200 -msgid "No changes were made between this two files." -msgstr "Zwischen diesen beiden Dateien wurden keine Änderungen gemacht." - -#: templates/dpaste/about.html:44 +#: templates/dpaste/about.html:59 msgid "Statistics" msgstr "Statistiken" -#: templates/dpaste/about.html:46 +#: templates/dpaste/about.html:61 #, python-format msgid "" "There are %(total)s snippets in the database. The most popular languages are:" @@ -139,10 +131,6 @@ msgstr "Erlischt in: %(date)s" msgid "Snippet never expires" msgstr "Snippet erlischt niemals" -#: templates/dpaste/snippet_details.html:59 -msgid "One-time snippet" -msgstr "One-Time snippet" - #: templates/dpaste/snippet_details.html:63 msgid "Really delete this snippet?" msgstr "Dieses Snippet wirklich löschen?" @@ -165,7 +153,7 @@ msgstr "Gist" #: templates/dpaste/snippet_details.html:82 msgid "This is a one-time snippet." -msgstr "Dies ist ein One-Time snippet" +msgstr "Dies ist ein One-Time Snippet." #: templates/dpaste/snippet_details.html:84 #, python-format @@ -205,6 +193,10 @@ msgstr "Erlischt in" msgid "Paste it" msgstr "Paste" +#: templates/dpaste/snippet_form.html:39 +msgid "or" +msgstr "" + #: templates/dpaste/snippet_list.html:16 msgid "DATETIME_FORMAT" msgstr "DATETIME_FORMAT" @@ -212,7 +204,7 @@ msgstr "DATETIME_FORMAT" #: templates/dpaste/snippet_list.html:17 #, python-format msgid "%(since)s ago" -msgstr "seit %(since)s" +msgstr "Vor %(since)s" #: templates/dpaste/snippet_list.html:23 msgid "" @@ -222,6 +214,10 @@ msgstr "" "Keine Snippets gespeichert. Entweder sind alle deine Snippets erloschen oder " "dein Cookie hat sich geändert." +#: views.py:200 +msgid "No changes were made between this two files." +msgstr "Zwischen diesen beiden Dateien wurden keine Änderungen gemacht." + #, fuzzy #~ msgid "Please fill out this field." #~ msgstr "Bitte dieses Feld ausfüllen." diff --git a/dpaste/locale/en/LC_MESSAGES/django.mo b/dpaste/locale/en/LC_MESSAGES/django.mo index 4f240ad8a32d7be24cda7d5df9a0e67ea40495e1..77e904a303f744e8cd1d7d214e029c48137910ee 100644 GIT binary patch delta 17 Zcmeyx^owc21a=DrLqjVA!->-$0{}Yh27mwn delta 17 Zcmeyx^owc21a?yeLjx-Vi;2@80{}YY27>?q diff --git a/dpaste/locale/en/LC_MESSAGES/django.po b/dpaste/locale/en/LC_MESSAGES/django.po index 872194e..eb26032 100644 --- a/dpaste/locale/en/LC_MESSAGES/django.po +++ b/dpaste/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-25 10:08+0000\n" +"POT-Creation-Date: 2014-10-28 11:01+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,8 +17,8 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: forms.py:11 -msgid "One Time Snippet" +#: forms.py:11 models.py:38 templates/dpaste/snippet_details.html:59 +msgid "One-Time snippet" msgstr "" #: forms.py:12 @@ -73,10 +73,6 @@ msgstr "" msgid "Keep Forever" msgstr "" -#: models.py:38 -msgid "One-Time snippet" -msgstr "" - #: models.py:41 msgid "Secret ID" msgstr "" @@ -93,15 +89,11 @@ msgstr "" msgid "View count" msgstr "" -#: views.py:200 -msgid "No changes were made between this two files." -msgstr "" - -#: templates/dpaste/about.html:44 +#: templates/dpaste/about.html:59 msgid "Statistics" msgstr "" -#: templates/dpaste/about.html:46 +#: templates/dpaste/about.html:61 #, python-format msgid "" "There are %(total)s snippets in the database. The most popular languages are:" @@ -138,10 +130,6 @@ msgstr "" msgid "Snippet never expires" msgstr "" -#: templates/dpaste/snippet_details.html:59 -msgid "One-time snippet" -msgstr "" - #: templates/dpaste/snippet_details.html:63 msgid "Really delete this snippet?" msgstr "" @@ -200,6 +188,10 @@ msgstr "" msgid "Paste it" msgstr "" +#: templates/dpaste/snippet_form.html:39 +msgid "or" +msgstr "" + #: templates/dpaste/snippet_list.html:16 msgid "DATETIME_FORMAT" msgstr "" @@ -214,3 +206,7 @@ msgid "" "No snippets saved. Either all your snippets are expired or your cookie has " "changed." msgstr "" + +#: views.py:200 +msgid "No changes were made between this two files." +msgstr "" diff --git a/dpaste/locale/es/LC_MESSAGES/django.mo b/dpaste/locale/es/LC_MESSAGES/django.mo index ccbacb4f0beec12b94cfa76d809bd42d89566870..ae722221bf3b8371d8544cd7f7d93241b910e6fd 100644 GIT binary patch delta 1049 zcmXxjOGs2v9LMqhjMI!Wjj7|K)Tu`EF+K*hHf3cHf)GW4u9SR$7k5J#f+EaNN`w#u zqeN|7MlCWJDp1_CFlbXdB`6AATCH8x_cxw7+;czo+{gK!^FQZ4jX!M2{)h!ujgq3q zsY^byt9an&MEO}_md0OLhIayH$8Zema0)}1!3uoj+Rw0@_8LZT9gpJ%R^c{=&9e55 z3w5xM)p&p$<|B$e2%?_HT)Q5lv|C;K0@l;MhW$8#J@_2;-e=^n9p`sczkAq4eEZAA z5I5q%qZ!=8QrZuY5!x~~;0o5@TX%mOHL$Pl{w`{!fAAI_;z=CjC4E1Rgt7%J^p6qZ z+cFn#Nc$>!vb_s-pBNg9@&JpP?#{_DQkmM>FL?YX|FHg-OokBqxqR|c}f0Vbkz4Ba#K}H delta 1144 zcmYk+O=uHA7{>9*N0WYRY!i)Xny9NrtF^VMP|ylFsGyWe!StdBp~w=7xD?XhMF{rf zQB3VYMeydS9)e;Iw#R}OQ4uRb4^j{mE7X%0@&CkGaOk_go!Q;lci!1_K6f`?-$+I8 z8`?0DCl*4+oJA+Xfz}%}#>Xrs@D8@&B4+Us#_y7jEND{DU3F z)J=-nG(jGBVF9^jPN5zs+3VxBe+eDNuiE}~?4y4ZOLz~9_!f0vIQB2$ZfhDfZw?1} zzv<_s%)k_C1y8NZ*4Nn1_-78SfX}tjTz$PxS4L{MN|Crg8Sd@#r)1+}f=26d;Fp1|;iCjjN{u=JUDyro3s00>K z_bp*v6TY-JtfET)-rlf|{FyHtRI(p-{5R@bh%mShlQ@necm{7_3RjU`Fz>AEsKhq# z2yS&z|4B|VY?MBxiuJbjAyNeM9F_4a9KbcyinftlOpI)FJ&Bqphg$h4YW{PmZ)5>a z<1^H}-xJiIIm|Bxl$oBQ@~!<*w?OEl3>t|WmpEVt4qNSy#q`qGi_}zsK|%@cB~)p( zL&Q-+TNl^nTFgO0RSH^vaDu~x zwjir=YL6&DYwz_xKzo{Leu_K@7u>0t8=hPCXJ%);IWy^dL#=`8e*<&PTFei{N8OR) nSn*`zTYRmt(tgF6nD#5R>54bzdevs8qbJfxIDO58Qw#kCT#saD diff --git a/dpaste/locale/es/LC_MESSAGES/django.po b/dpaste/locale/es/LC_MESSAGES/django.po index 5590d12..8b30bde 100644 --- a/dpaste/locale/es/LC_MESSAGES/django.po +++ b/dpaste/locale/es/LC_MESSAGES/django.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Leonardo J. Caballero G. , 2014 # Sergio Oliveira , 2014 @@ -9,18 +9,19 @@ msgid "" msgstr "" "Project-Id-Version: dpaste\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-25 10:08+0000\n" +"POT-Creation-Date: 2014-10-28 11:02+0000\n" "PO-Revision-Date: 2014-10-27 17:05+0000\n" "Last-Translator: Leonardo J. Caballero G. \n" -"Language-Team: Spanish (http://www.transifex.com/projects/p/dpaste/language/es/)\n" +"Language-Team: Spanish (http://www.transifex.com/projects/p/dpaste/language/" +"es/)\n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: forms.py:11 -msgid "One Time Snippet" +#: forms.py:11 models.py:38 templates/dpaste/snippet_details.html:59 +msgid "One-Time snippet" msgstr "Apenas una visualización" #: forms.py:12 @@ -75,10 +76,6 @@ msgstr "Caduca por fecha y hora" msgid "Keep Forever" msgstr "Guarde por siempre" -#: models.py:38 -msgid "One-Time snippet" -msgstr "Apenas una visualización" - #: models.py:41 msgid "Secret ID" msgstr "ID secreto" @@ -95,20 +92,17 @@ msgstr "Tipo de Caducidad " msgid "View count" msgstr "Visualizaciones" -#: views.py:200 -msgid "No changes were made between this two files." -msgstr "No hay cambios entre estos dos archivos." - -#: templates/dpaste/about.html:44 +#: templates/dpaste/about.html:59 msgid "Statistics" msgstr " Estadísticas" -#: templates/dpaste/about.html:46 +#: templates/dpaste/about.html:61 #, python-format msgid "" -"There are %(total)s snippets in the database. The most popular languages " -"are:" -msgstr "Hay %(total)s fragmentos en la base de datos. Los lenguajes más populares son:" +"There are %(total)s snippets in the database. The most popular languages are:" +msgstr "" +"Hay %(total)s fragmentos en la base de datos. Los lenguajes más populares " +"son:" #: templates/dpaste/base.html:8 templates/dpaste/base.html.py:21 #: templates/dpaste/snippet_new.html:6 templates/dpaste/snippet_new.html:7 @@ -141,10 +135,6 @@ msgstr "Caduca en: %(date)s" msgid "Snippet never expires" msgstr "El fragmento nunca caduca" -#: templates/dpaste/snippet_details.html:59 -msgid "One-time snippet" -msgstr "Apenas una visualización" - #: templates/dpaste/snippet_details.html:63 msgid "Really delete this snippet?" msgstr "¿Realmente desea eliminar este fragmento?" @@ -172,7 +162,8 @@ msgstr "Este fragmento podrá ser visualizado apenas sólo una vez." #: templates/dpaste/snippet_details.html:84 #, python-format msgid "It is automatically removed after %(remaining)s further views." -msgstr "Automáticamente eliminado después de más %(remaining)s visualizaciones." +msgstr "" +"Automáticamente eliminado después de más %(remaining)s visualizaciones." #: templates/dpaste/snippet_details.html:86 msgid "It is automatically removed after the next view." @@ -190,9 +181,13 @@ msgstr "Responder fragmento" #, python-format msgid "" "\n" -" Diff between #%(filea_id)s and #%(fileb_id)s\n" +" Diff between #%(filea_id)s and #%(fileb_id)s\n" " " -msgstr "\nComparar entre #%(filea_id)s y #%(fileb_id)s" +msgstr "" +"\n" +"Comparar entre #%(filea_id)s y #%(fileb_id)s" #: templates/dpaste/snippet_form.html:32 msgid "Expire in" @@ -202,6 +197,10 @@ msgstr "Caduca en" msgid "Paste it" msgstr "Pegarlo" +#: templates/dpaste/snippet_form.html:39 +msgid "or" +msgstr "" + #: templates/dpaste/snippet_list.html:16 msgid "DATETIME_FORMAT" msgstr "DATETIME_FORMAT" @@ -215,4 +214,10 @@ msgstr "%(since)s atrás" msgid "" "No snippets saved. Either all your snippets are expired or your cookie has " "changed." -msgstr "No hay fragmentos guardados. O sus fragmentos han caducado o su cookie cambió." +msgstr "" +"No hay fragmentos guardados. O sus fragmentos han caducado o su cookie " +"cambió." + +#: views.py:200 +msgid "No changes were made between this two files." +msgstr "No hay cambios entre estos dos archivos." diff --git a/dpaste/locale/pt_BR/LC_MESSAGES/django.mo b/dpaste/locale/pt_BR/LC_MESSAGES/django.mo index 761fd6420650a012c95d5a0b8d748ce6ce572eb0..28827d10cdef3a076cefdd3843bdb10a3cebb50a 100644 GIT binary patch delta 1052 zcmXxjPe{{Y9LMqR=9*4T+se$%Y-(wy17#N*m?D9M1)4#S`41F9VN7tRpdp9{@svt` zE*(4tMa6C&yeJ;J=q(Y9BJm`8j=*|<=Cg<2_xF09-=4qU-){$zop9zy$hT^g7*S2k zd(1lU*vpObv%oBgzwjdV`OGfhFjnC>7UE01gbS|y8p~8QZ6# z2@dfJ9wV1|SVaT;sNX}b9mZ1H4Xz!>FzrsfhtIGT-=g|`LoWO7JV4F+8(Uc4PN@v= zpxS?af)p0foZB+52>)Ou_RvY=N06oL1?J|*V%E1s zDj!MvDo)YvW>ux~6KcQ)*5Vdw;1Mddr^sdhTsy$(dPP;J@r}-QRKEwP@dKz=@EkKr zb&85ol146@bL}P9euJ8L4Quc#cHu7G#UO(9P;un#rCC~D$q4B-rFL-W{!uTUr2#}+(6l4%h-DfRWJ`8ttATa@7K z&`0^FXmDe$c7D@l^f79eN~I=M(I!-wKUegAl|g-gcL-%i3+X$_7yXg0P>iS zlpFu7+%9$Ut3-^@sq2X#ah)h5RP-I_Z>qv!>;}<5=)Ed4%|yN^v$wNB-#f22_9VOG vPkIX5qit=8*7)-MqRsM$W68<%*yKbanwlNye!T1t3}$BnXWr~uX~Od#F>F^? delta 1147 zcmYk+O-PhM9LMq5UG-5{+uBn1#q6oJtW9$(g7hF#hh8WmcRSRfkXX#5rv+EK1WUKN zy44}Pgaide$bzwly3|RCr9(tWo}{3Ifwz#d@9$|A8vM`anR%XhpS70wnk+3x8y*_c z0MSi62pDq$+d^cdSc5Sh#<3mmVIw}mIL@Mj3%D8I+Hwsels{uDe#bDb;a2>EEyk2g zl-|@qH*Uie^3DvR8VuX_XKZ;C+o-={%afR(d>e;x1~d2(^|=b> z%R`om9BKv6tX1nGHdDWZ%-F185?8SUTbaG;UDQI-WU4=mTKOqFhgs~xC#d#SY-D`% zi3fiGRD%_K!7=>A8Tne`&@YVQ25N#)vXkhd7I+=|@D8%M z=6O5&ud|q^LLGiUcHXZ8e=uFjdeUTEVwbJhYqdWX6QiulsHBN#FilXq#C7r09`gN! zcHYtXZz4JgrG7#yttVY17Gt&(2MC?}7DDMDp>qwYK++D@lNPg^(5maHxBh?w#6BXP zCezljaR2P}KVS#ZRrwNn989^niJN&h>rE62`Jy@R<@^1LssAd9mFXrg;2d=iWri}x p%0HZU1^2ume<3H%6d2#_zUBvYC8Y` diff --git a/dpaste/locale/pt_BR/LC_MESSAGES/django.po b/dpaste/locale/pt_BR/LC_MESSAGES/django.po index 1289589..4e1cf52 100644 --- a/dpaste/locale/pt_BR/LC_MESSAGES/django.po +++ b/dpaste/locale/pt_BR/LC_MESSAGES/django.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Sergio Oliveira , 2014 msgid "" msgstr "" "Project-Id-Version: dpaste\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-25 10:08+0000\n" +"POT-Creation-Date: 2014-10-28 11:03+0000\n" "PO-Revision-Date: 2014-10-25 14:25+0000\n" "Last-Translator: Sergio Oliveira \n" -"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/dpaste/language/pt_BR/)\n" +"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/" +"dpaste/language/pt_BR/)\n" +"Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: forms.py:11 -msgid "One Time Snippet" +#: forms.py:11 models.py:38 templates/dpaste/snippet_details.html:59 +msgid "One-Time snippet" msgstr "Uma única visualização" #: forms.py:12 @@ -74,10 +75,6 @@ msgstr "Expira por tempo" msgid "Keep Forever" msgstr "Não expira" -#: models.py:38 -msgid "One-Time snippet" -msgstr "Uma única visualização" - #: models.py:41 msgid "Secret ID" msgstr "ID secreto" @@ -94,19 +91,14 @@ msgstr "Tipo de validade" msgid "View count" msgstr "Visualizações" -#: views.py:200 -msgid "No changes were made between this two files." -msgstr "Nenhuma alterção feita entre esses dois arquivos." - -#: templates/dpaste/about.html:44 +#: templates/dpaste/about.html:59 msgid "Statistics" msgstr "Estatísticas" -#: templates/dpaste/about.html:46 +#: templates/dpaste/about.html:61 #, python-format msgid "" -"There are %(total)s snippets in the database. The most popular languages " -"are:" +"There are %(total)s snippets in the database. The most popular languages are:" msgstr "Existem %(total)s pastes no banco de dados. A linguagem mais popular é" #: templates/dpaste/base.html:8 templates/dpaste/base.html.py:21 @@ -140,10 +132,6 @@ msgstr "Expira em: %(date)s" msgid "Snippet never expires" msgstr "Paste nunca expira" -#: templates/dpaste/snippet_details.html:59 -msgid "One-time snippet" -msgstr "Uma única visualização" - #: templates/dpaste/snippet_details.html:63 msgid "Really delete this snippet?" msgstr "Deseja realmente remover esse paste?" @@ -189,9 +177,14 @@ msgstr "Responder paste" #, python-format msgid "" "\n" -" Diff between #%(filea_id)s and #%(fileb_id)s\n" +" Diff between #%(filea_id)s and #%(fileb_id)s\n" +" " +msgstr "" +"\n" +" Diff entre #%(filea_id)s e #%(fileb_id)s\n" " " -msgstr "\n Diff entre #%(filea_id)s e #%(fileb_id)s\n " #: templates/dpaste/snippet_form.html:32 msgid "Expire in" @@ -201,6 +194,10 @@ msgstr "Expira em" msgid "Paste it" msgstr "Criar paste" +#: templates/dpaste/snippet_form.html:39 +msgid "or" +msgstr "" + #: templates/dpaste/snippet_list.html:16 msgid "DATETIME_FORMAT" msgstr "DATETIME_FORMAT" @@ -214,4 +211,10 @@ msgstr "%(since)s atrás" msgid "" "No snippets saved. Either all your snippets are expired or your cookie has " "changed." -msgstr "Nenhum paste salvo. Ou todos os seus pastes expiraram ou seu cookie foi alterado." +msgstr "" +"Nenhum paste salvo. Ou todos os seus pastes expiraram ou seu cookie foi " +"alterado." + +#: views.py:200 +msgid "No changes were made between this two files." +msgstr "Nenhuma alterção feita entre esses dois arquivos." diff --git a/dpaste/templates/dpaste/snippet_details.html b/dpaste/templates/dpaste/snippet_details.html index 2f14c22..23381d9 100644 --- a/dpaste/templates/dpaste/snippet_details.html +++ b/dpaste/templates/dpaste/snippet_details.html @@ -56,7 +56,7 @@ {% elif snippet.expire_type == 2 %} {% trans "Snippet never expires" %} {% elif snippet.expire_type == 3 %} - {% trans "One-time snippet" %} + {% trans "One-Time snippet" %} {% endif %} {% if snippet.pk|in_list:request.session.snippet_list %} diff --git a/dpaste/templates/dpaste/snippet_form.html b/dpaste/templates/dpaste/snippet_form.html index 1c2366f..fac4747 100644 --- a/dpaste/templates/dpaste/snippet_form.html +++ b/dpaste/templates/dpaste/snippet_form.html @@ -36,6 +36,6 @@
- ⌘+⏎ or Ctrl+⏎ + ⌘+⏎ {% trans "or" %} Ctrl+⏎
diff --git a/dpaste/tests/test_snippet.py b/dpaste/tests/test_snippet.py index a79c8c8..9cc724d 100644 --- a/dpaste/tests/test_snippet.py +++ b/dpaste/tests/test_snippet.py @@ -108,7 +108,7 @@ class SnippetTestCase(TestCase): def test_new_snippet_onetime(self): """ - One-time snippets get deleted after two views. + One-Time snippets get deleted after two views. """ # POST data data = self.valid_form_data()