diff options
author | Christian Grothoff <christian@grothoff.org> | 2015-06-27 19:50:10 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2015-06-27 19:50:10 +0000 |
commit | 2eed057f8535501052b2335bc3f0a362197ad617 (patch) | |
tree | bb4c1ed18d7bc53f0352a2dbfb65e1207105ead5 /po | |
parent | 50c38f10458a775b2b7462de6c686f1c76c5039e (diff) | |
download | gnunet-2eed057f8535501052b2335bc3f0a362197ad617.tar.gz gnunet-2eed057f8535501052b2335bc3f0a362197ad617.zip |
downgrade to gettext 0.18.3 for more sane availability
Diffstat (limited to 'po')
-rw-r--r-- | po/Makefile.in.in | 47 | ||||
-rw-r--r-- | po/Makevars.template | 25 | ||||
-rw-r--r-- | po/POTFILES.in | 1 | ||||
-rw-r--r-- | po/Rules-quot | 13 |
4 files changed, 14 insertions, 72 deletions
diff --git a/po/Makefile.in.in b/po/Makefile.in.in index 65184f65c..fabdc76c9 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in | |||
@@ -8,8 +8,8 @@ | |||
8 | # Please note that the actual code of GNU gettext is covered by the GNU | 8 | # Please note that the actual code of GNU gettext is covered by the GNU |
9 | # General Public License and is *not* in the public domain. | 9 | # General Public License and is *not* in the public domain. |
10 | # | 10 | # |
11 | # Origin: gettext-0.19 | 11 | # Origin: gettext-0.18.3 |
12 | GETTEXT_MACRO_VERSION = 0.19 | 12 | GETTEXT_MACRO_VERSION = 0.18 |
13 | 13 | ||
14 | PACKAGE = @PACKAGE@ | 14 | PACKAGE = @PACKAGE@ |
15 | VERSION = @VERSION@ | 15 | VERSION = @VERSION@ |
@@ -77,16 +77,6 @@ POTFILES = \ | |||
77 | 77 | ||
78 | CATALOGS = @CATALOGS@ | 78 | CATALOGS = @CATALOGS@ |
79 | 79 | ||
80 | POFILESDEPS_ = $(srcdir)/$(DOMAIN).pot | ||
81 | POFILESDEPS_yes = $(POFILESDEPS_) | ||
82 | POFILESDEPS_no = | ||
83 | POFILESDEPS = $(POFILESDEPS_$(PO_DEPENDS_ON_POT)) | ||
84 | |||
85 | DISTFILESDEPS_ = update-po | ||
86 | DISTFILESDEPS_yes = $(DISTFILESDEPS_) | ||
87 | DISTFILESDEPS_no = | ||
88 | DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO)) | ||
89 | |||
90 | # Makevars gets inserted here. (Don't remove this line!) | 80 | # Makevars gets inserted here. (Don't remove this line!) |
91 | 81 | ||
92 | .SUFFIXES: | 82 | .SUFFIXES: |
@@ -153,25 +143,15 @@ stamp-po: $(srcdir)/$(DOMAIN).pot | |||
153 | # heuristic whether some file in the top level directory mentions "GNU xyz". | 143 | # heuristic whether some file in the top level directory mentions "GNU xyz". |
154 | # If GNU 'find' is available, we avoid grepping through monster files. | 144 | # If GNU 'find' is available, we avoid grepping through monster files. |
155 | $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed | 145 | $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed |
156 | package_gnu="$(PACKAGE_GNU)"; \ | 146 | if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \ |
157 | test -n "$$package_gnu" || { \ | 147 | LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f -size -10000000c -exec grep 'GNU @PACKAGE@' /dev/null '{}' ';' 2>/dev/null; \ |
158 | if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \ | 148 | else \ |
159 | LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f \ | 149 | LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \ |
160 | -size -10000000c -exec grep 'GNU @PACKAGE@' \ | 150 | fi; \ |
161 | /dev/null '{}' ';' 2>/dev/null; \ | 151 | } | grep -v 'libtool:' >/dev/null; then \ |
162 | else \ | 152 | package_gnu='GNU '; \ |
163 | LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \ | ||
164 | fi; \ | ||
165 | } | grep -v 'libtool:' >/dev/null; then \ | ||
166 | package_gnu=yes; \ | ||
167 | else \ | ||
168 | package_gnu=no; \ | ||
169 | fi; \ | ||
170 | }; \ | ||
171 | if test "$$package_gnu" = "yes"; then \ | ||
172 | package_prefix='GNU '; \ | ||
173 | else \ | 153 | else \ |
174 | package_prefix=''; \ | 154 | package_gnu=''; \ |
175 | fi; \ | 155 | fi; \ |
176 | if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \ | 156 | if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \ |
177 | msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \ | 157 | msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \ |
@@ -191,7 +171,7 @@ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed | |||
191 | --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \ | 171 | --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \ |
192 | --files-from=$(srcdir)/POTFILES.in \ | 172 | --files-from=$(srcdir)/POTFILES.in \ |
193 | --copyright-holder='$(COPYRIGHT_HOLDER)' \ | 173 | --copyright-holder='$(COPYRIGHT_HOLDER)' \ |
194 | --package-name="$${package_prefix}@PACKAGE@" \ | 174 | --package-name="$${package_gnu}@PACKAGE@" \ |
195 | --package-version='@VERSION@' \ | 175 | --package-version='@VERSION@' \ |
196 | --msgid-bugs-address="$$msgid_bugs_address" \ | 176 | --msgid-bugs-address="$$msgid_bugs_address" \ |
197 | ;; \ | 177 | ;; \ |
@@ -219,10 +199,9 @@ $(srcdir)/$(DOMAIN).pot: | |||
219 | 199 | ||
220 | # This target rebuilds a PO file if $(DOMAIN).pot has changed. | 200 | # This target rebuilds a PO file if $(DOMAIN).pot has changed. |
221 | # Note that a PO file is not touched if it doesn't need to be changed. | 201 | # Note that a PO file is not touched if it doesn't need to be changed. |
222 | $(POFILES): $(POFILESDEPS) | 202 | $(POFILES): $(srcdir)/$(DOMAIN).pot |
223 | @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \ | 203 | @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \ |
224 | if test -f "$(srcdir)/$${lang}.po"; then \ | 204 | if test -f "$(srcdir)/$${lang}.po"; then \ |
225 | test -f $(srcdir)/$(DOMAIN).pot || $(MAKE) $(srcdir)/$(DOMAIN).pot; \ | ||
226 | test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ | 205 | test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ |
227 | echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \ | 206 | echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \ |
228 | cd $(srcdir) \ | 207 | cd $(srcdir) \ |
@@ -383,7 +362,7 @@ maintainer-clean: distclean | |||
383 | 362 | ||
384 | distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) | 363 | distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) |
385 | dist distdir: | 364 | dist distdir: |
386 | test -z "$(DISTFILESDEPS)" || $(MAKE) $(DISTFILESDEPS) | 365 | $(MAKE) update-po |
387 | @$(MAKE) dist2 | 366 | @$(MAKE) dist2 |
388 | # This is a separate target because 'update-po' must be executed before. | 367 | # This is a separate target because 'update-po' must be executed before. |
389 | dist2: stamp-po $(DISTFILES) | 368 | dist2: stamp-po $(DISTFILES) |
diff --git a/po/Makevars.template b/po/Makevars.template index 0648ec759..4a9ff7d23 100644 --- a/po/Makevars.template +++ b/po/Makevars.template | |||
@@ -20,13 +20,6 @@ XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ | |||
20 | # their copyright. | 20 | # their copyright. |
21 | COPYRIGHT_HOLDER = Free Software Foundation, Inc. | 21 | COPYRIGHT_HOLDER = Free Software Foundation, Inc. |
22 | 22 | ||
23 | # This tells whether or not to prepend "GNU " prefix to the package | ||
24 | # name that gets inserted into the header of the $(DOMAIN).pot file. | ||
25 | # Possible values are "yes", "no", or empty. If it is empty, try to | ||
26 | # detect it automatically by scanning the files in $(top_srcdir) for | ||
27 | # "GNU packagename" string. | ||
28 | PACKAGE_GNU = | ||
29 | |||
30 | # This is the email address or URL to which the translators shall report | 23 | # This is the email address or URL to which the translators shall report |
31 | # bugs in the untranslated strings: | 24 | # bugs in the untranslated strings: |
32 | # - Strings which are not entire sentences, see the maintainer guidelines | 25 | # - Strings which are not entire sentences, see the maintainer guidelines |
@@ -58,21 +51,3 @@ USE_MSGCTXT = no | |||
58 | # --previous to keep previous msgids of translated messages, | 51 | # --previous to keep previous msgids of translated messages, |
59 | # --quiet to reduce the verbosity. | 52 | # --quiet to reduce the verbosity. |
60 | MSGMERGE_OPTIONS = | 53 | MSGMERGE_OPTIONS = |
61 | |||
62 | # These options get passed to msginit. | ||
63 | # If you want to disable line wrapping when writing PO files, add | ||
64 | # --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and | ||
65 | # MSGINIT_OPTIONS. | ||
66 | MSGINIT_OPTIONS = | ||
67 | |||
68 | # This tells whether or not to regenerate a PO file when $(DOMAIN).pot | ||
69 | # has changed. Possible values are "yes" and "no". Set this to no if | ||
70 | # the POT file is checked in the repository and the version control | ||
71 | # program ignores timestamps. | ||
72 | PO_DEPENDS_ON_POT = yes | ||
73 | |||
74 | # This tells whether or not to forcibly update $(DOMAIN).pot and | ||
75 | # regenerate PO files on "make dist". Possible values are "yes" and | ||
76 | # "no". Set this to no if the POT file and PO files are maintained | ||
77 | # externally. | ||
78 | DIST_DEPENDS_ON_UPDATE_PO = yes | ||
diff --git a/po/POTFILES.in b/po/POTFILES.in index a9015c08b..5fd10263e 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in | |||
@@ -459,7 +459,6 @@ src/include/gnunet_common.h | |||
459 | src/include/gnunet_mq_lib.h | 459 | src/include/gnunet_mq_lib.h |
460 | src/include/gnunet_postgres_lib.h | 460 | src/include/gnunet_postgres_lib.h |
461 | src/include/gnunet_time_lib.h | 461 | src/include/gnunet_time_lib.h |
462 | src/nat/test_stun.h | ||
463 | src/rps/rps-test_util.h | 462 | src/rps/rps-test_util.h |
464 | src/scalarproduct/scalarproduct.h | 463 | src/scalarproduct/scalarproduct.h |
465 | src/testbed/testbed_api.h | 464 | src/testbed/testbed_api.h |
diff --git a/po/Rules-quot b/po/Rules-quot index 9dc963076..5931e5392 100644 --- a/po/Rules-quot +++ b/po/Rules-quot | |||
@@ -1,4 +1,3 @@ | |||
1 | # This file, Rules-quot, can be copied and used freely without restrictions. | ||
2 | # Special Makefile rules for English message catalogs with quotation marks. | 1 | # Special Makefile rules for English message catalogs with quotation marks. |
3 | 2 | ||
4 | DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot | 3 | DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot |
@@ -21,17 +20,7 @@ en@boldquot.po-update: en@boldquot.po-update-en | |||
21 | ll=`echo $$lang | sed -e 's/@.*//'`; \ | 20 | ll=`echo $$lang | sed -e 's/@.*//'`; \ |
22 | LC_ALL=C; export LC_ALL; \ | 21 | LC_ALL=C; export LC_ALL; \ |
23 | cd $(srcdir); \ | 22 | cd $(srcdir); \ |
24 | if $(MSGINIT) $(MSGINIT_OPTIONS) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null \ | 23 | if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) $(SED) -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \ |
25 | | $(SED) -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | \ | ||
26 | { case `$(MSGFILTER) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ | ||
27 | '' | 0.[0-9] | 0.[0-9].* | 0.1[0-8] | 0.1[0-8].*) \ | ||
28 | $(MSGFILTER) $(SED) -f `echo $$lang | sed -e 's/.*@//'`.sed \ | ||
29 | ;; \ | ||
30 | *) \ | ||
31 | $(MSGFILTER) `echo $$lang | sed -e 's/.*@//'` \ | ||
32 | ;; \ | ||
33 | esac } 2>/dev/null > $$tmpdir/$$lang.new.po \ | ||
34 | ; then \ | ||
35 | if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ | 24 | if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ |
36 | rm -f $$tmpdir/$$lang.new.po; \ | 25 | rm -f $$tmpdir/$$lang.new.po; \ |
37 | else \ | 26 | else \ |