From 6843b528b61922d791aeb2df316837a44c3b5d8d Mon Sep 17 00:00:00 2001 From: localizer Date: Wed, 27 Aug 2014 01:20:18 +0000 Subject: [PATCH 1/4] updated translation resources --- airtime_mvc/locale/ja/LC_MESSAGES/airtime.mo | Bin 480 -> 513 bytes airtime_mvc/locale/ja/LC_MESSAGES/airtime.po | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/airtime_mvc/locale/ja/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/ja/LC_MESSAGES/airtime.mo index ccafc318192984500c288109bf5ab7a00f41404b..0ea7110a10524adda7f53fe973577c34ae6d0e3a 100644 GIT binary patch delta 163 zcmaFB+{og8Pl#nI0}wC)u?!IF05LNV+W;{LcmOdQ5PJgg0!9Xg03gi|#2i{tbSOD=dprj>`2C0F8iT)MrrV0i|R>me1 j&xy->CsvhaWESNs1ZQOCCgm&GWJ3k?ia`Ps|9u7kTICm7 diff --git a/airtime_mvc/locale/ja/LC_MESSAGES/airtime.po b/airtime_mvc/locale/ja/LC_MESSAGES/airtime.po index aca11315d..82b61f27b 100644 --- a/airtime_mvc/locale/ja/LC_MESSAGES/airtime.po +++ b/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 \n" +"PO-Revision-Date: 2014-08-27 01:20+0000\n" +"Last-Translator: Akemi Makino \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 From 2ac3633f6926e5c7775b9c2893a2c5110172b1d2 Mon Sep 17 00:00:00 2001 From: Albert Santoni Date: Wed, 27 Aug 2014 16:43:54 -0400 Subject: [PATCH 2/4] 3-way git merge driver for PO files and development bootstrapping script (the start of it anyways) --- .../bootstrap_development_environment.sh | 9 ++++ dev_tools/scripts/git-merge-po | 44 +++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100755 dev_tools/bootstrap_development_environment.sh create mode 100644 dev_tools/scripts/git-merge-po diff --git a/dev_tools/bootstrap_development_environment.sh b/dev_tools/bootstrap_development_environment.sh new file mode 100755 index 000000000..d3876b9c5 --- /dev/null +++ b/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 git-config-git-merge-po >> ../.git/config +cat git-attributes-git-merge-po >> ../.gitattributes + + diff --git a/dev_tools/scripts/git-merge-po b/dev_tools/scripts/git-merge-po new file mode 100644 index 000000000..2aedde19c --- /dev/null +++ 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 From f40357f9724abd534012e78016c539da3e915e47 Mon Sep 17 00:00:00 2001 From: Albert Santoni Date: Wed, 27 Aug 2014 16:51:37 -0400 Subject: [PATCH 3/4] Added missing git config stuff --- dev_tools/scripts/git-attributes-git-merge-po | 2 ++ dev_tools/scripts/git-config-git-merge-po | 5 +++++ 2 files changed, 7 insertions(+) create mode 100644 dev_tools/scripts/git-attributes-git-merge-po create mode 100644 dev_tools/scripts/git-config-git-merge-po diff --git a/dev_tools/scripts/git-attributes-git-merge-po b/dev_tools/scripts/git-attributes-git-merge-po new file mode 100644 index 000000000..619facfe8 --- /dev/null +++ b/dev_tools/scripts/git-attributes-git-merge-po @@ -0,0 +1,2 @@ + *.po merge=pofile + *.pot merge=pofile diff --git a/dev_tools/scripts/git-config-git-merge-po b/dev_tools/scripts/git-config-git-merge-po new file mode 100644 index 000000000..6fe011f1b --- /dev/null +++ b/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 + + From 8c869914f02c9dda2c55a9b4a1cc84d6a52b16ad Mon Sep 17 00:00:00 2001 From: Albert Santoni Date: Wed, 27 Aug 2014 16:52:06 -0400 Subject: [PATCH 4/4] One more time! --- dev_tools/bootstrap_development_environment.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev_tools/bootstrap_development_environment.sh b/dev_tools/bootstrap_development_environment.sh index d3876b9c5..5ca83a5ca 100755 --- a/dev_tools/bootstrap_development_environment.sh +++ b/dev_tools/bootstrap_development_environment.sh @@ -3,7 +3,7 @@ # 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 git-config-git-merge-po >> ../.git/config -cat git-attributes-git-merge-po >> ../.gitattributes +cat scripts/git-config-git-merge-po >> ../.git/config +cat scripts/git-attributes-git-merge-po >> ../.gitattributes