From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Mon, 28 Sep 2009 20:52:53 +0000 (+0000)
Subject: more SYNOPSIS instructions
X-Git-Tag: live~6655
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/f59967a8947d0f1587d4d6ac581473d907d03658

more SYNOPSIS instructions
---

diff --git a/script/locale/merge-from-translatewiki b/script/locale/merge-from-translatewiki
index afb3fca92..f053593b4 100644
--- a/script/locale/merge-from-translatewiki
+++ b/script/locale/merge-from-translatewiki
@@ -30,6 +30,9 @@ merge-from-translatewiki - Get new translations from L<http://translatewiki.net>
     config/locales$ for i in $(ls *yml | grep -v en.yml); do perl ../../script/locale/diff --dump-flat $i > $i.0 ;done
 
     # Merge and find out what changed:
+    rails_port$ perl script/locale/merge-from-translatewiki --locales-dir config/locales
+
+    # Or, more complexy:
     rails_port$ for i in $(svn st config/locales/ | egrep '^M|\\?' | awk '{print $2}' | grep 'yml$'); do rm -v $i; done && svn up config/locales && perl script/locale/merge-from-translatewiki --locales-dir config/locales && svn st config/locales
  
     # Diff: