Merge branch 'maint'

Conflicts due to change in return calling style.

Conflicts:
	src/pacman/pacman.c
	src/pacman/sync.c

1 files changed, 15 insertions, 0 deletions

diff --git a/doc/translation-help.txt b/doc/translation-help.txt
index 5be15dff..d95b5135 100644
--- a/doc/translation-help.txt
+++ b/doc/translation-help.txt
@@ -35,6 +35,21 @@ kbabel. Using a translation tool tends to make the job easier.
 Please read up on Transifex usage using the
 http://help.transifex.net/[Transifex Help] if you are not familiar.
 
+Here is an example set of commands if you have a source code checkout and are
+not worried about any local translations being overwritten. The .tx/ directory
+is checked into the git repository so is preconfigured with the two project
+resources (See `tx status` output for a quick overview).
+
+    tx pull -f
+    poedit po/<mylang>.po
+    poedit lib/libalpm/po/<mylang>.po
+    tx push -t -l <mylang>
+
+Or to just push one of the two available resources:
+
+    tx push -r archlinux-pacman.pacman-pot -t -l fi
+    tx push -r archlinux-pacman.libalpm-pot -t -l fi
+
 See the <<Notes,Notes>> section for additional hints on translating.
 
 Pre-release Updates