From 306c5286657490a1c1d1fe86167192561bc77281 Mon Sep 17 00:00:00 2001
From: Ford Guo <agile.guo@gmail.com>
Date: Tue, 30 Sep 2014 12:07:57 +0800
Subject: [PATCH] update zh_CN po mo

---
 .../locale/zh_CN/LC_MESSAGES/django.mo        | Bin 2918 -> 4766 bytes
 .../locale/zh_CN/LC_MESSAGES/django.po        |  40 ++++++-------
 .../locale/zh_CN/LC_MESSAGES/django.mo        | Bin 1852 -> 3282 bytes
 .../locale/zh_CN/LC_MESSAGES/django.po        |  40 ++++++-------
 .../locale/zh_CN/LC_MESSAGES/django.mo        | Bin 1572 -> 3473 bytes
 .../locale/zh_CN/LC_MESSAGES/django.po        |  56 +++++++++---------
 mayan/settings/local.py                       |  14 -----
 7 files changed, 68 insertions(+), 82 deletions(-)

diff --git a/mayan/apps/checkouts/locale/zh_CN/LC_MESSAGES/django.mo b/mayan/apps/checkouts/locale/zh_CN/LC_MESSAGES/django.mo
index 1e1ba421bb05adf4806446d31b3ce6caa8d56f01..ab15747f1f13fc7d67e9923914db45de0e9bf0e9 100644
GIT binary patch
literal 4766
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

