Merge branch 'master' into 646-undocumented-action-functions

ckan · May 28, 2013 · 098109f · 098109f
2 parents 550d2a5 + 82f45de
commit 098109f
Show file tree

Hide file tree

Showing 93 changed files with 180,705 additions and 56,852 deletions.
diff --git a/.tx/config b/.tx/config
@@ -1,7 +1,7 @@
 [main]
 host = http://www.transifex.net
 
-[ckan.1-8]
+[ckan.2-0]
 file_filter = ckan/i18n/<lang>/LC_MESSAGES/ckan.po
 source_file = ckan/i18n/ckan.pot
 source_lang = en

diff --git a/ckan/config/install.py b/ckan/config/install.py
@@ -4,6 +4,7 @@
 
 import ckan
 
+
 class CKANInstaller(PylonsInstaller):
 
     def config_content(self, command, vars):

diff --git a/ckan/i18n/bg/LC_MESSAGES/ckan.mo b/ckan/i18n/bg/LC_MESSAGES/ckan.mo