From: Guillem Jover Date: Fri, 17 Feb 2006 07:23:31 +0000 (+0000) Subject: Move dselect gettext strings to its own domain provided now by the X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92c0bb7afd728a44aa09b4e25c519d0cfe190713;p=dpkg Move dselect gettext strings to its own domain provided now by the dselect package. --- diff --git a/ChangeLog b/ChangeLog index 92021e54..6ef520a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2006-02-17 Guillem Jover + + * debian/dselect.install: Install only dselect domain. + * debian/dpkg.install: Install only dpkg domain. + * dselect/po: New directory. + * dselect/main.cc (main): Use DSELECT domain. + * dselect/Makefile.am (SUBDIRS): Add po. + * configure.ac (AC_CONFIG_FILES): Add dselect/po/Makefile.in. + 2006-02-17 Guillem Jover * methods/: Move directory to dselect/methods/. diff --git a/configure.ac b/configure.ac index b783f08c..425f40c9 100644 --- a/configure.ac +++ b/configure.ac @@ -104,6 +104,7 @@ AC_CONFIG_FILES([ Makefile dpkg-split/Makefile dselect/Makefile dselect/methods/Makefile + dselect/po/Makefile.in getopt/Makefile intl/Makefile lib/Makefile diff --git a/debian/changelog b/debian/changelog index fc7353b5..09354244 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ dpkg (1.13.16~) UNRELEASED; urgency=low * Require gettext 0.14.5. * Move the methods directory to dselect/methods, so the contents will not be installed if dselect is not to be built. + * Move dselect gettext strings to its own domain provided now by the + dselect package. -- Guillem Jover Fri, 17 Feb 2006 03:52:59 +0200 diff --git a/debian/dpkg.install b/debian/dpkg.install index e803ac07..17b089ff 100644 --- a/debian/dpkg.install +++ b/debian/dpkg.install @@ -11,7 +11,7 @@ usr/lib/dpkg/enoent usr/lib/dpkg/mksplit usr/sbin usr/share/dpkg -usr/share/locale +usr/share/locale/*/LC_MESSAGES/dpkg.mo usr/share/man/*/*/cleanup-info.8 usr/share/man/*/cleanup-info.8 usr/share/man/*/*/dpkg-deb.1 diff --git a/debian/dselect.install b/debian/dselect.install index ebf6ebae..8d525522 100644 --- a/debian/dselect.install +++ b/debian/dselect.install @@ -2,6 +2,7 @@ usr/bin/dselect usr/lib/dpkg/methods +usr/share/locale/*/LC_MESSAGES/dselect.mo usr/share/man/*/*/dselect.cfg.5 usr/share/man/*/dselect.cfg.5 usr/share/man/*/*/dselect.1 diff --git a/dselect/Makefile.am b/dselect/Makefile.am index 12c5401e..35ee7366 100644 --- a/dselect/Makefile.am +++ b/dselect/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = methods +SUBDIRS = methods po localedir = $(datadir)/locale INCLUDES = \ diff --git a/dselect/main.cc b/dselect/main.cc index b7877384..f0231559 100644 --- a/dselect/main.cc +++ b/dselect/main.cc @@ -482,8 +482,8 @@ int main(int, const char *const *argv) { jmp_buf ejbuf; setlocale(LC_ALL, ""); - bindtextdomain(PACKAGE, LOCALEDIR); - textdomain(PACKAGE); + bindtextdomain(DSELECT, LOCALEDIR); + textdomain(DSELECT); if (setjmp(ejbuf)) { /* expect warning about possible clobbering of argv */ cursesoff(); diff --git a/dselect/po/ChangeLog b/dselect/po/ChangeLog new file mode 100644 index 00000000..f2f46eab --- /dev/null +++ b/dselect/po/ChangeLog @@ -0,0 +1,39 @@ +2006-02-17 Guillem Jover + + * LINGUAS: New file. + * POTFILES.in: Likewise. + * Makefile.in.in: Likewise. + * Makevars: Likewise. + * remove-potcdate.sin: Likewise. + * dselect.pot: Likewise. + * bs.po: Likewise. + * ca.po: Likewise. + * cs.po: Likewise. + * da.po: Likewise. + * de.po: Likewise. + * el.po: Likewise. + * es.po: Likewise. + * eu.po: Likewise. + * fr.po: Likewise. + * gl.po: Likewise. + * he.po: Likewise. + * hu.po: Likewise. + * id.po: Likewise. + * it.po: Likewise. + * ja.po: Likewise. + * ko.po: Likewise. + * nb.po: Likewise. + * nl.po: Likewise. + * nn.po: Likewise. + * pl.po: Likewise. + * pt_BR.po: Likewise. + * pt.po: Likewise. + * ro.po: Likewise. + * ru.po: Likewise. + * sk.po: Likewise. + * sv.po: Likewise. + * tl.po: Likewise. + * vi.po: Likewise. + * zh_CN.po: Likewise. + * zh_TW.po: Likewise. + diff --git a/dselect/po/LINGUAS b/dselect/po/LINGUAS new file mode 100644 index 00000000..4f6e7b45 --- /dev/null +++ b/dselect/po/LINGUAS @@ -0,0 +1,97 @@ +# This file contains the list of available translations. +# +# Each should be prefixed with the English name for the language and +# the current maintainer's name in their preferred form and contact +# e-mail address. + +# Bosnian - Safir Šećerović +bs + +# Catalan - Jordi Mallach +ca + +# Czech - Miroslav Kure +cs + +# Danish - Claus Hindsgaul +da + +# German - Michael Piefel +de + +# Greek (Hellenic) - George Papamichelakis +el + +# Spanish - Javier Fernández-Sanguino Peña +es + +# Basque (Euskara) - Piarres Beobide Egaña +eu + +# French - Christian Perrier +fr + +# Galician - Héctor Fernández López +gl + +# Hebrew - Lior Kaplan +# Temporarily removed on request of the translator +# until some correct display of RTL languages can be OK +# he + +# Hungarian - Szervác Attila +hu + +# Indonesian - Arief S Fitrianto +id + +# Italian - Stefano Canepa +it + +# Japanese - Kenshi Muto +ja + +# Korean - Changwoo Ryu +ko + +# Norwegian (Bokmål) - Bjorn Steensrud +nb + +# Dutch - Bart Cornelis +nl + +# Norwegian (Nynorsk) - Håvard Korsvoll +nn + +# Polish - Bartosz Feñski +pl + +# Portuguese - Miguel Figueiredo +pt + +# Brazilian Portuguese - André Luís Lopes +pt_BR + +# Romanian - Eddy Petrisor +ro + +# Russian - Yuri Kozlov +ru + +# Slovak - Roman Benko +sk + +# Swedish - Peter Karlsson +sv + +# Tagalog - Eric Pareja +tl + +# Vietnamese - Clytie Siddall +vi + +# Simplified Chinese - Tchaikov +zh_CN + +# Traditional Chinese - Asho Yeh +zh_TW diff --git a/dselect/po/Makefile.in.in b/dselect/po/Makefile.in.in new file mode 100644 index 00000000..1f5cc285 --- /dev/null +++ b/dselect/po/Makefile.in.in @@ -0,0 +1,384 @@ +# Makefile for PO directory in any package using GNU gettext. +# Copyright (C) 1995-1997, 2000-2005 by Ulrich Drepper +# +# This file can be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU General Public +# License but which still want to provide support for the GNU gettext +# functionality. +# Please note that the actual code of GNU gettext is covered by the GNU +# General Public License and is *not* in the public domain. +# +# Origin: gettext-0.14.4 + +PACKAGE = @PACKAGE@ +VERSION = @VERSION@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + +SHELL = /bin/sh +@SET_MAKE@ + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ + +prefix = @prefix@ +exec_prefix = @exec_prefix@ +datadir = @datadir@ +localedir = $(datadir)/locale +gettextsrcdir = $(datadir)/gettext/po + +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +mkinstalldirs = $(SHELL) $(MKINSTALLDIRS) + +GMSGFMT = @GMSGFMT@ +MSGFMT = @MSGFMT@ +XGETTEXT = @XGETTEXT@ +MSGMERGE = msgmerge +MSGMERGE_UPDATE = @MSGMERGE@ --update +MSGINIT = msginit +MSGCONV = msgconv +MSGFILTER = msgfilter + +POFILES = @POFILES@ +GMOFILES = @GMOFILES@ +UPDATEPOFILES = @UPDATEPOFILES@ +DUMMYPOFILES = @DUMMYPOFILES@ +DISTFILES.common = Makefile.in.in remove-potcdate.sin \ +$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3) +DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \ +$(POFILES) $(GMOFILES) \ +$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3) + +POTFILES = \ + +CATALOGS = @CATALOGS@ + +# Makevars gets inserted here. (Don't remove this line!) + +.SUFFIXES: +.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update + +.po.mo: + @echo "$(MSGFMT) -c -o $@ $<"; \ + $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@ + +.po.gmo: + @lang=`echo $* | sed -e 's,.*/,,'`; \ + test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ + echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \ + cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo + +.sin.sed: + sed -e '/^#/d' $< > t-$@ + mv t-$@ $@ + + +all: all-@USE_NLS@ + +all-yes: stamp-po +all-no: + +# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no +# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because +# we don't want to bother translators with empty POT files). We assume that +# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty. +# In this case, stamp-po is a nop (i.e. a phony target). + +# stamp-po is a timestamp denoting the last time at which the CATALOGS have +# been loosely updated. Its purpose is that when a developer or translator +# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS, +# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent +# invocations of "make" will do nothing. This timestamp would not be necessary +# if updating the $(CATALOGS) would always touch them; however, the rule for +# $(POFILES) has been designed to not touch files that don't need to be +# changed. +stamp-po: $(srcdir)/$(DOMAIN).pot + test ! -f $(srcdir)/$(DOMAIN).pot || \ + test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES) + @test ! -f $(srcdir)/$(DOMAIN).pot || { \ + echo "touch stamp-po" && \ + echo timestamp > stamp-poT && \ + mv stamp-poT stamp-po; \ + } + +# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update', +# otherwise packages like GCC can not be built if only parts of the source +# have been downloaded. + +# This target rebuilds $(DOMAIN).pot; it is an expensive operation. +# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed. +$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed + if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \ + msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \ + else \ + msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \ + fi; \ + $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ + --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \ + --files-from=$(srcdir)/POTFILES.in \ + --copyright-holder='$(COPYRIGHT_HOLDER)' \ + --msgid-bugs-address="$$msgid_bugs_address" + test ! -f $(DOMAIN).po || { \ + if test -f $(srcdir)/$(DOMAIN).pot; then \ + sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ + sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ + if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \ + rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \ + else \ + rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \ + mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \ + fi; \ + else \ + mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \ + fi; \ + } + +# This rule has no dependencies: we don't need to update $(DOMAIN).pot at +# every "make" invocation, only create it when it is missing. +# Only "make $(DOMAIN).pot-update" or "make dist" will force an update. +$(srcdir)/$(DOMAIN).pot: + $(MAKE) $(DOMAIN).pot-update + +# This target rebuilds a PO file if $(DOMAIN).pot has changed. +# Note that a PO file is not touched if it doesn't need to be changed. +$(POFILES): $(srcdir)/$(DOMAIN).pot + @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \ + if test -f "$(srcdir)/$${lang}.po"; then \ + test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ + echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \ + cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \ + else \ + $(MAKE) $${lang}.po-create; \ + fi + + +install: install-exec install-data +install-exec: +install-data: install-data-@USE_NLS@ + if test "$(PACKAGE)" = "gettext-tools"; then \ + $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ + for file in $(DISTFILES.common) Makevars.template; do \ + $(INSTALL_DATA) $(srcdir)/$$file \ + $(DESTDIR)$(gettextsrcdir)/$$file; \ + done; \ + for file in Makevars; do \ + rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ + done; \ + else \ + : ; \ + fi +install-data-no: all +install-data-yes: all + $(mkinstalldirs) $(DESTDIR)$(datadir) + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ + dir=$(localedir)/$$lang/LC_MESSAGES; \ + $(mkinstalldirs) $(DESTDIR)$$dir; \ + if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \ + $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \ + echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \ + for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ + if test -n "$$lc"; then \ + if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \ + link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \ + mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ + mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ + (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \ + for file in *; do \ + if test -f $$file; then \ + ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \ + fi; \ + done); \ + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ + else \ + if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \ + :; \ + else \ + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \ + mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ + fi; \ + fi; \ + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \ + ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \ + ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \ + cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \ + echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \ + fi; \ + done; \ + done + +install-strip: install + +installdirs: installdirs-exec installdirs-data +installdirs-exec: +installdirs-data: installdirs-data-@USE_NLS@ + if test "$(PACKAGE)" = "gettext-tools"; then \ + $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ + else \ + : ; \ + fi +installdirs-data-no: +installdirs-data-yes: + $(mkinstalldirs) $(DESTDIR)$(datadir) + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ + dir=$(localedir)/$$lang/LC_MESSAGES; \ + $(mkinstalldirs) $(DESTDIR)$$dir; \ + for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ + if test -n "$$lc"; then \ + if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \ + link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \ + mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ + mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ + (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \ + for file in *; do \ + if test -f $$file; then \ + ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \ + fi; \ + done); \ + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ + else \ + if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \ + :; \ + else \ + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \ + mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ + fi; \ + fi; \ + fi; \ + done; \ + done + +# Define this as empty until I found a useful application. +installcheck: + +uninstall: uninstall-exec uninstall-data +uninstall-exec: +uninstall-data: uninstall-data-@USE_NLS@ + if test "$(PACKAGE)" = "gettext-tools"; then \ + for file in $(DISTFILES.common) Makevars.template; do \ + rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ + done; \ + else \ + : ; \ + fi +uninstall-data-no: +uninstall-data-yes: + catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ + for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \ + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \ + done; \ + done + +check: all + +info dvi ps pdf html tags TAGS ctags CTAGS ID: + +mostlyclean: + rm -f remove-potcdate.sed + rm -f stamp-poT + rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po + rm -fr *.o + +clean: mostlyclean + +distclean: clean + rm -f Makefile Makefile.in POTFILES *.mo + +maintainer-clean: distclean + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + rm -f stamp-po $(GMOFILES) + +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) +dist distdir: + $(MAKE) update-po + @$(MAKE) dist2 +# This is a separate target because 'update-po' must be executed before. +dist2: stamp-po $(DISTFILES) + dists="$(DISTFILES)"; \ + if test "$(PACKAGE)" = "gettext-tools"; then \ + dists="$$dists Makevars.template"; \ + fi; \ + if test -f $(srcdir)/$(DOMAIN).pot; then \ + dists="$$dists $(DOMAIN).pot stamp-po"; \ + fi; \ + if test -f $(srcdir)/ChangeLog; then \ + dists="$$dists ChangeLog"; \ + fi; \ + for i in 0 1 2 3 4 5 6 7 8 9; do \ + if test -f $(srcdir)/ChangeLog.$$i; then \ + dists="$$dists ChangeLog.$$i"; \ + fi; \ + done; \ + if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \ + for file in $$dists; do \ + if test -f $$file; then \ + cp -p $$file $(distdir) || exit 1; \ + else \ + cp -p $(srcdir)/$$file $(distdir) || exit 1; \ + fi; \ + done + +update-po: Makefile + $(MAKE) $(DOMAIN).pot-update + test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES) + $(MAKE) update-gmo + +# General rule for creating PO files. + +.nop.po-create: + @lang=`echo $@ | sed -e 's/\.po-create$$//'`; \ + echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \ + exit 1 + +# General rule for updating PO files. + +.nop.po-update: + @lang=`echo $@ | sed -e 's/\.po-update$$//'`; \ + if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; fi; \ + tmpdir=`pwd`; \ + echo "$$lang:"; \ + test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ + echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ + cd $(srcdir); \ + if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$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 "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ + exit 1; \ + fi; \ + fi; \ + else \ + echo "msgmerge for $$lang.po failed!" 1>&2; \ + rm -f $$tmpdir/$$lang.new.po; \ + fi + +$(DUMMYPOFILES): + +update-gmo: Makefile $(GMOFILES) + @: + +Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@ + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \ + $(SHELL) ./config.status + +force: + +# Tell versions [3.59,3.63) of GNU make not to export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/dselect/po/Makevars b/dselect/po/Makevars new file mode 100644 index 00000000..db8f7d55 --- /dev/null +++ b/dselect/po/Makevars @@ -0,0 +1,41 @@ +# Makefile variables for PO directory in any package using GNU gettext. + +# Usually the message domain is the same as the package name. +DOMAIN = dselect + +# These two variables depend on the location of this directory. +subdir = dselect/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 = Software in the Public Interest, Inc. + +# 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 = debian-dpkg@lists.debian.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 --git a/dselect/po/POTFILES.in b/dselect/po/POTFILES.in new file mode 100644 index 00000000..b1858856 --- /dev/null +++ b/dselect/po/POTFILES.in @@ -0,0 +1,22 @@ +# This is the list of all source files with translatable strings. + +dselect/basecmds.cc +dselect/baselist.cc +dselect/basetop.cc +dselect/bindings.cc +dselect/curkeys.cc +dselect/helpmsgs.cc +dselect/main.cc +dselect/methkeys.cc +dselect/methlist.cc +dselect/method.cc +dselect/methparse.cc +dselect/pkgcmds.cc +dselect/pkgdepcon.cc +dselect/pkgdisplay.cc +dselect/pkginfo.cc +dselect/pkgkeys.cc +dselect/pkglist.cc +dselect/pkgsublist.cc +dselect/pkgtop.cc + diff --git a/dselect/po/bs.po b/dselect/po/bs.po new file mode 100644 index 00000000..61791851 --- /dev/null +++ b/dselect/po/bs.po @@ -0,0 +1,1466 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: dpkg 1.13\n" +"Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" +"POT-Creation-Date: 2006-02-17 05:07+0200\n" +"PO-Revision-Date: 2006-02-17 08:55+0200\n" +"Last-Translator: Safir Šećerović \n" +"Language-Team: Bosnian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: dselect/basecmds.cc:121 +msgid "Search for ? " +msgstr "" + +#: dselect/basecmds.cc:143 +msgid "Error: " +msgstr "Greška:" + +#: dselect/basecmds.cc:171 +msgid "Help: " +msgstr "Pomoć:" + +#: dselect/basecmds.cc:177 +msgid "Press ? for help menu, . for next topic, to exit help." +msgstr "" + +#: dselect/basecmds.cc:184 +msgid "Help information is available under the following topics:" +msgstr "" + +#: dselect/basecmds.cc:192 +msgid "" +"Press a key from the list above, or `q' to exit help,\n" +" or `.' (full stop) to read each help page in turn. " +msgstr "" + +#: dselect/basecmds.cc:198 +msgid "error reading keyboard in help" +msgstr "" + +#: dselect/baselist.cc:57 +msgid "ioctl(TIOCGWINSZ) failed" +msgstr "" + +#: dselect/baselist.cc:60 +msgid "doupdate in SIGWINCH handler failed" +msgstr "" + +#: dselect/baselist.cc:67 +msgid "failed to restore old SIGWINCH sigact" +msgstr "" + +#: dselect/baselist.cc:69 +msgid "failed to restore old signal mask" +msgstr "" + +#: dselect/baselist.cc:79 +msgid "failed to get old signal mask" +msgstr "" + +#: dselect/baselist.cc:80 +msgid "failed to get old SIGWINCH sigact" +msgstr "" + +#: dselect/baselist.cc:84 +msgid "failed to block SIGWINCH" +msgstr "" + +#: dselect/baselist.cc:89 +msgid "failed to set new SIGWINCH sigact" +msgstr "" + +#: dselect/baselist.cc:126 +msgid "failed to allocate colour pair" +msgstr "" + +#: dselect/baselist.cc:166 +msgid "failed to create title window" +msgstr "" + +#: dselect/baselist.cc:170 +msgid "failed to create whatinfo window" +msgstr "" + +#: dselect/baselist.cc:174 +msgid "failed to create baselist pad" +msgstr "" + +#: dselect/baselist.cc:177 +msgid "failed to create heading pad" +msgstr "" + +#: dselect/baselist.cc:181 +msgid "failed to create thisstate pad" +msgstr "" + +#: dselect/baselist.cc:185 +msgid "failed to create info pad" +msgstr "" + +#: dselect/baselist.cc:190 +msgid "failed to create query window" +msgstr "" + +#: dselect/baselist.cc:203 +#, c-format +msgid "" +"baselist::startdisplay() done ...\n" +"\n" +" xmax=%d, ymax=%d;\n" +"\n" +" title_height=%d, colheads_height=%d, list_height=%d;\n" +" thisstate_height=%d, info_height=%d, whatinfo_height=%d;\n" +"\n" +" colheads_row=%d, thisstate_row=%d, info_row=%d;\n" +" whatinfo_row=%d, list_row=%d;\n" +"\n" +msgstr "" + +#: dselect/baselist.cc:259 +msgid "keybindings" +msgstr "" + +#: dselect/baselist.cc:307 +#, c-format +msgid " -- %d%%, press " +msgstr "" + +#: dselect/baselist.cc:310 +#, c-format +msgid "%s for more" +msgstr "" + +#: dselect/baselist.cc:314 +#, c-format +msgid "%s to go back" +msgstr "" + +#: dselect/bindings.cc:71 +msgid "[not bound]" +msgstr "" + +#: dselect/bindings.cc:75 +#, c-format +msgid "[unk: %d]" +msgstr "" + +#: dselect/bindings.cc:129 +msgid "Scroll onwards through help/information" +msgstr "" + +#: dselect/bindings.cc:130 +msgid "Scroll backwards through help/information" +msgstr "" + +#: dselect/bindings.cc:131 +msgid "Move up" +msgstr "Pomjeri gore" + +#: dselect/bindings.cc:132 +msgid "Move down" +msgstr "Pomjeri dole" + +#: dselect/bindings.cc:133 +msgid "Go to top of list" +msgstr "Idi na vrh liste" + +#: dselect/bindings.cc:134 +msgid "Go to end of list" +msgstr "Idi na kraj liste" + +#: dselect/bindings.cc:135 +msgid "Request help (cycle through help screens)" +msgstr "" + +#: dselect/bindings.cc:136 +msgid "Cycle through information displays" +msgstr "" + +#: dselect/bindings.cc:137 +msgid "Redraw display" +msgstr "" + +#: dselect/bindings.cc:138 +msgid "Scroll onwards through list by 1 line" +msgstr "" + +#: dselect/bindings.cc:139 +msgid "Scroll backwards through list by 1 line" +msgstr "" + +#: dselect/bindings.cc:140 +msgid "Scroll onwards through help/information by 1 line" +msgstr "" + +#: dselect/bindings.cc:141 +msgid "Scroll backwards through help/information by 1 line" +msgstr "" + +#: dselect/bindings.cc:142 +msgid "Scroll onwards through list" +msgstr "" + +#: dselect/bindings.cc:143 +msgid "Scroll backwards through list" +msgstr "" + +#: dselect/bindings.cc:146 +msgid "Mark package(s) for installation" +msgstr "" + +#: dselect/bindings.cc:147 +msgid "Mark package(s) for deinstallation" +msgstr "" + +#: dselect/bindings.cc:148 +msgid "Mark package(s) for deinstall and purge" +msgstr "" + +#: dselect/bindings.cc:149 +msgid "Make highlight more specific" +msgstr "" + +#: dselect/bindings.cc:150 +msgid "Make highlight less specific" +msgstr "" + +#: dselect/bindings.cc:151 +msgid "Search for a package whose name contains a string" +msgstr "" + +#: dselect/bindings.cc:152 +msgid "Repeat last search." +msgstr "" + +#: dselect/bindings.cc:153 +msgid "Swap sort order priority/section" +msgstr "" + +#: dselect/bindings.cc:154 +msgid "Quit, confirming, and checking dependencies" +msgstr "" + +#: dselect/bindings.cc:155 +msgid "Quit, confirming without check" +msgstr "" + +#: dselect/bindings.cc:156 +msgid "Quit, rejecting conflict/dependency suggestions" +msgstr "" + +#: dselect/bindings.cc:157 +msgid "Abort - quit without making changes" +msgstr "" + +#: dselect/bindings.cc:158 +msgid "Revert to old state for all packages" +msgstr "" + +#: dselect/bindings.cc:159 +msgid "Revert to suggested state for all packages" +msgstr "" + +#: dselect/bindings.cc:160 +msgid "Revert to directly requested state for all packages" +msgstr "" + +#: dselect/bindings.cc:163 +msgid "Select currently-highlighted access method" +msgstr "" + +#: dselect/bindings.cc:164 +msgid "Quit without changing selected access method" +msgstr "" + +#: dselect/helpmsgs.cc:8 +msgid "Keystrokes" +msgstr "" + +#: dselect/helpmsgs.cc:8 +msgid "" +"Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n" +" Down-arrow, j Up-arrow, k move highlight\n" +" N, Page-down, Space P, Page-up, Backspace scroll list by 1 page\n" +" ^n ^p scroll list by 1 line\n" +" t, Home e, End jump to top/end of list\n" +" u d scroll info by 1 page\n" +" ^u ^d scroll info by 1 line\n" +" B, Left-arrow F, Right-arrow pan display by 1/3 screen\n" +" ^b ^f pan display by 1 character\n" +"\n" +"Mark packages for later processing:\n" +" +, Insert install or upgrade =, H hold in present state\n" +" -, Delete remove :, G unhold: upgrade or leave " +"uninstalled\n" +" _ remove & purge config\n" +" Miscellaneous:\n" +"Quit, exit, overwrite (note capitals!): ?, F1 request help (also " +"Help)\n" +" Return Confirm, quit (check dependencies) i, I toggle/cycle info " +"displays\n" +" Q Confirm, quit (override dep.s) o, O cycle through sort " +"options\n" +" X, Esc eXit, abandoning any changes made v, V change status display " +"opts\n" +" R Revert to state before this list ^l redraw display\n" +" U set all to sUggested state / search (Return to " +"cancel)\n" +" D set all to Directly requested state n, \\ repeat last search\n" +msgstr "" + +#: dselect/helpmsgs.cc:33 +msgid "Introduction to package selections" +msgstr "" + +#: dselect/helpmsgs.cc:33 +msgid "" +"Welcome to dselect's main package listing.\n" +"\n" +"You will be presented with a list of packages which are installed or " +"available\n" +"for installation. You can navigate around the list using the cursor keys,\n" +"mark packages for installation (using `+') or deinstallation (using `-').\n" +"Packages can be marked either singly or in groups; initially you will see " +"that\n" +"the line `All packages' is selected. `+', `-' and so on will affect all " +"the\n" +"packages described by the highlighted line.\n" +"\n" +"Some of your choices will cause conflicts or dependency problems; you will " +"be\n" +"given a sub-list of the relevant packages, so that you can solve the " +"problems.\n" +"\n" +"You should read the list of keys and the explanations of the display.\n" +"Much on-line help is available, please make use of it - press `?' at\n" +"any time for help.\n" +"\n" +"When you have finished selecting packages, press to confirm " +"changes,\n" +"or `X' to quit without saving changes. A final check on conflicts and\n" +"dependencies will be done - here too you may see a sublist.\n" +"\n" +"Press to leave help and enter the list now.\n" +msgstr "" + +#: dselect/helpmsgs.cc:57 +msgid "Introduction to read-only package list browser" +msgstr "" + +#: dselect/helpmsgs.cc:57 +msgid "" +"Welcome to dselect's main package listing.\n" +"\n" +"You will be presented with a list of packages which are installed or " +"available\n" +"for installation. Since you do not have the privilege necessary to update\n" +"package states, you are in a read-only mode. You can navigate around the\n" +"list using the cursor keys (please see the `Keystrokes' help screen), " +"observe\n" +"the status of the packages and read information about them.\n" +"\n" +"You should read the list of keys and the explanations of the display.\n" +"Much on-line help is available, please make use of it - press `?' at\n" +"any time for help.\n" +"\n" +"When you have finished browsing, press `Q' or to quit.\n" +"\n" +"Press to leave help and enter the list now.\n" +msgstr "" + +#: dselect/helpmsgs.cc:75 +msgid "Introduction to conflict/dependency resolution sub-list" +msgstr "" + +#: dselect/helpmsgs.cc:75 +msgid "" +"Dependency/conflict resolution - introduction.\n" +"\n" +"One or more of your choices have raised a conflict or dependency problem -\n" +"some packages should only be installed in conjunction with certain others, " +"and\n" +"some combinations of packages may not be installed together.\n" +"\n" +"You will see a sub-list containing the packages involved. The bottom half " +"of\n" +"the display shows relevant conflicts and dependencies; use `i' to cycle " +"between\n" +"that, the package descriptions and the internal control information.\n" +"\n" +"A set of `suggested' packages has been calculated, and the initial markings " +"in\n" +"this sub-list have been set to match those, so you can just hit Return to\n" +"accept the suggestions if you wish. You may abort the change(s) which " +"caused\n" +"the problem(s), and go back to the main list, by pressing capital `X'.\n" +"\n" +"You can also move around the list and change the markings so that they are " +"more\n" +"like what you want, and you can `reject' my suggestions by using the " +"capital\n" +"`D' or `R' keys (see the keybindings help screen). You can use capital `Q' " +"to\n" +"force me to accept the situation currently displayed, in case you want to\n" +"override a recommendation or think that the program is mistaken.\n" +"\n" +"Press to leave help and enter the sub-list; remember: press `?' for " +"help.\n" +msgstr "" + +#: dselect/helpmsgs.cc:100 +msgid "Display, part 1: package listing and status chars" +msgstr "" + +#: dselect/helpmsgs.cc:100 +msgid "" +"The top half of the screen shows a list of packages. For each package you " +"see\n" +"four columns for its current status on the system and mark. In terse mode " +"(use\n" +"`v' to toggle verbose display) these are single characters, from left to " +"right:\n" +"\n" +" Error flag: Space - no error (but package may be in broken state - see " +"below)\n" +" `R' - serious error during installation, needs " +"reinstallation;\n" +" Installed state: Space - not installed;\n" +" `*' - installed;\n" +" `-' - not installed but config files remain;\n" +" packages in { `U' - unpacked but not yet configured;\n" +" these states { `C' - half-configured (an error happened);\n" +" are broken { `I' - half-installed (an error happened).\n" +" Old mark: what was requested for this package before presenting this list;\n" +" Mark: what is requested for this package:\n" +" `*': marked for installation or upgrade;\n" +" `-': marked for removal, but any configuration files will remain;\n" +" `=': on hold: package will not be processed at all;\n" +" `_': marked for purge completely - even remove configuration;\n" +" `n': package is new and has yet to be marked for install/remove/&c.\n" +"\n" +"Also displayed are each package's Priority, Section, name, installed and\n" +"available version numbers (shift-V to display/hide) and summary " +"description.\n" +msgstr "" + +#: dselect/helpmsgs.cc:125 +msgid "Display, part 2: list highlight; information display" +msgstr "" + +#: dselect/helpmsgs.cc:125 +msgid "" +"* Highlight: One line in the package list will be highlighted. It " +"indicates\n" +" which package(s) will be affected by presses of `+', `-' and `_'.\n" +"\n" +"* The dividing line in the middle of the screen shows a brief explanation " +"of\n" +" the status of the currently-highlighted package, or a description of " +"which\n" +" group is highlighted if a group line is. If you don't understand the\n" +" meaning of some of the status characters displayed, go to the relevant\n" +" package and look at this divider line, or use the `v' key for a verbose\n" +" display (press `v' again to go back to the terse display).\n" +"\n" +"* The bottom of the screen shows more information about the\n" +" currently-highlighted package (if there is only one).\n" +"\n" +" It can show an extended description of the package, the internal package\n" +" control details (either for the installed or available version of the\n" +" package), or information about conflicts and dependencies involving the\n" +" current package (in conflict/dependency resolution sublists).\n" +"\n" +" Use the `i' key to cycle through the displays, and `I' to hide the\n" +" information display or expand it to use almost all of the screen.\n" +msgstr "" + +#: dselect/helpmsgs.cc:148 +msgid "Introduction to method selection display" +msgstr "" + +#: dselect/helpmsgs.cc:148 +msgid "" +"dselect and dpkg can do automatic installation, loading the package files to " +"be\n" +"installed from one of a number of different possible places.\n" +"\n" +"This list allows you to select one of these installation methods.\n" +"\n" +"Move the highlight to the method you wish to use, and hit Enter. You will " +"then\n" +"be prompted for the information required to do the installation.\n" +"\n" +"As you move the highlight a description of each method, where available, is\n" +"displayed in the bottom half of the screen.\n" +"\n" +"If you wish to quit without changing anything use the `x' key while in the " +"list\n" +"of installation methods.\n" +"\n" +"A full list of keystrokes is available by pressing `k' now, or from the " +"help\n" +"menu reachable by pressing `?'.\n" +msgstr "" + +#: dselect/helpmsgs.cc:167 +msgid "Keystrokes for method selection" +msgstr "" + +#: dselect/helpmsgs.cc:167 +msgid "" +"Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n" +" n, Down-arrow p, Up-arrow move highlight\n" +" N, Page-down, Space P, Page-up, Backspace scroll list by 1 page\n" +" ^n ^p scroll list by 1 line\n" +" t, Home e, End jump to top/end of list\n" +" u d scroll info by 1 page\n" +" ^u ^d scroll info by 1 line\n" +" B, Left-arrow F, Right-arrow pan display by 1/3 screen\n" +" ^b ^f pan display by 1 character\n" +"(These are the same motion keys as in the package list display.)\n" +"\n" +"Quit:\n" +" Return, Enter select this method and go to its configuration dialogue\n" +" x, X exit without changing or setting up the installation " +"method\n" +"\n" +"Miscellaneous:\n" +" ?, Help, F1 request help\n" +" ^l redraw display\n" +" / search (just return to cancel)\n" +" \\ repeat last search\n" +msgstr "" + +#: dselect/main.cc:55 +msgid "Type dselect --help for help." +msgstr "Ukucajte dselect --help za pomoć." + +#: dselect/main.cc:138 +msgid "a" +msgstr "p" + +#: dselect/main.cc:138 +msgid "[A]ccess" +msgstr "[P]ristup" + +#: dselect/main.cc:138 +msgid "Choose the access method to use." +msgstr "Izaberite metod pristupa koji će se korisiti." + +#: dselect/main.cc:139 +msgid "u" +msgstr "a" + +#: dselect/main.cc:139 +msgid "[U]pdate" +msgstr "[A]žuriraj" + +#: dselect/main.cc:139 +msgid "Update list of available packages, if possible." +msgstr "Ažuriraj listu dostupnih paketa, po mogućnosti." + +#: dselect/main.cc:140 +msgid "s" +msgstr "o" + +#: dselect/main.cc:140 +msgid "[S]elect" +msgstr "[O]dabir" + +#: dselect/main.cc:140 +msgid "Request which packages you want on your system." +msgstr "Odaberite koje pakete želite na vašem sistemu." + +#: dselect/main.cc:141 +msgid "i" +msgstr "i" + +#: dselect/main.cc:141 +msgid "[I]nstall" +msgstr "[I]nstaliraj" + +#: dselect/main.cc:141 +msgid "Install and upgrade wanted packages." +msgstr "Instaliraj i nadogradi željene pakete." + +#: dselect/main.cc:142 +msgid "c" +msgstr "d" + +#: dselect/main.cc:142 +msgid "[C]onfig" +msgstr "Po[d]esi" + +#: dselect/main.cc:142 +msgid "Configure any packages that are unconfigured." +msgstr "Podesi sve pakete koji nisu podešeni." + +#: dselect/main.cc:143 +msgid "r" +msgstr "u" + +#: dselect/main.cc:143 +msgid "[R]emove" +msgstr "[U]kloni" + +#: dselect/main.cc:143 +msgid "Remove unwanted software." +msgstr "Ukloni neželjeni software" + +#: dselect/main.cc:144 +msgid "q" +msgstr "z" + +#: dselect/main.cc:144 +msgid "[Q]uit" +msgstr "I[z]ađi" + +#: dselect/main.cc:144 +msgid "Quit dselect." +msgstr "Izađi iz dselect programa." + +#: dselect/main.cc:145 +msgid "menu" +msgstr "meni" + +#: dselect/main.cc:150 +#, fuzzy, c-format +msgid "Debian `%s' package handling frontend version %s.\n" +msgstr "Debianov `%s' program za rukovanje paketima." + +#: dselect/main.cc:153 +msgid "" +"Copyright (C) 1994-1996 Ian Jackson.\n" +"Copyright (C) 2000,2001 Wichert Akkerman.\n" +msgstr "" + +#: dselect/main.cc:157 +#, fuzzy, c-format +msgid "" +"This is free software; see the GNU General Public License version 2 or\n" +"later for copying conditions. There is NO warranty.\n" +"See %s --license for copyright and license details.\n" +msgstr "" +"Verzija %s.\n" +"Copyright (C) 1994-1996 Ian Jackson.\n" +"Copyright (C) 2000,2001 Wichert Akkerman.\n" +"Ovo je slobodan software; pogledajte GNU opštu javnu licencu verzije 2\n" +"ili kasniju za uslove kopiranja. NEMA garancije. Pogledajte\n" +"dselect --licence za detalje.\n" + +#: dselect/main.cc:171 +#, c-format +msgid "" +"Usage: %s [