delta 981
zcmX}rO=uHA7{>A0S~uyYNt(2-wKX5DMjO4@tqCf$2fuphr6PhLf*%E;D2gDx1?k0$
zA`I%KNDCGZLM{alVoyRnc<?HS6$QOlgi@5^|JjTg^6qbUCwXV)oyqgc&#<wc?|fot
zBg9_fl4nc}7dp7mZtrM4-@!c3FL4;(U@v~be%x^VL8mc%Oo7WN4&xY}$D{ZFCvX*q
zjA@v^+$d3Tr!jpPVGbv;h!?SdbI8X$<&wY!)W9z=iL35;4fXr4*o_;w8@Evl2>sRq
zs@TW)W{R5>9anG{-b77k9z%SFX>4K_zC{hVh8pN2D)Bc|(S9SvFq^ncHUD6p=Ouom
z34Ou={Gn&YkFzRKn(VTKN-&CLtl=TNfK|MY5xznVypHioo!ib-(CY7Z9!BP3CY)!m
zp^{H=6ITG^3ZN3sV-_E~_lxfRYt+`fbN$~@iGR8NEvHXX<?BV|tD?SFcaEp1zdBC4
zFHECWe%W~ysbE}{J@~(A(j{V$(AH?X)b<lP6WZ^6gwD-DLXGWjH%&^1eMI|Dwc`EM
zzy}B&F73Pf1DGD}%Y;f@A+&-aLKWcbwi|P8w+wd_A^xXmf!c3XvfWPIn7KAvo|&_r
zf6qShL;Kz@*>j1|))OD>t>j(rtbG^^+H4T5G=rv>jE<F$L?>#;SFU$gJUf<|wd47;
W{hTS-fo#)u^-S7g?xbDLZT$l%X;{tx

diff --git a/mayan/apps/checkouts/locale/zh_CN/LC_MESSAGES/django.po b/mayan/apps/checkouts/locale/zh_CN/LC_MESSAGES/django.po
index 5e0ace0750..40de5e0116 100644
--- a/mayan/apps/checkouts/locale/zh_CN/LC_MESSAGES/django.po
+++ b/mayan/apps/checkouts/locale/zh_CN/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-07-31 19:51-0400\n"
-"PO-Revision-Date: 2014-09-28 02:59+0000\n"
+"PO-Revision-Date: 2014-09-30 03:28+0000\n"
 "Last-Translator: Ford Guo <agile.guo@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/mayan-edms/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -97,7 +97,7 @@ msgstr "检出过期的日期和时间"
 
 #: models.py:26
 msgid "Amount of time to hold the document checked out in minutes."
-msgstr ""
+msgstr "持有文档检出的时间分钟数"
 
 #: models.py:31
 msgid "block new version upload"
@@ -105,7 +105,7 @@ msgstr "阻止新版本上传"
 
 #: models.py:31
 msgid "Do not allow new version of this document to be uploaded."
-msgstr ""
+msgstr "此文档不允许上传新版本"
 
 #: models.py:54
 msgid "document checkout"
@@ -133,7 +133,7 @@ msgstr "强制文档签入"
 
 #: permissions.py:12
 msgid "Allow overriding check out restrictions"
-msgstr ""
+msgstr "允许覆盖检出限制"
 
 #: views.py:32
 msgid "checked out documents"
@@ -187,52 +187,52 @@ msgstr "文档：%s的检出信息"
 #: views.py:82
 #, python-format
 msgid "Error trying to check out document; %s"
-msgstr ""
+msgstr "尝试检出文档出错%s"
 
 #: views.py:84
 #, python-format
 msgid "Document \"%s\" checked out successfully."
-msgstr ""
+msgstr "文档\"%s\"检出成功"
 
 #: views.py:87
 msgid "Document already checked out."
-msgstr ""
+msgstr "文档已经检出"
 
 #: views.py:95
 #, python-format
 msgid "Check out document: %s"
-msgstr ""
+msgstr "检出文档: %s"
 
 #: views.py:124
 msgid "Document has not been checked out."
-msgstr ""
+msgstr "文档未被检出"
 
 #: views.py:126
 #, python-format
 msgid "Error trying to check in document; %s"
-msgstr ""
+msgstr "尝试签入文档出错: %s"
 
 #: views.py:128
 #, python-format
 msgid "Document \"%s\" checked in successfully."
-msgstr ""
+msgstr "文档\"%s\"签入成功"
 
 #: views.py:141
 #, python-format
 msgid ""
 "You didn't originally checked out this document.  Are you sure you wish to "
 "forcefully check in document: %s?"
-msgstr ""
+msgstr "你起初没有检出此文档，确定要强制签入文档: %s么?"
 
 #: views.py:143
 #, python-format
 msgid "Are you sure you wish to check in document: %s?"
-msgstr ""
+msgstr "确定要签入文档: %s么？"
 
 #: widgets.py:19
 #, python-format
 msgid "Document status: %(widget)s %(text)s"
-msgstr ""
+msgstr "文档状态: %(widget)s %(text)s"
 
 #: widgets.py:31
 msgid "Days"
@@ -248,26 +248,26 @@ msgstr "分钟"
 
 #: widgets.py:63
 msgid "Enter a valid number of days."
-msgstr ""
+msgstr "输入有效的天数"
 
 #: widgets.py:64
 msgid "Enter a valid number of hours."
-msgstr ""
+msgstr "输入有效的小时数"
 
 #: widgets.py:65
 msgid "Enter a valid number of minutes."
-msgstr ""
+msgstr "输入有效的分钟数"
 
 #: widgets.py:66
 msgid "Enter a valid time difference."
-msgstr ""
+msgstr "输入有效的时间差"
 
 #: widgets.py:92
 msgid ""
 "Amount of time to hold the document in the checked out state in days, hours "
 "and/or minutes."
-msgstr ""
+msgstr "持有文档检出状态的时间数，以天，小时，分钟为单位。"
 
 #: widgets.py:93
 msgid "Check out expiration date and time"
-msgstr ""
+msgstr "检出过期的日期和时间"
diff --git a/mayan/apps/converter/locale/zh_CN/LC_MESSAGES/django.mo b/mayan/apps/converter/locale/zh_CN/LC_MESSAGES/django.mo
index 031f3540675ce0e7b3d87a3894fc81c4591161ae..8e02f7da31a11114930727201c45b76227bb2095 100644
GIT binary patch
literal 3282
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

delta 728
zcmZwEF-#Lt9LMoLP-rOyg`!AMa&XFm0|iZpvNQ|^oY27;^$LX6l5!-N7|}uFN}k4O
zG|><p7?i+3G~%Wvgo(w)r~}2pgasxX<onag<Ujr2=ickPcmMyp_2zeVGhZ7b4~#fM
z9won!C&(vdT!^l6vqPA|6rRH<UdJ}PjqNyx&G->p@jLqX8ynHDFssL2Y{5aSGMljs
zH`*}wcfzJn58OZxXEB0{*nrEZ^{be`bz~#^R+`_$O2%9Gf+luQ4LoMD2NzK5H?WQO
z+fQy(aV@h4@FePiKGdmPKy@~b>fjElkcX%O=CKx+k)M6w62~?4@pEbZ7an9>PW9Ae
zNlfs5YvP9g>^N3qXK8#IOJBi~%yW`|I;%syKt(8ONS0bm142dW#8mvhP=N}atfGlj
zF@qYYYlW&(s0f{ax;soNRN#K3ujVfY-as}xH5nF$!+gQ(zu4`zE6%!fyxna@d^cD5
z+&!&2?=D5Xmdsc-@G|*AZaAE@(O_(3G_;AJa3#1Fx;N2VvF;u(b?Qu4?@~I}QP%k1
vt)Er*v9<4}<E?Hte$#!b8FIPAF*ln?*8h0)zIgBM=Ii@be6>=1`_lFR&&6T{

diff --git a/mayan/apps/converter/locale/zh_CN/LC_MESSAGES/django.po b/mayan/apps/converter/locale/zh_CN/LC_MESSAGES/django.po
index d7ec4bc95f..9db0bca24e 100644
--- a/mayan/apps/converter/locale/zh_CN/LC_MESSAGES/django.po
+++ b/mayan/apps/converter/locale/zh_CN/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-07-31 19:51-0400\n"
-"PO-Revision-Date: 2014-09-23 14:08+0000\n"
+"PO-Revision-Date: 2014-09-30 03:35+0000\n"
 "Last-Translator: Ford Guo <agile.guo@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/mayan-edms/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -117,35 +117,35 @@ msgstr "微软Audio/Visual Interleaved"
 
 #: literals.py:64
 msgid "AVS X image"
-msgstr ""
+msgstr "AVS X 图像"
 
 #: literals.py:66
 msgid "Raw blue samples"
-msgstr ""
+msgstr "原始蓝色取样"
 
 #: literals.py:67
 msgid "Raw blue, green, and red samples"
-msgstr ""
+msgstr "原始蓝, 绿, 红取样"
 
 #: literals.py:68
 msgid "Raw blue, green, red and alpha samples"
-msgstr ""
+msgstr "原始蓝, 绿, 红，alpha取样"
 
 #: literals.py:69
 msgid "Microsoft Windows bitmap image"
-msgstr ""
+msgstr "微软视窗位图图像"
 
 #: literals.py:70
 msgid "Microsoft Windows bitmap image version 2"
-msgstr ""
+msgstr "微软视窗位图图像V2"
 
 #: literals.py:71
 msgid "Microsoft Windows bitmap image version 3"
-msgstr ""
+msgstr "微软视窗位图图像V3"
 
 #: literals.py:72
 msgid "BRF ASCII Braille format"
-msgstr ""
+msgstr "BRF ASCII Braille格式"
 
 #: literals.py:73
 msgid "Raw blue, red, and green samples"
@@ -165,7 +165,7 @@ msgstr ""
 
 #: literals.py:79
 msgid "Image caption"
-msgstr ""
+msgstr "图像标题"
 
 #: literals.py:80
 msgid "Cineon Image File"
@@ -851,7 +851,7 @@ msgstr ""
 
 #: literals.py:295
 msgid "GIMP image"
-msgstr ""
+msgstr "GIMP图像"
 
 #: literals.py:296
 msgid "Adobe XML metadata"
@@ -883,27 +883,27 @@ msgstr ""
 
 #: views.py:17
 msgid "suported file formats"
-msgstr ""
+msgstr "支持的文件格式"
 
 #: views.py:22
 msgid "name"
-msgstr ""
+msgstr "名称"
 
 #: views.py:26
 msgid "description"
-msgstr ""
+msgstr "描述"
 
 #: conf/settings.py:11
 msgid "File path to imagemagick's convert program."
-msgstr ""
+msgstr "imagemagick的文件目录"
 
 #: conf/settings.py:12
 msgid "File path to imagemagick's identify program."
-msgstr ""
+msgstr "imagemagick标识的文件目录"
 
 #: conf/settings.py:13
 msgid "File path to graphicsmagick's program."
-msgstr ""
+msgstr "graphicsmagick的文件目录"
 
 #: conf/settings.py:15
 msgid ""
@@ -915,15 +915,15 @@ msgstr ""
 
 #: conf/settings.py:16
 msgid "Path to the libreoffice program."
-msgstr ""
+msgstr "libreoffice的目录"
 
 #: templates/converter_file_formats_help.html:3
 msgid "Help"
-msgstr ""
+msgstr "帮助"
 
 #: templates/converter_file_formats_help.html:4
 #, python-format
 msgid ""
 "These are the file formats supported by the currently selected converter "
 "backend.  In this case: '%(backend)s'"
-msgstr ""
+msgstr "这些都是当前后台转换所支持的文件格式，使用环境: '%(backend)s'"
diff --git a/mayan/apps/django_gpg/locale/zh_CN/LC_MESSAGES/django.mo b/mayan/apps/django_gpg/locale/zh_CN/LC_MESSAGES/django.mo
index 52525cc897334a0bef1cbfc25c128dabcc78bee4..9bb3f859104e3e827ae2fe68393ccacde77a23d8 100644
GIT binary patch
literal 3473
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
A)c^nh

delta 698
zcmYk&Pe_wt9Ki9PHrre?)7%JhV}ccR5{(WPbtoe6(y4P(A7Z%auvH8X(?}V3(Ox<<
z1{Ulsl2E9t(q)&Rx^@UcgVz^9(Sw%|qwnwCE9`;a`+5HTp6B<xi|4D6;_uGDE1^Y+
zZlXrSiA)n8+6JD+O+117cnS~jHcGR|6}aO&ftMMVF^DzP{BL*?f1#f9r#>#q7M(Lp
z>|!hat1n21U7FC2dO!>#cmcJ5e$)$YqD?V({q>zd{er)!`;V{>!!07ccpWd{L+p{F
zNQsUfw2YeY3AK<f$eHrhAAiSo#y?T_xu^vm_#XQ6%}jcQ`^J3ZNS)F_v=REp!y|l-
z8xQvq_0qHcWC->3+Vn4JVcg>t0^Xlcd8Bj_U4%YH3p{StULaweYxxl!GKFL|HJ*B8
zvSvIl_n!=B(j(TrVEopDw0V{sGlj=8YBDBoB%RGoOy-5D#*Ex#`e`a}>N|5@y4Sa^
zhMoueuO<5i1_wT`hb}f*Q{ja5F8m?7I=B7Oc30lI3v=SkestER-SP{o97*0-vfawO
i<E@KRdb9nyD$eSfGiyUblKXy!6Es)Zsw}%pw)_Vkzk)#k

diff --git a/mayan/apps/django_gpg/locale/zh_CN/LC_MESSAGES/django.po b/mayan/apps/django_gpg/locale/zh_CN/LC_MESSAGES/django.po
index e5937c9543..38585c4432 100644
--- a/mayan/apps/django_gpg/locale/zh_CN/LC_MESSAGES/django.po
+++ b/mayan/apps/django_gpg/locale/zh_CN/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-07-31 19:52-0400\n"
-"PO-Revision-Date: 2014-09-26 03:34+0000\n"
+"PO-Revision-Date: 2014-09-30 03:54+0000\n"
 "Last-Translator: Ford Guo <agile.guo@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/mayan-edms/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -69,11 +69,11 @@ msgstr "未知"
 
 #: forms.py:7
 msgid "Term"
-msgstr ""
+msgstr "术语"
 
 #: forms.py:8
 msgid "Name, e-mail, key ID or key fingerprint to look for."
-msgstr ""
+msgstr "要查找的名称，邮件，密钥ID或者密钥指纹"
 
 #: links.py:6 views.py:66
 msgid "private keys"
@@ -89,7 +89,7 @@ msgstr "删除"
 
 #: links.py:9
 msgid "query keyservers"
-msgstr ""
+msgstr "查询密钥服务器"
 
 #: links.py:10
 msgid "import"
@@ -113,47 +113,47 @@ msgstr "删除密钥"
 
 #: permissions.py:11
 msgid "Query keyservers"
-msgstr ""
+msgstr "查询密钥服务器"
 
 #: permissions.py:12
 msgid "Import keys from keyservers"
-msgstr ""
+msgstr "从密钥服务器倒入密钥"
 
 #: views.py:37
 #, python-format
 msgid "Key: %s, imported successfully."
-msgstr ""
+msgstr "密钥: %s导入成功"
 
 #: views.py:42
 #, python-format
 msgid "Unable to import key id: %(key_id)s; %(error)s"
-msgstr ""
+msgstr "不能导入密钥 id: %(key_id)s，错误：%(error)s"
 
 #: views.py:51
 msgid "Import key"
-msgstr ""
+msgstr "导入密钥"
 
 #: views.py:52
 #, python-format
 msgid "Are you sure you wish to import key id: %s?"
-msgstr ""
+msgstr "确定要导入密钥id: %s么?"
 
 #: views.py:77
 msgid "Key ID"
-msgstr ""
+msgstr "密钥ID"
 
 #: views.py:81
 msgid "Owner"
-msgstr ""
+msgstr "持有者"
 
 #: views.py:101
 #, python-format
 msgid "Key: %s, deleted successfully."
-msgstr ""
+msgstr "密钥: %s,删除成功"
 
 #: views.py:108
 msgid "Delete key"
-msgstr ""
+msgstr "删除密钥"
 
 #: views.py:110
 #, python-format
@@ -161,56 +161,56 @@ msgid ""
 "Are you sure you wish to delete key: %s?  If you try to delete a public key "
 "that is part of a public/private pair the private key will be deleted as "
 "well."
-msgstr ""
+msgstr "确定要删除密钥%s么？如果你试图删除一个带有共／私配对的公钥，那么私钥也将被删除。"
 
 #: views.py:128
 msgid "Query key server"
-msgstr ""
+msgstr "查询密钥服务器"
 
 #: views.py:141
 msgid "results"
-msgstr ""
+msgstr "结果"
 
 #: views.py:146
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #: views.py:150
 msgid "type"
-msgstr ""
+msgstr "类型"
 
 #: views.py:154
 msgid "creation date"
-msgstr ""
+msgstr "创建日期"
 
 #: views.py:158
 msgid "disabled"
-msgstr ""
+msgstr "无效"
 
 #: views.py:162
 msgid "expiration date"
-msgstr ""
+msgstr "过期时间"
 
 #: views.py:166
 msgid "expired"
-msgstr ""
+msgstr "过期的"
 
 #: views.py:170
 msgid "length"
-msgstr ""
+msgstr "长度"
 
 #: views.py:174
 msgid "revoked"
-msgstr ""
+msgstr "撤销"
 
 #: views.py:179
 msgid "Identifies"
-msgstr ""
+msgstr "标识"
 
 #: conf/settings.py:15
 msgid "List of keyservers to be queried for unknown keys."
-msgstr ""
+msgstr "查询未知密钥的密钥服务器列表"
 
 #: conf/settings.py:16
 msgid "Home directory used to store keys as well as configuration files."
-msgstr ""
+msgstr "存储密钥和配置文件的用户目录。"
diff --git a/mayan/settings/local.py b/mayan/settings/local.py
index bdbe0015bc..4013e13a5b 100644
--- a/mayan/settings/local.py
+++ b/mayan/settings/local.py
@@ -2,17 +2,3 @@ from __future__ import absolute_import
 from .base import *
 
 SECRET_KEY = 'rv4^n)!7-6np1crot2y4wki@-o7)^_oehl-zmaymu9$3k-6d7&'
-
-WEB_THEME_VERBOSE_LOGIN = False
-MAIN_DISABLE_HOME_VIEW = True
-COMMON_ALLOW_ANONYMOUS_ACCESS = True
-WEB_THEME_THEME = "activo"
-CONVERTER_IM_CONVERT_PATH = "/usr/local/bin/convert"
-CONVERTER_LIBREOFFICE_PATH = "/Applications/LibreOffice.app/Contents/MacOS/soffice"
-OCR_TESSERACT_PATH = "/usr/local/bin/tesseract"
-CONVERTER_IM_IDENTIFY_PATH = "/usr/local/bin/identify"
-OCR_TESSERACT_PATH = "/usr/local/bin/tesseract"
-OCR_UNPAPER_PATH = "/usr/local/bin/unpaper"
-CONVERTER_GM_PATH = "/usr/local/bin/gm"
-CONVERTER_GRAPHICS_BACKEND = "converter.backends.imagemagick.ImageMagick"
-OCR_PDFTOTEXT_PATH = "/usr/local/bin/pdftotext"