Merge branch '1.4'

Conflicts:
	locale/zh_CN/LC_MESSAGES/django.po

base/locale/zh_CN/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-21 10:53+0800\n"
+"POT-Creation-Date: 2013-01-31 13:07+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -50,6 +50,10 @@ msgstr ""
 msgid "The two password fields didn't match."
 msgstr ""
 
+#: management/commands/createsuperuser.py:25
+msgid "Enter a valid e-mail address."
+msgstr ""
+
 #: templatetags/seahub_tags.py:80
 msgid "Added"
 msgstr "添加了"
@@ -90,55 +94,55 @@ msgstr "重命名了目录"
 msgid "Moved directory"
 msgstr "移动了目录"
 
-#: templatetags/seahub_tags.py:100
-msgid "Reverted repo to status at"
+#: templatetags/seahub_tags.py:102
+msgid "Reverted library to status at"
 msgstr "资料库内容还原到"
 
-#: templatetags/seahub_tags.py:102
+#: templatetags/seahub_tags.py:104
 msgid "Reverted file to status at"
 msgstr "文件内容还原到"
 
-#: templatetags/seahub_tags.py:104
+#: templatetags/seahub_tags.py:106
 msgid "Recovered deleted directory"
 msgstr "还原已删除的目录"
 
-#: templatetags/seahub_tags.py:106
+#: templatetags/seahub_tags.py:108
 msgid "Auto merge by seafile system"
 msgstr "系统自动合并修改"
 
-#: templatetags/seahub_tags.py:163 templatetags/seahub_tags.py:197
+#: templatetags/seahub_tags.py:164 templatetags/seahub_tags.py:198
 msgid "Just now"
 msgstr "刚才"
 
-#: templatetags/seahub_tags.py:172
+#: templatetags/seahub_tags.py:173
 #, python-format
 msgid "%(days)d day ago"
 msgid_plural "%(days)d days ago"
 msgstr[0] "%(days)d 天前"
 
-#: templatetags/seahub_tags.py:179
+#: templatetags/seahub_tags.py:180
 #, python-format
 msgid "%(hours)d hour ago"
 msgid_plural "%(hours)d hours ago"
 msgstr[0] "%(hours)d 小时前"
 
-#: templatetags/seahub_tags.py:186
+#: templatetags/seahub_tags.py:187
 #, python-format
 msgid "%(minutes)d minute ago"
 msgid_plural "%(minutes)d minutes ago"
 msgstr[0] "%(minutes)d 分钟前"
 
-#: templatetags/seahub_tags.py:192
+#: templatetags/seahub_tags.py:193
 #, python-format
 msgid "%(seconds)d second ago"
 msgid_plural "%(seconds)d seconds ago"
 msgstr[0] "%(seconds)d 秒前"
 
-#: templatetags/seahub_tags.py:272
+#: templatetags/seahub_tags.py:273
 msgid "Read-Write"
 msgstr "可读写"
 
-#: templatetags/seahub_tags.py:274
+#: templatetags/seahub_tags.py:275
 msgid "Read-Only"
 msgstr "只读"
 

base/templatetags/seahub_tags.py

@@ -91,13 +91,17 @@ COMMIT_MSG_TRANSLATION_MAP = {
 @register.filter(name='translate_commit_desc')
 def translate_commit_desc(value):
     """Translate commit description."""
+    if value.startswith('Reverted repo'):
+        # Change 'repo' to 'library' in revert commit msg, since 'repo' is
+        # only used inside of seafile system.
+        value = value.replace('repo', 'library')
         
     # Do nothing if current language is English.
     if translation.get_language() == 'en':
         return value
     
-    if value.startswith('Reverted repo'):
-        return value.replace('Reverted repo to status at', _('Reverted repo to status at'))
+    if value.startswith('Reverted library'):
+        return value.replace('Reverted library to status at', _('Reverted library to status at'))
     elif value.startswith('Reverted file'):
         return value.replace('Reverted file to status at', _('Reverted file to status at'))
     elif value.startswith('Recovered deleted directory'):

group/templates/group/group_info.html

@@ -43,7 +43,7 @@
                 <li class="member">{% avatar member.user_name 16 %}<a class="name" href="{{ SITE_ROOT }}profile/{{ member.user_name }}/">{{ member.user_name|email2nickname }}</a></li>
               {% else %}
                 {% if forloop.last %}
-                  <li class="member">...</li>
+                  <li>...</li>
                 {% endif %}
               {% endif %}
             {% endfor %}

locale/zh_CN/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-30 21:15+0800\n"
+"POT-Creation-Date: 2013-01-31 11:41+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2076,7 +2076,7 @@ msgid "Encrypt"
 msgstr "加密"
 
 #: templates/snippets/repo_create_form.html:17
-msgid "(at lease 3 characters)"
+msgid "(at least 3 characters)"
 msgstr "(至少3个字符)"
 
 #: templates/snippets/repo_create_form.html:19
@@ -2130,5 +2130,5 @@ msgid "Note(optional)"
 msgstr "备注(可选)"
 
 #: utils/__init__.py:69
-msgid "permissiong error"
+msgid "permission error"
 msgstr "权限错误"

templates/snippets/repo_create_form.html

@@ -14,7 +14,7 @@
     {% endif %}
     <div class="repo-create-encryption">
         <input type="checkbox" name="encryption" id="encrypt-switch" /><label>{% trans "Encrypt"%}</label><br />
-        <label>{% trans "Password"%}</label><span class="tip">{% trans "(at lease 3 characters)"%}</span><br />
+        <label>{% trans "Password"%}</label><span class="tip">{% trans "(at least 3 characters)"%}</span><br />
         <input type="password" name="passwd" disabled="disabled" class="passwd input-disabled" /><br />
         <label>{% trans "Password again"%}</label><br />
         <input type="password" name="passwd_again" disabled="disabled" class="passwd input-disabled" />

utils/__init__.py

@@ -66,7 +66,7 @@ def render_permission_error(request, msg=None, extra_ctx=None):
 
     """
     ctx = {}
-    ctx['error_msg'] = msg or _('permissiong error')
+    ctx['error_msg'] = msg or _('permission error')
 
     if extra_ctx:
         for k in extra_ctx: