Merge branch '2.5.x' into saas

airtime_mvc/locale/ja/LC_MESSAGES/airtime.po

@@ -10,8 +10,8 @@ msgstr ""
 "Project-Id-Version: Airtime\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-12-13 12:58-0500\n"
-"PO-Revision-Date: 2014-08-25 02:34+0000\n"
-"Last-Translator: Kazuhiro Shimbo <kazuhiro.shimbo@mail.rakuten.com>\n"
+"PO-Revision-Date: 2014-08-27 01:20+0000\n"
+"Last-Translator: Akemi Makino <akemi.makino@mail.rakuten.com>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/airtime/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -38,7 +38,7 @@ msgstr ""
 
 #: airtime_mvc/application/layouts/scripts/layout.phtml:27
 msgid "Logout"
-msgstr ""
+msgstr "ログアウト"
 
 #: airtime_mvc/application/layouts/scripts/layout.phtml:42
 #: airtime_mvc/application/layouts/scripts/layout.phtml:68

dev_tools/bootstrap_development_environment.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# Set up 3 way PO file merging, which we need for non-mainline branches
+cp scripts/git-merge-po /usr/local/bin
+chmod +x /usr/local/bin/git-merge-po
+cat scripts/git-config-git-merge-po >> ../.git/config
+cat scripts/git-attributes-git-merge-po >> ../.gitattributes
+
+

dev_tools/scripts/git-attributes-git-merge-po

@@ -0,0 +1,2 @@
+   *.po   merge=pofile
+   *.pot  merge=pofile

dev_tools/scripts/git-config-git-merge-po

@@ -0,0 +1,5 @@
+[merge "pofile"]
+        name = Gettext merge driver
+        driver = git merge-po %O %A %B
+    
+

dev_tools/scripts/git-merge-po

@@ -0,0 +1,44 @@
+#!/bin/sh
+#
+# https://gist.github.com/mezis/1605647 
+# by Julien Letessier (mezis)
+#
+# Custom Git merge driver - merges PO files using msgcat(1)
+#
+# - Install gettext
+#
+# - Place this script in your PATH
+# 
+# - Add this to your .git/config :
+#
+#   [merge "pofile"]
+#     name = Gettext merge driver
+#     driver = git merge-po %O %A %B
+# 
+# - Add this to .gitattributes :
+# 
+#   *.po   merge=pofile
+#   *.pot  merge=pofile
+#
+# - When merging branches, conflicts in PO files will be maked with "#-#-#-#"
+# 
+O=$1
+A=$2
+B=$3
+
+# Extract the PO header from the current branch (top of file until first empty line)
+header=$(mktemp /tmp/merge-po.XXXX)
+sed -e '/^$/q' < $A > $header
+
+# Merge files, then repair header
+temp=$(mktemp /tmp/merge-po.XXXX)
+msgcat -o $temp $A $B
+msgcat --use-first -o $A $header $temp
+
+# Clean up
+rm $header $temp
+
+# Check for conflicts
+conflicts=$(grep -c "#-#" $A)
+test $conflicts -gt 0 && exit 1
+exit 0