diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-08-23 17:49:01 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-08-23 17:49:01 +0100 |
| commit | 5ea4882f38bcf18016c82c1e6119c4df5237e96e (patch) | |
| tree | a393c38b8b4273eee7f4a693c6f4c7a7bd55266f /doc/TRANSLATE.md | |
| parent | db8bb7fa5440855420b8f3ce24611a766e52f89e (diff) | |
| parent | a311a1892507aacec5bfb2837dd10f5257dfb42c (diff) | |
Merge remote-tracking branch 'origin/release/0.6.4' into wdtk
Conflicts:
app/views/request/show.rhtml
spec/models/info_request_spec.rb
Diffstat (limited to 'doc/TRANSLATE.md')
| -rw-r--r-- | doc/TRANSLATE.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/TRANSLATE.md b/doc/TRANSLATE.md index 97ef39954..543c16cd9 100644 --- a/doc/TRANSLATE.md +++ b/doc/TRANSLATE.md @@ -66,7 +66,7 @@ must: * this updates the PO template, but also merges it with the individual PO files, marking strings that have only changed slightly as "fuzzy" - * reupload (`tx push -s -t`) the POT and PO files to Transifex to the + * reupload (`tx push -s -t`) the POT and PO files to Transifex from the current release branch * The point of uploading the PO files is that Transifex converts the "fuzzy" suggestions from Transifex into |