Репозитории ALT
5.1: | 0.99.9-alt7.1 |
4.1: | 0.99.9-alt7 |
4.0: | 0.99.9-alt6.1 |
3.0: | 0.99.7-alt3 |
Группа :: Коммуникации
Пакет: jpilot
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: jpilot-0.99.9pre2-alt-gettext.patch
Скачать
Скачать
diff -urN jpilot-0.99.9pre2/configure.in jpilot-0.99.9pre2.patched/configure.in
--- jpilot-0.99.9pre2/configure.in 2006-02-28 12:21:07 +0300
+++ jpilot-0.99.9pre2.patched/configure.in 2006-02-28 12:30:57 +0300
@@ -45,28 +45,15 @@
dnl ******************************
dnl * start gettext
dnl ******************************
-AC_PROG_INTLTOOL()
+GETTEXT_PACKAGE=jpilot
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [gettext package name])
dnl Set of available languages
ALL_LINGUAS="ca cs da de es fr it ja ko nl no ru rw sv tr uk vi zh_CN zh_TW"
-dnl AM_GNU_GETTEXT([])
-AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.14.5])
-
-if test "x$MSGFMT" = "xno"; then
- if test "x$GMSGFMT" = "xno"; then
- AC_MSG_RESULT(I can't find gettext)
- AC_MSG_ERROR(Either install gettext or use 'configure --disable-nls')
- fi
-fi
-
-AC_SUBST(BUILD_INCLUDED_LIBINTL)
-AC_SUBST(USE_INCLUDED_LIBINTL)
-AC_SUBST(INTLOBJS)
-AC_SUBST(GLIBC21)
-AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
-AC_SUBST(INTLBISON)
+AM_GLIB_GNU_GETTEXT
+AC_PROG_INTLTOOL
dnl ******************************
dnl * end gettext
diff -urN jpilot-0.99.9pre2/po/boldquot.sed jpilot-0.99.9pre2.patched/po/boldquot.sed
--- jpilot-0.99.9pre2/po/boldquot.sed 2006-02-28 12:21:07 +0300
+++ jpilot-0.99.9pre2.patched/po/boldquot.sed 2006-02-28 12:21:20 +0300
@@ -1,10 +0,0 @@
-s/"\([^"]*\)"/Б─°\1Б─²/g
-s/`\([^`']*\)'/Б─≤\1Б─≥/g
-s/ '\([^`']*\)' / Б─≤\1Б─≥ /g
-s/ '\([^`']*\)'$/ Б─≤\1Б─≥/g
-s/^'\([^`']*\)' /Б─≤\1Б─≥ /g
-s/Б─°Б─²/""/g
-s/Б─°/Б─°[1m/g
-s/Б─²/[0mБ─²/g
-s/Б─≤/Б─≤[1m/g
-s/Б─≥/[0mБ─≥/g
diff -urN jpilot-0.99.9pre2/po/ChangeLog jpilot-0.99.9pre2.patched/po/ChangeLog
--- jpilot-0.99.9pre2/po/ChangeLog 2006-02-28 12:21:07 +0300
+++ jpilot-0.99.9pre2.patched/po/ChangeLog 2006-02-28 12:21:20 +0300
@@ -2,22 +2,3 @@
* Makefile.in.in: Upgrade to gettext-0.14.5.
-2004-02-22 gettextize <bug-gnu-gettext@gnu.org>
-
- * Makefile.in.in: Upgrade to gettext-0.14.1.
-
-2003-04-20 gettextize <bug-gnu-gettext@gnu.org>
-
- * Makefile.in.in: Upgrade to gettext-0.11.5.
- * Rules-quot: New file, from gettext-0.11.5.
- * boldquot.sed: New file, from gettext-0.11.5.
- * en@boldquot.header: New file, from gettext-0.11.5.
- * en@quot.header: New file, from gettext-0.11.5.
- * insert-header.sin: New file, from gettext-0.11.5.
- * quot.sed: New file, from gettext-0.11.5.
- * remove-potcdate.sin: New file, from gettext-0.11.5.
-
-2003-01-13 gettextize <bug-gnu-utils@gnu.org>
-
- * Makefile.in.in: Upgrade to gettext-0.10.40.
-
diff -urN jpilot-0.99.9pre2/po/en@boldquot.header jpilot-0.99.9pre2.patched/po/en@boldquot.header
--- jpilot-0.99.9pre2/po/en@boldquot.header 2006-02-28 12:21:07 +0300
+++ jpilot-0.99.9pre2.patched/po/en@boldquot.header 2006-02-28 12:21:20 +0300
@@ -1,25 +0,0 @@
-# All this catalog "translates" are quotation characters.
-# The msgids must be ASCII and therefore cannot contain real quotation
-# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
-# and double quote (0x22). These substitutes look strange; see
-# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
-#
-# This catalog translates grave accent (0x60) and apostrophe (0x27) to
-# left single quotation mark (U+2018) and right single quotation mark (U+2019).
-# It also translates pairs of apostrophe (0x27) to
-# left single quotation mark (U+2018) and right single quotation mark (U+2019)
-# and pairs of quotation mark (0x22) to
-# left double quotation mark (U+201C) and right double quotation mark (U+201D).
-#
-# When output to an UTF-8 terminal, the quotation characters appear perfectly.
-# When output to an ISO-8859-1 terminal, the single quotation marks are
-# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
-# grave/acute accent (by libiconv), and the double quotation marks are
-# transliterated to 0x22.
-# When output to an ASCII terminal, the single quotation marks are
-# transliterated to apostrophes, and the double quotation marks are
-# transliterated to 0x22.
-#
-# This catalog furthermore displays the text between the quotation marks in
-# bold face, assuming the VT100/XTerm escape sequences.
-#
diff -urN jpilot-0.99.9pre2/po/en@quot.header jpilot-0.99.9pre2.patched/po/en@quot.header
--- jpilot-0.99.9pre2/po/en@quot.header 2006-02-28 12:21:07 +0300
+++ jpilot-0.99.9pre2.patched/po/en@quot.header 2006-02-28 12:21:20 +0300
@@ -1,22 +0,0 @@
-# All this catalog "translates" are quotation characters.
-# The msgids must be ASCII and therefore cannot contain real quotation
-# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
-# and double quote (0x22). These substitutes look strange; see
-# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
-#
-# This catalog translates grave accent (0x60) and apostrophe (0x27) to
-# left single quotation mark (U+2018) and right single quotation mark (U+2019).
-# It also translates pairs of apostrophe (0x27) to
-# left single quotation mark (U+2018) and right single quotation mark (U+2019)
-# and pairs of quotation mark (0x22) to
-# left double quotation mark (U+201C) and right double quotation mark (U+201D).
-#
-# When output to an UTF-8 terminal, the quotation characters appear perfectly.
-# When output to an ISO-8859-1 terminal, the single quotation marks are
-# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
-# grave/acute accent (by libiconv), and the double quotation marks are
-# transliterated to 0x22.
-# When output to an ASCII terminal, the single quotation marks are
-# transliterated to apostrophes, and the double quotation marks are
-# transliterated to 0x22.
-#
diff -urN jpilot-0.99.9pre2/po/insert-header.sin jpilot-0.99.9pre2.patched/po/insert-header.sin
--- jpilot-0.99.9pre2/po/insert-header.sin 2006-02-28 12:21:07 +0300
+++ jpilot-0.99.9pre2.patched/po/insert-header.sin 2006-02-28 12:21:20 +0300
@@ -1,23 +0,0 @@
-# Sed script that inserts the file called HEADER before the header entry.
-#
-# At each occurrence of a line starting with "msgid ", we execute the following
-# commands. At the first occurrence, insert the file. At the following
-# occurrences, do nothing. The distinction between the first and the following
-# occurrences is achieved by looking at the hold space.
-/^msgid /{
-x
-# Test if the hold space is empty.
-s/m/m/
-ta
-# Yes it was empty. First occurrence. Read the file.
-r HEADER
-# Output the file's contents by reading the next line. But don't lose the
-# current line while doing this.
-g
-N
-bb
-:a
-# The hold space was nonempty. Following occurrences. Do nothing.
-x
-:b
-}
diff -urN jpilot-0.99.9pre2/po/Makevars jpilot-0.99.9pre2.patched/po/Makevars
--- jpilot-0.99.9pre2/po/Makevars 2006-02-28 12:21:07 +0300
+++ jpilot-0.99.9pre2.patched/po/Makevars 2006-02-28 12:21:31 +0300
@@ -1,41 +0,0 @@
-# Makefile variables for PO directory in any package using GNU gettext.
-
-# Usually the message domain is the same as the package name.
-DOMAIN = $(PACKAGE)
-
-# These two variables depend on the location of this directory.
-subdir = po
-top_builddir = ..
-
-# These options get passed to xgettext.
-XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
-
-# This is the copyright holder that gets inserted into the header of the
-# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
-# package. (Note that the msgstr strings, extracted from the package's
-# sources, belong to the copyright holder of the package.) Translators are
-# expected to transfer the copyright for their translations to this person
-# or entity, or to disclaim their copyright. The empty string stands for
-# the public domain; in this case the translators are expected to disclaim
-# their copyright.
-COPYRIGHT_HOLDER = Judd Montgomery
-
-# This is the email address or URL to which the translators shall report
-# bugs in the untranslated strings:
-# - Strings which are not entire sentences, see the maintainer guidelines
-# in the GNU gettext documentation, section 'Preparing Strings'.
-# - Strings which use unclear terms or require additional context to be
-# understood.
-# - Strings which make invalid assumptions about notation of date, time or
-# money.
-# - Pluralisation problems.
-# - Incorrect English spelling.
-# - Incorrect formatting.
-# It can be your email address, or a mailing list address where translators
-# can write to without being subscribed, or the URL of a web page through
-# which the translators can contact you.
-MSGID_BUGS_ADDRESS = jpilot-devel@jpilot.org
-
-# This is the list of locale categories, beyond LC_MESSAGES, for which the
-# message catalogs shall be used. It is usually empty.
-EXTRA_LOCALE_CATEGORIES =
diff -urN jpilot-0.99.9pre2/po/remove-potcdate.sin jpilot-0.99.9pre2.patched/po/remove-potcdate.sin
--- jpilot-0.99.9pre2/po/remove-potcdate.sin 2006-02-28 12:21:07 +0300
+++ jpilot-0.99.9pre2.patched/po/remove-potcdate.sin 2006-02-28 12:21:31 +0300
@@ -1,19 +0,0 @@
-# Sed script that remove the POT-Creation-Date line in the header entry
-# from a POT file.
-#
-# The distinction between the first and the following occurrences of the
-# pattern is achieved by looking at the hold space.
-/^"POT-Creation-Date: .*"$/{
-x
-# Test if the hold space is empty.
-s/P/P/
-ta
-# Yes it was empty. First occurrence. Remove the line.
-g
-d
-bb
-:a
-# The hold space was nonempty. Following occurrences. Do nothing.
-x
-:b
-}
diff -urN jpilot-0.99.9pre2/po/Rules-quot jpilot-0.99.9pre2.patched/po/Rules-quot
--- jpilot-0.99.9pre2/po/Rules-quot 2006-02-28 12:21:07 +0300
+++ jpilot-0.99.9pre2.patched/po/Rules-quot 2006-02-28 12:21:31 +0300
@@ -1,47 +0,0 @@
-# Special Makefile rules for English message catalogs with quotation marks.
-
-DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot
-
-.SUFFIXES: .insert-header .po-update-en
-
-en@quot.po-create:
- $(MAKE) en@quot.po-update
-en@boldquot.po-create:
- $(MAKE) en@boldquot.po-update
-
-en@quot.po-update: en@quot.po-update-en
-en@boldquot.po-update: en@boldquot.po-update-en
-
-.insert-header.po-update-en:
- @lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \
- if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
- tmpdir=`pwd`; \
- echo "$$lang:"; \
- ll=`echo $$lang | sed -e 's/@.*//'`; \
- LC_ALL=C; export LC_ALL; \
- cd $(srcdir); \
- if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$ll -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 \
- if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
- rm -f $$tmpdir/$$lang.new.po; \
- else \
- if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
- :; \
- else \
- echo "creation of $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
- exit 1; \
- fi; \
- fi; \
- else \
- echo "creation of $$lang.po failed!" 1>&2; \
- rm -f $$tmpdir/$$lang.new.po; \
- fi
-
-en@quot.insert-header: insert-header.sin
- sed -e '/^#/d' -e 's/HEADER/en@quot.header/g' $(srcdir)/insert-header.sin > en@quot.insert-header
-
-en@boldquot.insert-header: insert-header.sin
- sed -e '/^#/d' -e 's/HEADER/en@boldquot.header/g' $(srcdir)/insert-header.sin > en@boldquot.insert-header
-
-mostlyclean: mostlyclean-quot
-mostlyclean-quot:
- rm -f *.insert-header