diff options
author | Bruno Sarlo <bruno@bruno-laptop.(none)> | 2009-08-11 02:07:20 -0300 |
---|---|---|
committer | Bruno Sarlo <bruno@bruno-laptop.(none)> | 2009-08-11 02:07:20 -0300 |
commit | f98fd296e8adddd61bd76a5cf025b5278c74780e (patch) | |
tree | b8d7deb8f9e245f8b5f8330860f867803a0e74dd /templates/content | |
parent | 5deaa09e3afce6fc295eed868bea72a30418da08 (diff) | |
parent | 22237890caf3c65f6ecc696a619299cba91ff90c (diff) | |
download | askbot-f98fd296e8adddd61bd76a5cf025b5278c74780e.tar.gz askbot-f98fd296e8adddd61bd76a5cf025b5278c74780e.tar.bz2 askbot-f98fd296e8adddd61bd76a5cf025b5278c74780e.zip |
Merge branch 'master' of git://github.com/evgenyfadeev/CNPROG
Conflicts:
forum/views.py
locale/es/LC_MESSAGES/django.mo
settings_local.py
templates/answer_edit_tips.html
templates/book.html
templates/header.html
templates/index.html
templates/question_edit_tips.html
templates/user_stats.html
templates/user_tabs.html
templates/users_questions.html
Diffstat (limited to 'templates/content')
-rw-r--r-- | templates/content/jquery-openid/images/blogger-1.png | bin | 0 -> 432 bytes | |||
-rw-r--r-- | templates/content/jquery-openid/images/claimid-0.png | bin | 0 -> 629 bytes | |||
-rw-r--r-- | templates/content/jquery-openid/images/flickr.png | bin | 0 -> 426 bytes | |||
-rw-r--r-- | templates/content/jquery-openid/images/livejournal-1.png | bin | 0 -> 713 bytes | |||
-rw-r--r-- | templates/content/jquery-openid/images/myopenid-2.png | bin | 0 -> 511 bytes | |||
-rw-r--r-- | templates/content/jquery-openid/images/technorati-1.png | bin | 0 -> 606 bytes | |||
-rw-r--r-- | templates/content/jquery-openid/images/verisign-2.png | bin | 0 -> 859 bytes | |||
-rw-r--r-- | templates/content/jquery-openid/images/vidoop.png | bin | 0 -> 499 bytes | |||
-rw-r--r-- | templates/content/jquery-openid/images/wordpress.png | bin | 0 -> 566 bytes | |||
-rw-r--r-- | templates/content/jquery-openid/openid.css | 2 | ||||
-rw-r--r-- | templates/content/js/com.cnprog.i18n.js | 61 | ||||
-rw-r--r-- | templates/content/style/style.css | 1 |
12 files changed, 61 insertions, 3 deletions
diff --git a/templates/content/jquery-openid/images/blogger-1.png b/templates/content/jquery-openid/images/blogger-1.png Binary files differnew file mode 100644 index 00000000..8b360ea5 --- /dev/null +++ b/templates/content/jquery-openid/images/blogger-1.png diff --git a/templates/content/jquery-openid/images/claimid-0.png b/templates/content/jquery-openid/images/claimid-0.png Binary files differnew file mode 100644 index 00000000..4a0ea1b3 --- /dev/null +++ b/templates/content/jquery-openid/images/claimid-0.png diff --git a/templates/content/jquery-openid/images/flickr.png b/templates/content/jquery-openid/images/flickr.png Binary files differnew file mode 100644 index 00000000..142405a6 --- /dev/null +++ b/templates/content/jquery-openid/images/flickr.png diff --git a/templates/content/jquery-openid/images/livejournal-1.png b/templates/content/jquery-openid/images/livejournal-1.png Binary files differnew file mode 100644 index 00000000..e6436081 --- /dev/null +++ b/templates/content/jquery-openid/images/livejournal-1.png diff --git a/templates/content/jquery-openid/images/myopenid-2.png b/templates/content/jquery-openid/images/myopenid-2.png Binary files differnew file mode 100644 index 00000000..f64fb8e8 --- /dev/null +++ b/templates/content/jquery-openid/images/myopenid-2.png diff --git a/templates/content/jquery-openid/images/technorati-1.png b/templates/content/jquery-openid/images/technorati-1.png Binary files differnew file mode 100644 index 00000000..f7195240 --- /dev/null +++ b/templates/content/jquery-openid/images/technorati-1.png diff --git a/templates/content/jquery-openid/images/verisign-2.png b/templates/content/jquery-openid/images/verisign-2.png Binary files differnew file mode 100644 index 00000000..c1467008 --- /dev/null +++ b/templates/content/jquery-openid/images/verisign-2.png diff --git a/templates/content/jquery-openid/images/vidoop.png b/templates/content/jquery-openid/images/vidoop.png Binary files differnew file mode 100644 index 00000000..032c9e98 --- /dev/null +++ b/templates/content/jquery-openid/images/vidoop.png diff --git a/templates/content/jquery-openid/images/wordpress.png b/templates/content/jquery-openid/images/wordpress.png Binary files differnew file mode 100644 index 00000000..ee29f0cf --- /dev/null +++ b/templates/content/jquery-openid/images/wordpress.png diff --git a/templates/content/jquery-openid/openid.css b/templates/content/jquery-openid/openid.css index e53c1823..6c59192f 100644 --- a/templates/content/jquery-openid/openid.css +++ b/templates/content/jquery-openid/openid.css @@ -1,7 +1,7 @@ fieldset {border-style:none;} img {border-style:none;} -.logo_box {width:90px;height:40px;background:white;border:1px solid #dddddd;} +.logo_box {display:inline-block;width:90px;height:40px;background:white;border:1px solid #dddddd;} .openid_box img {margin-top:6px;} .aol_box img {margin-top:6px;} .yahoo_box img {margin-top:13px;} diff --git a/templates/content/js/com.cnprog.i18n.js b/templates/content/js/com.cnprog.i18n.js index 90166eec..848ad59e 100644 --- a/templates/content/js/com.cnprog.i18n.js +++ b/templates/content/js/com.cnprog.i18n.js @@ -84,9 +84,68 @@ var i18nEn = { 'characters':'characters left', }; +var i18nEs = { + 'insufficient privilege':'privilegio insuficiente', + 'cannot pick own answer as best':'no puede escoger su propia respuesta como la mejor', + 'anonymous users cannot select favorite questions':'usuarios anonimos no pueden seleccionar', + 'please login':'por favor inicie sesión', + 'anonymous users cannot vote':'usuarios anónimos no pueden votar', + '>15 points requried to upvote': '>15 puntos requeridos para votar positivamente', + '>100 points required to downvote':'>100 puntos requeridos para votar negativamente', + 'please see': 'por favor vea', + 'cannot vote for own posts':'no se puede votar por sus propias publicaciones', + 'daily vote cap exhausted':'cuota de votos diarios excedida', + 'cannot revoke old vote':'no puede revocar un voto viejo', + 'please confirm offensive':"por favor confirme ofensiva", + 'anonymous users cannot flag offensive posts':'usuarios anónimos no pueden marcar publicaciones como ofensivas', + 'cannot flag message as offensive twice':'no puede marcar mensaje como ofensivo dos veces', + 'flag offensive cap exhausted':'cuota para marcar ofensivas ha sido excedida', + 'need >15 points to report spam':"necesita >15 puntos para reportar spam", + 'confirm delete':"¿Está seguro que desea borrar esto?", + 'anonymous users cannot delete/undelete':"usuarios anónimos no pueden borrar o recuperar publicaciones", + 'post recovered':"publicación recuperada", + 'post deleted':"publicación borrada。", + 'add comment':'agregar comentario', + 'community reputation points':'reputación comunitaria', + 'to comment, need':'para comentar, necesita reputación', + 'delete this comment':'borrar este comentario', + 'hide comments':"ocultar comentarios", + 'add a comment':"agregar comentarios", + 'comments':"comentarios", + 'confirm delete comment':"¿Realmente desea borrar este comentario?", + 'characters':'caracteres faltantes', + 'can write':'tiene ', + 'click to close':'haga click para cerrar', + 'loading...':'cargando...', + 'tags cannot be empty':'las etiquetas no pueden estar vacías', + 'tablimits info':"hasta 5 etiquetas de no mas de 20 caracteres cada una", + 'content cannot be empty':'el contenido no puede estar vacío', + 'content minchars': 'por favor introduzca mas de {0} caracteres', + 'please enter title':'por favor ingrese un título', + 'title minchars':"por favor introduzca al menos {0} caracteres", + 'delete':'borrar', + 'undelete': 'recuperar', + 'bold': 'negrita', + 'italic':'cursiva', + 'link':'enlace', + 'quote':'citar', + 'preformatted text':'texto preformateado', + 'image':'imagen', + 'numbered list':'lista numerada', + 'bulleted list':'lista no numerada', + 'heading':'标题', + 'horizontal bar':'barra horizontal', + 'undo':'deshacer', + 'redo':'rehacer', + 'enter image url':'introduzca la URL de la imagen, por ejemplo:<br />http://www.example.com/image.jpg \"titulo de imagen\"', + 'enter url':'introduzca direcciones web, ejemplo:<br />http://www.cnprog.com/ \"titulo del enlace\"</p>"', + 'upload image':'cargar imagen:', +}; + var i18n = { 'en':i18nEn, - 'zh_CN':i18nZh + 'zh_CN':i18nZh, + 'es':i18nEs }; var i18n_dict = i18n[i18nLang]; diff --git a/templates/content/style/style.css b/templates/content/style/style.css index 6c53eec9..1f992b7b 100644 --- a/templates/content/style/style.css +++ b/templates/content/style/style.css @@ -97,7 +97,6 @@ blockquote right:0px; height:20px; text-align:right; - color:black; padding:3px; background-color:#ffffff; width:500px; |