diff options
| author | Michael Tänzer <neo@nhng.de> | 2013-11-06 03:18:30 +0100 |
|---|---|---|
| committer | Michael Tänzer <neo@nhng.de> | 2013-11-06 03:18:30 +0100 |
| commit | 6238e3b56e965aeb8eaa3345af330e96714f3989 (patch) | |
| tree | 1bfbcd4dce8e2aa36b1207193a284ca7bfdcae7f /locale/Makefile | |
| parent | 654e5db51486c4da9941ba2c3b02b037c1918533 (diff) | |
| parent | 234b43aca01ba78b9aff492591f84187ca12a664 (diff) | |
| download | cacert-devel-6238e3b56e965aeb8eaa3345af330e96714f3989.tar.gz cacert-devel-6238e3b56e965aeb8eaa3345af330e96714f3989.tar.xz cacert-devel-6238e3b56e965aeb8eaa3345af330e96714f3989.zip | |
Merge branch 'release' into bug-440
Conflicts:
includes/account.php
Signed-off-by: Michael Tänzer <neo@nhng.de>
Diffstat (limited to 'locale/Makefile')
| -rw-r--r-- | locale/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/locale/Makefile b/locale/Makefile index b703fb2..4215a4f 100644 --- a/locale/Makefile +++ b/locale/Makefile @@ -112,8 +112,7 @@ $(LANGS:%=$(MO_FILE_TEMPLATE)): $(MO_FILE_TEMPLATE): $(PO_FILE_TEMPLATE) $(LANGS:%=$(PO_FILE_TEMPLATE)): mkdir -p $(@D) wget --output-document - '$(@:$(PO_FILE_TEMPLATE)=$(PO_URL_TEMPLATE))' | \ - # convert UTF-8 characters to HTML entities \ - php -r 'while (!feof(STDIN)) echo mb_convert_encoding(fgets(STDIN), "HTML-ENTITIES", "UTF-8");' \ + php -f escape_special_chars.php \ > $@ @@ -177,7 +176,8 @@ upload.clean: template.clean messages.pot: $(GETTEXT_FILES) xgettext --output - --sort-by-file --copyright-holder "CAcert Inc." \ --package-name "CAcert" --package-version "$(VERSION)" \ - --msgid-bugs-address "translations-admin@cacert.org" $^ | \ + --msgid-bugs-address "translations-admin@cacert.org" \ + --add-comments=TRANSLATORS $^ | \ # replace place holders in the lines before the first msgid\ sed '1,/^msgid/ { s/SOME DESCRIPTIVE TITLE/$(DESCRITPION)/; s/YEAR/$(COPYRIGHT_YEAR)/; s/PACKAGE/$(PACKAGE)/ }' \ > $@ |