Merge remote-tracking branch 'origin/master' into django1.8/upgrade

Makefile

@@ -46,7 +46,7 @@ deploy-documentation:documentation withdraw-documentation
 
 deploy: deploy-documentation
 
-release: clean unit functional doctest deploy-documentation publish
+release: clean doctest deploy-documentation publish
 	@printf "Exporting to $(filename)... "
 	@tar czf $(filename) lettuce setup.py README.md COPYING
 	@echo "DONE!"

README.md

 # lettuce
-> Version 0.2.20 - kryptonite
+> Version 0.2.21 - kryptonite
 
 [![Build Status](https://secure.travis-ci.org/gabrielfalcao/lettuce.png)](http://travis-ci.org/gabrielfalcao/lettuce)
 [![tip for next commit](http://tip4commit.com/projects/132.svg)](http://tip4commit.com/projects/132)

lettuce/__init__.py

@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-__version__ = version = '0.2.20'
+__version__ = version = '0.2.21'
 
 release = 'kryptonite'
 

lettuce/languages.py

@@ -99,13 +99,13 @@ LANGUAGES = {
     },
     'ja': {
         'examples': u'例',
-        'feature': u'フィーチャ',
+        'feature': u'フィーチャ|機能',
         'name': u'Japanese',
         'native': u'日本語',
         'scenario': u'シナリオ',
         'scenario_outline': u'シナリオアウトライン|シナリオテンプレート|テンプレ|シナリオテンプレ',
         'scenario_separator': u'(シナリオ|シナリオアウトライン|シナリオテンプレート|テンプレ|シナリオテンプレ)',
-        'background': u'(?:Background)',
+        'background': u'背景',
     },
     'tr': {
         'examples': u'Örnekler',

setup.py

@@ -39,7 +39,7 @@ if os.name.lower() == 'nt':
 
 setup(
     name='lettuce',
-    version='0.2.20.002',
+    version='0.2.21',
     description='Behaviour Driven Development for python',
     author='Gabriel Falcao',
     author_email='gabriel@nacaolivre.org',