Merge branch 'master' into bootstrap

docs/admin/install.rst

@@ -356,7 +356,7 @@ recommended to use separate, file backed cache for this purpose:
         },
         'avatar': {
             'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
-            'LOCATION': os.path.join(WEB_ROOT, 'avatar-cache'),
+            'LOCATION': os.path.join(BASE_DIR, 'avatar-cache'),
             'TIMEOUT': 604800,
             'OPTIONS': {
                 'MAX_ENTRIES': 1000,
@@ -460,7 +460,7 @@ example to set it to ``configuration`` directory under Weblate tree:
 
 .. code-block:: python
 
-    os.environ['HOME'] = os.path.join(WEB_ROOT, 'configuration')
+    os.environ['HOME'] = os.path.join(BASE_DIR, 'configuration')
 
 .. note::
 

locale/pt/LC_MESSAGES/djangojs.po

@@ -7,17 +7,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Weblate 1.2\n"
 "Report-Msgid-Bugs-To: weblate@lists.cihar.com\n"
-"POT-Creation-Date: 2014-10-05 20:22+0200\n"
-"PO-Revision-Date: 2014-04-28 12:59+0200\n"
-"Last-Translator: Júlio Sebastião <j38600@gmail.com>\n"
-"Language-Team: Portuguese <https://hosted.weblate.org/projects/weblate/"
-"javascript/pt/>\n"
+"POT-Creation-Date: 2014-10-05 12:29+0200\n"
+"PO-Revision-Date: 2014-10-06 14:53+0200\n"
+"Last-Translator: Michal Čihař <michal@cihar.com>\n"
+"Language-Team: Portuguese "
+"<https://hosted.weblate.org/projects/weblate/javascript/pt/>\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 1.9-dev\n"
+"X-Generator: Weblate 1.10-dev\n"
 
 #. Translators: Verb for copy operation
 #: weblate/media/loader-bootstrap.js:72 weblate/media/loader.js:78
@@ -56,7 +56,7 @@ msgstr "O pedido do AJAX para carregar este conteúdo falhou!"
 
 #: weblate/media/loader.js:324 weblate/media/loader.js.c:395
 msgid "Loading…"
-msgstr "A carregar…"
+msgstr "Carregando…"
 
 #: weblate/media/loader.js:369
 msgid "Confirm resetting repository"

weblate.spec

@@ -54,7 +54,7 @@ List of features includes:
 %build
 make -C docs html
 cp weblate/settings_example.py weblate/settings.py
-sed -i 's@^WEB_ROOT = .*@WEB_ROOT = "%{WLDIR}/weblate"@g' weblate/settings.py
+sed -i 's@^BASE_DIR = .*@WEB_ROOT = "%{WLDIR}/weblate"@g' weblate/settings.py
 sed -i 's@^WHOOSH_INDEX = .*@WHOOSH_INDEX = "%{WLDATADIR}/whoosh-index"@g' weblate/settings.py
 sed -i 's@^GIT_ROOT = .*@GIT_ROOT = "%{WLDATADIR}/repos"@g' weblate/settings.py
 sed -i "s@'ENGINE': 'django.db.backends.sqlite3'@'ENGINE': 'django.db.backends.mysql'@" weblate/settings.py

weblate/accounts/avatar.py

@@ -100,7 +100,7 @@ def get_fallback_avatar(size):
     Returns fallback avatar.
     """
     fallback = os.path.join(
-        appsettings.WEB_ROOT,
+        appsettings.BASE_DIR,
         'media/weblate-{0}.png'.format(size)
     )
     with open(fallback, 'r') as handle:

weblate/trans/checks/same.py

@@ -52,6 +52,7 @@ SAME_BLACKLIST = frozenset((
     'appliance',
     'appliances',
     'aptitude',
+    'array',
     'attribute',
     'attribution',
     'atom',
@@ -865,6 +866,7 @@ DB_TAGS = (
     'programlisting',
 )
 
+
 def strip_format(msg, flags):
     '''
     Checks whether given string contains only format strings