summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--.cvsignore4
-rw-r--r--ChangeLog8
-rw-r--r--README-alpha25
-rw-r--r--bootstrap.conf62
-rw-r--r--build-aux/.cvsignore11
-rwxr-xr-xbuild-aux/bootstrap683
-rw-r--r--configure.ac9
-rw-r--r--lib/.cvsignore82
-rw-r--r--po/.cvsignore8
-rw-r--r--po/Makevars16
-rw-r--r--po/da.po193
-rw-r--r--po/pl.po150
-rw-r--r--po/uk.po143
-rw-r--r--src/main.c12
14 files changed, 962 insertions, 444 deletions
diff --git a/.cvsignore b/.cvsignore
index 37551e1..1b66749 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,14 +1,14 @@
1*.tar.bz2
2*.tar.gz
1ABOUT-NLS 3ABOUT-NLS
2INSTALL 4INSTALL
3Makefile 5Makefile
4Makefile.in 6Makefile.in
5aclocal.m4 7aclocal.m4
6autom4te.cache 8autom4te.cache
7*.tar.bz2
8*.tar.gz
9config 9config
10config.h 10config.h
11config.h.in 11config.h.in
12config.log 12config.log
13config.status 13config.status
14configure 14configure
diff --git a/ChangeLog b/ChangeLog
index 8f4980b..0fda28b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,14 @@
12007-05-18 Sergey Poznyakoff <gray@gnu.org.ua>
2
3 * bootstrap.conf: New file
4 * build-aux/bootstrap: Replaced from the gnulib CVS
5 * configure.ac: Update
6 * po/Makevars: Remove automatically generated file
7 * src/main.c: Remove #include <strndup.h>
8
12006-09-11 Sergey Poznyakoff <gray@gnu.org.ua> 92006-09-11 Sergey Poznyakoff <gray@gnu.org.ua>
2 10
3 * src/main.c (doc): Reformat argp docstring in accordance with the 11 * src/main.c (doc): Reformat argp docstring in accordance with the
4 new argp guidelines. Remove unneeded translators comment. 12 new argp guidelines. Remove unneeded translators comment.
5 (main): Set program_name. 13 (main): Set program_name.
6 14
diff --git a/README-alpha b/README-alpha
index 68806c1..6548cf6 100644
--- a/README-alpha
+++ b/README-alpha
@@ -35,22 +35,27 @@ contact the mailing list.
35The CVS repository is also available via HTTP from 35The CVS repository is also available via HTTP from
36 36
37 http://savannah.gnu.org/cgi-bin/viewcvs/cflow/cflow/ 37 http://savannah.gnu.org/cgi-bin/viewcvs/cflow/cflow/
38 38
39* Building 39* Building
40 40
41In order to build this you will first need to have right versions of 41If you have taken the sources from CVS you will need the following
42autotools. At the time of this writing these are: 42packages to build cflow. I don't make any extra effort to accommodate
43 43older versions of these packages, so please make sure that you have the
44 Package Version (>=) 44latest stable version.
45 ======== ============ 45
46 automake 1.8.5 46- Automake <http://www.gnu.org/software/automake/>
47 autoconf 2.59 47- Autoconf <http://www.gnu.org/software/autoconf/>
48 48- Gettext <http://www.gnu.org/software/gettext/>
49To prepare the package for building run build-aux/bootstrap. For 49- Gnulib <http://www.gnu.org/software/gnulib/>
50example: 50- M4 <http://www.gnu.org/software/m4/>
51- Texinfo <http://www.gnu.org/software/texinfo>
52- Wget <http://www.gnu.org/software/wget/>
53
54To prepare the package for building run `build-aux/bootstrap' utility.
55For example:
51 56
52 $ cd cflow 57 $ cd cflow
53 $ build-aux/bootstrap 58 $ build-aux/bootstrap
54 59
55If you have already checked out gnulib sources, use --gnulib-srcdir 60If you have already checked out gnulib sources, use --gnulib-srcdir
56to specify their location, this will spare you time and bandwidth: 61to specify their location, this will spare you time and bandwidth:
diff --git a/bootstrap.conf b/bootstrap.conf
new file mode 100644
index 0000000..9e200ac
--- a/dev/null
+++ b/bootstrap.conf
@@ -0,0 +1,62 @@
1# Bootstrap configuration.
2# Copyright (C) 2006 Free Software Foundation, Inc.
3#
4# This program is free software; you can redistribute it and/or modify
5# it under the terms of the GNU General Public License as published by
6# the Free Software Foundation; either version 2, or (at your option)
7# any later version.
8#
9# This program is distributed in the hope that it will be useful,
10# but WITHOUT ANY WARRANTY; without even the implied warranty of
11# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12# GNU General Public License for more details.
13#
14# You should have received a copy of the GNU General Public License
15# along with this program; if not, write to the Free Software
16# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
17# 02110-1301, USA.
18
19# We don't need these modules, even though gnulib-tool mistakenly
20# includes them because of gettext dependencies.
21avoided_gnulib_modules='
22 --avoid=lock
23'
24
25# gnulib modules used by this package.
26gnulib_modules="$avoided_gnulib_modules
27`grep '^[^#]' build-aux/gnulib.modules`
28"
29# Additional xgettext options to use. Use "\\\newline" to break lines.
30XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\
31 --flag=_:1:pass-c-format\\\
32 --flag=N_:1:pass-c-format\\\
33 --flag=error:3:c-format --flag=error_at_line:5:c-format\\\
34 --flag=asnprintf:3:c-format --flag=vasnprintf:3:c-format\\\
35 --flag=argp_error:2:c-format\\\
36 --flag=__argp_error:2:c-format\\\
37 --flag=argp_failure:4:c-format\\\
38 --flag=__argp_failure:4:c-format\\\
39 --flag=argp_fmtstream_printf:2:c-format\\\
40 --flag=__argp_fmtstream_printf:2:c-format\\\
41'
42
43# Gettext supplies these files, but we don't need them since
44# we don't have an intl subdirectory.
45excluded_files='
46 m4/glibc2.m4
47 m4/intdiv0.m4
48 m4/lcmessage.m4
49 m4/lock.m4
50 m4/printf-posix.m4
51 m4/size_max.m4
52 m4/uintmax_t.m4
53 m4/ulonglong.m4
54 m4/visibility.m4
55 m4/xsize.m4
56'
57
58# Read local configuration file
59if [ -r .bootstrap ]; then
60 echo "$0: Reading configuration file .bootstrap"
61 eval set -- "`sed 's/#.*$//;/^$/d' .bootstrap | tr '\n' ' '` $*"
62fi
diff --git a/build-aux/.cvsignore b/build-aux/.cvsignore
index c23a7d2..8d1fd5b 100644
--- a/build-aux/.cvsignore
+++ b/build-aux/.cvsignore
@@ -1,9 +1,10 @@
1config.guess
2config.rpath
3config.sub
1depcomp 4depcomp
2install-sh 5install-sh
3missing 6link-warning.h
4config.rpath
5mdate-sh 7mdate-sh
6texinfo.tex 8missing
7config.guess
8config.sub
9mkinstalldirs 9mkinstalldirs
10texinfo.tex
diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index d025457..c028967 100755
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -1,9 +1,11 @@
1#! /bin/sh 1#! /bin/sh
2 2
3# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. 3# Bootstrap this package from checked-out sources.
4
5# Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
4 6
5# This program is free software; you can redistribute it and/or modify 7# This program is free software; you can redistribute it and/or modify
6# it under the terms of the GNU General Public License as published by 8# it under the terms of the GNU General Public License as published by
7# the Free Software Foundation; either version 2, or (at your option) 9# the Free Software Foundation; either version 2, or (at your option)
8# any later version. 10# any later version.
9 11
@@ -11,272 +13,541 @@
11# but WITHOUT ANY WARRANTY; without even the implied warranty of 13# but WITHOUT ANY WARRANTY; without even the implied warranty of
12# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13# GNU General Public License for more details. 15# GNU General Public License for more details.
14 16
15# You should have received a copy of the GNU General Public License 17# You should have received a copy of the GNU General Public License
16# along with this program; if not, write to the Free Software 18# along with this program; if not, write to the Free Software
17# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 19# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
18# 02111-1307, USA. 20# 02110-1301, USA.
19 21
20# Written by Paul Eggert and Sergey Poznyakoff. 22# Written by Paul Eggert.
21 23
22# URL of our text domain page in Translation Project 24nl='
23TP_URL="http://www.iro.umontreal.ca/translation/maint/cflow/" 25'
24 26
25# Ensure file names are sorted consistently across platforms; 27# Ensure file names are sorted consistently across platforms.
26# e.g., m4/ulonglong_gl.m4 should follow m4/ulonglong.m4. 28# Also, ensure diagnostics are in English, e.g., "wget --help" below.
27LC_ALL=C 29LC_ALL=C
28export LC_ALL 30export LC_ALL
29 31
30usage() { 32# Temporary directory names.
31 cat <<EOF 33bt='._bootmp'
32 usage: $0 [--gnulib-srcdir=DIR][--cvs-auth=AUTH-METHOD][--cvs-user=USERNAME][--no-po] 34bt_regex=`echo "$bt"| sed 's/\./[.]/g'`
33 Options are: 35bt2=${bt}2
34 --gnulib-srcdir=DIRNAME Specify the local directory where gnulib
35 sources reside. Use this if you already
36 have gnulib sources on your machine, and
37 do not want to waste your bandwidth dowloading
38 them again.
39 --cvs-auth=METHOD Set the CVS access method used for downloading
40 gnulib files. METHOD is one of the keywords
41 accepted by cvs -d option (see info cvs
42 repository).
43 --cvs-user=USERNAME Set the CVS username to be used when accessing
44 the gnulib repository.
45
46The following two options are reserved for future use:
47
48 --no-po Do not download po files.
49 --update-po[=LANG] Update po file(s) and exit.
50
51If the file \`.bootstrap' exists in the current working directory, its
52contents is read, comments and empty lines removed, shell variables expanded
53and the result is prepended to the command line options.
54
55Running without arguments will suffice in most cases. It is equivalent
56to
57
58 ./bootstrap --cvs-auth=ext --cvs-user=anoncvs
59
60EOF
61}
62 36
63update_po() { 37usage() {
64 if [ $# = 1 ]; then 38 echo >&2 "\
65 case $1 in 39Usage: $0 [OPTION]...
66 *.po) POFILE=$1;; 40Bootstrap this package from the checked-out sources.
67 *) POFILE=${1}.po;; 41
68 esac 42Options:
69 echo "$0: getting translation for $1..." 43 --gnulib-srcdir=DIRNAME Specify the local directory where gnulib
70 (cd po; 44 sources reside. Use this if you already
71 wget -r --cache=off -O $POFILE $TP_URL/$POFILE || exit 45 have gnulib sources on your machine, and
72 LANG=`expr $POFILE : '\(.*\)\.po'` 46 do not want to waste your bandwidth downloading
73 if ! grep -q $LANG LINGUAS; then 47 them again.
74 mv LINGUAS LINGUAS.$$ 48 --copy Copy files instead of creating symbolic links.
75 (echo $LANG; cat LINGUAS.$$) | sort > LINGUAS 49 --force Attempt to bootstrap even if the sources seem
76 fi) 50 not to have been checked out.
77 else 51 --skip-po Do not download po files.
78 echo "$0: getting translations into po..." 52 --cvs-user=USERNAME Set the username to use when checking out
79 (cd po && 53 sources from the gnulib repository.
80 rm -f dummy `ls | sed -n '/\.gmo$/p; /\.po/p'` && 54
81 wget -nv -nd -r -l 1 -A .po -C off $TP_URL && 55If the file .bootstrap.conf exists in the current working directory, its
82 rm -f index.html index.html.[0-9]* 56contents are read as shell variables to configure the bootstrap.
83 ls *.po | sed 's/\.po$//' >LINGUAS 57
84 ) || exit 58Running without arguments will suffice in most cases.
85 fi 59"
86} 60}
87 61
88# Read configuration file 62# Configuration.
89if [ -r .bootstrap ]; then 63
90 echo "$0: Reading configuration file .bootstrap" 64# List of gnulib modules needed.
91 eval set -- "`sed 's/#.*$//;/^$/d' .bootstrap | tr '\n' ' '` $*" 65gnulib_modules=
92fi 66
67# Any gnulib files needed that are not in modules.
68gnulib_files=
69
70# Translation Project URL, for the registry of all projects
71# and for the translation-team master directory.
72TP_URL='http://www.iro.umontreal.ca/translation/registry.cgi?domain='
73TP_PO_URL='http://www.iro.umontreal.ca/translation/teams/PO/'
74
75extract_package_name='
76 /^AC_INIT(/{
77 /.*,.*,.*,/{
78 s///
79 s/[][]//g
80 p
81 q
82 }
83 s/AC_INIT(\[*//
84 s/]*,.*//
85 s/^GNU //
86 y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
87 s/[^A-Za-z0-9_]/-/g
88 p
89 }
90'
91package=`sed -n "$extract_package_name" configure.ac` || exit
92gnulib_name=lib$package
93
94build_aux=build-aux
95# Extra files from gnulib, which override files from other sources.
96gnulib_extra_files="
97 $build_aux/install-sh
98 $build_aux/missing
99 $build_aux/mdate-sh
100 $build_aux/texinfo.tex
101 $build_aux/depcomp
102 $build_aux/config.guess
103 $build_aux/config.sub
104 doc/INSTALL
105"
106# Additional gnulib-tool options to use. Use "\newline" to break lines.
107gnulib_tool_option_extras=
108
109# Other locale categories that need message catalogs.
110EXTRA_LOCALE_CATEGORIES=
111
112# Additional xgettext options to use. Use "\\\newline" to break lines.
113XGETTEXT_OPTIONS='\\\
114 --flag=_:1:pass-c-format\\\
115 --flag=N_:1:pass-c-format\\\
116 --flag=error:3:c-format --flag=error_at_line:5:c-format\\\
117'
118
119# Files we don't want to import.
120excluded_files=
121
122# File that should exist in the top directory of a checked out hierarchy,
123# but not in a distribution tarball.
124checkout_only_file=README-hacking
125
126# Whether to use copies instead of symlinks.
127copy=false
128
129# Override the default configuration, if necessary.
130test -r bootstrap.conf && . ./bootstrap.conf
131
132# Translate configuration into internal form.
93 133
94# Parse options. 134# Parse options.
95 135
96DOWNLOAD_PO=no
97for option 136for option
98do 137do
99 case $option in 138 case $option in
100 --help) 139 --help)
101 usage 140 usage
102 exit;; 141 exit;;
103 --gnulib-srcdir=*) 142 --gnulib-srcdir=*)
104 GNULIB_SRCDIR=`expr "$option" : '--gnulib-srcdir=\(.*\)'`;; 143 GNULIB_SRCDIR=`expr "$option" : '--gnulib-srcdir=\(.*\)'`;;
105 --cvs-auth=*)
106 CVS_AUTH=`expr "$option" : '--cvs-auth=\(.*\)'`;;
107 --cvs-user=*) 144 --cvs-user=*)
108 CVS_USER=`expr "$option" : '--cvs-user=\(.*\)'`;; 145 CVS_USER=`expr "$option" : '--cvs-user=\(.*\)'`;;
109 --no-po) 146 --skip-po)
110 DOWNLOAD_PO=no;; 147 SKIP_PO=t;;
111 --update-po=*) 148 --force)
112 DOWNLOAD_PO=`expr "$option" : '--update-po=\(.*\)'`;; 149 checkout_only_file=;;
113 --update-po) 150 --copy)
114 DOWNLOAD_PO=only;; 151 copy=true;;
115 *) 152 *)
116 echo >&2 "$0: $option: unknown option" 153 echo >&2 "$0: $option: unknown option"
117 exit 1;; 154 exit 1;;
118 esac 155 esac
119done 156done
120 157
121case $DOWNLOAD_PO in 158if test -n "$checkout_only_file" && test ! -r "$checkout_only_file"; then
122 only)update_po 159 echo "$0: Bootstrapping from a non-checked-out distribution is risky." >&2
123 exit 0 160 exit 1
124 ;; 161fi
125no|yes) ;; 162
126 *)update_po $DOWNLOAD_PO 163# If $STR is not already on a line by itself in $FILE, insert it,
127 exit 0 164# sorting the new contents of the file and replacing $FILE with the result.
165insert_sorted_if_absent() {
166 file=$1
167 str=$2
168 echo "$str" | sort -u - $file | cmp -s - $file \
169 || echo "$str" | sort -u - $file -o $file \
170 || exit 1
171}
172
173# Die if there is no AC_CONFIG_AUX_DIR($build_aux) line in configure.ac.
174found_aux_dir=no
175 grep '^[ ]*AC_CONFIG_AUX_DIR(\['"$build_aux"'\])' configure.ac \
176 >/dev/null && found_aux_dir=yes
177 grep '^[ ]*AC_CONFIG_AUX_DIR('"$build_aux"')' configure.ac \
178 >/dev/null && found_aux_dir=yes
179if test $found_aux_dir = no; then
180 echo "$0: expected line not found in configure.ac. Add the following:" >&2
181 echo " AC_CONFIG_AUX_DIR([$build_aux])" >&2.
182fi
183
184# If $build_aux doesn't exist, create it now, otherwise some bits
185# below will malfunction. If creating it, also mark it as ignored.
186if test ! -d $build_aux; then
187 mkdir $build_aux
188 for ig in .cvsignore .gitignore; do
189 test -f $ig && insert_sorted_if_absent $ig $build_aux
190 done
191fi
192
193echo "$0: Bootstrapping from checked-out $package sources..."
194
195cleanup_gnulib() {
196 status=$?
197 rm -fr gnulib
198 exit $status
199}
200
201# Get gnulib files.
202
203case ${GNULIB_SRCDIR--} in
204-)
205 if [ ! -d gnulib ]; then
206 echo "$0: getting gnulib files..."
207
208 case ${CVS_AUTH-pserver} in
209 pserver)
210 CVS_PREFIX=':pserver:anonymous@';;
211 ssh)
212 CVS_PREFIX="$CVS_USER${CVS_USER+@}";;
213 *)
214 echo "$0: $CVS_AUTH: Unknown CVS access method" >&2
215 exit 1;;
216 esac
217
218 case $CVS_RSH in
219 '') CVS_RSH=ssh; export CVS_RSH;;
220 esac
221
222 trap cleanup_gnulib 1 2 13 15
223
224 cvs -z3 -q -d ${CVS_PREFIX}cvs.savannah.gnu.org:/cvsroot/gnulib co gnulib ||
225 cleanup_gnulib
226
227 trap - 1 2 13 15
228 fi
229 GNULIB_SRCDIR=gnulib
128esac 230esac
129 231
130echo "$0: Bootstrapping CVS cflow..." 232gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
233<$gnulib_tool || exit
234
235# Get translations.
236
237get_translations() {
238 subdir=$1
239 domain=$2
240
241 case $WGET_COMMAND in
242 '')
243 echo "$0: wget not available; skipping translations";;
244 ?*)
245 echo "$0: getting translations into $subdir for $domain..." &&
246
247 (cd $subdir && rm -f dummy `ls | sed -n '/\.gmo$/p; /\.po/p'`) &&
248 $WGET_COMMAND -O "$subdir/$domain.html" "$TP_URL$domain" &&
249
250 sed -n 's|.*"http://[^"]*/translation/teams/PO/\([^/"]*\)/'"$domain"'-\([^/"]*\)\.[^."]*\.po".*|\1.\2|p' <"$subdir/$domain.html" |
251 sort -k 1,1 -k 2,2n -k2,2 -k3,3n -k3,3 -k4,4n -k4,4 -k5,5n -k5.5 |
252 awk -F. '
253 { if (lang && $1 != lang) print lang, ver }
254 { lang = $1; ver = substr($0, index($0, ".") + 1) }
255 END { if (lang) print lang, ver }
256 ' | awk -v domain="$domain" -v subdir="$subdir" '
257 {
258 lang = $1
259 ver = $2
260 urlfmt = ""
261 printf "{ $WGET_COMMAND -O %s/%s.po '\'"$TP_PO_URL"'/%s/%s-%s.%s.po'\'' &&\n", subdir, lang, lang, domain, ver, lang
262 printf " msgfmt -c -o /dev/null %s/%s.po || {\n", subdir, lang
263 printf " echo >&2 '\'"$0"': omitting translation for %s'\''\n", lang
264 printf " rm -f %s/%s.po; }; } &&\n", subdir, lang
265 }
266 END { print ":" }
267 ' | WGET_COMMAND="$WGET_COMMAND" sh;;
268 esac &&
269 ls "$subdir"/*.po 2>/dev/null |
270 sed 's|.*/||; s|\.po$||' >"$subdir/LINGUAS" &&
271 rm -f "$subdir/$domain.html"
272}
131 273
132build_cvs_prefix() { 274case $SKIP_PO in
133 CVS_PREFIX=:${1}: 275'')
134 if [ "${2}" != - ]; then 276 case `wget --help` in
135 CVS_PREFIX=${CVS_PREFIX}${2}@ 277 *'--no-cache'*)
278 WGET_COMMAND='wget -nv --no-cache';;
279 *'--cache=on/off'*)
280 WGET_COMMAND='wget -nv --cache=off';;
281 *'--non-verbose'*)
282 WGET_COMMAND='wget -nv';;
283 *)
284 WGET_COMMAND='';;
285 esac
286
287 if test -d po; then
288 get_translations po $package || exit
136 fi 289 fi
137 if [ "$1" = "ext" ]; then 290
138 if [ -z "${CVS_RSH}" ]; then 291 if test -d runtime-po; then
139 CVS_RSH=ssh 292 get_translations runtime-po $package-runtime || exit
140 export CVS_RSH 293 fi;;
294esac
295
296symlink_to_gnulib()
297{
298 src=$GNULIB_SRCDIR/$1
299 dst=${2-$1}
300
301 test -f "$src" && {
302 if $copy; then
303 {
304 test ! -h "$dst" || {
305 echo "$0: rm -f $dst" &&
306 rm -f "$dst"
307 }
308 } &&
309 test -f "$dst" &&
310 cmp -s "$src" "$dst" || {
311 echo "$0: cp -fp $src $dst" &&
312 cp -fp "$src" "$dst"
313 }
314 else
315 test -h "$dst" &&
316 src_ls=`ls -diL "$src" 2>/dev/null` && set $src_ls && src_i=$1 &&
317 dst_ls=`ls -diL "$dst" 2>/dev/null` && set $dst_ls && dst_i=$1 &&
318 test "$src_i" = "$dst_i" || {
319 dot_dots=
320 case $src in
321 /*) ;;
322 *)
323 case /$dst/ in
324 *//* | */../* | */./* | /*/*/*/*/*/)
325 echo >&2 "$0: invalid symlink calculation: $src -> $dst"
326 exit 1;;
327 /*/*/*/*/)dot_dots=../../../;;
328 /*/*/*/)dot_dots=../../;;
329 /*/*/)dot_dots=../;;
330 esac;;
331 esac
332
333 echo "$0: ln -fs $dot_dots$src $dst" &&
334 ln -fs "$dot_dots$src" "$dst"
335 }
141 fi 336 fi
142 fi 337 }
143} 338}
144 339
145# checkout package 340cp_mark_as_generated()
146checkout() { 341{
147 if [ ! -d $1 ]; then 342 cp_src=$1
148 echo "$0: getting $1 files..." 343 cp_dst=$2
149 344
150 trap exit 1 2 13 15 345 if cmp -s "$cp_src" "$GNULIB_SRCDIR/$cp_dst"; then
151 trap 'rm -fr $1; exit 1' 0 346 symlink_to_gnulib "$cp_dst"
152 347 else
153 case "${CVS_AUTH--}" in 348 case $cp_dst in
154 -) build_cvs_prefix ext anoncvs 349 *.[ch]) c1='/* '; c2=' */';;
155 ;; 350 *.texi) c1='@c '; c2= ;;
156 pserver) build_cvs_prefix $CVS_AUTH ${CVS_USER:-anoncvs} 351 *.m4|*/Make*|Make*) c1='# ' ; c2= ;;
157 ;; 352 *) c1= ; c2= ;;
158 gserver|server)
159 build_cvs_prefix $CVS_AUTH ${CVS_USER--}
160 ;;
161 ext) build_cvs_prefix $CVS_AUTH ${CVS_USER--}
162 ;;
163 *) echo "$0: Unknown CVS access method" >&2
164 exit 1;;
165 esac 353 esac
166 if [ "${CVS_AUTH--}" = "pserver" ]; then
167 cvs -d ${CVS_PREFIX}subversions.gnu.org:/cvsroot/$1 login || exit
168 fi
169 cvs -q -d ${CVS_PREFIX}subversions.gnu.org:/cvsroot/$1 co $1 || exit
170 354
171 trap 0 355 if test -z "$c1"; then
356 cmp -s "$cp_src" "$cp_dst" || {
357 echo "$0: cp -f $cp_src $cp_dst" &&
358 rm -f "$cp_dst" &&
359 sed "s!$bt_regex/!!g" "$cp_src" > "$cp_dst"
360 }
361 else
362 # Copy the file first to get proper permissions if it
363 # doesn't already exist. Then overwrite the copy.
364 cp "$cp_src" "$cp_dst-t" &&
365 (
366 echo "$c1-*- buffer-read-only: t -*- vi: set ro:$c2" &&
367 echo "${c1}DO NOT EDIT! GENERATED AUTOMATICALLY!$c2" &&
368 sed "s!$bt_regex/!!g" "$cp_src"
369 ) > $cp_dst-t &&
370 if cmp -s "$cp_dst-t" "$cp_dst"; then
371 rm -f "$cp_dst-t"
372 else
373 echo "$0: cp $cp_src $cp_dst # with edits" &&
374 mv -f "$cp_dst-t" "$cp_dst"
375 fi
376 fi
172 fi 377 fi
173} 378}
174 379
175# Prepare temporary module list 380version_controlled_file() {
176cat /dev/null > modlist.tmp 381 dir=$1
177trap 'rm -f modlist.tmp' 0 1 2 13 15 382 file=$2
178 383 found=no
179get_modules() { 384 if test -d CVS; then
180 sed '/^[ ]*#/d;/^[ ]*$/d' $* >> modlist.tmp 385 grep -F "/$file/" $dir/CVS/Entries 2>/dev/null |
386 grep '^/[^/]*/[0-9]' > /dev/null && found=yes
387 elif test -d .git; then
388 git-rm -n "$dir/$file" > /dev/null 2>&1 && found=yes
389 else
390 echo "$0: no version control for $dir/$file?" >&2
391 fi
392 test $found = yes
181} 393}
182 394
183# copy_files srcdir dstdir 395slurp() {
184copy_files() { 396 for dir in . `(cd $1 && find * -type d -print)`; do
185 for file in `cat $1/DISTFILES` 397 copied=
186 do 398 sep=
187 case $file in 399 for file in `ls $1/$dir`; do
188 "#*") continue;; 400 test -d $1/$dir/$file && continue
189 esac 401 for excluded_file in $excluded_files; do
190 echo "$0: Copying file $1/$file" 402 test "$dir/$file" = "$excluded_file" && continue 2
191 cp -p $1/$file $2/`expr $file : '.*/\(.*\)'` 403 done
404 if test $file = Makefile.am; then
405 copied=$copied${sep}gnulib.mk; sep=$nl
406 remove_intl='/^[^#].*\/intl/s/^/#/;'"s!$bt_regex/!!g"
407 sed "$remove_intl" $1/$dir/$file | cmp -s - $dir/gnulib.mk || {
408 echo "$0: Copying $1/$dir/$file to $dir/gnulib.mk ..." &&
409 rm -f $dir/gnulib.mk &&
410 sed "$remove_intl" $1/$dir/$file >$dir/gnulib.mk
411 }
412 elif { test "${2+set}" = set && test -r $2/$dir/$file; } ||
413 version_controlled_file $dir $file; then
414 echo "$0: $dir/$file overrides $1/$dir/$file"
415 else
416 copied=$copied$sep$file; sep=$nl
417 if test $file = gettext.m4; then
418 echo "$0: patching m4/gettext.m4 to remove need for intl/* ..."
419 rm -f $dir/$file
420 sed '
421 /^AC_DEFUN(\[AM_INTL_SUBDIR],/,/^]/c\
422 AC_DEFUN([AM_INTL_SUBDIR], [
423 /^AC_DEFUN(\[gt_INTL_SUBDIR_CORE],/,/^]/c\
424 AC_DEFUN([gt_INTL_SUBDIR_CORE], [])
425 $a\
426 AC_DEFUN([gl_LOCK_EARLY], [])
427 ' $1/$dir/$file >$dir/$file
428 else
429 cp_mark_as_generated $1/$dir/$file $dir/$file
430 fi
431 fi || exit
432 done
433
434 for dot_ig in .cvsignore .gitignore; do
435 ig=$dir/$dot_ig
436 if test -n "$copied" && test -f $ig; then
437 insert_sorted_if_absent $ig "$copied"
438 # If an ignored file name ends with _.h, then also add
439 # the name with just ".h". Many gnulib headers are generated,
440 # e.g., stdint_.h -> stdint.h, dirent_.h ->..., etc.
441 f=`echo "$copied"|sed 's/_\.h$/.h/'`
442 insert_sorted_if_absent $ig "$f"
443 fi
444 done
192 done 445 done
193} 446}
194 447
195# Get gnulib files.
196 448
197case ${GNULIB_SRCDIR--} in 449# Create boot temporary directories to import from gnulib and gettext.
198-) checkout gnulib 450rm -fr $bt $bt2 &&
199 GNULIB_SRCDIR=gnulib 451mkdir $bt $bt2 || exit
200esac 452
453# Import from gnulib.
454
455gnulib_tool_options="\
456 --import\
457 --no-changelog\
458 --aux-dir $bt/$build_aux\
459 --doc-base $bt/doc\
460 --lib $gnulib_name\
461 --m4-base $bt/m4/\
462 --source-base $bt/lib/\
463 --tests-base $bt/tests\
464 --local-dir gl\
465$gnulib_tool_option_extras\
466"
467echo "$0: $gnulib_tool $gnulib_tool_options --import ..."
468$gnulib_tool $gnulib_tool_options --import $gnulib_modules &&
469slurp $bt || exit
470
471for file in $gnulib_files; do
472 symlink_to_gnulib $file || exit
473done
201 474
202<$GNULIB_SRCDIR/gnulib-tool || exit
203 475
204get_modules build-aux/gnulib.modules 476# Import from gettext.
477with_gettext=yes
478 grep '^[ ]*AM_GNU_GETTEXT_VERSION(' configure.ac >/dev/null || \
479 with_gettext=no
205 480
206gnulib_modules=`sort -u modlist.tmp` 481if test $with_gettext = yes; then
207previous_gnulib_modules= 482 echo "$0: (cd $bt2; autopoint) ..."
208while [ "$gnulib_modules" != "$previous_gnulib_modules" ]; do 483 cp configure.ac $bt2 &&
209 previous_gnulib_modules=$gnulib_modules 484 (cd $bt2 && autopoint && rm configure.ac) &&
210 gnulib_modules=` 485 slurp $bt2 $bt || exit
211 (echo "$gnulib_modules"
212 for gnulib_module in $gnulib_modules; do
213 $GNULIB_SRCDIR/gnulib-tool --extract-dependencies $gnulib_module
214 done) | sort -u
215 `
216done
217 486
218gnulib_files=` 487 rm -fr $bt $bt2 || exit
219 (for gnulib_module in $gnulib_modules; do 488fi
220 $GNULIB_SRCDIR/gnulib-tool --extract-filelist $gnulib_module
221 done) | sort -u
222`
223 489
224gnulib_dirs=`echo "$gnulib_files" | sed 's,/[^/]*$,,' | sort -u`
225mkdir -p $gnulib_dirs || exit
226 490
227for file in build-aux/*.m4; do 491# Reconfigure, getting other files.
228 dest=m4/`basename $file`
229 492
230 rm -f $dest && 493for command in \
231 echo "$0: Copying file $file" && 494 libtool \
232 cp -p $file $dest || exit 495 'aclocal --force -I m4' \
496 'autoconf --force' \
497 'autoheader --force' \
498 'automake --add-missing --copy --force-missing';
499do
500 if test "$command" = libtool; then
501 grep '^[ ]*AM_PROG_LIBTOOL\>' configure.ac >/dev/null ||
502 continue
503 command='libtoolize -c -f'
504 fi
505 echo "$0: $command ..."
506 $command || exit
233done 507done
234 508
235for gnulib_file in $gnulib_files; do 509
236 case $gnulib_file in 510# Get some extra files from gnulib, overriding existing files.
237 config/*) dest=`echo $gnulib_file | sed 's,config/,build-aux/,'`;; 511
238 # These will be overwritten by autopoint, which still uses 512for file in $gnulib_extra_files; do
239 # old jm_.* macro names, so we have to keep both copies. 513 case $file in
240 m4/gettext.m4 | m4/glibc21.m4 | m4/inttypes_h.m4 | m4/lib-ld.m4 | \ 514 */INSTALL) dst=INSTALL;;
241 m4/lib-prefix.m4 | m4/po.m4 | m4/stdint_h.m4 | m4/uintmax_t.m4 | \ 515 *) dst=$file;;
242 m4/ulonglong.m4 | m4/longlong.m4)
243 dest=`expr $gnulib_file : '\(.*\).m4'`_gl.m4;;
244 *) dest=$gnulib_file;;
245 esac 516 esac
246 rm -f $dest && 517 symlink_to_gnulib $file $dst || exit
247 echo "$0: Copying file $GNULIB_SRCDIR/$gnulib_file" &&
248 cp -p $GNULIB_SRCDIR/$gnulib_file $dest || exit
249done 518done
250 519
251echo "$0: Creating m4/gnulib.m4" 520if test $with_gettext = yes; then
252(echo "# This file is generated automatically. Please, do not edit." 521 # Create gettext configuration.
253 echo "#" 522 echo "$0: Creating po/Makevars from po/Makevars.template ..."
254 echo "AC_DEFUN([cflow_GNULIB],[" 523 rm -f po/Makevars
255 for gnulib_module in $gnulib_modules; do 524 sed '
256 echo "# $gnulib_module" 525 /^EXTRA_LOCALE_CATEGORIES *=/s/=.*/= '"$EXTRA_LOCALE_CATEGORIES"'/
257 $GNULIB_SRCDIR/gnulib-tool --extract-autoconf-snippet $gnulib_module 526 /^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-'"$package"'@gnu.org/
258 done | sed '/AM_GNU_GETTEXT/d' 527 /^XGETTEXT_OPTIONS *=/{
259 echo "])") > ./m4/gnulib.m4 528 s/$/ \\/
260 529 a\
261echo "$0: Creating lib/Makefile.am" 530 '"$XGETTEXT_OPTIONS"' $${end_of_xgettext_options+}
262(echo "# -*- buffer-read-only: t -*- vi: set ro:" 531 }
263 echo "# This file is generated automatically from lib/Makefile.tmpl. Do not edit!" 532 ' po/Makevars.template >po/Makevars
264 cat lib/Makefile.tmpl 533
265 534 if test -d runtime-po; then
266 for gnulib_module in $gnulib_modules; do 535 # Similarly for runtime-po/Makevars, but not quite the same.
267 echo "# $gnulib_module" 536 rm -f runtime-po/Makevars
268 $GNULIB_SRCDIR/gnulib-tool --extract-automake-snippet $gnulib_module 537 sed '
269 done | sed 's/lib_SOURCES/libcflow_a_SOURCES/g' ) > lib/Makefile.am 538 /^DOMAIN *=.*/s/=.*/= '"$package"'-runtime/
270 539 /^subdir *=.*/s/=.*/= runtime-po/
271# Get translations. 540 /^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-'"$package"'@gnu.org/
272if test "$DOWNLOAD_PO" = "yes"; then 541 /^XGETTEXT_OPTIONS *=/{
273 update_po 542 s/$/ \\/
543 a\
544 '"$XGETTEXT_OPTIONS_RUNTIME"' $${end_of_xgettext_options+}
545 }
546 ' <po/Makevars.template >runtime-po/Makevars
547
548 # Copy identical files from po to runtime-po.
549 (cd po && cp -p Makefile.in.in *-quot *.header *.sed *.sin ../runtime-po)
550 fi
274fi 551fi
275 552
276# Reconfigure, getting other files.
277
278echo "$0: autoreconf --verbose --install --force ..."
279autoreconf --verbose --install --force || exit 1
280
281
282echo "$0: done. Now you can run './configure'." 553echo "$0: done. Now you can run './configure'."
diff --git a/configure.ac b/configure.ac
index 2326343..765f65c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,13 +21,13 @@
21AC_PREREQ(2.59) 21AC_PREREQ(2.59)
22AC_INIT([GNU cflow], [1.1], [bug-cflow@gnu.org]) 22AC_INIT([GNU cflow], [1.1], [bug-cflow@gnu.org])
23AC_CONFIG_SRCDIR([src/cflow.h]) 23AC_CONFIG_SRCDIR([src/cflow.h])
24AC_CONFIG_AUX_DIR([build-aux]) 24AC_CONFIG_AUX_DIR([build-aux])
25AM_INIT_AUTOMAKE 25AM_INIT_AUTOMAKE
26AC_CONFIG_HEADER([config.h]) 26AC_CONFIG_HEADER([config.h])
27gl_USE_SYSTEM_EXTENSIONS 27gl_EARLY
28 28
29# Checks for programs. 29# Checks for programs.
30AC_PROG_CC 30AC_PROG_CC
31AC_PROG_LEX 31AC_PROG_LEX
32AC_PROG_RANLIB 32AC_PROG_RANLIB
33 33
@@ -36,13 +36,13 @@ AC_HEADER_STDC
36AC_CHECK_HEADERS([stdlib.h string.h unistd.h locale.h]) 36AC_CHECK_HEADERS([stdlib.h string.h unistd.h locale.h])
37 37
38# Checks for library functions. 38# Checks for library functions.
39AC_FUNC_ERROR_AT_LINE 39AC_FUNC_ERROR_AT_LINE
40AC_CHECK_FUNCS([memmove memset strdup strerror strtol setlocale]) 40AC_CHECK_FUNCS([memmove memset strdup strerror strtol setlocale])
41 41
42cflow_GNULIB 42gl_INIT
43MU_DEBUG_MODE 43MU_DEBUG_MODE
44 44
45AH_BOTTOM([ 45AH_BOTTOM([
46/* program_name is used by lib/error.c */ 46/* program_name is used by lib/error.c */
47#define program_name program_invocation_name 47#define program_name program_invocation_name
48#include <errno.h> 48#include <errno.h>
@@ -54,15 +54,14 @@ AM_PATH_LISPDIR
54if test "$EMACS" != "no"; then 54if test "$EMACS" != "no"; then
55 lisp_LISP='$(LISPSRC)' 55 lisp_LISP='$(LISPSRC)'
56fi 56fi
57AC_SUBST(lisp_LISP) 57AC_SUBST(lisp_LISP)
58 58
59# Gettext. 59# Gettext.
60AM_MKINSTALLDIRS 60AM_GNU_GETTEXT([external], [need-formatstring-macros])
61AM_GNU_GETTEXT([external], [need-ngettext]) 61AM_GNU_GETTEXT_VERSION(0.16)
62AM_GNU_GETTEXT_VERSION(0.14.1)
63 62
64# Doc hints. 63# Doc hints.
65# Select a rendition level: 64# Select a rendition level:
66# DISTRIB for stable releases (at most one dot in the version number) 65# DISTRIB for stable releases (at most one dot in the version number)
67# PROOF for alpha releases. 66# PROOF for alpha releases.
68# PUBLISH can only be required manually when running make in doc/ 67# PUBLISH can only be required manually when running make in doc/
diff --git a/lib/.cvsignore b/lib/.cvsignore
index 1a97f7b..410c714 100644
--- a/lib/.cvsignore
+++ b/lib/.cvsignore
@@ -1,5 +1,85 @@
1*.[ch]
1.deps 2.deps
2Makefile 3Makefile
3Makefile.am 4Makefile.am
4Makefile.in 5Makefile.in
5*.[ch] 6alloca.c
7alloca.h
8alloca_.h
9argp-ba.c
10argp-eexst.c
11argp-fmtstream.c
12argp-fmtstream.h
13argp-fs-xinl.c
14argp-help.c
15argp-namefrob.h
16argp-parse.c
17argp-pin.c
18argp-pv.c
19argp-pvh.c
20argp-xinl.c
21argp.h
22asnprintf.c
23basename.c
24dirname.c
25dirname.h
26dummy.c
27error.c
28error.h
29exitfail.c
30exitfail.h
31getopt.c
32getopt.h
33getopt1.c
34getopt_.h
35getopt_int.h
36gettext.h
37gnulib.mk
38hash.c
39hash.h
40lstat.c
41lstat.h
42malloc.c
43mempcpy.c
44obstack.c
45obstack.h
46printf-args.c
47printf-args.h
48printf-parse.c
49printf-parse.h
50size_max.h
51sleep.c
52snprintf.c
53stdbool.h
54stdbool_.h
55stdint.h
56stdint_.h
57stdio.h
58stdio_.h
59stdlib.h
60stdlib_.h
61strcasecmp.c
62strchrnul.c
63string.h
64string_.h
65stripslash.c
66strncasecmp.c
67strndup.c
68strnlen.c
69sys_stat.h
70sys_stat_.h
71sysexits.h
72sysexits_.h
73unistd.h
74unistd_.h
75vasnprintf.c
76vasnprintf.h
77vsnprintf.c
78wchar.h
79wchar_.h
80xalloc-die.c
81xalloc.h
82xmalloc.c
83xsize.h
84xstrndup.c
85xstrndup.h
diff --git a/po/.cvsignore b/po/.cvsignore
index 0055994..e34e97e 100644
--- a/po/.cvsignore
+++ b/po/.cvsignore
@@ -1,18 +1,18 @@
1*.gmo
2*.mo
1Makefile 3Makefile
2Makefile.in 4Makefile.in
3Makefile.in.in 5Makefile.in.in
4Makevars.template 6Makevars.template
5POTFILES 7POTFILES
6Rules-quot 8Rules-quot
7cflow.pot
8boldquot.sed 9boldquot.sed
10cflow.pot
9en@boldquot.header 11en@boldquot.header
10en@quot.header 12en@quot.header
11insert-header.sin 13insert-header.sin
12mailutils.pot 14mailutils.pot
13quot.sed 15quot.sed
14remove-potcdate.sin
15remove-potcdate.sed 16remove-potcdate.sed
17remove-potcdate.sin
16stamp-po 18stamp-po
17*.mo
18*.gmo
diff --git a/po/Makevars b/po/Makevars
deleted file mode 100644
index 15fe7fb..0000000
--- a/po/Makevars
+++ b/dev/null
@@ -1,16 +0,0 @@
1#
2# Makefile variables for PO directory.
3# Copyright (C) 2005 Free Software Foundation, Inc.
4#
5
6DOMAIN = $(PACKAGE)
7
8subdir = po
9top_builddir = ..
10
11XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
12COPYRIGHT_HOLDER = Sergey Poznyakoff
13MSGID_BUGS_ADDRESS = bug-cflow@gnu.org
14EXTRA_LOCALE_CATEGORIES =
15
16# EOF
diff --git a/po/da.po b/po/da.po
index 9ec4f88..3a2da6e 100644
--- a/po/da.po
+++ b/po/da.po
@@ -2,13 +2,13 @@
2# Copyright (C) 2005 Free Software Foundation, Inc. 2# Copyright (C) 2005 Free Software Foundation, Inc.
3# Morten Bo Johansen <mojo@mbjnet.dk>, 2005- 3# Morten Bo Johansen <mojo@mbjnet.dk>, 2005-
4msgid "" 4msgid ""
5msgstr "" 5msgstr ""
6"Project-Id-Version: cflow 1.0\n" 6"Project-Id-Version: cflow 1.0\n"
7"Report-Msgid-Bugs-To: bug-cflow@gnu.org\n" 7"Report-Msgid-Bugs-To: bug-cflow@gnu.org\n"
8"POT-Creation-Date: 2005-10-07 10:22+0300\n" 8"POT-Creation-Date: 2006-09-10 15:17+0300\n"
9"PO-Revision-Date: 2005-11-01 00:27+0200\n" 9"PO-Revision-Date: 2005-11-01 00:27+0200\n"
10"Last-Translator: Morten Bo Johansen <mojo@mbjnet.dk>\n" 10"Last-Translator: Morten Bo Johansen <mojo@mbjnet.dk>\n"
11"Language-Team: Danish <dansk@klid.dk>\n" 11"Language-Team: Danish <dansk@klid.dk>\n"
12"MIME-Version: 1.0\n" 12"MIME-Version: 1.0\n"
13"Content-Type: text/plain; charset=iso-8859-1\n" 13"Content-Type: text/plain; charset=iso-8859-1\n"
14"Content-Transfer-Encoding: 8bit\n" 14"Content-Transfer-Encoding: 8bit\n"
@@ -34,17 +34,26 @@ msgstr "kan ikke bne \"%s\""
34 34
35#: src/c.l:422 35#: src/c.l:422
36#, c-format 36#, c-format
37msgid "New location: %s:%d\n" 37msgid "New location: %s:%d\n"
38msgstr "Ny placering: %s:%d\n" 38msgstr "Ny placering: %s:%d\n"
39 39
40#. TRANSLATORS: Please, preserve the vertical tabulation (^K character) 40#: src/main.c:27
41#. in this message 41msgid "generate a program flowgraph"
42msgstr ""
43
42#: src/main.c:29 44#: src/main.c:29
43msgid "generate a program flowgraph * The effect of each option marked with an asterisk is reversed if the option's long name is prefixed with `no-'. For example, --no-cpp cancels --cpp." 45#, fuzzy
44msgstr "generr en flowgraf for program. * Virkningen af at tilvalg er markeret med en asterisk er den modsatte hvis tilvalgets lange navn har prfikset \"no-\". F.eks. --no-cpp annullerer --cpp." 46msgid ""
47"* The effect of each option marked with an asterisk is reversed if the "
48"option's long name is prefixed with `no-'. For example, --no-cpp cancels --"
49"cpp."
50msgstr ""
51"generr en flowgraf for program. * Virkningen af at tilvalg er markeret med "
52"en asterisk er den modsatte hvis tilvalgets lange navn har prfikset \"no-"
53"\". F.eks. --no-cpp annullerer --cpp."
45 54
46#: src/main.c:56 55#: src/main.c:56
47msgid "General options:" 56msgid "General options:"
48msgstr "Generelle tilvalg:" 57msgstr "Generelle tilvalg:"
49 58
50#: src/main.c:57 src/main.c:98 59#: src/main.c:57 src/main.c:98
@@ -57,22 +66,29 @@ msgstr "angiv den dybde hvori flowgrafen skres af"
57 66
58#: src/main.c:59 67#: src/main.c:59
59msgid "CLASSES" 68msgid "CLASSES"
60msgstr "KLASSER" 69msgstr "KLASSER"
61 70
62#: src/main.c:60 71#: src/main.c:60
63msgid "Include specified classes of symbols (see below). Prepend CLASSES with ^ or - to exclude them from the output" 72msgid ""
64msgstr "Medtag de anfrte symbolklasser (se nedenfor). Lad KLASSER begynde med ^ eller - for at fjerne dem fra uddata" 73"Include specified classes of symbols (see below). Prepend CLASSES with ^ or "
74"- to exclude them from the output"
75msgstr ""
76"Medtag de anfrte symbolklasser (se nedenfor). Lad KLASSER begynde med ^ "
77"eller - for at fjerne dem fra uddata"
65 78
66#: src/main.c:61 src/main.c:102 src/main.c:106 79#: src/main.c:61 src/main.c:102 src/main.c:106 lib/argp-parse.c:84
67msgid "NAME" 80msgid "NAME"
68msgstr "NAVN" 81msgstr "NAVN"
69 82
70#: src/main.c:62 83#: src/main.c:62
71msgid "Use given output format NAME. Valid names are `gnu' (default) and `posix'" 84msgid ""
72msgstr "Brug det anfrte navn for format p uddata: Gyldige navne er \"gnu\" (standard) og \"posix\"" 85"Use given output format NAME. Valid names are `gnu' (default) and `posix'"
86msgstr ""
87"Brug det anfrte navn for format p uddata: Gyldige navne er \"gnu"
88"\" (standard) og \"posix\""
73 89
74#: src/main.c:65 90#: src/main.c:65
75msgid "* Print reverse call tree" 91msgid "* Print reverse call tree"
76msgstr "* Udskriv trstruktur over kald i omvendt orden" 92msgstr "* Udskriv trstruktur over kald i omvendt orden"
77 93
78#: src/main.c:67 94#: src/main.c:67
@@ -81,22 +97,28 @@ msgstr "Lav kun en liste over krydsreferencer"
81 97
82#: src/main.c:68 98#: src/main.c:68
83msgid "OPT" 99msgid "OPT"
84msgstr "TILVALG" 100msgstr "TILVALG"
85 101
86#: src/main.c:69 102#: src/main.c:69
87msgid "Set printing option to OPT. Valid OPT values are: xref (or cross-ref), tree. Any unambiguous abbreviation of the above is also accepted" 103msgid ""
88msgstr "St tilvalg for udskrivning til TILVALG. Gyldige vrdier for TILVALG er: xref (eller cross-xref), tree. Enhver entydig forkortelse af disse vrdier kan ogs godkendes" 104"Set printing option to OPT. Valid OPT values are: xref (or cross-ref), tree. "
105"Any unambiguous abbreviation of the above is also accepted"
106msgstr ""
107"St tilvalg for udskrivning til TILVALG. Gyldige vrdier for TILVALG er: "
108"xref (eller cross-xref), tree. Enhver entydig forkortelse af disse vrdier "
109"kan ogs godkendes"
89 110
90#: src/main.c:71 111#: src/main.c:71
91msgid "FILE" 112msgid "FILE"
92msgstr "FIL" 113msgstr "FIL"
93 114
94#: src/main.c:72 115#: src/main.c:72
95msgid "Set output file name (default -, meaning stdout)" 116msgid "Set output file name (default -, meaning stdout)"
96msgstr "Angiv navn p uddata-fil (standard er \"-\" som betyder standarduddata)" 117msgstr ""
118"Angiv navn p uddata-fil (standard er \"-\" som betyder standarduddata)"
97 119
98#: src/main.c:75 120#: src/main.c:75
99msgid "Symbols classes for --include argument" 121msgid "Symbols classes for --include argument"
100msgstr "Symbolklasser til argumentet --include" 122msgstr "Symbolklasser til argumentet --include"
101 123
102#: src/main.c:77 124#: src/main.c:77
@@ -133,14 +155,20 @@ msgstr "St den frste stak-strrelse p elementer til ANTAL"
133 155
134#: src/main.c:100 156#: src/main.c:100
135msgid "SYMBOL:TYPE" 157msgid "SYMBOL:TYPE"
136msgstr "SYMBOL:TYPE" 158msgstr "SYMBOL:TYPE"
137 159
138#: src/main.c:101 160#: src/main.c:101
139msgid "Register SYMBOL with given TYPE. Valid types are: keyword (or kw), modifier, identifier, type, wrapper. Any unambiguous abbreviation of the above is also accepted" 161msgid ""
140msgstr "Registrr SYMBOL for angiven TYPE. Gyldig typer er: keyword (eller kw), modifier, identifier, type, wrapper. Enhver entydig forkortelse af disse typer kan ogs godkendes" 162"Register SYMBOL with given TYPE. Valid types are: keyword (or kw), modifier, "
163"identifier, type, wrapper. Any unambiguous abbreviation of the above is also "
164"accepted"
165msgstr ""
166"Registrr SYMBOL for angiven TYPE. Gyldig typer er: keyword (eller kw), "
167"modifier, identifier, type, wrapper. Enhver entydig forkortelse af disse "
168"typer kan ogs godkendes"
141 169
142#: src/main.c:103 170#: src/main.c:103
143msgid "Assume main function to be called NAME" 171msgid "Assume main function to be called NAME"
144msgstr "Antag at hovedfunktionen hedder NAVN" 172msgstr "Antag at hovedfunktionen hedder NAVN"
145 173
146#: src/main.c:104 174#: src/main.c:104
@@ -157,14 +185,18 @@ msgstr "Annullr alle tidligere definitioner af NAVN"
157 185
158#: src/main.c:108 186#: src/main.c:108
159msgid "DIR" 187msgid "DIR"
160msgstr "KATALOG" 188msgstr "KATALOG"
161 189
162#: src/main.c:109 190#: src/main.c:109
163msgid "Add the directory DIR to the list of directories to be searched for header files." 191msgid ""
164msgstr "Tilfj kataloget KATALOG til listen over kataloger der skal gennemsges for inkluderingsfiler." 192"Add the directory DIR to the list of directories to be searched for header "
193"files."
194msgstr ""
195"Tilfj kataloget KATALOG til listen over kataloger der skal gennemsges for "
196"inkluderingsfiler."
165 197
166#: src/main.c:110 198#: src/main.c:110
167msgid "COMMAND" 199msgid "COMMAND"
168msgstr "KOMMANDO" 200msgstr "KOMMANDO"
169 201
170#: src/main.c:111 202#: src/main.c:111
@@ -286,13 +318,13 @@ msgid ""
286"License for %s:\n" 318"License for %s:\n"
287"\n" 319"\n"
288msgstr "" 320msgstr ""
289"Licens til %s:\n" 321"Licens til %s:\n"
290"\n" 322"\n"
291 323
292#: src/main.c:575 src/main.c:760 324#: src/main.c:575 src/main.c:762
293#, c-format 325#, c-format
294msgid "%s: No such output driver" 326msgid "%s: No such output driver"
295msgstr "%s: Ingen sdan uddata-driver" 327msgstr "%s: Ingen sdan uddata-driver"
296 328
297#: src/main.c:602 329#: src/main.c:602
298#, c-format 330#, c-format
@@ -304,46 +336,46 @@ msgid "[FILE]..."
304msgstr "[FIL]..." 336msgstr "[FIL]..."
305 337
306#: src/main.c:725 338#: src/main.c:725
307msgid "Exiting" 339msgid "Exiting"
308msgstr "Afslutter" 340msgstr "Afslutter"
309 341
310#: src/main.c:792 342#: src/main.c:794
311msgid "no input files" 343msgid "no input files"
312msgstr "ingen inddatafiler" 344msgstr "ingen inddatafiler"
313 345
314#: src/parser.c:119 346#: src/parser.c:120
315#, c-format 347#, c-format
316msgid " near " 348msgid " near "
317msgstr " nr " 349msgstr " nr "
318 350
319#: src/parser.c:188 351#: src/parser.c:189
320msgid "INTERNAL ERROR: cannot return token to stream" 352msgid "INTERNAL ERROR: cannot return token to stream"
321msgstr "INTERN FEJL: kan ikke returnere element til datastrm" 353msgstr "INTERN FEJL: kan ikke returnere element til datastrm"
322 354
323#: src/parser.c:398 355#: src/parser.c:399
324msgid "unexpected end of file in expression" 356msgid "unexpected end of file in expression"
325msgstr "uventet slutning p fil i udtryk " 357msgstr "uventet slutning p fil i udtryk "
326 358
327#: src/parser.c:453 src/parser.c:552 359#: src/parser.c:454 src/parser.c:553
328msgid "expected `;'" 360msgid "expected `;'"
329msgstr "forventede ';'" 361msgstr "forventede ';'"
330 362
331#: src/parser.c:470 src/parser.c:577 363#: src/parser.c:471 src/parser.c:578
332msgid "unexpected end of file in declaration" 364msgid "unexpected end of file in declaration"
333msgstr "uventet slutning p fil i erklring" 365msgstr "uventet slutning p fil i erklring"
334 366
335#: src/parser.c:502 367#: src/parser.c:503
336msgid "missing `;' after struct declaration" 368msgid "missing `;' after struct declaration"
337msgstr "manglende ';' efter struct-erklring" 369msgstr "manglende ';' efter struct-erklring"
338 370
339#: src/parser.c:599 371#: src/parser.c:600
340msgid "unexpected end of file in initializer list" 372msgid "unexpected end of file in initializer list"
341msgstr "uventet slutning p fil i liste over startvrdier" 373msgstr "uventet slutning p fil i liste over startvrdier"
342 374
343#: src/parser.c:683 375#: src/parser.c:684
344msgid "unexpected end of file in struct" 376msgid "unexpected end of file in struct"
345msgstr "uventet slutning p fil i struct" 377msgstr "uventet slutning p fil i struct"
346 378
347#: src/parser.c:769 src/parser.c:792 379#: src/parser.c:769 src/parser.c:792
348msgid "expected `)'" 380msgid "expected `)'"
349msgstr "forventede ')'" 381msgstr "forventede ')'"
@@ -365,171 +397,194 @@ msgid "forced function body close"
365msgstr "gennemtvang afslutning af funktionens krop" 397msgstr "gennemtvang afslutning af funktionens krop"
366 398
367#: src/parser.c:944 399#: src/parser.c:944
368msgid "unexpected end of file in function body" 400msgid "unexpected end of file in function body"
369msgstr "uventet slutning p fil i funktionens indhold" 401msgstr "uventet slutning p fil i funktionens indhold"
370 402
371#: src/parser.c:979 403#: src/parser.c:983
372#, c-format 404#, c-format
373msgid "%s/%d redefined" 405msgid "%s/%d redefined"
374msgstr "%s/%d omdefineret" 406msgstr "%s/%d omdefineret"
375 407
376#: src/parser.c:982 408#: src/parser.c:986
377msgid "this is the place of previous definition" 409msgid "this is the place of previous definition"
378msgstr "dette er stedet for den forrige definition" 410msgstr "dette er stedet for den forrige definition"
379 411
380#: src/parser.c:994 412#: src/parser.c:999
381#, c-format 413#, c-format
382msgid "%s:%d: %s/%d defined to %s\n" 414msgid "%s:%d: %s/%d defined to %s\n"
383msgstr "%s:%d: %s/%d defineret til %s\n" 415msgstr "%s:%d: %s/%d defineret til %s\n"
384 416
385#: src/parser.c:1019 417#: src/parser.c:1024
386#, c-format 418#, c-format
387msgid "%s:%d: type %s\n" 419msgid "%s:%d: type %s\n"
388msgstr "%s:%d: type %s\n" 420msgstr "%s:%d: type %s\n"
389 421
390#: src/rc.c:55 422#: src/rc.c:55
391msgid "not enough memory to process rc file" 423msgid "not enough memory to process rc file"
392msgstr "ikke nok hukommelse til at behandle rc-fil" 424msgstr "ikke nok hukommelse til at behandle rc-fil"
393 425
394#: src/symbol.c:317 426#: src/symbol.c:368
395msgid "not enough core" 427msgid "not enough core"
396msgstr "ikke nok kernehukommelse (core)" 428msgstr "ikke nok kernehukommelse (core)"
397 429
398#: lib/argp-help.c:195 430#: lib/argp-help.c:148
431#, c-format
432msgid "ARGP_HELP_FMT: %s value is less than or equal to %s"
433msgstr ""
434
435#: lib/argp-help.c:221
399#, c-format 436#, c-format
400msgid "%.*s: ARGP_HELP_FMT parameter requires a value" 437msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
401msgstr "%.*s: ARGP_HELP_FMT-parameteren krver en vrdi" 438msgstr "%.*s: ARGP_HELP_FMT-parameteren krver en vrdi"
402 439
403#: lib/argp-help.c:204 440#: lib/argp-help.c:227
441#, fuzzy, c-format
442msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
443msgstr "%.*s: ARGP_HELP_FMT-parameteren krver en vrdi"
444
445#: lib/argp-help.c:236
404#, c-format 446#, c-format
405msgid "%.*s: Unknown ARGP_HELP_FMT parameter" 447msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
406msgstr "%.*s: Ukendt ARGP_HELP_FMT-parameter" 448msgstr "%.*s: Ukendt ARGP_HELP_FMT-parameter"
407 449
408#: lib/argp-help.c:216 450#: lib/argp-help.c:248
409#, c-format 451#, c-format
410msgid "Garbage in ARGP_HELP_FMT: %s" 452msgid "Garbage in ARGP_HELP_FMT: %s"
411msgstr "Snavs i ARGP_HELP_FMT: %s" 453msgstr "Snavs i ARGP_HELP_FMT: %s"
412 454
413#: lib/argp-help.c:1195 455#: lib/argp-help.c:1229
414msgid "Mandatory or optional arguments to long options are also mandatory or optional for any corresponding short options." 456msgid ""
415msgstr "Obligatoriske eller frivillige argumenter til lange tilvalg er ogs obligatoriske eller frivillige for tilsvarende korte tilvalg." 457"Mandatory or optional arguments to long options are also mandatory or "
458"optional for any corresponding short options."
459msgstr ""
460"Obligatoriske eller frivillige argumenter til lange tilvalg er ogs "
461"obligatoriske eller frivillige for tilsvarende korte tilvalg."
416 462
417#: lib/argp-help.c:1582 463#: lib/argp-help.c:1622
418msgid "Usage:" 464msgid "Usage:"
419msgstr "Brug:" 465msgstr "Brug:"
420 466
421#: lib/argp-help.c:1586 467#: lib/argp-help.c:1626
422msgid " or: " 468msgid " or: "
423msgstr " eller: " 469msgstr " eller: "
424 470
425#: lib/argp-help.c:1598 471#: lib/argp-help.c:1638
426msgid " [OPTION...]" 472msgid " [OPTION...]"
427msgstr " [FLAG...]" 473msgstr " [FLAG...]"
428 474
429#: lib/argp-help.c:1625 475#: lib/argp-help.c:1665
430#, c-format 476#, c-format
431msgid "Try `%s --help' or `%s --usage' for more information.\n" 477msgid "Try `%s --help' or `%s --usage' for more information.\n"
432msgstr "Prv '%s --help' eller '%s --usage' for mere information.\n" 478msgstr "Prv '%s --help' eller '%s --usage' for mere information.\n"
433 479
434#: lib/argp-help.c:1653 480#: lib/argp-help.c:1693
435#, c-format 481#, c-format
436msgid "Report bugs to %s.\n" 482msgid "Report bugs to %s.\n"
437msgstr "" 483msgstr ""
438"Rapportr fejl til %s.\n" 484"Rapportr fejl til %s.\n"
439"Rapportr fejl i oversttelsen til dansk@dansk-gruppen.dk.\n" 485"Rapportr fejl i oversttelsen til dansk@dansk-gruppen.dk.\n"
440 486
441#: lib/argp-help.c:1873 lib/error.c:122 487#: lib/argp-help.c:1912 lib/error.c:125
442msgid "Unknown system error" 488msgid "Unknown system error"
443msgstr "Ukendt systemfejl" 489msgstr "Ukendt systemfejl"
444 490
445#: lib/argp-parse.c:83 491#: lib/argp-parse.c:82
446msgid "Give this help list" 492#, fuzzy
493msgid "give this help list"
447msgstr "Vis denne hjlpeliste" 494msgstr "Vis denne hjlpeliste"
448 495
449#: lib/argp-parse.c:84 496#: lib/argp-parse.c:83
450msgid "Give a short usage message" 497#, fuzzy
498msgid "give a short usage message"
451msgstr "Giv en kort brugsmeddelelse" 499msgstr "Giv en kort brugsmeddelelse"
452 500
453#: lib/argp-parse.c:85 501#: lib/argp-parse.c:84
454msgid "Set the program name" 502#, fuzzy
503msgid "set the program name"
455msgstr "Angiv programnavnet" 504msgstr "Angiv programnavnet"
456 505
457#: lib/argp-parse.c:87 506#: lib/argp-parse.c:85
458msgid "Hang for SECS seconds (default 3600)" 507msgid "SECS"
508msgstr ""
509
510#: lib/argp-parse.c:86
511#, fuzzy
512msgid "hang for SECS seconds (default 3600)"
459msgstr "Hng i SEK sekunder (forvalgt 3600)" 513msgstr "Hng i SEK sekunder (forvalgt 3600)"
460 514
461#: lib/argp-parse.c:148 515#: lib/argp-parse.c:143
462msgid "Print program version" 516#, fuzzy
517msgid "print program version"
463msgstr "Skriv programversion" 518msgstr "Skriv programversion"
464 519
465#: lib/argp-parse.c:164 520#: lib/argp-parse.c:159
466msgid "(PROGRAM ERROR) No version known!?" 521msgid "(PROGRAM ERROR) No version known!?"
467msgstr "(PROGRAMFEJL) Ingen kendt version!?" 522msgstr "(PROGRAMFEJL) Ingen kendt version!?"
468 523
469#: lib/argp-parse.c:620 524#: lib/argp-parse.c:612
470#, c-format 525#, c-format
471msgid "%s: Too many arguments\n" 526msgid "%s: Too many arguments\n"
472msgstr "%s: For mange argumenter\n" 527msgstr "%s: For mange argumenter\n"
473 528
474#: lib/argp-parse.c:763 529#: lib/argp-parse.c:755
475msgid "(PROGRAM ERROR) Option should have been recognized!?" 530msgid "(PROGRAM ERROR) Option should have been recognized!?"
476msgstr "(PROGRAMFEJL) Flag skulle have vret genkendt!?" 531msgstr "(PROGRAMFEJL) Flag skulle have vret genkendt!?"
477 532
478#: lib/getopt.c:552 lib/getopt.c:571 533#: lib/getopt.c:531 lib/getopt.c:547
479#, c-format 534#, c-format
480msgid "%s: option `%s' is ambiguous\n" 535msgid "%s: option `%s' is ambiguous\n"
481msgstr "%s: tilvalget '%s' er ikke entydigt\n" 536msgstr "%s: tilvalget '%s' er ikke entydigt\n"
482 537
483#: lib/getopt.c:604 lib/getopt.c:608 538#: lib/getopt.c:580 lib/getopt.c:584
484#, c-format 539#, c-format
485msgid "%s: option `--%s' doesn't allow an argument\n" 540msgid "%s: option `--%s' doesn't allow an argument\n"
486msgstr "%s: tilvalget '--%s' tillader ikke argumenter\n" 541msgstr "%s: tilvalget '--%s' tillader ikke argumenter\n"
487 542
488#: lib/getopt.c:617 lib/getopt.c:622 543#: lib/getopt.c:593 lib/getopt.c:598
489#, c-format 544#, c-format
490msgid "%s: option `%c%s' doesn't allow an argument\n" 545msgid "%s: option `%c%s' doesn't allow an argument\n"
491msgstr "%s: tilvalget '%c%s' tillader ikke argument\n" 546msgstr "%s: tilvalget '%c%s' tillader ikke argument\n"
492 547
493#: lib/getopt.c:668 lib/getopt.c:690 lib/getopt.c:1021 lib/getopt.c:1043 548#: lib/getopt.c:641 lib/getopt.c:660 lib/getopt.c:976 lib/getopt.c:995
494#, c-format 549#, c-format
495msgid "%s: option `%s' requires an argument\n" 550msgid "%s: option `%s' requires an argument\n"
496msgstr "%s: tilvalget '%s' skal have et argument\n" 551msgstr "%s: tilvalget '%s' skal have et argument\n"
497 552
498#: lib/getopt.c:728 lib/getopt.c:731 553#: lib/getopt.c:698 lib/getopt.c:701
499#, c-format 554#, c-format
500msgid "%s: unrecognized option `--%s'\n" 555msgid "%s: unrecognized option `--%s'\n"
501msgstr "%s: ukendt tilvalg '--%s'\n" 556msgstr "%s: ukendt tilvalg '--%s'\n"
502 557
503#: lib/getopt.c:739 lib/getopt.c:742 558#: lib/getopt.c:709 lib/getopt.c:712
504#, c-format 559#, c-format
505msgid "%s: unrecognized option `%c%s'\n" 560msgid "%s: unrecognized option `%c%s'\n"
506msgstr "%s: ukendt tilvalg '%c%s'\n" 561msgstr "%s: ukendt tilvalg '%c%s'\n"
507 562
508#: lib/getopt.c:797 lib/getopt.c:800 563#: lib/getopt.c:764 lib/getopt.c:767
509#, c-format 564#, c-format
510msgid "%s: illegal option -- %c\n" 565msgid "%s: illegal option -- %c\n"
511msgstr "%s: ugyldigt tilvalg -- %c\n" 566msgstr "%s: ugyldigt tilvalg -- %c\n"
512 567
513#: lib/getopt.c:806 lib/getopt.c:809 568#: lib/getopt.c:773 lib/getopt.c:776
514#, c-format 569#, c-format
515msgid "%s: invalid option -- %c\n" 570msgid "%s: invalid option -- %c\n"
516msgstr "%s: ugyldigt tilvalg -- %c\n" 571msgstr "%s: ugyldigt tilvalg -- %c\n"
517 572
518#: lib/getopt.c:864 lib/getopt.c:883 lib/getopt.c:1096 lib/getopt.c:1117 573#: lib/getopt.c:828 lib/getopt.c:844 lib/getopt.c:1048 lib/getopt.c:1066
519#, c-format 574#, c-format
520msgid "%s: option requires an argument -- %c\n" 575msgid "%s: option requires an argument -- %c\n"
521msgstr "%s: tilvalget skal have et argument -- %c\n" 576msgstr "%s: tilvalget skal have et argument -- %c\n"
522 577
523#: lib/getopt.c:936 lib/getopt.c:955 578#: lib/getopt.c:897 lib/getopt.c:913
524#, c-format 579#, c-format
525msgid "%s: option `-W %s' is ambiguous\n" 580msgid "%s: option `-W %s' is ambiguous\n"
526msgstr "%s: tilvalget '-W %s' er ikke entydigt\n" 581msgstr "%s: tilvalget '-W %s' er ikke entydigt\n"
527 582
528#: lib/getopt.c:979 lib/getopt.c:1000 583#: lib/getopt.c:937 lib/getopt.c:955
529#, c-format 584#, c-format
530msgid "%s: option `-W %s' doesn't allow an argument\n" 585msgid "%s: option `-W %s' doesn't allow an argument\n"
531msgstr "%s: tilvalget '-W %s' tillader ikke argument\n" 586msgstr "%s: tilvalget '-W %s' tillader ikke argument\n"
532 587
533#: lib/obstack.c:439 lib/obstack.c:442 588#: lib/obstack.c:427 lib/obstack.c:429
534msgid "memory exhausted" 589msgid "memory exhausted"
535msgstr "hukommelsen opbrugt" 590msgstr "hukommelsen opbrugt"
diff --git a/po/pl.po b/po/pl.po
index f797ea8..2d14c45 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3,20 +3,21 @@
3# Sergey Poznyakoff <gray@gnu.org>, 2005. 3# Sergey Poznyakoff <gray@gnu.org>, 2005.
4# 4#
5msgid "" 5msgid ""
6msgstr "" 6msgstr ""
7"Project-Id-Version: cflow 1.0\n" 7"Project-Id-Version: cflow 1.0\n"
8"Report-Msgid-Bugs-To: bug-cflow@gnu.org\n" 8"Report-Msgid-Bugs-To: bug-cflow@gnu.org\n"
9"POT-Creation-Date: 2005-10-07 10:22+0300\n" 9"POT-Creation-Date: 2006-09-10 15:17+0300\n"
10"PO-Revision-Date: 2005-10-16 00:06+0300\n" 10"PO-Revision-Date: 2005-10-16 00:06+0300\n"
11"Last-Translator: Sergey Poznyakoff <gray@gnu.org>\n" 11"Last-Translator: Sergey Poznyakoff <gray@gnu.org>\n"
12"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n" 12"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
13"MIME-Version: 1.0\n" 13"MIME-Version: 1.0\n"
14"Content-Type: text/plain; charset=iso-8859-2\n" 14"Content-Type: text/plain; charset=iso-8859-2\n"
15"Content-Transfer-Encoding: 8bit\n" 15"Content-Transfer-Encoding: 8bit\n"
16"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" 16"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
17"|| n%100>=20) ? 1 : 2);\n"
17 18
18#: src/c.l:137 19#: src/c.l:137
19msgid "unterminated string?" 20msgid "unterminated string?"
20msgstr "niezakoñczony ³añcuch?" 21msgstr "niezakoñczony ³añcuch?"
21 22
22#: src/c.l:296 23#: src/c.l:296
@@ -36,19 +37,22 @@ msgstr "otwarcie `%s' jest niemo¿liwe"
36 37
37#: src/c.l:422 38#: src/c.l:422
38#, c-format 39#, c-format
39msgid "New location: %s:%d\n" 40msgid "New location: %s:%d\n"
40msgstr "Nowa pozycja: %s:%d\n" 41msgstr "Nowa pozycja: %s:%d\n"
41 42
42#. TRANSLATORS: Please, preserve the vertical tabulation (^K character) 43#: src/main.c:27
43#. in this message 44msgid "generate a program flowgraph"
45msgstr ""
46
44#: src/main.c:29 47#: src/main.c:29
48#, fuzzy
45msgid "" 49msgid ""
46"generate a program flowgraph * The effect of each option marked with an " 50"* The effect of each option marked with an asterisk is reversed if the "
47"asterisk is reversed if the option's long name is prefixed with `no-'. For " 51"option's long name is prefixed with `no-'. For example, --no-cpp cancels --"
48"example, --no-cpp cancels --cpp." 52"cpp."
49msgstr "" 53msgstr ""
50"generuje wykres przebiegu sterowania w programie * Ka¿da opcja, zaznaczona " 54"generuje wykres przebiegu sterowania w programie * Ka¿da opcja, zaznaczona "
51"przez gwiazdkê, wykazuje dzia³anie odwrotne gdy jest u¿yta z przyrostkiem " 55"przez gwiazdkê, wykazuje dzia³anie odwrotne gdy jest u¿yta z przyrostkiem "
52"`no-'. Na przyk³ad, --no-cpp wy³±cza preprocesor." 56"`no-'. Na przyk³ad, --no-cpp wy³±cza preprocesor."
53 57
54#: src/main.c:56 58#: src/main.c:56
@@ -69,16 +73,16 @@ msgstr "KLASY"
69 73
70#: src/main.c:60 74#: src/main.c:60
71msgid "" 75msgid ""
72"Include specified classes of symbols (see below). Prepend CLASSES with ^ or " 76"Include specified classes of symbols (see below). Prepend CLASSES with ^ or "
73"- to exclude them from the output" 77"- to exclude them from the output"
74msgstr "" 78msgstr ""
75"Do³±cza do wykresu podane klasy symboli (patrz ni¿ej). By wy³±czyæ je, wpisz " 79"Do³±cza do wykresu podane klasy symboli (patrz ni¿ej). By wy³±czyæ je, "
76"^ albo - na pocz±tek argumentu." 80"wpisz ^ albo - na pocz±tek argumentu."
77 81
78#: src/main.c:61 src/main.c:102 src/main.c:106 82#: src/main.c:61 src/main.c:102 src/main.c:106 lib/argp-parse.c:84
79msgid "NAME" 83msgid "NAME"
80msgstr "NAZWA" 84msgstr "NAZWA"
81 85
82#: src/main.c:62 86#: src/main.c:62
83msgid "" 87msgid ""
84"Use given output format NAME. Valid names are `gnu' (default) and `posix'" 88"Use given output format NAME. Valid names are `gnu' (default) and `posix'"
@@ -101,22 +105,23 @@ msgstr "OPCJA"
101#: src/main.c:69 105#: src/main.c:69
102msgid "" 106msgid ""
103"Set printing option to OPT. Valid OPT values are: xref (or cross-ref), tree. " 107"Set printing option to OPT. Valid OPT values are: xref (or cross-ref), tree. "
104"Any unambiguous abbreviation of the above is also accepted" 108"Any unambiguous abbreviation of the above is also accepted"
105msgstr "" 109msgstr ""
106"Ustala opcje wy¶wietlania. Poprawnymi warto¶ciami s±: xref albo cross-ref " 110"Ustala opcje wy¶wietlania. Poprawnymi warto¶ciami s±: xref albo cross-ref "
107"(tablica odwo³añ skro¶nych) i tree (drzewo wywo³añ). Mo¿na tak¿e u¿ywaæ " 111"(tablica odwo³añ skro¶nych) i tree (drzewo wywo³añ). Mo¿na tak¿e "
108"dowolnych jednoznacznych skrótów." 112"u¿ywaæ dowolnych jednoznacznych skrótów."
109 113
110#: src/main.c:71 114#: src/main.c:71
111msgid "FILE" 115msgid "FILE"
112msgstr "PLIK" 116msgstr "PLIK"
113 117
114#: src/main.c:72 118#: src/main.c:72
115msgid "Set output file name (default -, meaning stdout)" 119msgid "Set output file name (default -, meaning stdout)"
116msgstr "Podaje nazwê pliku wyj¶ciowego (domy¶lnie -, tzn. wyj¶cie standardowe)" 120msgstr ""
121"Podaje nazwê pliku wyj¶ciowego (domy¶lnie -, tzn. wyj¶cie standardowe)"
117 122
118#: src/main.c:75 123#: src/main.c:75
119msgid "Symbols classes for --include argument" 124msgid "Symbols classes for --include argument"
120msgstr "Klasy symboli do u¿ycia z --include" 125msgstr "Klasy symboli do u¿ycia z --include"
121 126
122#: src/main.c:77 127#: src/main.c:77
@@ -317,13 +322,13 @@ msgid ""
317"License for %s:\n" 322"License for %s:\n"
318"\n" 323"\n"
319msgstr "" 324msgstr ""
320"Licencja dla %s:\n" 325"Licencja dla %s:\n"
321"\n" 326"\n"
322 327
323#: src/main.c:575 src/main.c:760 328#: src/main.c:575 src/main.c:762
324#, c-format 329#, c-format
325msgid "%s: No such output driver" 330msgid "%s: No such output driver"
326msgstr "%s: Nie ma takiego sterownika wyj¶cia" 331msgstr "%s: Nie ma takiego sterownika wyj¶cia"
327 332
328#: src/main.c:602 333#: src/main.c:602
329#, c-format 334#, c-format
@@ -335,46 +340,46 @@ msgid "[FILE]..."
335msgstr "[PLIK...]" 340msgstr "[PLIK...]"
336 341
337#: src/main.c:725 342#: src/main.c:725
338msgid "Exiting" 343msgid "Exiting"
339msgstr "Wyj¶cie" 344msgstr "Wyj¶cie"
340 345
341#: src/main.c:792 346#: src/main.c:794
342msgid "no input files" 347msgid "no input files"
343msgstr "nie podano nazw plików wej¶ciowych" 348msgstr "nie podano nazw plików wej¶ciowych"
344 349
345#: src/parser.c:119 350#: src/parser.c:120
346#, c-format 351#, c-format
347msgid " near " 352msgid " near "
348msgstr " przy " 353msgstr " przy "
349 354
350#: src/parser.c:188 355#: src/parser.c:189
351msgid "INTERNAL ERROR: cannot return token to stream" 356msgid "INTERNAL ERROR: cannot return token to stream"
352msgstr "B£¡D WEWNÊTRZNY: nie mo¿na zwróciæ symbolu do strumienia" 357msgstr "B£¡D WEWNÊTRZNY: nie mo¿na zwróciæ symbolu do strumienia"
353 358
354#: src/parser.c:398 359#: src/parser.c:399
355msgid "unexpected end of file in expression" 360msgid "unexpected end of file in expression"
356msgstr "nieoczekiwany koniec pliku w wyra¿eniu" 361msgstr "nieoczekiwany koniec pliku w wyra¿eniu"
357 362
358#: src/parser.c:453 src/parser.c:552 363#: src/parser.c:454 src/parser.c:553
359msgid "expected `;'" 364msgid "expected `;'"
360msgstr "spodziewane `;'" 365msgstr "spodziewane `;'"
361 366
362#: src/parser.c:470 src/parser.c:577 367#: src/parser.c:471 src/parser.c:578
363msgid "unexpected end of file in declaration" 368msgid "unexpected end of file in declaration"
364msgstr "nieoczekiwany koniec pliku w deklaracji" 369msgstr "nieoczekiwany koniec pliku w deklaracji"
365 370
366#: src/parser.c:502 371#: src/parser.c:503
367msgid "missing `;' after struct declaration" 372msgid "missing `;' after struct declaration"
368msgstr "brak `;' po deklaracji struktury" 373msgstr "brak `;' po deklaracji struktury"
369 374
370#: src/parser.c:599 375#: src/parser.c:600
371msgid "unexpected end of file in initializer list" 376msgid "unexpected end of file in initializer list"
372msgstr "nieoczekiwany koniec pliku w li¶cie warto¶ci pocz±tkowych" 377msgstr "nieoczekiwany koniec pliku w li¶cie warto¶ci pocz±tkowych"
373 378
374#: src/parser.c:683 379#: src/parser.c:684
375msgid "unexpected end of file in struct" 380msgid "unexpected end of file in struct"
376msgstr "nieoczekiwany koniec pliku w strukturze" 381msgstr "nieoczekiwany koniec pliku w strukturze"
377 382
378#: src/parser.c:769 src/parser.c:792 383#: src/parser.c:769 src/parser.c:792
379msgid "expected `)'" 384msgid "expected `)'"
380msgstr "spodziewane `)'" 385msgstr "spodziewane `)'"
@@ -396,173 +401,192 @@ msgid "forced function body close"
396msgstr "wymuszone zakoñczenie cia³a funkcji" 401msgstr "wymuszone zakoñczenie cia³a funkcji"
397 402
398#: src/parser.c:944 403#: src/parser.c:944
399msgid "unexpected end of file in function body" 404msgid "unexpected end of file in function body"
400msgstr "nieoczekiwany koniec pliku w ciele funkcji" 405msgstr "nieoczekiwany koniec pliku w ciele funkcji"
401 406
402#: src/parser.c:979 407#: src/parser.c:983
403#, c-format 408#, c-format
404msgid "%s/%d redefined" 409msgid "%s/%d redefined"
405msgstr "ponowna definicja %s/%d" 410msgstr "ponowna definicja %s/%d"
406 411
407#: src/parser.c:982 412#: src/parser.c:986
408msgid "this is the place of previous definition" 413msgid "this is the place of previous definition"
409msgstr "to miejsce poprzedniej definicji" 414msgstr "to miejsce poprzedniej definicji"
410 415
411#: src/parser.c:994 416#: src/parser.c:999
412#, c-format 417#, c-format
413msgid "%s:%d: %s/%d defined to %s\n" 418msgid "%s:%d: %s/%d defined to %s\n"
414msgstr "%s:%d: %s/%d zdefiniowano jako %s\n" 419msgstr "%s:%d: %s/%d zdefiniowano jako %s\n"
415 420
416#: src/parser.c:1019 421#: src/parser.c:1024
417#, c-format 422#, c-format
418msgid "%s:%d: type %s\n" 423msgid "%s:%d: type %s\n"
419msgstr "%s:%d: typ %s\n" 424msgstr "%s:%d: typ %s\n"
420 425
421#: src/rc.c:55 426#: src/rc.c:55
422msgid "not enough memory to process rc file" 427msgid "not enough memory to process rc file"
423msgstr "brak pamiêci do przetworzenia pliku konfiguracyjnego" 428msgstr "brak pamiêci do przetworzenia pliku konfiguracyjnego"
424 429
425#: src/symbol.c:317 430#: src/symbol.c:368
426msgid "not enough core" 431msgid "not enough core"
427msgstr "brak pamiêci" 432msgstr "brak pamiêci"
428 433
429#: lib/argp-help.c:195 434#: lib/argp-help.c:148
435#, c-format
436msgid "ARGP_HELP_FMT: %s value is less than or equal to %s"
437msgstr ""
438
439#: lib/argp-help.c:221
430#, c-format 440#, c-format
431msgid "%.*s: ARGP_HELP_FMT parameter requires a value" 441msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
432msgstr "%.*s: parametr ARGP_HELP_FMT wymaga podania warto¶ci" 442msgstr "%.*s: parametr ARGP_HELP_FMT wymaga podania warto¶ci"
433 443
434#: lib/argp-help.c:204 444#: lib/argp-help.c:227
445#, fuzzy, c-format
446msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
447msgstr "%.*s: parametr ARGP_HELP_FMT wymaga podania warto¶ci"
448
449#: lib/argp-help.c:236
435#, c-format 450#, c-format
436msgid "%.*s: Unknown ARGP_HELP_FMT parameter" 451msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
437msgstr "%.*s: Nieznany parametr ARGP_HELP_FMT" 452msgstr "%.*s: Nieznany parametr ARGP_HELP_FMT"
438 453
439#: lib/argp-help.c:216 454#: lib/argp-help.c:248
440#, c-format 455#, c-format
441msgid "Garbage in ARGP_HELP_FMT: %s" 456msgid "Garbage in ARGP_HELP_FMT: %s"
442msgstr "B³êdne dane w ARGP_HELP_FMT: %s" 457msgstr "B³êdne dane w ARGP_HELP_FMT: %s"
443 458
444#: lib/argp-help.c:1195 459#: lib/argp-help.c:1229
445msgid "" 460msgid ""
446"Mandatory or optional arguments to long options are also mandatory or " 461"Mandatory or optional arguments to long options are also mandatory or "
447"optional for any corresponding short options." 462"optional for any corresponding short options."
448msgstr "" 463msgstr ""
449"Argumenty obowi±zkowe lub opcjonalne dla d³ugich opcji s± równie¿ \n" 464"Argumenty obowi±zkowe lub opcjonalne dla d³ugich opcji s± równie¿ \n"
450"obowi±zkowe lub opcjonalne dla odpowiednich krótkich opcji." 465"obowi±zkowe lub opcjonalne dla odpowiednich krótkich opcji."
451 466
452#: lib/argp-help.c:1582 467#: lib/argp-help.c:1622
453msgid "Usage:" 468msgid "Usage:"
454msgstr "Sk³adnia:" 469msgstr "Sk³adnia:"
455 470
456#: lib/argp-help.c:1586 471#: lib/argp-help.c:1626
457msgid " or: " 472msgid " or: "
458msgstr " lub: " 473msgstr " lub: "
459 474
460#: lib/argp-help.c:1598 475#: lib/argp-help.c:1638
461msgid " [OPTION...]" 476msgid " [OPTION...]"
462msgstr " [OPCJA...]" 477msgstr " [OPCJA...]"
463 478
464#: lib/argp-help.c:1625 479#: lib/argp-help.c:1665
465#, c-format 480#, c-format
466msgid "Try `%s --help' or `%s --usage' for more information.\n" 481msgid "Try `%s --help' or `%s --usage' for more information.\n"
467msgstr "Napisz `%s --help' lub `%s --usage' by uzyskaæ wiêcej informacji.\n" 482msgstr "Napisz `%s --help' lub `%s --usage' by uzyskaæ wiêcej informacji.\n"
468 483
469#: lib/argp-help.c:1653 484#: lib/argp-help.c:1693
470#, c-format 485#, c-format
471msgid "Report bugs to %s.\n" 486msgid "Report bugs to %s.\n"
472msgstr "Prosimy zg³aszaæ b³êdy na adres %s.\n" 487msgstr "Prosimy zg³aszaæ b³êdy na adres %s.\n"
473 488
474#: lib/argp-help.c:1873 lib/error.c:122 489#: lib/argp-help.c:1912 lib/error.c:125
475msgid "Unknown system error" 490msgid "Unknown system error"
476msgstr "Nieznany b³±d systemowy" 491msgstr "Nieznany b³±d systemowy"
477 492
478#: lib/argp-parse.c:83 493#: lib/argp-parse.c:82
479msgid "Give this help list" 494#, fuzzy
495msgid "give this help list"
480msgstr "Wy¶wietla ten tekst pomocy" 496msgstr "Wy¶wietla ten tekst pomocy"
481 497
482#: lib/argp-parse.c:84 498#: lib/argp-parse.c:83
483msgid "Give a short usage message" 499#, fuzzy
500msgid "give a short usage message"
484msgstr "Wy¶wietla krótkie informacje o sk³adni polecenia" 501msgstr "Wy¶wietla krótkie informacje o sk³adni polecenia"
485 502
486#: lib/argp-parse.c:85 503#: lib/argp-parse.c:84
487msgid "Set the program name" 504#, fuzzy
505msgid "set the program name"
488msgstr "Okre¶la nazwê programu" 506msgstr "Okre¶la nazwê programu"
489 507
490#: lib/argp-parse.c:87 508#: lib/argp-parse.c:85
491msgid "Hang for SECS seconds (default 3600)" 509msgid "SECS"
510msgstr ""
511
512#: lib/argp-parse.c:86
513#, fuzzy
514msgid "hang for SECS seconds (default 3600)"
492msgstr "Czeka przez SEK sekund (domy¶lnie 3600)" 515msgstr "Czeka przez SEK sekund (domy¶lnie 3600)"
493 516
494#: lib/argp-parse.c:148 517#: lib/argp-parse.c:143
495msgid "Print program version" 518#, fuzzy
519msgid "print program version"
496msgstr "Wy¶wietla wersjê programu" 520msgstr "Wy¶wietla wersjê programu"
497 521
498#: lib/argp-parse.c:164 522#: lib/argp-parse.c:159
499msgid "(PROGRAM ERROR) No version known!?" 523msgid "(PROGRAM ERROR) No version known!?"
500msgstr "(B£¡D PROGRAMU) Nieznana wersja!?" 524msgstr "(B£¡D PROGRAMU) Nieznana wersja!?"
501 525
502#: lib/argp-parse.c:620 526#: lib/argp-parse.c:612
503#, c-format 527#, c-format
504msgid "%s: Too many arguments\n" 528msgid "%s: Too many arguments\n"
505msgstr "%s: Za du¿o argumentów\n" 529msgstr "%s: Za du¿o argumentów\n"
506 530
507#: lib/argp-parse.c:763 531#: lib/argp-parse.c:755
508msgid "(PROGRAM ERROR) Option should have been recognized!?" 532msgid "(PROGRAM ERROR) Option should have been recognized!?"
509msgstr "(B£¡D PROGRAMU) Opcja powinna zostaæ rozpoznana?!" 533msgstr "(B£¡D PROGRAMU) Opcja powinna zostaæ rozpoznana?!"
510 534
511#: lib/getopt.c:552 lib/getopt.c:571 535#: lib/getopt.c:531 lib/getopt.c:547
512#, c-format 536#, c-format
513msgid "%s: option `%s' is ambiguous\n" 537msgid "%s: option `%s' is ambiguous\n"
514msgstr "%s: opcja `%s' jest niejednoznaczna\n" 538msgstr "%s: opcja `%s' jest niejednoznaczna\n"
515 539
516#: lib/getopt.c:604 lib/getopt.c:608 540#: lib/getopt.c:580 lib/getopt.c:584
517#, c-format 541#, c-format
518msgid "%s: option `--%s' doesn't allow an argument\n" 542msgid "%s: option `--%s' doesn't allow an argument\n"
519msgstr "%s: opcja `--%s' nie mo¿e mieæ argumentu\n" 543msgstr "%s: opcja `--%s' nie mo¿e mieæ argumentu\n"
520 544
521#: lib/getopt.c:617 lib/getopt.c:622 545#: lib/getopt.c:593 lib/getopt.c:598
522#, c-format 546#, c-format
523msgid "%s: option `%c%s' doesn't allow an argument\n" 547msgid "%s: option `%c%s' doesn't allow an argument\n"
524msgstr "%s: opcja `%c%s' nie mo¿e mieæ argumentu\n" 548msgstr "%s: opcja `%c%s' nie mo¿e mieæ argumentu\n"
525 549
526#: lib/getopt.c:668 lib/getopt.c:690 lib/getopt.c:1021 lib/getopt.c:1043 550#: lib/getopt.c:641 lib/getopt.c:660 lib/getopt.c:976 lib/getopt.c:995
527#, c-format 551#, c-format
528msgid "%s: option `%s' requires an argument\n" 552msgid "%s: option `%s' requires an argument\n"
529msgstr "%s: opcja `%s' wymaga argumentu\n" 553msgstr "%s: opcja `%s' wymaga argumentu\n"
530 554
531#: lib/getopt.c:728 lib/getopt.c:731 555#: lib/getopt.c:698 lib/getopt.c:701
532#, c-format 556#, c-format
533msgid "%s: unrecognized option `--%s'\n" 557msgid "%s: unrecognized option `--%s'\n"
534msgstr "%s: nierozpoznana opcja `--%s'\n" 558msgstr "%s: nierozpoznana opcja `--%s'\n"
535 559
536#: lib/getopt.c:739 lib/getopt.c:742 560#: lib/getopt.c:709 lib/getopt.c:712
537#, c-format 561#, c-format
538msgid "%s: unrecognized option `%c%s'\n" 562msgid "%s: unrecognized option `%c%s'\n"
539msgstr "%s: nierozpoznana opcja `%c%s'\n" 563msgstr "%s: nierozpoznana opcja `%c%s'\n"
540 564
541#: lib/getopt.c:797 lib/getopt.c:800 565#: lib/getopt.c:764 lib/getopt.c:767
542#, c-format 566#, c-format
543msgid "%s: illegal option -- %c\n" 567msgid "%s: illegal option -- %c\n"
544msgstr "%s: nieprawid³owa opcja -- %c\n" 568msgstr "%s: nieprawid³owa opcja -- %c\n"
545 569
546#: lib/getopt.c:806 lib/getopt.c:809 570#: lib/getopt.c:773 lib/getopt.c:776
547#, c-format 571#, c-format
548msgid "%s: invalid option -- %c\n" 572msgid "%s: invalid option -- %c\n"
549msgstr "%s: b³êdna opcja -- %c\n" 573msgstr "%s: b³êdna opcja -- %c\n"
550 574
551#: lib/getopt.c:864 lib/getopt.c:883 lib/getopt.c:1096 lib/getopt.c:1117 575#: lib/getopt.c:828 lib/getopt.c:844 lib/getopt.c:1048 lib/getopt.c:1066
552#, c-format 576#, c-format
553msgid "%s: option requires an argument -- %c\n" 577msgid "%s: option requires an argument -- %c\n"
554msgstr "%s: opcja wymaga argumentu -- %c\n" 578msgstr "%s: opcja wymaga argumentu -- %c\n"
555 579
556#: lib/getopt.c:936 lib/getopt.c:955 580#: lib/getopt.c:897 lib/getopt.c:913
557#, c-format 581#, c-format
558msgid "%s: option `-W %s' is ambiguous\n" 582msgid "%s: option `-W %s' is ambiguous\n"
559msgstr "%s: opcja `-W %s' jest niejednoznaczna\n" 583msgstr "%s: opcja `-W %s' jest niejednoznaczna\n"
560 584
561#: lib/getopt.c:979 lib/getopt.c:1000 585#: lib/getopt.c:937 lib/getopt.c:955
562#, c-format 586#, c-format
563msgid "%s: option `-W %s' doesn't allow an argument\n" 587msgid "%s: option `-W %s' doesn't allow an argument\n"
564msgstr "%s: opcja `-W %s' nie mo¿e mieæ argumentu\n" 588msgstr "%s: opcja `-W %s' nie mo¿e mieæ argumentu\n"
565 589
566#: lib/obstack.c:439 lib/obstack.c:442 590#: lib/obstack.c:427 lib/obstack.c:429
567msgid "memory exhausted" 591msgid "memory exhausted"
568msgstr "pamiêæ wyczerpana" 592msgstr "pamiêæ wyczerpana"
diff --git a/po/uk.po b/po/uk.po
index 7696786..c2c1185 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,22 +1,23 @@
1# Ukrainian messages for GNU cflow 1# Ukrainian messages for GNU cflow
2# Copyright (C) 2005 Free Software Foundation, Inc. 2# Copyright (C) 2005 Free Software Foundation, Inc.
3# Sergey Poznyakoff <gray@gnu.org>, 2005. 3# Sergey Poznyakoff <gray@gnu.org>, 2005.
4# 4#
5msgid "" 5msgid ""
6msgstr "" 6msgstr ""
7"Project-Id-Version: cflow 1ю0\n" 7"Project-Id-Version: cflow 1.0\n"
8"Report-Msgid-Bugs-To: bug-cflow@gnu.org\n" 8"Report-Msgid-Bugs-To: bug-cflow@gnu.org\n"
9"POT-Creation-Date: 2005-10-07 10:22+0300\n" 9"POT-Creation-Date: 2006-09-10 15:17+0300\n"
10"PO-Revision-Date: 2005-10-16 00:06+0300\n" 10"PO-Revision-Date: 2005-10-16 00:08+0300\n"
11"Last-Translator: Sergey Poznyakoff <gray@gnu.org>\n" 11"Last-Translator: Sergey Poznyakoff <gray@gnu.org>\n"
12"Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n" 12"Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
13"MIME-Version: 1.0\n" 13"MIME-Version: 1.0\n"
14"Content-Type: text/plain; charset=UTF-8\n" 14"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Transfer-Encoding: 8bit\n" 15"Content-Transfer-Encoding: 8bit\n"
16"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" 16"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
17"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
17 18
18#: src/c.l:137 19#: src/c.l:137
19msgid "unterminated string?" 20msgid "unterminated string?"
20msgstr "не завершений рядок?" 21msgstr "не завершений рядок?"
21 22
22#: src/c.l:296 23#: src/c.l:296
@@ -36,19 +37,22 @@ msgstr "не вдається відкрити `%s'"
36 37
37#: src/c.l:422 38#: src/c.l:422
38#, c-format 39#, c-format
39msgid "New location: %s:%d\n" 40msgid "New location: %s:%d\n"
40msgstr "Нове розташування: %s:%d\n" 41msgstr "Нове розташування: %s:%d\n"
41 42
42#. TRANSLATORS: Please, preserve the vertical tabulation (^K character) 43#: src/main.c:27
43#. in this message 44msgid "generate a program flowgraph"
45msgstr ""
46
44#: src/main.c:29 47#: src/main.c:29
48#, fuzzy
45msgid "" 49msgid ""
46"generate a program flowgraph * The effect of each option marked with an " 50"* The effect of each option marked with an asterisk is reversed if the "
47"asterisk is reversed if the option's long name is prefixed with `no-'. For " 51"option's long name is prefixed with `no-'. For example, --no-cpp cancels --"
48"example, --no-cpp cancels --cpp." 52"cpp."
49msgstr "" 53msgstr ""
50"Створює граф потоків керування у програмі. * Помічені зірочкою опції мають " 54"Створює граф потоків керування у програмі. * Помічені зірочкою опції мають "
51"зворотну дію, якщо до їх назви додати приросток `no-'. Наприклад, --no-cpp " 55"зворотну дію, якщо до їх назви додати приросток `no-'. Наприклад, --no-cpp "
52"вимикає препроцесор." 56"вимикає препроцесор."
53 57
54#: src/main.c:56 58#: src/main.c:56
@@ -72,13 +76,13 @@ msgid ""
72"Include specified classes of symbols (see below). Prepend CLASSES with ^ or " 76"Include specified classes of symbols (see below). Prepend CLASSES with ^ or "
73"- to exclude them from the output" 77"- to exclude them from the output"
74msgstr "" 78msgstr ""
75"Включити до графу вказані класи символів (див. нижче). Щоб їх виключити " 79"Включити до графу вказані класи символів (див. нижче). Щоб їх виключити "
76"додайте ^ або - на початку аргументу" 80"додайте ^ або - на початку аргументу"
77 81
78#: src/main.c:61 src/main.c:102 src/main.c:106 82#: src/main.c:61 src/main.c:102 src/main.c:106 lib/argp-parse.c:84
79msgid "NAME" 83msgid "NAME"
80msgstr "НАЗВА" 84msgstr "НАЗВА"
81 85
82#: src/main.c:62 86#: src/main.c:62
83msgid "" 87msgid ""
84"Use given output format NAME. Valid names are `gnu' (default) and `posix'" 88"Use given output format NAME. Valid names are `gnu' (default) and `posix'"
@@ -313,13 +317,13 @@ msgid ""
313"License for %s:\n" 317"License for %s:\n"
314"\n" 318"\n"
315msgstr "" 319msgstr ""
316"Ліцензія для %s\n" 320"Ліцензія для %s\n"
317"\n" 321"\n"
318 322
319#: src/main.c:575 src/main.c:760 323#: src/main.c:575 src/main.c:762
320#, c-format 324#, c-format
321msgid "%s: No such output driver" 325msgid "%s: No such output driver"
322msgstr "%s: не має такого вихідного приладу" 326msgstr "%s: не має такого вихідного приладу"
323 327
324#: src/main.c:602 328#: src/main.c:602
325#, c-format 329#, c-format
@@ -331,46 +335,46 @@ msgid "[FILE]..."
331msgstr "[FILE]..." 335msgstr "[FILE]..."
332 336
333#: src/main.c:725 337#: src/main.c:725
334msgid "Exiting" 338msgid "Exiting"
335msgstr "Вихід" 339msgstr "Вихід"
336 340
337#: src/main.c:792 341#: src/main.c:794
338msgid "no input files" 342msgid "no input files"
339msgstr "не вказані вхідні файли" 343msgstr "не вказані вхідні файли"
340 344
341#: src/parser.c:119 345#: src/parser.c:120
342#, c-format 346#, c-format
343msgid " near " 347msgid " near "
344msgstr " біля " 348msgstr " біля "
345 349
346#: src/parser.c:188 350#: src/parser.c:189
347msgid "INTERNAL ERROR: cannot return token to stream" 351msgid "INTERNAL ERROR: cannot return token to stream"
348msgstr "ВНУТРІШНЯ ПОМИЛКА: не вдається повернути символ у потік" 352msgstr "ВНУТРІШНЯ ПОМИЛКА: не вдається повернути символ у потік"
349 353
350#: src/parser.c:398 354#: src/parser.c:399
351msgid "unexpected end of file in expression" 355msgid "unexpected end of file in expression"
352msgstr "неочікуваний кінець файлу у виразі" 356msgstr "неочікуваний кінець файлу у виразі"
353 357
354#: src/parser.c:453 src/parser.c:552 358#: src/parser.c:454 src/parser.c:553
355msgid "expected `;'" 359msgid "expected `;'"
356msgstr "очікувалось `;'" 360msgstr "очікувалось `;'"
357 361
358#: src/parser.c:470 src/parser.c:577 362#: src/parser.c:471 src/parser.c:578
359msgid "unexpected end of file in declaration" 363msgid "unexpected end of file in declaration"
360msgstr "неочікуваний кінець файлу у декларації" 364msgstr "неочікуваний кінець файлу у декларації"
361 365
362#: src/parser.c:502 366#: src/parser.c:503
363msgid "missing `;' after struct declaration" 367msgid "missing `;' after struct declaration"
364msgstr "після декларації структури пропущено `;' " 368msgstr "після декларації структури пропущено `;' "
365 369
366#: src/parser.c:599 370#: src/parser.c:600
367msgid "unexpected end of file in initializer list" 371msgid "unexpected end of file in initializer list"
368msgstr "неочікуваний кінець файлу у переліку початкових значень" 372msgstr "неочікуваний кінець файлу у переліку початкових значень"
369 373
370#: src/parser.c:683 374#: src/parser.c:684
371msgid "unexpected end of file in struct" 375msgid "unexpected end of file in struct"
372msgstr "неочікуваний кінець файлу у структурі" 376msgstr "неочікуваний кінець файлу у структурі"
373 377
374#: src/parser.c:769 src/parser.c:792 378#: src/parser.c:769 src/parser.c:792
375msgid "expected `)'" 379msgid "expected `)'"
376msgstr "очікувалася `)'" 380msgstr "очікувалася `)'"
@@ -392,173 +396,192 @@ msgid "forced function body close"
392msgstr "примусове закінчення тіла функції" 396msgstr "примусове закінчення тіла функції"
393 397
394#: src/parser.c:944 398#: src/parser.c:944
395msgid "unexpected end of file in function body" 399msgid "unexpected end of file in function body"
396msgstr "неочікуваний кінець файлу у тілі функції" 400msgstr "неочікуваний кінець файлу у тілі функції"
397 401
398#: src/parser.c:979 402#: src/parser.c:983
399#, c-format 403#, c-format
400msgid "%s/%d redefined" 404msgid "%s/%d redefined"
401msgstr "перевизначення %s/%d" 405msgstr "перевизначення %s/%d"
402 406
403#: src/parser.c:982 407#: src/parser.c:986
404msgid "this is the place of previous definition" 408msgid "this is the place of previous definition"
405msgstr "це місце першого визначення" 409msgstr "це місце першого визначення"
406 410
407#: src/parser.c:994 411#: src/parser.c:999
408#, c-format 412#, c-format
409msgid "%s:%d: %s/%d defined to %s\n" 413msgid "%s:%d: %s/%d defined to %s\n"
410msgstr "%s:%d: %s/%d визначено на %s\n" 414msgstr "%s:%d: %s/%d визначено на %s\n"
411 415
412#: src/parser.c:1019 416#: src/parser.c:1024
413#, c-format 417#, c-format
414msgid "%s:%d: type %s\n" 418msgid "%s:%d: type %s\n"
415msgstr "%s:%d: тип: %s\n" 419msgstr "%s:%d: тип: %s\n"
416 420
417#: src/rc.c:55 421#: src/rc.c:55
418msgid "not enough memory to process rc file" 422msgid "not enough memory to process rc file"
419msgstr "Недостатньо пам'яті для перетворення файлу конфігурації" 423msgstr "Недостатньо пам'яті для перетворення файлу конфігурації"
420 424
421#: src/symbol.c:317 425#: src/symbol.c:368
422msgid "not enough core" 426msgid "not enough core"
423msgstr "недостатньо пам'яті" 427msgstr "недостатньо пам'яті"
424 428
425#: lib/argp-help.c:195 429#: lib/argp-help.c:148
430#, c-format
431msgid "ARGP_HELP_FMT: %s value is less than or equal to %s"
432msgstr ""
433
434#: lib/argp-help.c:221
426#, c-format 435#, c-format
427msgid "%.*s: ARGP_HELP_FMT parameter requires a value" 436msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
428msgstr "%.*s: параметр ARGP_HELP_FMT вимагає значення" 437msgstr "%.*s: параметр ARGP_HELP_FMT вимагає значення"
429 438
430#: lib/argp-help.c:204 439#: lib/argp-help.c:227
440#, fuzzy, c-format
441msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
442msgstr "%.*s: параметр ARGP_HELP_FMT вимагає значення"
443
444#: lib/argp-help.c:236
431#, c-format 445#, c-format
432msgid "%.*s: Unknown ARGP_HELP_FMT parameter" 446msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
433msgstr "%.*s: Невідомий параметр ARGP_HELP_FMT" 447msgstr "%.*s: Невідомий параметр ARGP_HELP_FMT"
434 448
435#: lib/argp-help.c:216 449#: lib/argp-help.c:248
436#, c-format 450#, c-format
437msgid "Garbage in ARGP_HELP_FMT: %s" 451msgid "Garbage in ARGP_HELP_FMT: %s"
438msgstr "Хибні дані в ARGP_HELP_FMT: %s" 452msgstr "Хибні дані в ARGP_HELP_FMT: %s"
439 453
440#: lib/argp-help.c:1195 454#: lib/argp-help.c:1229
441msgid "" 455msgid ""
442"Mandatory or optional arguments to long options are also mandatory or " 456"Mandatory or optional arguments to long options are also mandatory or "
443"optional for any corresponding short options." 457"optional for any corresponding short options."
444msgstr "" 458msgstr ""
445"Аргументи, обов'язкові для довгих ключів, є обов'язковими й для коротких." 459"Аргументи, обов'язкові для довгих ключів, є обов'язковими й для коротких."
446 460
447#: lib/argp-help.c:1582 461#: lib/argp-help.c:1622
448msgid "Usage:" 462msgid "Usage:"
449msgstr "Використання:" 463msgstr "Використання:"
450 464
451#: lib/argp-help.c:1586 465#: lib/argp-help.c:1626
452msgid " or: " 466msgid " or: "
453msgstr " чи: " 467msgstr " чи: "
454 468
455#: lib/argp-help.c:1598 469#: lib/argp-help.c:1638
456msgid " [OPTION...]" 470msgid " [OPTION...]"
457msgstr " [ОПЦІЯ...]" 471msgstr " [ОПЦІЯ...]"
458 472
459#: lib/argp-help.c:1625 473#: lib/argp-help.c:1665
460#, c-format 474#, c-format
461msgid "Try `%s --help' or `%s --usage' for more information.\n" 475msgid "Try `%s --help' or `%s --usage' for more information.\n"
462msgstr "" 476msgstr ""
463"Спробуйте `%s --help' або `%s --usage' для отримання докладнішого опису.\n" 477"Спробуйте `%s --help' або `%s --usage' для отримання докладнішого опису.\n"
464 478
465#: lib/argp-help.c:1653 479#: lib/argp-help.c:1693
466#, c-format 480#, c-format
467msgid "Report bugs to %s.\n" 481msgid "Report bugs to %s.\n"
468msgstr "Про помилки звітуйте на %s.\n" 482msgstr "Про помилки звітуйте на %s.\n"
469 483
470#: lib/argp-help.c:1873 lib/error.c:122 484#: lib/argp-help.c:1912 lib/error.c:125
471msgid "Unknown system error" 485msgid "Unknown system error"
472msgstr "Невідома системна помилка" 486msgstr "Невідома системна помилка"
473 487
474#: lib/argp-parse.c:83 488#: lib/argp-parse.c:82
475msgid "Give this help list" 489#, fuzzy
490msgid "give this help list"
476msgstr "Вивести цю довідку" 491msgstr "Вивести цю довідку"
477 492
478#: lib/argp-parse.c:84 493#: lib/argp-parse.c:83
479msgid "Give a short usage message" 494#, fuzzy
495msgid "give a short usage message"
480msgstr "Вивести коротке повідомлення про використання" 496msgstr "Вивести коротке повідомлення про використання"
481 497
482#: lib/argp-parse.c:85 498#: lib/argp-parse.c:84
483msgid "Set the program name" 499#, fuzzy
500msgid "set the program name"
484msgstr "Встановити назву програми" 501msgstr "Встановити назву програми"
485 502
486#: lib/argp-parse.c:87 503#: lib/argp-parse.c:85
487msgid "Hang for SECS seconds (default 3600)" 504msgid "SECS"
505msgstr ""
506
507#: lib/argp-parse.c:86
508#, fuzzy
509msgid "hang for SECS seconds (default 3600)"
488msgstr "Зачекати вказану кількість секунд (типово 3600)" 510msgstr "Зачекати вказану кількість секунд (типово 3600)"
489 511
490#: lib/argp-parse.c:148 512#: lib/argp-parse.c:143
491msgid "Print program version" 513#, fuzzy
514msgid "print program version"
492msgstr "Вивести версію програми" 515msgstr "Вивести версію програми"
493 516
494#: lib/argp-parse.c:164 517#: lib/argp-parse.c:159
495msgid "(PROGRAM ERROR) No version known!?" 518msgid "(PROGRAM ERROR) No version known!?"
496msgstr "(ПОМИЛКА ПРОГРАМУВАННЯ) Невідома версія!?" 519msgstr "(ПОМИЛКА ПРОГРАМУВАННЯ) Невідома версія!?"
497 520
498#: lib/argp-parse.c:620 521#: lib/argp-parse.c:612
499#, c-format 522#, c-format
500msgid "%s: Too many arguments\n" 523msgid "%s: Too many arguments\n"
501msgstr "%s: Забагато аргументів\n" 524msgstr "%s: Забагато аргументів\n"
502 525
503#: lib/argp-parse.c:763 526#: lib/argp-parse.c:755
504msgid "(PROGRAM ERROR) Option should have been recognized!?" 527msgid "(PROGRAM ERROR) Option should have been recognized!?"
505msgstr "(ПОМИЛКА ПРОГРАМУВАННЯ) Опція мала бути розпізнана!?" 528msgstr "(ПОМИЛКА ПРОГРАМУВАННЯ) Опція мала бути розпізнана!?"
506 529
507#: lib/getopt.c:552 lib/getopt.c:571 530#: lib/getopt.c:531 lib/getopt.c:547
508#, c-format 531#, c-format
509msgid "%s: option `%s' is ambiguous\n" 532msgid "%s: option `%s' is ambiguous\n"
510msgstr "%s: опція `%s' неоднозначна\n" 533msgstr "%s: опція `%s' неоднозначна\n"
511 534
512#: lib/getopt.c:604 lib/getopt.c:608 535#: lib/getopt.c:580 lib/getopt.c:584
513#, c-format 536#, c-format
514msgid "%s: option `--%s' doesn't allow an argument\n" 537msgid "%s: option `--%s' doesn't allow an argument\n"
515msgstr "%s: опція `--%s' не може мати аргументу\n" 538msgstr "%s: опція `--%s' не може мати аргументу\n"
516 539
517#: lib/getopt.c:617 lib/getopt.c:622 540#: lib/getopt.c:593 lib/getopt.c:598
518#, c-format 541#, c-format
519msgid "%s: option `%c%s' doesn't allow an argument\n" 542msgid "%s: option `%c%s' doesn't allow an argument\n"
520msgstr "%s: опція `%c%s' не може мати аргументу\n" 543msgstr "%s: опція `%c%s' не може мати аргументу\n"
521 544
522#: lib/getopt.c:668 lib/getopt.c:690 lib/getopt.c:1021 lib/getopt.c:1043 545#: lib/getopt.c:641 lib/getopt.c:660 lib/getopt.c:976 lib/getopt.c:995
523#, c-format 546#, c-format
524msgid "%s: option `%s' requires an argument\n" 547msgid "%s: option `%s' requires an argument\n"
525msgstr "%s: опція `%s' вимагає аргумент\n" 548msgstr "%s: опція `%s' вимагає аргумент\n"
526 549
527#: lib/getopt.c:728 lib/getopt.c:731 550#: lib/getopt.c:698 lib/getopt.c:701
528#, c-format 551#, c-format
529msgid "%s: unrecognized option `--%s'\n" 552msgid "%s: unrecognized option `--%s'\n"
530msgstr "%s: невідома опція `--%s'\n" 553msgstr "%s: невідома опція `--%s'\n"
531 554
532#: lib/getopt.c:739 lib/getopt.c:742 555#: lib/getopt.c:709 lib/getopt.c:712
533#, c-format 556#, c-format
534msgid "%s: unrecognized option `%c%s'\n" 557msgid "%s: unrecognized option `%c%s'\n"
535msgstr "%s: невідома опція `%c%s'\n" 558msgstr "%s: невідома опція `%c%s'\n"
536 559
537#: lib/getopt.c:797 lib/getopt.c:800 560#: lib/getopt.c:764 lib/getopt.c:767
538#, c-format 561#, c-format
539msgid "%s: illegal option -- %c\n" 562msgid "%s: illegal option -- %c\n"
540msgstr "%s: недопустима опція -- %c\n" 563msgstr "%s: недопустима опція -- %c\n"
541 564
542#: lib/getopt.c:806 lib/getopt.c:809 565#: lib/getopt.c:773 lib/getopt.c:776
543#, c-format 566#, c-format
544msgid "%s: invalid option -- %c\n" 567msgid "%s: invalid option -- %c\n"
545msgstr "%s: невірна опція -- %c\n" 568msgstr "%s: невірна опція -- %c\n"
546 569
547#: lib/getopt.c:864 lib/getopt.c:883 lib/getopt.c:1096 lib/getopt.c:1117 570#: lib/getopt.c:828 lib/getopt.c:844 lib/getopt.c:1048 lib/getopt.c:1066
548#, c-format 571#, c-format
549msgid "%s: option requires an argument -- %c\n" 572msgid "%s: option requires an argument -- %c\n"
550msgstr "%s: опція вимагає аргумент -- %c\n" 573msgstr "%s: опція вимагає аргумент -- %c\n"
551 574
552#: lib/getopt.c:936 lib/getopt.c:955 575#: lib/getopt.c:897 lib/getopt.c:913
553#, c-format 576#, c-format
554msgid "%s: option `-W %s' is ambiguous\n" 577msgid "%s: option `-W %s' is ambiguous\n"
555msgstr "%s: опція `-W %s' неоднозначна\n" 578msgstr "%s: опція `-W %s' неоднозначна\n"
556 579
557#: lib/getopt.c:979 lib/getopt.c:1000 580#: lib/getopt.c:937 lib/getopt.c:955
558#, c-format 581#, c-format
559msgid "%s: option `-W %s' doesn't allow an argument\n" 582msgid "%s: option `-W %s' doesn't allow an argument\n"
560msgstr "%s: опція `-W %s' не може мати аргументу\n" 583msgstr "%s: опція `-W %s' не може мати аргументу\n"
561 584
562#: lib/obstack.c:439 lib/obstack.c:442 585#: lib/obstack.c:427 lib/obstack.c:429
563msgid "memory exhausted" 586msgid "memory exhausted"
564msgstr "пам'ять вичерпана" 587msgstr "пам'ять вичерпана"
diff --git a/src/main.c b/src/main.c
index 3e933d9..78f615d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -17,13 +17,12 @@
17 MA 02110-1301 USA */ 17 MA 02110-1301 USA */
18 18
19#include <cflow.h> 19#include <cflow.h>
20#include <argp.h> 20#include <argp.h>
21#include <stdarg.h> 21#include <stdarg.h>
22#include <parser.h> 22#include <parser.h>
23#include <strndup.h>
24 23
25const char *argp_program_version = "cflow (" PACKAGE_NAME ") " VERSION; 24const char *argp_program_version = "cflow (" PACKAGE_NAME ") " VERSION;
26const char *argp_program_bug_address = "<" PACKAGE_BUGREPORT ">"; 25const char *argp_program_bug_address = "<" PACKAGE_BUGREPORT ">";
27static char doc[] = N_("generate a program flowgraph") 26static char doc[] = N_("generate a program flowgraph")
28"\v" 27"\v"
29N_("* The effect of each option marked with an asterisk is reversed if the option's long name is prefixed with `no-'. For example, --no-cpp cancels --cpp."); 28N_("* The effect of each option marked with an asterisk is reversed if the option's long name is prefixed with `no-'. For example, --no-cpp cancels --cpp.");
@@ -211,17 +210,19 @@ int omit_symbol_names_option; /* Omit symbol name from symbol declaration string
211 210
212#define SM_FUNCTIONS 0x0001 211#define SM_FUNCTIONS 0x0001
213#define SM_DATA 0x0002 212#define SM_DATA 0x0002
214#define SM_STATIC 0x0004 213#define SM_STATIC 0x0004
215#define SM_UNDERSCORE 0x0008 214#define SM_UNDERSCORE 0x0008
216#define SM_TYPEDEF 0x0010 215#define SM_TYPEDEF 0x0010
216#define SM_UNDEFINED 0x0020
217 217
218#define CHAR_TO_SM(c) ((c)=='x' ? SM_DATA : \ 218#define CHAR_TO_SM(c) ((c)=='x' ? SM_DATA : \
219 (c)=='_' ? SM_UNDERSCORE : \ 219 (c)=='_' ? SM_UNDERSCORE : \
220 (c)=='s' ? SM_STATIC : \ 220 (c)=='s' ? SM_STATIC : \
221 (c)=='t' ? SM_TYPEDEF : 0) 221 (c)=='t' ? SM_TYPEDEF : \
222 (c)=='u' ? SM_UNDEFINED : 0)
222#define SYMBOL_INCLUDE(c) (symbol_map |= CHAR_TO_SM(c)) 223#define SYMBOL_INCLUDE(c) (symbol_map |= CHAR_TO_SM(c))
223#define SYMBOL_EXCLUDE(c) (symbol_map &= ~CHAR_TO_SM(c)) 224#define SYMBOL_EXCLUDE(c) (symbol_map &= ~CHAR_TO_SM(c))
224int symbol_map; /* A bitmap of symbols included in the graph. */ 225int symbol_map; /* A bitmap of symbols included in the graph. */
225 226
226char *level_indent[] = { NULL, NULL }; 227char *level_indent[] = { NULL, NULL };
227char *level_end[] = { "", "" }; 228char *level_end[] = { "", "" };
@@ -590,12 +591,13 @@ parse_opt (int key, char *arg, struct argp_state *state)
590 num = 1; 591 num = 1;
591 break; 592 break;
592 case 'x': 593 case 'x':
593 case '_': 594 case '_':
594 case 's': 595 case 's':
595 case 't': 596 case 't':
597 case 'u':
596 if (num) 598 if (num)
597 SYMBOL_INCLUDE(*arg); 599 SYMBOL_INCLUDE(*arg);
598 else 600 else
599 SYMBOL_EXCLUDE(*arg); 601 SYMBOL_EXCLUDE(*arg);
600 break; 602 break;
601 default: 603 default:
@@ -707,12 +709,16 @@ include_symbol(Symbol *sym)
707 if (sym->storage == StaticStorage) 709 if (sym->storage == StaticStorage)
708 type |= SM_STATIC; 710 type |= SM_STATIC;
709 if (sym->arity == -1 && sym->storage != AutoStorage) 711 if (sym->arity == -1 && sym->storage != AutoStorage)
710 type |= SM_DATA; 712 type |= SM_DATA;
711 else if (sym->arity >= 0) 713 else if (sym->arity >= 0)
712 type |= SM_FUNCTIONS; 714 type |= SM_FUNCTIONS;
715
716 if (!sym->source)
717 type |= SM_UNDEFINED;
718
713 } else if (sym->type == SymToken) { 719 } else if (sym->type == SymToken) {
714 if (sym->token_type == TYPE && sym->source) 720 if (sym->token_type == TYPE && sym->source)
715 type |= SM_TYPEDEF; 721 type |= SM_TYPEDEF;
716 else 722 else
717 return 0; 723 return 0;
718 } 724 }
@@ -752,13 +758,13 @@ main(int argc, char **argv)
752 bindtextdomain(PACKAGE, LOCALEDIR); 758 bindtextdomain(PACKAGE, LOCALEDIR);
753 textdomain(PACKAGE); 759 textdomain(PACKAGE);
754 760
755 register_output("gnu", gnu_output_handler, NULL); 761 register_output("gnu", gnu_output_handler, NULL);
756 register_output("posix", posix_output_handler, NULL); 762 register_output("posix", posix_output_handler, NULL);
757 763
758 symbol_map = SM_FUNCTIONS|SM_STATIC; 764 symbol_map = SM_FUNCTIONS|SM_STATIC|SM_UNDEFINED;
759 765
760 if (getenv("POSIXLY_CORRECT")) { 766 if (getenv("POSIXLY_CORRECT")) {
761 if (select_output_driver("posix")) 767 if (select_output_driver("posix"))
762 error(1, 0, _("%s: No such output driver"), "posix"); 768 error(1, 0, _("%s: No such output driver"), "posix");
763 output_init(); 769 output_init();
764 } 770 }

Return to:

Send suggestions and report system problems to the System administrator.

Generated by cgit.