Ubuntu patch gtksourceview 1.7.1-0ubuntu2
- From: Ubuntu Merge-o-Matic <mom ubuntu com>
- To: gtksourceview packages qa debian org
- Subject: Ubuntu patch gtksourceview 1.7.1-0ubuntu2
- Date: Tue, 25 Jul 2006 13:25:26 -0000
This e-mail has been sent due to an upload to Ubuntu of a new upstream
version which still contains Ubuntu changes. It contains the difference
between the Ubuntu version and the equivalent base version in Debian, note
that this difference may include the upstream changes.
Format: 1.7
Date: Mon, 24 Jul 2006 21:49:40 +0200
Source: gtksourceview
Binary: libgtksourceview-dev libgtksourceview-common libgtksourceview1.0-0 libgtksourceview-doc
Architecture: source
Version: 1.7.1-0ubuntu2
Distribution: edgy
Urgency: low
Maintainer: Andrew Lau <netsnipe users sourceforge net>
Changed-By: Sebastian Dröge <slomo ubuntu com>
Description:
libgtksourceview-common - common files for the GTK+ syntax highlighting widget
libgtksourceview-dev - development files for the GTK+ syntax highlighting widget
libgtksourceview-doc - documentation for the GTK+ syntax highlighting widget
libgtksourceview1.0-0 - shared libraries for the GTK+ syntax highlighting widget
Changes:
gtksourceview (1.7.1-0ubuntu2) edgy; urgency=low
.
* debian/boo.lang,
debian/libgtksourceview-common.install:
+ Don't install our custom boo syntax file now that it is upstream
.
gtksourceview (1.7.1-0ubuntu1) edgy; urgency=low
.
* New usptream release:
- New Lang files (D, boo)
- Updated translations
Files:
b2bd16661e6cb70cf75681b4309f324b 1605 libs optional gtksourceview_1.7.1-0ubuntu2.dsc
3074c683156c97671611d7c0b61383a8 6391 libs optional gtksourceview_1.7.1-0ubuntu2.diff.gz
diff -pruN 1.6.1-3/ChangeLog 1.7.1-0ubuntu2/ChangeLog
--- 1.6.1-3/ChangeLog 2006-04-10 09:22:22.000000000 +0100
+++ 1.7.1-0ubuntu2/ChangeLog 2006-07-24 18:40:14.000000000 +0100
@@ -1,3 +1,31 @@
+=== gtksourceview 1.7.1 ===
+
+2006-07-24 Paolo Borelli <pborelli katamail com>
+
+ * gtksourceview/configure.ac:
+ * gtksourceview/README:
+ * gtksourceview/NEWS:
+
+ release 1.7.1
+
+2006-07-24 Paolo Borelli <pborelli katamail com>
+
+ * gtksourceview/configure.ac: newer po/LINGUAS stuff.
+
+2006-07-24 Paolo Borelli <pborelli katamail com>
+
+ * gtksourceview/gtksourceview/language-specs/boo.lang: add boo lang.
+
+2006-07-24 Paolo Borelli <pborelli katamail com>
+
+ * gtksourceview/gtksourceview/language-specs/d.lang: add D lang
+ file by Martin Szulecki.
+
+2006-06-22 Paolo Borelli <pborelli katamail com>
+
+ * gtksourceview/gtksourceview.c: fix bug #345252 â?? Automatic
+ indentation does not work with keypad enter.
+
=== gtksourceview 1.6.1 ===
2006-04-10 Paolo Borelli <pborelli katamail com>
diff -pruN 1.6.1-3/Makefile.in 1.7.1-0ubuntu2/Makefile.in
--- 1.6.1-3/Makefile.in 2006-04-10 09:25:45.000000000 +0100
+++ 1.7.1-0ubuntu2/Makefile.in 2006-07-24 18:40:55.000000000 +0100
@@ -85,6 +85,7 @@ distuninstallcheck_listfiles = find . -t
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ALL_LINGUAS = @ALL_LINGUAS@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
@@ -102,7 +103,6 @@ CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
diff -pruN 1.6.1-3/NEWS 1.7.1-0ubuntu2/NEWS
--- 1.6.1-3/NEWS 2006-04-10 09:24:31.000000000 +0100
+++ 1.7.1-0ubuntu2/NEWS 2006-07-24 17:17:29.000000000 +0100
@@ -1,3 +1,9 @@
+News in 1.7.1
+-------------
+
+* New Lang files (D, boo)
+* Updated translations
+
News in 1.6.1
-------------
diff -pruN 1.6.1-3/README 1.7.1-0ubuntu2/README
--- 1.6.1-3/README 2006-04-10 09:25:01.000000000 +0100
+++ 1.7.1-0ubuntu2/README 2006-07-24 17:16:41.000000000 +0100
@@ -1,7 +1,7 @@
General Information
===================
-This is version 1.6.1 of GtkSourceView.
+This is version 1.7.1 of GtkSourceView.
GtkSourceView is a text widget that extends the standard gtk+ 2.x
text widget GtkTextView.
@@ -26,8 +26,8 @@ GtkSourceView requires GTK+-2.8.x, libxm
Simple install procedure:
- % gzip -cd gtksourceview-1.6.1.tar.gz | tar xvf - # unpack the sources
- % cd gtksourceview-1.6.1 # change to the toplevel directory
+ % gzip -cd gtksourceview-1.7.1.tar.gz | tar xvf - # unpack the sources
+ % cd gtksourceview-1.7.1 # change to the toplevel directory
% ./configure # run the `configure' script
% make # build gtksourceview
[ Become root if necessary ]
diff -pruN 1.6.1-3/aclocal.m4 1.7.1-0ubuntu2/aclocal.m4
--- 1.6.1-3/aclocal.m4 2006-04-10 09:25:37.000000000 +0100
+++ 1.7.1-0ubuntu2/aclocal.m4 2006-07-24 18:40:50.000000000 +0100
@@ -1534,7 +1534,7 @@ ifelse([$1],[],,
dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
-# serial 2 IT_PROG_INTLTOOL
+# serial 35 IT_PROG_INTLTOOL
AC_DEFUN([IT_PROG_INTLTOOL],
[AC_PREREQ([2.50])dnl
@@ -1549,9 +1549,9 @@ esac
if test -n "$1"; then
AC_MSG_CHECKING(for intltool >= $1)
- INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 100 + $ 2; }'`
+ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
- [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 100 + VERSION[2];}' ${ac_aux_dir}/intltool-update.in`
+ [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
]
AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
@@ -1622,6 +1622,9 @@ AC_PATH_PROG(INTLTOOL_MSGFMT, msgfmt, ms
AC_PATH_PROG(INTLTOOL_MSGMERGE, msgmerge, msgmerge)
AC_PATH_PROG(INTLTOOL_XGETTEXT, xgettext, xgettext)
+# Substitute ALL_LINGUAS so we can use it in po/Makefile
+AC_SUBST(ALL_LINGUAS)
+
IT_PO_SUBDIR([po])
dnl The following is very similar to
@@ -1713,7 +1716,7 @@ AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_IN
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# serial 47 AC_PROG_LIBTOOL
+# serial 48 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -1843,7 +1846,7 @@ rm="rm -f"
default_ofile=libtool
can_build_shared=yes
-# All known linkers require a `.a' archive for static linking (except M$VC,
+# All known linkers require a `.a' archive for static linking (except MSVC,
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
@@ -1863,6 +1866,7 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
test -z "$AS" && AS=as
test -z "$CC" && CC=cc
test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
test -z "$DLLTOOL" && DLLTOOL=dlltool
test -z "$LD" && LD=ld
test -z "$LN_S" && LN_S="ln -s"
@@ -1882,10 +1886,10 @@ old_postuninstall_cmds=
if test -n "$RANLIB"; then
case $host_os in
openbsd*)
- old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
;;
*)
- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
;;
esac
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
@@ -1933,6 +1937,9 @@ AC_DEFUN([_LT_AC_SYS_COMPILER],
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
# Allow CC to be a program name with arguments.
compiler=$CC
])# _LT_AC_SYS_COMPILER
@@ -1961,7 +1968,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -
AC_DEFUN([_LT_COMPILER_BOILERPLATE],
[ac_outfile=conftest.$ac_objext
printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_compiler_boilerplate=`cat conftest.err`
$rm conftest*
])# _LT_COMPILER_BOILERPLATE
@@ -1974,7 +1981,7 @@ $rm conftest*
AC_DEFUN([_LT_LINKER_BOILERPLATE],
[ac_outfile=conftest.$ac_objext
printf "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
])# _LT_LINKER_BOILERPLATE
@@ -2059,8 +2066,8 @@ if test "X${echo_test_string+set}" != Xs
# find a string as large as possible, as long as the shell can cope with it
for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
# expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
- if (echo_test_string="`eval $cmd`") 2>/dev/null &&
- echo_test_string="`eval $cmd`" &&
+ if (echo_test_string=`eval $cmd`) 2>/dev/null &&
+ echo_test_string=`eval $cmd` &&
(test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
then
break
@@ -2229,7 +2236,7 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*li
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
- case "`/usr/bin/file conftest.o`" in
+ case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
x86_64-*linux*)
@@ -2280,6 +2287,22 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*li
CFLAGS="$SAVE_CFLAGS"
fi
;;
+sparc*-*solaris*)
+ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+ case `/usr/bin/file conftest.o` in
+ *64-bit*)
+ case $lt_cv_prog_gnu_ld in
+ yes*) LD="${LD-ld} -m elf64_sparc" ;;
+ *) LD="${LD-ld} -64" ;;
+ esac
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+
AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
AC_CHECK_TOOL(DLLTOOL, dlltool, false)
@@ -2311,7 +2334,7 @@ AC_CACHE_CHECK([$1], [$2],
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
@@ -2322,9 +2345,9 @@ AC_CACHE_CHECK([$1], [$2],
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
- $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
- $SED '/^$/d' conftest.err >conftest.er2
- if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
$2=yes
fi
fi
@@ -2350,13 +2373,13 @@ AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
LDFLAGS="$LDFLAGS $3"
printf "$lt_simple_link_test_code" > conftest.$ac_ext
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
- # The compiler can only warn and ignore the option if not recognized
+ # The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
if test -s conftest.err; then
# Append any errors to the config.log.
cat conftest.err 1>&AS_MESSAGE_LOG_FD
- $echo "X$_lt_linker_boilerplate" | $Xsed > conftest.exp
- $SED '/^$/d' conftest.err >conftest.er2
+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
$2=yes
fi
@@ -2425,25 +2448,42 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
elif test -x /usr/sbin/sysctl; then
lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
else
- lt_cv_sys_max_cmd_len=65536 # usable default for *BSD
+ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs
fi
# And add a safety zone
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
;;
+
+ interix*)
+ # We know the value 262144 and hardcode it with a safety zone (like BSD)
+ lt_cv_sys_max_cmd_len=196608
+ ;;
+
osf*)
# Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
# due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
# nice to cause kernel panics so lets avoid the loop below.
# First set a reasonable default.
lt_cv_sys_max_cmd_len=16384
- #
+ #
if test -x /sbin/sysconfig; then
case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
*1*) lt_cv_sys_max_cmd_len=-1 ;;
esac
fi
;;
+ sco3.2v5*)
+ lt_cv_sys_max_cmd_len=102400
+ ;;
+ sysv5* | sco5v6* | sysv4.2uw2*)
+ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+ if test -n "$kargmax"; then
+ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'`
+ else
+ lt_cv_sys_max_cmd_len=32768
+ fi
+ ;;
*)
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
@@ -2475,7 +2515,7 @@ fi
# _LT_AC_CHECK_DLFCN
-# --------------------
+# ------------------
AC_DEFUN([_LT_AC_CHECK_DLFCN],
[AC_CHECK_HEADERS(dlfcn.h)dnl
])# _LT_AC_CHECK_DLFCN
@@ -2483,7 +2523,7 @@ AC_DEFUN([_LT_AC_CHECK_DLFCN],
# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-# ------------------------------------------------------------------
+# ---------------------------------------------------------------------
AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
if test "$cross_compiling" = yes; then :
@@ -2549,17 +2589,19 @@ int main ()
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
+ else
+ puts (dlerror ());
exit (status);
}]
EOF
if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
- (./conftest; exit; ) 2>/dev/null
+ (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) $1 ;;
x$lt_dlneed_uscore) $2 ;;
- x$lt_unknown|x*) $3 ;;
+ x$lt_dlunknown|x*) $3 ;;
esac
else :
# compilation failed
@@ -2571,7 +2613,7 @@ rm -fr conftest*
# AC_LIBTOOL_DLOPEN_SELF
-# -------------------
+# ----------------------
AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
if test "x$enable_dlopen" != xyes; then
@@ -2642,7 +2684,7 @@ else
test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
save_LDFLAGS="$LDFLAGS"
- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -2655,7 +2697,7 @@ else
])
if test "x$lt_cv_dlopen_self" = xyes; then
- LDFLAGS="$LDFLAGS $link_static_flag"
+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
lt_cv_dlopen_self_static, [dnl
_LT_AC_TRY_DLOPEN_SELF(
@@ -2703,7 +2745,7 @@ AC_CACHE_CHECK([if $compiler supports -c
# Note that $ac_compile itself does not contain backslashes and begins
# with a dollar sign (not a hyphen), so the echo should work correctly.
lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
@@ -2715,13 +2757,13 @@ AC_CACHE_CHECK([if $compiler supports -c
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
- $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
- $SED '/^$/d' out/conftest.err >out/conftest.er2
- if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
fi
fi
- chmod u+w .
+ chmod u+w . 2>&AS_MESSAGE_LOG_FD
$rm conftest*
# SGI C++ compiler will create directory out/ii_files/ for
# template instantiation
@@ -2981,7 +3023,8 @@ cygwin* | mingw* | pw32*)
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
- $install_prog $dir/$dlname \$dldir/$dlname'
+ $install_prog $dir/$dlname \$dldir/$dlname~
+ chmod a+x \$dldir/$dlname'
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
@@ -3034,7 +3077,7 @@ darwin* | rhapsody*)
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
- shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
@@ -3072,7 +3115,14 @@ kfreebsd*-gnu)
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+ if test -x /usr/bin/objformat; then
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+ freebsd[[123]]*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
@@ -3094,10 +3144,15 @@ freebsd* | dragonfly*)
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
- *) # from 3.2 on
+ freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
+ freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
+ freebsd*) # from 4.6 on
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
esac
;;
@@ -3117,7 +3172,7 @@ hpux9* | hpux10* | hpux11*)
version_type=sunos
need_lib_prefix=no
need_version=no
- case "$host_cpu" in
+ case $host_cpu in
ia64*)
shrext_cmds='.so'
hardcode_into_libs=yes
@@ -3157,6 +3212,18 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib'
;;
+interix3*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
@@ -3295,6 +3362,7 @@ nto-qnx*)
openbsd*)
version_type=sunos
+ sys_lib_dlsearch_path_spec="/usr/lib"
need_lib_prefix=no
# Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
case $host_os in
@@ -3338,13 +3406,6 @@ osf3* | osf4* | osf5*)
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
-sco3.2v5*)
- version_type=osf
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- ;;
-
solaris*)
version_type=linux
need_lib_prefix=no
@@ -3370,7 +3431,7 @@ sunos4*)
need_version=yes
;;
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+sysv4 | sysv4.3*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
@@ -3403,6 +3464,29 @@ sysv4*MP*)
fi
;;
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ version_type=freebsd-elf
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ hardcode_into_libs=yes
+ if test "$with_gnu_ld" = yes; then
+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+ shlibpath_overrides_runpath=no
+ else
+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+ shlibpath_overrides_runpath=yes
+ case $host_os in
+ sco3.2v5*)
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+ ;;
+ esac
+ fi
+ sys_lib_dlsearch_path_spec='/usr/lib'
+ ;;
+
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -3416,6 +3500,11 @@ uts4*)
esac
AC_MSG_RESULT([$dynamic_linker])
test "$dynamic_linker" = no && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
@@ -3440,6 +3529,9 @@ if test -f "$ltmain" && test -n "$tagnam
AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
fi
fi
+ if test -z "$LTCFLAGS"; then
+ eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
+ fi
# Extract list of available tagged configurations in $ofile.
# Note that this assumes the entire list is on one line.
@@ -3530,7 +3622,7 @@ AC_DEFUN([AC_LIBTOOL_DLOPEN],
# AC_LIBTOOL_WIN32_DLL
# --------------------
-# declare package support for building win32 dll's
+# declare package support for building win32 DLLs
AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
])# AC_LIBTOOL_WIN32_DLL
@@ -3568,7 +3660,7 @@ AC_ARG_ENABLE([shared],
# AC_DISABLE_SHARED
# -----------------
-#- set the default shared flag to --disable-shared
+# set the default shared flag to --disable-shared
AC_DEFUN([AC_DISABLE_SHARED],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
AC_ENABLE_SHARED(no)
@@ -3704,7 +3796,7 @@ dnl not every word. This closes a longs
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
- file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
+ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
@@ -3814,7 +3906,7 @@ AC_CACHE_VAL(lt_cv_path_LD,
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
lt_cv_path_LD="$ac_dir/$ac_prog"
# Check to see if the program is GNU ld. I'd rather use --version,
- # but apparently some GNU ld's only accept -v.
+ # but apparently some variants of GNU ld only accept -v.
# Break only if it was the GNU/non-GNU ld that we prefer.
case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
@@ -3846,7 +3938,7 @@ AC_PROG_LD_GNU
AC_DEFUN([AC_PROG_LD_GNU],
[AC_REQUIRE([AC_PROG_EGREP])dnl
AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
@@ -3876,7 +3968,7 @@ reload_cmds='$LD$reload_flag -o $output$
case $host_os in
darwin*)
if test "$GCC" = yes; then
- reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs'
+ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
else
reload_cmds='$LD$reload_flag -o $output$reload_objs'
fi
@@ -3960,7 +4052,7 @@ gnu*)
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
- case "$host_cpu" in
+ case $host_cpu in
ia64*)
lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
@@ -3976,6 +4068,11 @@ hpux10.20* | hpux11*)
esac
;;
+interix3*)
+ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
+ ;;
+
irix5* | irix6* | nonstopux*)
case $LD in
*-32|*"-32 ") libmagic=32-bit;;
@@ -4021,15 +4118,11 @@ osf3* | osf4* | osf5*)
lt_cv_deplibs_check_method=pass_all
;;
-sco3.2v5*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
solaris*)
lt_cv_deplibs_check_method=pass_all
;;
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+sysv4 | sysv4.3*)
case $host_vendor in
motorola)
lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
@@ -4050,10 +4143,13 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
siemens)
lt_cv_deplibs_check_method=pass_all
;;
+ pc)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
esac
;;
-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*)
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
lt_cv_deplibs_check_method=pass_all
;;
esac
@@ -4073,36 +4169,43 @@ AC_DEFUN([AC_PROG_NM],
# Let the user override the test.
lt_cv_path_NM="$NM"
else
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
- IFS="$lt_save_ifs"
- test -z "$ac_dir" && ac_dir=.
- tmp_nm="$ac_dir/${ac_tool_prefix}nm"
- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
- # Check to see if the nm accepts a BSD-compat flag.
- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
- # nm: unknown option "B" ignored
- # Tru64's nm complains that /dev/null is an invalid object file
- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
- */dev/null* | *'Invalid file or object type'*)
- lt_cv_path_NM="$tmp_nm -B"
- break
- ;;
- *)
- case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
- */dev/null*)
- lt_cv_path_NM="$tmp_nm -p"
+ lt_nm_to_check="${ac_tool_prefix}nm"
+ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+ lt_nm_to_check="$lt_nm_to_check nm"
+ fi
+ for lt_tmp_nm in $lt_nm_to_check; do
+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+ IFS="$lt_save_ifs"
+ test -z "$ac_dir" && ac_dir=.
+ tmp_nm="$ac_dir/$lt_tmp_nm"
+ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+ # Check to see if the nm accepts a BSD-compat flag.
+ # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+ # nm: unknown option "B" ignored
+ # Tru64's nm complains that /dev/null is an invalid object file
+ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+ */dev/null* | *'Invalid file or object type'*)
+ lt_cv_path_NM="$tmp_nm -B"
break
;;
*)
- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
- continue # so that we can try to find one that supports BSD flags
+ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+ */dev/null*)
+ lt_cv_path_NM="$tmp_nm -p"
+ break
+ ;;
+ *)
+ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+ continue # so that we can try to find one that supports BSD flags
+ ;;
+ esac
;;
esac
- esac
- fi
+ fi
+ done
+ IFS="$lt_save_ifs"
done
- IFS="$lt_save_ifs"
test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
fi])
NM="$lt_cv_path_NM"
@@ -4134,13 +4237,13 @@ esac
# -----------------------------------
# sets LIBLTDL to the link flags for the libltdl convenience library and
# LTDLINCL to the include flags for the libltdl header and adds
-# --enable-ltdl-convenience to the configure arguments. Note that LIBLTDL
-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If
-# DIRECTORY is not provided, it is assumed to be `libltdl'. LIBLTDL will
-# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with
-# '${top_srcdir}/' (note the single quotes!). If your package is not
-# flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
+# --enable-ltdl-convenience to the configure arguments. Note that
+# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided,
+# it is assumed to be `libltdl'. LIBLTDL will be prefixed with
+# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
+# (note the single quotes!). If your package is not flat and you're not
+# using automake, define top_builddir and top_srcdir appropriately in
+# the Makefiles.
AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
case $enable_ltdl_convenience in
@@ -4159,13 +4262,13 @@ AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
# -----------------------------------
# sets LIBLTDL to the link flags for the libltdl installable library and
# LTDLINCL to the include flags for the libltdl header and adds
-# --enable-ltdl-install to the configure arguments. Note that LIBLTDL
-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If
-# DIRECTORY is not provided and an installed libltdl is not found, it is
-# assumed to be `libltdl'. LIBLTDL will be prefixed with '${top_builddir}/'
-# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single
-# quotes!). If your package is not flat and you're not using automake,
-# define top_builddir and top_srcdir appropriately in the Makefiles.
+# --enable-ltdl-install to the configure arguments. Note that
+# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided,
+# and an installed libltdl is not found, it is assumed to be `libltdl'.
+# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
+# '${top_srcdir}/' (note the single quotes!). If your package is not
+# flat and you're not using automake, define top_builddir and top_srcdir
+# appropriately in the Makefiles.
# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
@@ -4208,7 +4311,7 @@ _LT_AC_SHELL_INIT([tagnames=${tagnames+$
])# _LT_AC_LANG_CXX
# _LT_AC_PROG_CXXCPP
-# ---------------
+# ------------------
AC_DEFUN([_LT_AC_PROG_CXXCPP],
[
AC_REQUIRE([AC_PROG_CXX])
@@ -4257,7 +4360,7 @@ _LT_AC_SHELL_INIT([tagnames=${tagnames+$
# AC_LIBTOOL_RC
-# --------------
+# -------------
# enable support for Windows resource files
AC_DEFUN([AC_LIBTOOL_RC],
[AC_REQUIRE([LT_AC_PROG_RC])
@@ -4294,37 +4397,6 @@ _LT_AC_SYS_COMPILER
_LT_COMPILER_BOILERPLATE
_LT_LINKER_BOILERPLATE
-#
-# Check for any special shared library compilation flags.
-#
-_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)=
-if test "$GCC" = no; then
- case $host_os in
- sco3.2v5*)
- _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf'
- ;;
- esac
-fi
-if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
- AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
- if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[ ]]" >/dev/null; then :
- else
- AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
- _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
- fi
-fi
-
-
-#
-# Check to make sure the static flag actually works.
-#
-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works],
- _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
- $_LT_AC_TAGVAR(lt_prog_compiler_static, $1),
- [],
- [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
-
-
AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
AC_LIBTOOL_PROG_COMPILER_PIC($1)
AC_LIBTOOL_PROG_CC_C_O($1)
@@ -4333,9 +4405,9 @@ AC_LIBTOOL_PROG_LD_SHLIBS($1)
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
AC_LIBTOOL_SYS_LIB_STRIP
-AC_LIBTOOL_DLOPEN_SELF($1)
+AC_LIBTOOL_DLOPEN_SELF
-# Report which librarie types wil actually be built
+# Report which library types will actually be built
AC_MSG_CHECKING([if libtool supports shared libraries])
AC_MSG_RESULT([$can_build_shared])
@@ -4344,7 +4416,7 @@ test "$can_build_shared" = "no" && enabl
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
-case "$host_os" in
+case $host_os in
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
@@ -4394,6 +4466,7 @@ _LT_AC_TAGVAR(hardcode_libdir_flag_spec,
_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
_LT_AC_TAGVAR(module_expsym_cmds, $1)=
@@ -4411,7 +4484,7 @@ _LT_AC_TAGVAR(postdeps, $1)=
_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
# Source file extension for C++ test sources.
-ac_ext=cc
+ac_ext=cpp
# Object file extension for compiled C++ test sources.
objext=o
@@ -4421,7 +4494,7 @@ _LT_AC_TAGVAR(objext, $1)=$objext
lt_simple_compile_test_code="int some_variable = 0;\n"
# Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
+lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -4440,12 +4513,12 @@ lt_save_path_LD=$lt_cv_path_LD
if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
else
- unset lt_cv_prog_gnu_ld
+ $as_unset lt_cv_prog_gnu_ld
fi
if test -n "${lt_cv_path_LDCXX+set}"; then
lt_cv_path_LD=$lt_cv_path_LDCXX
else
- unset lt_cv_path_LD
+ $as_unset lt_cv_path_LD
fi
test -z "${LDCXX+set}" || LD=$LDCXX
CC=${CXX-"c++"}
@@ -4540,6 +4613,7 @@ case $host_os in
;;
esac
done
+ ;;
esac
exp_sym_flag='-bexport'
@@ -4577,6 +4651,7 @@ case $host_os in
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
fi
+ ;;
esac
shared_flag='-shared'
if test "$aix_use_runtimelinking" = yes; then
@@ -4608,12 +4683,12 @@ case $host_os in
_LT_AC_SYS_LIBPATH_AIX
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
else
if test "$host_cpu" = ia64; then
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
@@ -4622,16 +4697,26 @@ case $host_os in
# -berok will link without error, but may produce a broken library.
_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
- # -bexpall does not export symbols beginning with underscore (_)
- _LT_AC_TAGVAR(always_export_symbols, $1)=yes
# Exported symbols can be pulled into shared objects from archives
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
- # This is similar to how AIX traditionally builds it's shared libraries.
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ # This is similar to how AIX traditionally builds its shared libraries.
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
fi
fi
;;
+
+ beos*)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+ # Joseph Beckenbach <jrb3 best com> says some releases of gcc
+ # support --undefined. This deserves some investigation. FIXME
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ else
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+
chorus*)
case $cc_basename in
*)
@@ -4641,7 +4726,6 @@ case $host_os in
esac
;;
-
cygwin* | mingw* | pw32*)
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
@@ -4651,7 +4735,7 @@ case $host_os in
_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
@@ -4660,13 +4744,13 @@ case $host_os in
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
;;
darwin* | rhapsody*)
- case "$host_os" in
+ case $host_os in
rhapsody* | darwin1.[[012]])
_LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
;;
@@ -4704,7 +4788,7 @@ case $host_os in
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
fi
_LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
else
@@ -4717,7 +4801,7 @@ case $host_os in
output_verbose_link_cmd='echo'
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
_LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
_LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
@@ -4797,33 +4881,22 @@ case $host_os in
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
- case "$host_cpu" in
- hppa*64*)
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+ case $host_cpu in
+ hppa*64*|ia64*)
_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- ;;
- ia64*)
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
;;
*)
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
;;
esac
fi
- case "$host_cpu" in
- hppa*64*)
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
- ia64*)
+ case $host_cpu in
+ hppa*64*|ia64*)
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
- # but as the default
- # location of the library.
;;
*)
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
@@ -4839,9 +4912,12 @@ case $host_os in
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
aCC*)
- case "$host_cpu" in
- hppa*64*|ia64*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+ case $host_cpu in
+ hppa*64*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ ia64*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
*)
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
@@ -4860,9 +4936,12 @@ case $host_os in
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
- case "$host_cpu" in
- ia64*|hppa*64*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+ case $host_cpu in
+ hppa*64*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ ia64*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
*)
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
@@ -4876,6 +4955,20 @@ case $host_os in
;;
esac
;;
+ interix3*)
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+ # Instead, shared libraries are loaded at an image base (0x10000000 by
+ # default) and relocated if they conflict, which is a slow very memory
+ # consuming and fragmenting process. To avoid this, we pick a random,
+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
irix5* | irix6*)
case $cc_basename in
CC*)
@@ -4961,7 +5054,7 @@ case $host_os in
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
;;
cxx*)
# Compaq C++
@@ -5158,19 +5251,6 @@ case $host_os in
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
- sco*)
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- case $cc_basename in
- CC*)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- *)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- esac
- ;;
sunos4*)
case $cc_basename in
CC*)
@@ -5193,10 +5273,11 @@ case $host_os in
case $cc_basename in
CC*)
# Sun C++ 4.2, 5.x and Centerline C++
+ _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+ $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -5216,15 +5297,7 @@ case $host_os in
esac
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- #
- # There doesn't appear to be a way to prevent this compiler from
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ output_verbose_link_cmd='echo'
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
@@ -5270,8 +5343,59 @@ case $host_os in
;;
esac
;;
- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ runpath_var='LD_RUN_PATH'
+
+ case $cc_basename in
+ CC*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ *)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ ;;
+ sysv5* | sco3.2v5* | sco5v6*)
+ # Note: We can NOT use -z defs as we might desire, because we do not
+ # link with -lc, and that would cause any symbols used from libc to
+ # always be unresolved, which means just about no library would
+ # ever link correctly. If we're not using GNU ld we use -z text
+ # though, which does catch some bad symbols but isn't as heavy-handed
+ # as -z defs.
+ # For security reasons, it is highly recommended that you always
+ # use absolute paths for naming shared libraries, and exclude the
+ # DT_RUNPATH tag from executables and libraries. But doing so
+ # requires that you compile everything twice, which is a pain.
+ # So that behaviour is only enabled if SCOABSPATH is set to a
+ # non-empty value in the environment. Most likely only useful for
+ # creating official distributions of packages.
+ # This is a hack until libtool officially supports absolute path
+ # names for shared libraries.
+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+ runpath_var='LD_RUN_PATH'
+
+ case $cc_basename in
+ CC*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ *)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
;;
tandem*)
case $cc_basename in
@@ -5308,8 +5432,6 @@ AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
AC_LIBTOOL_PROG_LD_SHLIBS($1)
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-AC_LIBTOOL_SYS_LIB_STRIP
-AC_LIBTOOL_DLOPEN_SELF($1)
AC_LIBTOOL_CONFIG($1)
@@ -5327,7 +5449,7 @@ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
])# AC_LIBTOOL_LANG_CXX_CONFIG
# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
-# ------------------------
+# ------------------------------------
# Figure out "hidden" library dependencies from verbose
# compiler output when linking a shared library.
# Parse the compiler output and extract the necessary
@@ -5381,7 +5503,7 @@ if AC_TRY_EVAL(ac_compile); then
# The `*' in the case matches for architectures that use `case' in
# $output_verbose_cmd can trigger glob expansion during the loop
# eval without this substitution.
- output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
+ output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
for p in `eval $output_verbose_link_cmd`; do
case $p in
@@ -5457,13 +5579,37 @@ fi
$rm -f confest.$objext
+# PORTME: override above test on systems where it is broken
+ifelse([$1],[CXX],
+[case $host_os in
+interix3*)
+ # Interix 3.5 installs completely hosed .la files for C++, so rather than
+ # hack all around it, let's just trust "g++" to DTRT.
+ _LT_AC_TAGVAR(predep_objects,$1)=
+ _LT_AC_TAGVAR(postdep_objects,$1)=
+ _LT_AC_TAGVAR(postdeps,$1)=
+ ;;
+
+solaris*)
+ case $cc_basename in
+ CC*)
+ # Adding this requires a known-good setup of shared libraries for
+ # Sun compiler versions before 5.6, else PIC objects from an old
+ # archive will be linked into the output, leading to subtle bugs.
+ _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
+ ;;
+ esac
+ ;;
+esac
+])
+
case " $_LT_AC_TAGVAR(postdeps, $1) " in
*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
esac
])# AC_LIBTOOL_POSTDEP_PREDEP
# AC_LIBTOOL_LANG_F77_CONFIG
-# ------------------------
+# --------------------------
# Ensure that the configuration vars for the C compiler are
# suitably defined. Those variables are subsequently used by
# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
@@ -5526,7 +5672,7 @@ test "$can_build_shared" = "no" && enabl
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
-case "$host_os" in
+case $host_os in
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
@@ -5547,8 +5693,6 @@ AC_MSG_CHECKING([whether to build static
test "$enable_shared" = yes || enable_static=yes
AC_MSG_RESULT([$enable_static])
-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
_LT_AC_TAGVAR(GCC, $1)="$G77"
_LT_AC_TAGVAR(LD, $1)="$LD"
@@ -5558,8 +5702,6 @@ AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
AC_LIBTOOL_PROG_LD_SHLIBS($1)
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-AC_LIBTOOL_SYS_LIB_STRIP
-
AC_LIBTOOL_CONFIG($1)
@@ -5616,8 +5758,6 @@ AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
AC_LIBTOOL_PROG_LD_SHLIBS($1)
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-AC_LIBTOOL_SYS_LIB_STRIP
-AC_LIBTOOL_DLOPEN_SELF($1)
AC_LIBTOOL_CONFIG($1)
@@ -5627,7 +5767,7 @@ CC="$lt_save_CC"
# AC_LIBTOOL_LANG_RC_CONFIG
-# --------------------------
+# -------------------------
# Ensure that the configuration vars for the Windows resource compiler are
# suitably defined. Those variables are subsequently used by
# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
@@ -5690,7 +5830,7 @@ if test -f "$ltmain"; then
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
SED SHELL STRIP \
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
@@ -5859,6 +5999,9 @@ AR_FLAGS=$lt_AR_FLAGS
# A C compiler.
LTCC=$lt_LTCC
+# LTCC compiler flags.
+LTCFLAGS=$lt_LTCFLAGS
+
# A language-specific compiler.
CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
@@ -6232,9 +6375,18 @@ irix* | nonstopux*)
osf*)
symcode='[[BCDEGQRST]]'
;;
-solaris* | sysv5*)
+solaris*)
symcode='[[BDRT]]'
;;
+sco3.2v5*)
+ symcode='[[DT]]'
+ ;;
+sysv4.2uw2*)
+ symcode='[[DT]]'
+ ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+ symcode='[[ABDT]]'
+ ;;
sysv4)
symcode='[[DFNSTU]]'
;;
@@ -6417,6 +6569,10 @@ AC_MSG_CHECKING([for $compiler option to
# DJGPP does not support shared libraries at all
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
;;
+ interix3*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+ # Instead, we relocate shared libraries at runtime.
+ ;;
sysv4*MP*)
if test -d /usr/nec; then
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
@@ -6425,7 +6581,7 @@ AC_MSG_CHECKING([for $compiler option to
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
- case "$host_cpu" in
+ case $host_cpu in
hppa*64*|ia64*)
;;
*)
@@ -6486,15 +6642,15 @@ AC_MSG_CHECKING([for $compiler option to
case $cc_basename in
CC*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
if test "$host_cpu" != ia64; then
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
fi
;;
aCC*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
- case "$host_cpu" in
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+ case $host_cpu in
hppa*64*|ia64*)
# +Z the default
;;
@@ -6507,6 +6663,10 @@ AC_MSG_CHECKING([for $compiler option to
;;
esac
;;
+ interix*)
+ # This is c89, which is MS Visual C++ (no shared libs)
+ # Anyone wants to do a port?
+ ;;
irix5* | irix6* | nonstopux*)
case $cc_basename in
CC*)
@@ -6535,7 +6695,7 @@ AC_MSG_CHECKING([for $compiler option to
# Portland Group C++ compiler.
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
cxx*)
# Compaq C++
@@ -6586,15 +6746,6 @@ AC_MSG_CHECKING([for $compiler option to
;;
psos*)
;;
- sco*)
- case $cc_basename in
- CC*)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- ;;
- *)
- ;;
- esac
- ;;
solaris*)
case $cc_basename in
CC*)
@@ -6636,7 +6787,14 @@ AC_MSG_CHECKING([for $compiler option to
;;
esac
;;
- unixware*)
+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+ case $cc_basename in
+ CC*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+ esac
;;
vxworks*)
;;
@@ -6683,6 +6841,11 @@ AC_MSG_CHECKING([for $compiler option to
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
;;
+ interix3*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+ # Instead, we relocate shared libraries at runtime.
+ ;;
+
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
@@ -6699,7 +6862,7 @@ AC_MSG_CHECKING([for $compiler option to
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
- case "$host_cpu" in
+ case $host_cpu in
hppa*64*|ia64*)
# +Z the default
;;
@@ -6746,7 +6909,7 @@ AC_MSG_CHECKING([for $compiler option to
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
- case "$host_cpu" in
+ case $host_cpu in
hppa*64*|ia64*)
# +Z the default
;;
@@ -6776,12 +6939,12 @@ AC_MSG_CHECKING([for $compiler option to
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
;;
- pgcc* | pgf77* | pgf90*)
+ pgcc* | pgf77* | pgf90* | pgf95*)
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
ccc*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
@@ -6797,11 +6960,6 @@ AC_MSG_CHECKING([for $compiler option to
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
- sco3.2v5*)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn'
- ;;
-
solaris*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
@@ -6819,7 +6977,7 @@ AC_MSG_CHECKING([for $compiler option to
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+ sysv4 | sysv4.2uw2* | sysv4.3*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
@@ -6832,6 +6990,12 @@ AC_MSG_CHECKING([for $compiler option to
fi
;;
+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+
unicos*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
@@ -6864,7 +7028,7 @@ if test -n "$_LT_AC_TAGVAR(lt_prog_compi
[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
fi
-case "$host_os" in
+case $host_os in
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
@@ -6873,6 +7037,16 @@ case "$host_os" in
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
;;
esac
+
+#
+# Check to make sure the static flag actually works.
+#
+wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
+AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
+ _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
+ $lt_tmp_static_flag,
+ [],
+ [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
])
@@ -6951,6 +7125,10 @@ ifelse([$1],[CXX],[
with_gnu_ld=no
fi
;;
+ interix*)
+ # we just hope/assume this is gcc and not c89 (= MSVC++)
+ with_gnu_ld=yes
+ ;;
openbsd*)
with_gnu_ld=no
;;
@@ -6960,7 +7138,7 @@ ifelse([$1],[CXX],[
if test "$with_gnu_ld" = yes; then
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
-
+
# Set some defaults for GNU ld with shared library support. These
# are reset later if shared libraries are not supported. Putting them
# here allows them to be overridden if necessary.
@@ -6981,7 +7159,7 @@ ifelse([$1],[CXX],[
*\ 2.11.*) ;; # other 2.11 versions
*) supports_anon_versioning=yes ;;
esac
-
+
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
@@ -7035,7 +7213,7 @@ EOF
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
@@ -7044,22 +7222,37 @@ EOF
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
;;
+ interix3*)
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+ # Instead, shared libraries are loaded at an image base (0x10000000 by
+ # default) and relocated if they conflict, which is a slow very memory
+ # consuming and fragmenting process. To avoid this, we pick a random,
+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
+
linux*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
pgcc*) # Portland Group C compiler
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
tmp_addflag=' $pic_flag'
;;
- pgf77* | pgf90* ) # Portland Group f77 and f90 compilers
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
@@ -7091,7 +7284,7 @@ EOF
fi
;;
- solaris* | sysv5*)
+ solaris*)
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
_LT_AC_TAGVAR(ld_shlibs, $1)=no
cat <<EOF 1>&2
@@ -7112,6 +7305,33 @@ EOF
fi
;;
+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+ case `$LD -v 2>&1` in
+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems. Therefore, libtool
+*** is disabling shared libraries support. We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+ ;;
+ *)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
+ else
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+ esac
+ ;;
+
sunos4*)
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
@@ -7145,7 +7365,7 @@ EOF
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
- if test "$GCC" = yes && test -z "$link_static_flag"; then
+ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
@@ -7179,6 +7399,7 @@ EOF
break
fi
done
+ ;;
esac
exp_sym_flag='-bexport'
@@ -7216,6 +7437,7 @@ EOF
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
fi
+ ;;
esac
shared_flag='-shared'
if test "$aix_use_runtimelinking" = yes; then
@@ -7228,11 +7450,11 @@ EOF
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
- if test "$aix_use_runtimelinking" = yes; then
+ if test "$aix_use_runtimelinking" = yes; then
shared_flag='${wl}-G'
else
shared_flag='${wl}-bM:SRE'
- fi
+ fi
fi
fi
@@ -7246,12 +7468,12 @@ EOF
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
else
if test "$host_cpu" = ia64; then
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
@@ -7260,13 +7482,11 @@ EOF
# -berok will link without error, but may produce a broken library.
_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
- # -bexpall does not export symbols beginning with underscore (_)
- _LT_AC_TAGVAR(always_export_symbols, $1)=yes
# Exported symbols can be pulled into shared objects from archives
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
- # This is similar to how AIX traditionally builds it's shared libraries.
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ # This is similar to how AIX traditionally builds its shared libraries.
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
fi
fi
;;
@@ -7305,7 +7525,7 @@ EOF
;;
darwin* | rhapsody*)
- case "$host_os" in
+ case $host_os in
rhapsody* | darwin1.[[012]])
_LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
;;
@@ -7334,7 +7554,7 @@ EOF
output_verbose_link_cmd='echo'
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
_LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
_LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
else
@@ -7343,7 +7563,7 @@ EOF
output_verbose_link_cmd='echo'
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
_LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
_LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
@@ -7407,47 +7627,62 @@ EOF
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
;;
- hpux10* | hpux11*)
+ hpux10*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- case "$host_cpu" in
- hppa*64*|ia64*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+ fi
+ if test "$with_gnu_ld" = no; then
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+ fi
+ ;;
+
+ hpux11*)
+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ case $host_cpu in
+ hppa*64*)
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
+ ia64*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
*)
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
else
- case "$host_cpu" in
- hppa*64*|ia64*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+ case $host_cpu in
+ hppa*64*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ ia64*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
fi
if test "$with_gnu_ld" = no; then
- case "$host_cpu" in
- hppa*64*)
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+ case $host_cpu in
+ hppa*64*|ia64*)
_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
- ia64*)
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
;;
*)
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
@@ -7549,14 +7784,6 @@ EOF
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
;;
- sco3.2v5*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
- runpath_var=LD_RUN_PATH
- hardcode_runpath_var=yes
- ;;
-
solaris*)
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
if test "$GCC" = yes; then
@@ -7642,36 +7869,45 @@ EOF
fi
;;
- sysv4.2uw2*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- hardcode_runpath_var=yes
- runpath_var=LD_RUN_PATH
- ;;
+ runpath_var='LD_RUN_PATH'
- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
if test "$GCC" = yes; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
else
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
fi
- runpath_var='LD_RUN_PATH'
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
- sysv5*)
- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
- # $CC -shared without GNU ld will not create a library from C++
- # object files and a static libstdc++, better avoid it by now
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+ sysv5* | sco3.2v5* | sco5v6*)
+ # Note: We can NOT use -z defs as we might desire, because we do not
+ # link with -lc, and that would cause any symbols used from libc to
+ # always be unresolved, which means just about no library would
+ # ever link correctly. If we're not using GNU ld we use -z text
+ # though, which does catch some bad symbols but isn't as heavy-handed
+ # as -z defs.
+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
runpath_var='LD_RUN_PATH'
+
+ if test "$GCC" = yes; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ fi
;;
uts4*)
@@ -7689,11 +7925,6 @@ EOF
AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
#
# Do we need to explicitly link libc?
#
@@ -7721,6 +7952,7 @@ x|xyes)
libobjs=conftest.$ac_objext
deplibs=
wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
+ pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
compiler_flags=-v
linker_flags=-v
verstring=
@@ -7909,7 +8141,7 @@ if test "x$ac_cv_env_PKG_CONFIG_set" !=
AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
fi
if test -n "$PKG_CONFIG"; then
- _pkg_min_version=m4_ifval([$1], [$1], [0.9.0])
+ _pkg_min_version=m4_default([$1], [0.9.0])
AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
AC_MSG_RESULT([yes])
@@ -7945,14 +8177,30 @@ fi])
# ---------------------------------------------
m4_define([_PKG_CONFIG],
[if test -n "$PKG_CONFIG"; then
+ if test -n "$$1"; then
+ pkg_cv_[]$1="$$1"
+ else
PKG_CHECK_EXISTS([$3],
[pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
[pkg_failed=yes])
+ fi
else
pkg_failed=untried
fi[]dnl
])# _PKG_CONFIG
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
# [ACTION-IF-NOT-FOUND])
#
@@ -7974,19 +8222,30 @@ AC_MSG_CHECKING([for $1])
_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
if test $pkg_failed = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+ _PKG_SHORT_ERRORS_SUPPORTED
+ if test $_pkg_short_errors_supported = yes; then
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
+ else
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+ fi
# Put the nasty error message in config.log where it belongs
- echo "$$1[]_PKG_ERRORS" 1>&AS_MESSAGE_LOG_FD
+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
ifelse([$4], , [AC_MSG_ERROR(dnl
-[Package requirements ($2) were not met.
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
-Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables
-to avoid the need to call pkg-config. See the pkg-config man page for
-more details.])],
+_PKG_TEXT
+])],
[$4])
elif test $pkg_failed = untried; then
ifelse([$4], , [AC_MSG_FAILURE(dnl
@@ -7994,9 +8253,7 @@ elif test $pkg_failed = untried; then
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables
-to avoid the need to call pkg-config. See the pkg-config man page for
-more details.
+_PKG_TEXT
To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
[$4])
diff -pruN 1.6.1-3/configure 1.7.1-0ubuntu2/configure
--- 1.6.1-3/configure 2006-04-10 09:25:41.000000000 +0100
+++ 1.7.1-0ubuntu2/configure 2006-07-24 18:40:56.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for gtksourceview 1.6.1.
+# Generated by GNU Autoconf 2.59 for gtksourceview 1.7.1.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gtksourceview>.
#
@@ -287,8 +287,8 @@ if test "X${echo_test_string+set}" != Xs
# find a string as large as possible, as long as the shell can cope with it
for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
# expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
- if (echo_test_string="`eval $cmd`") 2>/dev/null &&
- echo_test_string="`eval $cmd`" &&
+ if (echo_test_string=`eval $cmd`) 2>/dev/null &&
+ echo_test_string=`eval $cmd` &&
(test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
then
break
@@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='gtksourceview'
PACKAGE_TARNAME='gtksourceview'
-PACKAGE_VERSION='1.6.1'
-PACKAGE_STRING='gtksourceview 1.6.1'
+PACKAGE_VERSION='1.7.1'
+PACKAGE_STRING='gtksourceview 1.7.1'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gtksourceview'
ac_unique_file="gtksourceview/gtksourcebuffer.h"
@@ -465,7 +465,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar ACLOCAL_AMFLAGS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_SERVICE_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT GTK_REQUIRED_VERSION GNOME_VFS_REQUIRED_VERSION LIBXML_REQUIRED_VERSION GNOME_PRINT_REQUIRED_VERSION GLIB_GENMARSHAL GLIB_MKENUMS WARN_CFLAGS DEPRECATED_FLAGS PKG_CONFIG ac_pt_PKG_CONFIG DEP_CFLAGS DEP_LIBS HAVE_GNOMEPRINT_TRUE HAVE_GNOMEPRINT_FALSE GNOMEPRINT_CFLAGS GNOMEPRINT_LIBS BUILD_GNU_REGEX_TRUE BUILD_GNU_REGEX_FALSE BUILD_TESTS_TRUE BUILD_TESTS_FALSE TESTS_CFLAGS TESTS_LIBS GETTEXT_PACKAGE CONFIG_STATUS_DEPENDENCIES USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS HTML_DIR ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE GTK_DOC_USE_LIBTOOL_TRUE GTK_DOC_USE_LIBTOOL_FALSE LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar ACLOCAL_AMFLAGS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_SERVICE_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT ALL_LINGUAS GTK_REQUIRED_VERSION GNOME_VFS_REQUIRED_VERSION LIBXML_REQUIRED_VERSION GNOME_PRINT_REQUIRED_VERSION GLIB_GENMARSHAL GLIB_MKENUMS WARN_CFLAGS DEPRECATED_FLAGS PKG_CONFIG ac_pt_PKG_CONFIG DEP_CFLAGS DEP_LIBS HAVE_GNOMEPRINT_TRUE HAVE_GNOMEPRINT_FALSE GNOMEPRINT_CFLAGS GNOMEPRINT_LIBS BUILD_GNU_REGEX_TRUE BUILD_GNU_REGEX_FALSE BUILD_TESTS_TRUE BUILD_TESTS_FALSE TESTS_CFLAGS TESTS_LIBS GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS HTML_DIR ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE GTK_DOC_USE_LIBTOOL_TRUE GTK_DOC_USE_LIBTOOL_FALSE LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -982,7 +982,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures gtksourceview 1.6.1 to adapt to many kinds of systems.
+\`configure' configures gtksourceview 1.7.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1048,7 +1048,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of gtksourceview 1.6.1:";;
+ short | recursive ) echo "Configuration of gtksourceview 1.7.1:";;
esac
cat <<\_ACEOF
@@ -1207,7 +1207,7 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-gtksourceview configure 1.6.1
+gtksourceview configure 1.7.1
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1221,7 +1221,7 @@ cat >&5 <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by gtksourceview $as_me 1.6.1, which was
+It was created by gtksourceview $as_me 1.7.1, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1868,7 +1868,7 @@ fi
# Define the identity of the package.
PACKAGE=gtksourceview
- VERSION=1.6.1
+ VERSION=1.7.1
cat >>confdefs.h <<_ACEOF
@@ -3468,7 +3468,7 @@ else
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
lt_cv_path_LD="$ac_dir/$ac_prog"
# Check to see if the program is GNU ld. I'd rather use --version,
- # but apparently some GNU ld's only accept -v.
+ # but apparently some variants of GNU ld only accept -v.
# Break only if it was the GNU/non-GNU ld that we prefer.
case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
@@ -3502,7 +3502,7 @@ echo $ECHO_N "checking if the linker ($L
if test "${lt_cv_prog_gnu_ld+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+ # I'd rather use --version here, but apparently some GNU lds only accept -v.
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
@@ -3535,7 +3535,7 @@ reload_cmds='$LD$reload_flag -o $output$
case $host_os in
darwin*)
if test "$GCC" = yes; then
- reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs'
+ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
else
reload_cmds='$LD$reload_flag -o $output$reload_objs'
fi
@@ -3551,36 +3551,43 @@ else
# Let the user override the test.
lt_cv_path_NM="$NM"
else
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
- IFS="$lt_save_ifs"
- test -z "$ac_dir" && ac_dir=.
- tmp_nm="$ac_dir/${ac_tool_prefix}nm"
- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
- # Check to see if the nm accepts a BSD-compat flag.
- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
- # nm: unknown option "B" ignored
- # Tru64's nm complains that /dev/null is an invalid object file
- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
- */dev/null* | *'Invalid file or object type'*)
- lt_cv_path_NM="$tmp_nm -B"
- break
- ;;
- *)
- case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
- */dev/null*)
- lt_cv_path_NM="$tmp_nm -p"
+ lt_nm_to_check="${ac_tool_prefix}nm"
+ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+ lt_nm_to_check="$lt_nm_to_check nm"
+ fi
+ for lt_tmp_nm in $lt_nm_to_check; do
+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+ IFS="$lt_save_ifs"
+ test -z "$ac_dir" && ac_dir=.
+ tmp_nm="$ac_dir/$lt_tmp_nm"
+ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+ # Check to see if the nm accepts a BSD-compat flag.
+ # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+ # nm: unknown option "B" ignored
+ # Tru64's nm complains that /dev/null is an invalid object file
+ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+ */dev/null* | *'Invalid file or object type'*)
+ lt_cv_path_NM="$tmp_nm -B"
break
;;
*)
- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
- continue # so that we can try to find one that supports BSD flags
+ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+ */dev/null*)
+ lt_cv_path_NM="$tmp_nm -p"
+ break
+ ;;
+ *)
+ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+ continue # so that we can try to find one that supports BSD flags
+ ;;
+ esac
;;
esac
- esac
- fi
+ fi
+ done
+ IFS="$lt_save_ifs"
done
- IFS="$lt_save_ifs"
test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
fi
fi
@@ -3672,7 +3679,7 @@ gnu*)
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
- case "$host_cpu" in
+ case $host_cpu in
ia64*)
lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
@@ -3688,6 +3695,11 @@ hpux10.20* | hpux11*)
esac
;;
+interix3*)
+ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
+ ;;
+
irix5* | irix6* | nonstopux*)
case $LD in
*-32|*"-32 ") libmagic=32-bit;;
@@ -3733,15 +3745,11 @@ osf3* | osf4* | osf5*)
lt_cv_deplibs_check_method=pass_all
;;
-sco3.2v5*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
solaris*)
lt_cv_deplibs_check_method=pass_all
;;
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+sysv4 | sysv4.3*)
case $host_vendor in
motorola)
lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
@@ -3762,10 +3770,13 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
siemens)
lt_cv_deplibs_check_method=pass_all
;;
+ pc)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
esac
;;
-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7* | sysv4*uw2*)
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
lt_cv_deplibs_check_method=pass_all
;;
esac
@@ -3783,6 +3794,9 @@ test -z "$deplibs_check_method" && depli
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
# Allow CC to be a program name with arguments.
compiler=$CC
@@ -3818,7 +3832,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 3821 "configure"' > conftest.$ac_ext
+ echo '#line 3835 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -3861,7 +3875,7 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*li
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- case "`/usr/bin/file conftest.o`" in
+ case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
x86_64-*linux*)
@@ -3974,6 +3988,26 @@ echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
CFLAGS="$SAVE_CFLAGS"
fi
;;
+sparc*-*solaris*)
+ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ case `/usr/bin/file conftest.o` in
+ *64-bit*)
+ case $lt_cv_prog_gnu_ld in
+ yes*) LD="${LD-ld} -m elf64_sparc" ;;
+ *) LD="${LD-ld} -64" ;;
+ esac
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+
esac
@@ -5397,7 +5431,7 @@ fi
# Provide some information about the compiler.
-echo "$as_me:5400:" \
+echo "$as_me:5434:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -5594,12 +5628,18 @@ else
elif test -x /usr/sbin/sysctl; then
lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
else
- lt_cv_sys_max_cmd_len=65536 # usable default for *BSD
+ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs
fi
# And add a safety zone
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
;;
+
+ interix*)
+ # We know the value 262144 and hardcode it with a safety zone (like BSD)
+ lt_cv_sys_max_cmd_len=196608
+ ;;
+
osf*)
# Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
# due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -5613,6 +5653,17 @@ else
esac
fi
;;
+ sco3.2v5*)
+ lt_cv_sys_max_cmd_len=102400
+ ;;
+ sysv5* | sco5v6* | sysv4.2uw2*)
+ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+ if test -n "$kargmax"; then
+ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'`
+ else
+ lt_cv_sys_max_cmd_len=32768
+ fi
+ ;;
*)
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
@@ -5698,9 +5749,18 @@ irix* | nonstopux*)
osf*)
symcode='[BCDEGQRST]'
;;
-solaris* | sysv5*)
+solaris*)
symcode='[BDRT]'
;;
+sco3.2v5*)
+ symcode='[DT]'
+ ;;
+sysv4.2uw2*)
+ symcode='[DT]'
+ ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+ symcode='[ABDT]'
+ ;;
sysv4)
symcode='[DFNSTU]'
;;
@@ -5909,7 +5969,7 @@ rm="rm -f"
default_ofile=libtool
can_build_shared=yes
-# All known linkers require a `.a' archive for static linking (except M$VC,
+# All known linkers require a `.a' archive for static linking (except MSVC,
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
@@ -6166,6 +6226,7 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
test -z "$AS" && AS=as
test -z "$CC" && CC=cc
test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
test -z "$DLLTOOL" && DLLTOOL=dlltool
test -z "$LD" && LD=ld
test -z "$LN_S" && LN_S="ln -s"
@@ -6185,10 +6246,10 @@ old_postuninstall_cmds=
if test -n "$RANLIB"; then
case $host_os in
openbsd*)
- old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
;;
*)
- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
;;
esac
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
@@ -6230,7 +6291,7 @@ else
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
- file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
+ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
@@ -6292,7 +6353,7 @@ else
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
- file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
+ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
@@ -6387,6 +6448,9 @@ lt_simple_link_test_code='int main(){ret
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
# Allow CC to be a program name with arguments.
compiler=$CC
@@ -6394,82 +6458,17 @@ compiler=$CC
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_compiler_boilerplate=`cat conftest.err`
$rm conftest*
ac_outfile=conftest.$ac_objext
printf "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
-#
-# Check for any special shared library compilation flags.
-#
-lt_prog_cc_shlib=
-if test "$GCC" = no; then
- case $host_os in
- sco3.2v5*)
- lt_prog_cc_shlib='-belf'
- ;;
- esac
-fi
-if test -n "$lt_prog_cc_shlib"; then
- { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&5
-echo "$as_me: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&2;}
- if echo "$old_CC $old_CFLAGS " | grep "[ ]$lt_prog_cc_shlib[ ]" >/dev/null; then :
- else
- { echo "$as_me:$LINENO: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5
-echo "$as_me: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;}
- lt_cv_prog_cc_can_build_shared=no
- fi
-fi
-
-
-#
-# Check to make sure the static flag actually works.
-#
-echo "$as_me:$LINENO: checking if $compiler static flag $lt_prog_compiler_static works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_prog_compiler_static works... $ECHO_C" >&6
-if test "${lt_prog_compiler_static_works+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- lt_prog_compiler_static_works=no
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS $lt_prog_compiler_static"
- printf "$lt_simple_link_test_code" > conftest.$ac_ext
- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
- if test -s conftest.err; then
- # Append any errors to the config.log.
- cat conftest.err 1>&5
- $echo "X$_lt_linker_boilerplate" | $Xsed > conftest.exp
- $SED '/^$/d' conftest.err >conftest.er2
- if diff conftest.exp conftest.er2 >/dev/null; then
- lt_prog_compiler_static_works=yes
- fi
- else
- lt_prog_compiler_static_works=yes
- fi
- fi
- $rm conftest*
- LDFLAGS="$save_LDFLAGS"
-
-fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6
-
-if test x"$lt_prog_compiler_static_works" = xyes; then
- :
-else
- lt_prog_compiler_static=
-fi
-
-
-
lt_prog_compiler_no_builtin_flag=
@@ -6492,20 +6491,20 @@ else
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6498: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6497: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6502: \$? = $ac_status" >&5
+ echo "$as_me:6501: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
- $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
- $SED '/^$/d' conftest.err >conftest.er2
- if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_rtti_exceptions=yes
fi
fi
@@ -6566,6 +6565,11 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_pic='-fno-common'
;;
+ interix3*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+ # Instead, we relocate shared libraries at runtime.
+ ;;
+
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
@@ -6582,7 +6586,7 @@ echo $ECHO_N "checking for $compiler opt
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
- case "$host_cpu" in
+ case $host_cpu in
hppa*64*|ia64*)
# +Z the default
;;
@@ -6629,7 +6633,7 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_wl='-Wl,'
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
- case "$host_cpu" in
+ case $host_cpu in
hppa*64*|ia64*)
# +Z the default
;;
@@ -6659,12 +6663,12 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-static'
;;
- pgcc* | pgf77* | pgf90*)
+ pgcc* | pgf77* | pgf90* | pgf95*)
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-fpic'
- lt_prog_compiler_static='-static'
+ lt_prog_compiler_static='-Bstatic'
;;
ccc*)
lt_prog_compiler_wl='-Wl,'
@@ -6680,11 +6684,6 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_static='-non_shared'
;;
- sco3.2v5*)
- lt_prog_compiler_pic='-Kpic'
- lt_prog_compiler_static='-dn'
- ;;
-
solaris*)
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
@@ -6702,7 +6701,7 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_static='-Bstatic'
;;
- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+ sysv4 | sysv4.2uw2* | sysv4.3*)
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
@@ -6715,6 +6714,12 @@ echo $ECHO_N "checking for $compiler opt
fi
;;
+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-KPIC'
+ lt_prog_compiler_static='-Bstatic'
+ ;;
+
unicos*)
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_can_build_shared=no
@@ -6754,20 +6759,20 @@ else
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6760: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6765: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6764: \$? = $ac_status" >&5
+ echo "$as_me:6769: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
- $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
- $SED '/^$/d' conftest.err >conftest.er2
- if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_prog_compiler_pic_works=yes
fi
fi
@@ -6788,7 +6793,7 @@ else
fi
fi
-case "$host_os" in
+case $host_os in
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic=
@@ -6798,6 +6803,48 @@ case "$host_os" in
;;
esac
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
+if test "${lt_prog_compiler_static_works+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ lt_prog_compiler_static_works=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+ printf "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+ # The linker can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+ if test -s conftest.err; then
+ # Append any errors to the config.log.
+ cat conftest.err 1>&5
+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if diff conftest.exp conftest.er2 >/dev/null; then
+ lt_prog_compiler_static_works=yes
+ fi
+ else
+ lt_prog_compiler_static_works=yes
+ fi
+ fi
+ $rm conftest*
+ LDFLAGS="$save_LDFLAGS"
+
+fi
+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
+echo "${ECHO_T}$lt_prog_compiler_static_works" >&6
+
+if test x"$lt_prog_compiler_static_works" = xyes; then
+ :
+else
+ lt_prog_compiler_static=
+fi
+
+
echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
if test "${lt_cv_prog_compiler_c_o+set}" = set; then
@@ -6816,25 +6863,25 @@ else
# Note that $ac_compile itself does not contain backslashes and begins
# with a dollar sign (not a hyphen), so the echo should work correctly.
lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6822: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6869: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:6826: \$? = $ac_status" >&5
+ echo "$as_me:6873: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
- $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
- $SED '/^$/d' out/conftest.err >out/conftest.er2
- if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o=yes
fi
fi
- chmod u+w .
+ chmod u+w . 2>&5
$rm conftest*
# SGI C++ compiler will create directory out/ii_files/ for
# template instantiation
@@ -6930,6 +6977,10 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -
with_gnu_ld=no
fi
;;
+ interix*)
+ # we just hope/assume this is gcc and not c89 (= MSVC++)
+ with_gnu_ld=yes
+ ;;
openbsd*)
with_gnu_ld=no
;;
@@ -7014,7 +7065,7 @@ EOF
export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
@@ -7023,22 +7074,37 @@ EOF
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
else
ld_shlibs=no
fi
;;
+ interix3*)
+ hardcode_direct=no
+ hardcode_shlibpath_var=no
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ export_dynamic_flag_spec='${wl}-E'
+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+ # Instead, shared libraries are loaded at an image base (0x10000000 by
+ # default) and relocated if they conflict, which is a slow very memory
+ # consuming and fragmenting process. To avoid this, we pick a random,
+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
+
linux*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
pgcc*) # Portland Group C compiler
- whole_archive_flag_spec='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
tmp_addflag=' $pic_flag'
;;
- pgf77* | pgf90* ) # Portland Group f77 and f90 compilers
- whole_archive_flag_spec='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
@@ -7070,7 +7136,7 @@ EOF
fi
;;
- solaris* | sysv5*)
+ solaris*)
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs=no
cat <<EOF 1>&2
@@ -7091,6 +7157,33 @@ EOF
fi
;;
+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+ case `$LD -v 2>&1` in
+ *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+ ld_shlibs=no
+ cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems. Therefore, libtool
+*** is disabling shared libraries support. We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+ ;;
+ *)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
+ else
+ ld_shlibs=no
+ fi
+ ;;
+ esac
+ ;;
+
sunos4*)
archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
@@ -7124,7 +7217,7 @@ EOF
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L=yes
- if test "$GCC" = yes && test -z "$link_static_flag"; then
+ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct=unsupported
@@ -7158,6 +7251,7 @@ EOF
break
fi
done
+ ;;
esac
exp_sym_flag='-bexport'
@@ -7195,6 +7289,7 @@ EOF
hardcode_libdir_flag_spec='-L$libdir'
hardcode_libdir_separator=
fi
+ ;;
esac
shared_flag='-shared'
if test "$aix_use_runtimelinking" = yes; then
@@ -7207,11 +7302,11 @@ EOF
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
- if test "$aix_use_runtimelinking" = yes; then
+ if test "$aix_use_runtimelinking" = yes; then
shared_flag='${wl}-G'
else
shared_flag='${wl}-bM:SRE'
- fi
+ fi
fi
fi
@@ -7276,12 +7371,12 @@ rm -f conftest.err conftest.$ac_objext \
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
- archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
else
if test "$host_cpu" = ia64; then
hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
allow_undefined_flag="-z nodefs"
- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
@@ -7341,13 +7436,11 @@ if test -z "$aix_libpath"; then aix_libp
# -berok will link without error, but may produce a broken library.
no_undefined_flag=' ${wl}-bernotok'
allow_undefined_flag=' ${wl}-berok'
- # -bexpall does not export symbols beginning with underscore (_)
- always_export_symbols=yes
# Exported symbols can be pulled into shared objects from archives
- whole_archive_flag_spec=' '
+ whole_archive_flag_spec='$convenience'
archive_cmds_need_lc=yes
- # This is similar to how AIX traditionally builds it's shared libraries.
- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ # This is similar to how AIX traditionally builds its shared libraries.
+ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
fi
fi
;;
@@ -7386,7 +7479,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
darwin* | rhapsody*)
- case "$host_os" in
+ case $host_os in
rhapsody* | darwin1.[012])
allow_undefined_flag='${wl}-undefined ${wl}suppress'
;;
@@ -7415,7 +7508,7 @@ if test -z "$aix_libpath"; then aix_libp
output_verbose_link_cmd='echo'
archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
else
@@ -7424,7 +7517,7 @@ if test -z "$aix_libpath"; then aix_libp
output_verbose_link_cmd='echo'
archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
@@ -7488,47 +7581,62 @@ if test -z "$aix_libpath"; then aix_libp
export_dynamic_flag_spec='${wl}-E'
;;
- hpux10* | hpux11*)
+ hpux10*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- case "$host_cpu" in
- hppa*64*|ia64*)
+ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+ fi
+ if test "$with_gnu_ld" = no; then
+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ hardcode_libdir_separator=:
+
+ hardcode_direct=yes
+ export_dynamic_flag_spec='${wl}-E'
+
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+ hardcode_minus_L=yes
+ fi
+ ;;
+
+ hpux11*)
+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ case $host_cpu in
+ hppa*64*)
archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
+ ia64*)
+ archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
*)
archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
else
- case "$host_cpu" in
- hppa*64*|ia64*)
- archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+ case $host_cpu in
+ hppa*64*)
+ archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ ia64*)
+ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
fi
if test "$with_gnu_ld" = no; then
- case "$host_cpu" in
- hppa*64*)
- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ hardcode_libdir_separator=:
+
+ case $host_cpu in
+ hppa*64*|ia64*)
hardcode_libdir_flag_spec_ld='+b $libdir'
- hardcode_libdir_separator=:
- hardcode_direct=no
- hardcode_shlibpath_var=no
- ;;
- ia64*)
- hardcode_libdir_flag_spec='-L$libdir'
hardcode_direct=no
hardcode_shlibpath_var=no
-
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- hardcode_minus_L=yes
;;
*)
- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
- hardcode_libdir_separator=:
hardcode_direct=yes
export_dynamic_flag_spec='${wl}-E'
@@ -7630,14 +7738,6 @@ if test -z "$aix_libpath"; then aix_libp
hardcode_libdir_separator=:
;;
- sco3.2v5*)
- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_shlibpath_var=no
- export_dynamic_flag_spec='${wl}-Bexport'
- runpath_var=LD_RUN_PATH
- hardcode_runpath_var=yes
- ;;
-
solaris*)
no_undefined_flag=' -z text'
if test "$GCC" = yes; then
@@ -7723,36 +7823,45 @@ if test -z "$aix_libpath"; then aix_libp
fi
;;
- sysv4.2uw2*)
- archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
- hardcode_direct=yes
- hardcode_minus_L=no
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+ no_undefined_flag='${wl}-z,text'
+ archive_cmds_need_lc=no
hardcode_shlibpath_var=no
- hardcode_runpath_var=yes
- runpath_var=LD_RUN_PATH
- ;;
+ runpath_var='LD_RUN_PATH'
- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
- no_undefined_flag='${wl}-z ${wl}text'
if test "$GCC" = yes; then
- archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
else
- archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
fi
- runpath_var='LD_RUN_PATH'
- hardcode_shlibpath_var=no
;;
- sysv5*)
- no_undefined_flag=' -z text'
- # $CC -shared without GNU ld will not create a library from C++
- # object files and a static libstdc++, better avoid it by now
- archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
- hardcode_libdir_flag_spec=
+ sysv5* | sco3.2v5* | sco5v6*)
+ # Note: We can NOT use -z defs as we might desire, because we do not
+ # link with -lc, and that would cause any symbols used from libc to
+ # always be unresolved, which means just about no library would
+ # ever link correctly. If we're not using GNU ld we use -z text
+ # though, which does catch some bad symbols but isn't as heavy-handed
+ # as -z defs.
+ no_undefined_flag='${wl}-z,text'
+ allow_undefined_flag='${wl}-z,nodefs'
+ archive_cmds_need_lc=no
hardcode_shlibpath_var=no
+ hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+ hardcode_libdir_separator=':'
+ link_all_deplibs=yes
+ export_dynamic_flag_spec='${wl}-Bexport'
runpath_var='LD_RUN_PATH'
+
+ if test "$GCC" = yes; then
+ archive_cmds='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ archive_cmds='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ fi
;;
uts4*)
@@ -7771,11 +7880,6 @@ echo "$as_me:$LINENO: result: $ld_shlibs
echo "${ECHO_T}$ld_shlibs" >&6
test "$ld_shlibs" = no && can_build_shared=no
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
#
# Do we need to explicitly link libc?
#
@@ -7808,6 +7912,7 @@ echo $ECHO_N "checking whether -lc shoul
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl
+ pic_flag=$lt_prog_compiler_pic
compiler_flags=-v
linker_flags=-v
verstring=
@@ -7968,7 +8073,8 @@ cygwin* | mingw* | pw32*)
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
- $install_prog $dir/$dlname \$dldir/$dlname'
+ $install_prog $dir/$dlname \$dldir/$dlname~
+ chmod a+x \$dldir/$dlname'
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
@@ -8021,7 +8127,7 @@ darwin* | rhapsody*)
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
- shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
@@ -8059,7 +8165,14 @@ kfreebsd*-gnu)
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+ if test -x /usr/bin/objformat; then
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+ freebsd[123]*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
@@ -8081,10 +8194,15 @@ freebsd* | dragonfly*)
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
- *) # from 3.2 on
+ freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+ freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
+ freebsd*) # from 4.6 on
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
esac
;;
@@ -8104,7 +8222,7 @@ hpux9* | hpux10* | hpux11*)
version_type=sunos
need_lib_prefix=no
need_version=no
- case "$host_cpu" in
+ case $host_cpu in
ia64*)
shrext_cmds='.so'
hardcode_into_libs=yes
@@ -8144,6 +8262,18 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib'
;;
+interix3*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
@@ -8205,7 +8335,7 @@ linux*)
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 8208 "configure"' > conftest.$ac_ext
+ echo '#line 8338 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -8286,6 +8416,7 @@ nto-qnx*)
openbsd*)
version_type=sunos
+ sys_lib_dlsearch_path_spec="/usr/lib"
need_lib_prefix=no
# Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
case $host_os in
@@ -8329,13 +8460,6 @@ osf3* | osf4* | osf5*)
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
-sco3.2v5*)
- version_type=osf
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- ;;
-
solaris*)
version_type=linux
need_lib_prefix=no
@@ -8361,7 +8485,7 @@ sunos4*)
need_version=yes
;;
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+sysv4 | sysv4.3*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
@@ -8394,6 +8518,29 @@ sysv4*MP*)
fi
;;
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ version_type=freebsd-elf
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ hardcode_into_libs=yes
+ if test "$with_gnu_ld" = yes; then
+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+ shlibpath_overrides_runpath=no
+ else
+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+ shlibpath_overrides_runpath=yes
+ case $host_os in
+ sco3.2v5*)
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+ ;;
+ esac
+ fi
+ sys_lib_dlsearch_path_spec='/usr/lib'
+ ;;
+
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -8409,6 +8556,11 @@ echo "$as_me:$LINENO: result: $dynamic_l
echo "${ECHO_T}$dynamic_linker" >&6
test "$dynamic_linker" = no && can_build_shared=no
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
hardcode_action=
@@ -9064,7 +9216,7 @@ fi
test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
save_LDFLAGS="$LDFLAGS"
- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -9080,7 +9232,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9083 "configure"
+#line 9235 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9137,6 +9289,8 @@ int main ()
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
+ else
+ puts (dlerror ());
exit (status);
}
@@ -9146,12 +9300,12 @@ EOF
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
- (./conftest; exit; ) 2>/dev/null
+ (./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
- x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
+ x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
esac
else :
# compilation failed
@@ -9166,7 +9320,7 @@ echo "$as_me:$LINENO: result: $lt_cv_dlo
echo "${ECHO_T}$lt_cv_dlopen_self" >&6
if test "x$lt_cv_dlopen_self" = xyes; then
- LDFLAGS="$LDFLAGS $link_static_flag"
+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
if test "${lt_cv_dlopen_self_static+set}" = set; then
@@ -9178,7 +9332,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9181 "configure"
+#line 9335 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9235,6 +9389,8 @@ int main ()
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
+ else
+ puts (dlerror ());
exit (status);
}
@@ -9244,12 +9400,12 @@ EOF
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
- (./conftest; exit; ) 2>/dev/null
+ (./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
- x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
+ x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
esac
else :
# compilation failed
@@ -9282,7 +9438,7 @@ echo "${ECHO_T}$lt_cv_dlopen_self_static
fi
-# Report which librarie types wil actually be built
+# Report which library types will actually be built
echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
echo "$as_me:$LINENO: result: $can_build_shared" >&5
@@ -9294,7 +9450,7 @@ test "$can_build_shared" = "no" && enabl
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
-case "$host_os" in
+case $host_os in
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
@@ -9332,7 +9488,7 @@ if test -f "$ltmain"; then
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
SED SHELL STRIP \
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
@@ -9498,6 +9654,9 @@ AR_FLAGS=$lt_AR_FLAGS
# A C compiler.
LTCC=$lt_LTCC
+# LTCC compiler flags.
+LTCFLAGS=$lt_LTCFLAGS
+
# A language-specific compiler.
CC=$lt_compiler
@@ -9828,6 +9987,9 @@ echo "$as_me: WARNING: output file \`$of
echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
fi
fi
+ if test -z "$LTCFLAGS"; then
+ eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
+ fi
# Extract list of available tagged configurations in $ofile.
# Note that this assumes the entire list is on one line.
@@ -9880,6 +10042,7 @@ hardcode_libdir_flag_spec_CXX=
hardcode_libdir_flag_spec_ld_CXX=
hardcode_libdir_separator_CXX=
hardcode_minus_L_CXX=no
+hardcode_shlibpath_var_CXX=unsupported
hardcode_automatic_CXX=no
module_cmds_CXX=
module_expsym_cmds_CXX=
@@ -9897,7 +10060,7 @@ postdeps_CXX=
compiler_lib_search_path_CXX=
# Source file extension for C++ test sources.
-ac_ext=cc
+ac_ext=cpp
# Object file extension for compiled C++ test sources.
objext=o
@@ -9907,13 +10070,16 @@ objext_CXX=$objext
lt_simple_compile_test_code="int some_variable = 0;\n"
# Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *) { return(0); }\n'
+lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
# Allow CC to be a program name with arguments.
compiler=$CC
@@ -9921,13 +10087,13 @@ compiler=$CC
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_compiler_boilerplate=`cat conftest.err`
$rm conftest*
ac_outfile=conftest.$ac_objext
printf "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
@@ -9942,12 +10108,12 @@ lt_save_path_LD=$lt_cv_path_LD
if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
else
- unset lt_cv_prog_gnu_ld
+ $as_unset lt_cv_prog_gnu_ld
fi
if test -n "${lt_cv_path_LDCXX+set}"; then
lt_cv_path_LD=$lt_cv_path_LDCXX
else
- unset lt_cv_path_LD
+ $as_unset lt_cv_path_LD
fi
test -z "${LDCXX+set}" || LD=$LDCXX
CC=${CXX-"c++"}
@@ -10033,7 +10199,7 @@ else
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
lt_cv_path_LD="$ac_dir/$ac_prog"
# Check to see if the program is GNU ld. I'd rather use --version,
- # but apparently some GNU ld's only accept -v.
+ # but apparently some variants of GNU ld only accept -v.
# Break only if it was the GNU/non-GNU ld that we prefer.
case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
@@ -10067,7 +10233,7 @@ echo $ECHO_N "checking if the linker ($L
if test "${lt_cv_prog_gnu_ld+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+ # I'd rather use --version here, but apparently some GNU lds only accept -v.
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
@@ -10158,6 +10324,7 @@ case $host_os in
;;
esac
done
+ ;;
esac
exp_sym_flag='-bexport'
@@ -10195,6 +10362,7 @@ case $host_os in
hardcode_libdir_flag_spec_CXX='-L$libdir'
hardcode_libdir_separator_CXX=
fi
+ ;;
esac
shared_flag='-shared'
if test "$aix_use_runtimelinking" = yes; then
@@ -10277,12 +10445,12 @@ if test -z "$aix_libpath"; then aix_libp
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
- archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
else
if test "$host_cpu" = ia64; then
hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
allow_undefined_flag_CXX="-z nodefs"
- archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+ archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
@@ -10342,16 +10510,26 @@ if test -z "$aix_libpath"; then aix_libp
# -berok will link without error, but may produce a broken library.
no_undefined_flag_CXX=' ${wl}-bernotok'
allow_undefined_flag_CXX=' ${wl}-berok'
- # -bexpall does not export symbols beginning with underscore (_)
- always_export_symbols_CXX=yes
# Exported symbols can be pulled into shared objects from archives
- whole_archive_flag_spec_CXX=' '
+ whole_archive_flag_spec_CXX='$convenience'
archive_cmds_need_lc_CXX=yes
- # This is similar to how AIX traditionally builds it's shared libraries.
- archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ # This is similar to how AIX traditionally builds its shared libraries.
+ archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
fi
fi
;;
+
+ beos*)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ allow_undefined_flag_CXX=unsupported
+ # Joseph Beckenbach <jrb3 best com> says some releases of gcc
+ # support --undefined. This deserves some investigation. FIXME
+ archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ else
+ ld_shlibs_CXX=no
+ fi
+ ;;
+
chorus*)
case $cc_basename in
*)
@@ -10361,7 +10539,6 @@ if test -z "$aix_libpath"; then aix_libp
esac
;;
-
cygwin* | mingw* | pw32*)
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
# as there is no search path for DLLs.
@@ -10371,7 +10548,7 @@ if test -z "$aix_libpath"; then aix_libp
enable_shared_with_static_runtimes_CXX=yes
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
@@ -10380,13 +10557,13 @@ if test -z "$aix_libpath"; then aix_libp
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
else
ld_shlibs_CXX=no
fi
;;
darwin* | rhapsody*)
- case "$host_os" in
+ case $host_os in
rhapsody* | darwin1.[012])
allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
;;
@@ -10424,7 +10601,7 @@ if test -z "$aix_libpath"; then aix_libp
archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
fi
module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
else
@@ -10437,7 +10614,7 @@ if test -z "$aix_libpath"; then aix_libp
output_verbose_link_cmd='echo'
archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
@@ -10517,33 +10694,22 @@ if test -z "$aix_libpath"; then aix_libp
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
- case "$host_cpu" in
- hppa*64*)
- hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+ hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+ hardcode_libdir_separator_CXX=:
+
+ case $host_cpu in
+ hppa*64*|ia64*)
hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
- hardcode_libdir_separator_CXX=:
- ;;
- ia64*)
- hardcode_libdir_flag_spec_CXX='-L$libdir'
;;
*)
- hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
- hardcode_libdir_separator_CXX=:
export_dynamic_flag_spec_CXX='${wl}-E'
;;
esac
fi
- case "$host_cpu" in
- hppa*64*)
- hardcode_direct_CXX=no
- hardcode_shlibpath_var_CXX=no
- ;;
- ia64*)
+ case $host_cpu in
+ hppa*64*|ia64*)
hardcode_direct_CXX=no
hardcode_shlibpath_var_CXX=no
- hardcode_minus_L_CXX=yes # Not in the search PATH,
- # but as the default
- # location of the library.
;;
*)
hardcode_direct_CXX=yes
@@ -10559,9 +10725,12 @@ if test -z "$aix_libpath"; then aix_libp
ld_shlibs_CXX=no
;;
aCC*)
- case "$host_cpu" in
- hppa*64*|ia64*)
- archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+ case $host_cpu in
+ hppa*64*)
+ archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ ia64*)
+ archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
*)
archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
@@ -10580,9 +10749,12 @@ if test -z "$aix_libpath"; then aix_libp
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
- case "$host_cpu" in
- ia64*|hppa*64*)
- archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+ case $host_cpu in
+ hppa*64*)
+ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ ia64*)
+ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
*)
archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
@@ -10596,6 +10768,20 @@ if test -z "$aix_libpath"; then aix_libp
;;
esac
;;
+ interix3*)
+ hardcode_direct_CXX=no
+ hardcode_shlibpath_var_CXX=no
+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+ export_dynamic_flag_spec_CXX='${wl}-E'
+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+ # Instead, shared libraries are loaded at an image base (0x10000000 by
+ # default) and relocated if they conflict, which is a slow very memory
+ # consuming and fragmenting process. To avoid this, we pick a random,
+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
+ archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
irix5* | irix6*)
case $cc_basename in
CC*)
@@ -10681,7 +10867,7 @@ if test -z "$aix_libpath"; then aix_libp
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
- whole_archive_flag_spec_CXX='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
;;
cxx*)
# Compaq C++
@@ -10878,19 +11064,6 @@ if test -z "$aix_libpath"; then aix_libp
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
- sco*)
- archive_cmds_need_lc_CXX=no
- case $cc_basename in
- CC*)
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- ;;
- *)
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- ;;
- esac
- ;;
sunos4*)
case $cc_basename in
CC*)
@@ -10913,10 +11086,11 @@ if test -z "$aix_libpath"; then aix_libp
case $cc_basename in
CC*)
# Sun C++ 4.2, 5.x and Centerline C++
+ archive_cmds_need_lc_CXX=yes
no_undefined_flag_CXX=' -zdefs'
- archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+ $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-R$libdir'
hardcode_shlibpath_var_CXX=no
@@ -10936,15 +11110,7 @@ if test -z "$aix_libpath"; then aix_libp
esac
link_all_deplibs_CXX=yes
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- #
- # There doesn't appear to be a way to prevent this compiler from
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[LR]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ output_verbose_link_cmd='echo'
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
@@ -10990,8 +11156,59 @@ if test -z "$aix_libpath"; then aix_libp
;;
esac
;;
- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+ no_undefined_flag_CXX='${wl}-z,text'
+ archive_cmds_need_lc_CXX=no
+ hardcode_shlibpath_var_CXX=no
+ runpath_var='LD_RUN_PATH'
+
+ case $cc_basename in
+ CC*)
+ archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ *)
+ archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ ;;
+ sysv5* | sco3.2v5* | sco5v6*)
+ # Note: We can NOT use -z defs as we might desire, because we do not
+ # link with -lc, and that would cause any symbols used from libc to
+ # always be unresolved, which means just about no library would
+ # ever link correctly. If we're not using GNU ld we use -z text
+ # though, which does catch some bad symbols but isn't as heavy-handed
+ # as -z defs.
+ # For security reasons, it is highly recommended that you always
+ # use absolute paths for naming shared libraries, and exclude the
+ # DT_RUNPATH tag from executables and libraries. But doing so
+ # requires that you compile everything twice, which is a pain.
+ # So that behaviour is only enabled if SCOABSPATH is set to a
+ # non-empty value in the environment. Most likely only useful for
+ # creating official distributions of packages.
+ # This is a hack until libtool officially supports absolute path
+ # names for shared libraries.
+ no_undefined_flag_CXX='${wl}-z,text'
+ allow_undefined_flag_CXX='${wl}-z,nodefs'
archive_cmds_need_lc_CXX=no
+ hardcode_shlibpath_var_CXX=no
+ hardcode_libdir_flag_spec_CXX='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+ hardcode_libdir_separator_CXX=':'
+ link_all_deplibs_CXX=yes
+ export_dynamic_flag_spec_CXX='${wl}-Bexport'
+ runpath_var='LD_RUN_PATH'
+
+ case $cc_basename in
+ CC*)
+ archive_cmds_CXX='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ *)
+ archive_cmds_CXX='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
;;
tandem*)
case $cc_basename in
@@ -11048,7 +11265,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
# The `*' in the case matches for architectures that use `case' in
# $output_verbose_cmd can trigger glob expansion during the loop
# eval without this substitution.
- output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
+ output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
for p in `eval $output_verbose_link_cmd`; do
case $p in
@@ -11124,6 +11341,29 @@ fi
$rm -f confest.$objext
+# PORTME: override above test on systems where it is broken
+case $host_os in
+interix3*)
+ # Interix 3.5 installs completely hosed .la files for C++, so rather than
+ # hack all around it, let's just trust "g++" to DTRT.
+ predep_objects_CXX=
+ postdep_objects_CXX=
+ postdeps_CXX=
+ ;;
+
+solaris*)
+ case $cc_basename in
+ CC*)
+ # Adding this requires a known-good setup of shared libraries for
+ # Sun compiler versions before 5.6, else PIC objects from an old
+ # archive will be linked into the output, leading to subtle bugs.
+ postdeps_CXX='-lCstd -lCrun'
+ ;;
+ esac
+ ;;
+esac
+
+
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
@@ -11171,6 +11411,10 @@ echo $ECHO_N "checking for $compiler opt
# DJGPP does not support shared libraries at all
lt_prog_compiler_pic_CXX=
;;
+ interix3*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+ # Instead, we relocate shared libraries at runtime.
+ ;;
sysv4*MP*)
if test -d /usr/nec; then
lt_prog_compiler_pic_CXX=-Kconform_pic
@@ -11179,7 +11423,7 @@ echo $ECHO_N "checking for $compiler opt
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
- case "$host_cpu" in
+ case $host_cpu in
hppa*64*|ia64*)
;;
*)
@@ -11240,15 +11484,15 @@ echo $ECHO_N "checking for $compiler opt
case $cc_basename in
CC*)
lt_prog_compiler_wl_CXX='-Wl,'
- lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+ lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
if test "$host_cpu" != ia64; then
lt_prog_compiler_pic_CXX='+Z'
fi
;;
aCC*)
lt_prog_compiler_wl_CXX='-Wl,'
- lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
- case "$host_cpu" in
+ lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
+ case $host_cpu in
hppa*64*|ia64*)
# +Z the default
;;
@@ -11261,6 +11505,10 @@ echo $ECHO_N "checking for $compiler opt
;;
esac
;;
+ interix*)
+ # This is c89, which is MS Visual C++ (no shared libs)
+ # Anyone wants to do a port?
+ ;;
irix5* | irix6* | nonstopux*)
case $cc_basename in
CC*)
@@ -11289,7 +11537,7 @@ echo $ECHO_N "checking for $compiler opt
# Portland Group C++ compiler.
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_pic_CXX='-fpic'
- lt_prog_compiler_static_CXX='-static'
+ lt_prog_compiler_static_CXX='-Bstatic'
;;
cxx*)
# Compaq C++
@@ -11340,15 +11588,6 @@ echo $ECHO_N "checking for $compiler opt
;;
psos*)
;;
- sco*)
- case $cc_basename in
- CC*)
- lt_prog_compiler_pic_CXX='-fPIC'
- ;;
- *)
- ;;
- esac
- ;;
solaris*)
case $cc_basename in
CC*)
@@ -11390,7 +11629,14 @@ echo $ECHO_N "checking for $compiler opt
;;
esac
;;
- unixware*)
+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+ case $cc_basename in
+ CC*)
+ lt_prog_compiler_wl_CXX='-Wl,'
+ lt_prog_compiler_pic_CXX='-KPIC'
+ lt_prog_compiler_static_CXX='-Bstatic'
+ ;;
+ esac
;;
vxworks*)
;;
@@ -11423,20 +11669,20 @@ else
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11429: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11675: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11433: \$? = $ac_status" >&5
+ echo "$as_me:11679: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
- $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
- $SED '/^$/d' conftest.err >conftest.er2
- if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_prog_compiler_pic_works_CXX=yes
fi
fi
@@ -11457,7 +11703,7 @@ else
fi
fi
-case "$host_os" in
+case $host_os in
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_CXX=
@@ -11467,6 +11713,48 @@ case "$host_os" in
;;
esac
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
+if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ lt_prog_compiler_static_works_CXX=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+ printf "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+ # The linker can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+ if test -s conftest.err; then
+ # Append any errors to the config.log.
+ cat conftest.err 1>&5
+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if diff conftest.exp conftest.er2 >/dev/null; then
+ lt_prog_compiler_static_works_CXX=yes
+ fi
+ else
+ lt_prog_compiler_static_works_CXX=yes
+ fi
+ fi
+ $rm conftest*
+ LDFLAGS="$save_LDFLAGS"
+
+fi
+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
+echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6
+
+if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
+ :
+else
+ lt_prog_compiler_static_CXX=
+fi
+
+
echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
@@ -11485,25 +11773,25 @@ else
# Note that $ac_compile itself does not contain backslashes and begins
# with a dollar sign (not a hyphen), so the echo should work correctly.
lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11491: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11779: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11495: \$? = $ac_status" >&5
+ echo "$as_me:11783: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
- $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
- $SED '/^$/d' out/conftest.err >out/conftest.er2
- if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o_CXX=yes
fi
fi
- chmod u+w .
+ chmod u+w . 2>&5
$rm conftest*
# SGI C++ compiler will create directory out/ii_files/ for
# template instantiation
@@ -11569,11 +11857,6 @@ echo "$as_me:$LINENO: result: $ld_shlibs
echo "${ECHO_T}$ld_shlibs_CXX" >&6
test "$ld_shlibs_CXX" = no && can_build_shared=no
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
#
# Do we need to explicitly link libc?
#
@@ -11606,6 +11889,7 @@ echo $ECHO_N "checking whether -lc shoul
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_CXX
+ pic_flag=$lt_prog_compiler_pic_CXX
compiler_flags=-v
linker_flags=-v
verstring=
@@ -11766,7 +12050,8 @@ cygwin* | mingw* | pw32*)
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
- $install_prog $dir/$dlname \$dldir/$dlname'
+ $install_prog $dir/$dlname \$dldir/$dlname~
+ chmod a+x \$dldir/$dlname'
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
@@ -11819,7 +12104,7 @@ darwin* | rhapsody*)
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
- shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
@@ -11857,7 +12142,14 @@ kfreebsd*-gnu)
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+ if test -x /usr/bin/objformat; then
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+ freebsd[123]*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
@@ -11879,10 +12171,15 @@ freebsd* | dragonfly*)
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
- *) # from 3.2 on
+ freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+ freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
+ freebsd*) # from 4.6 on
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
esac
;;
@@ -11902,7 +12199,7 @@ hpux9* | hpux10* | hpux11*)
version_type=sunos
need_lib_prefix=no
need_version=no
- case "$host_cpu" in
+ case $host_cpu in
ia64*)
shrext_cmds='.so'
hardcode_into_libs=yes
@@ -11942,6 +12239,18 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib'
;;
+interix3*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
@@ -12003,7 +12312,7 @@ linux*)
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 12006 "configure"' > conftest.$ac_ext
+ echo '#line 12315 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -12084,6 +12393,7 @@ nto-qnx*)
openbsd*)
version_type=sunos
+ sys_lib_dlsearch_path_spec="/usr/lib"
need_lib_prefix=no
# Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
case $host_os in
@@ -12127,13 +12437,6 @@ osf3* | osf4* | osf5*)
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
-sco3.2v5*)
- version_type=osf
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- ;;
-
solaris*)
version_type=linux
need_lib_prefix=no
@@ -12159,7 +12462,7 @@ sunos4*)
need_version=yes
;;
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+sysv4 | sysv4.3*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
@@ -12192,6 +12495,29 @@ sysv4*MP*)
fi
;;
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ version_type=freebsd-elf
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ hardcode_into_libs=yes
+ if test "$with_gnu_ld" = yes; then
+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+ shlibpath_overrides_runpath=no
+ else
+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+ shlibpath_overrides_runpath=yes
+ case $host_os in
+ sco3.2v5*)
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+ ;;
+ esac
+ fi
+ sys_lib_dlsearch_path_spec='/usr/lib'
+ ;;
+
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -12207,6 +12533,11 @@ echo "$as_me:$LINENO: result: $dynamic_l
echo "${ECHO_T}$dynamic_linker" >&6
test "$dynamic_linker" = no && can_build_shared=no
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
hardcode_action_CXX=
@@ -12244,1147 +12575,315 @@ elif test "$shlibpath_overrides_runpath"
enable_fast_install=needless
fi
-striplib=
-old_striplib=
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
- test -z "$striplib" && striplib="$STRIP --strip-unneeded"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-# FIXME - insert some real tests, host_os isn't really good enough
- case $host_os in
- darwin*)
- if test -n "$STRIP" ; then
- striplib="$STRIP -x"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
- ;;
- *)
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- ;;
- esac
-fi
-
-if test "x$enable_dlopen" != xyes; then
- enable_dlopen=unknown
- enable_dlopen_self=unknown
- enable_dlopen_self_static=unknown
-else
- lt_cv_dlopen=no
- lt_cv_dlopen_libs=
-
- case $host_os in
- beos*)
- lt_cv_dlopen="load_add_on"
- lt_cv_dlopen_libs=
- lt_cv_dlopen_self=yes
- ;;
- mingw* | pw32*)
- lt_cv_dlopen="LoadLibrary"
- lt_cv_dlopen_libs=
- ;;
+# The else clause should only fire when bootstrapping the
+# libtool distribution, otherwise you forgot to ship ltmain.sh
+# with your package, and you will get complaints that there are
+# no rules to generate ltmain.sh.
+if test -f "$ltmain"; then
+ # See if we are running on zsh, and set the options which allow our commands through
+ # without removal of \ escapes.
+ if test -n "${ZSH_VERSION+set}" ; then
+ setopt NO_GLOB_SUBST
+ fi
+ # Now quote all the things that may contain metacharacters while being
+ # careful not to overquote the AC_SUBSTed values. We take copies of the
+ # variables and quote the copies for generation of the libtool script.
+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
+ SED SHELL STRIP \
+ libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+ old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+ deplibs_check_method reload_flag reload_cmds need_locks \
+ lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+ lt_cv_sys_global_symbol_to_c_name_address \
+ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+ old_postinstall_cmds old_postuninstall_cmds \
+ compiler_CXX \
+ CC_CXX \
+ LD_CXX \
+ lt_prog_compiler_wl_CXX \
+ lt_prog_compiler_pic_CXX \
+ lt_prog_compiler_static_CXX \
+ lt_prog_compiler_no_builtin_flag_CXX \
+ export_dynamic_flag_spec_CXX \
+ thread_safe_flag_spec_CXX \
+ whole_archive_flag_spec_CXX \
+ enable_shared_with_static_runtimes_CXX \
+ old_archive_cmds_CXX \
+ old_archive_from_new_cmds_CXX \
+ predep_objects_CXX \
+ postdep_objects_CXX \
+ predeps_CXX \
+ postdeps_CXX \
+ compiler_lib_search_path_CXX \
+ archive_cmds_CXX \
+ archive_expsym_cmds_CXX \
+ postinstall_cmds_CXX \
+ postuninstall_cmds_CXX \
+ old_archive_from_expsyms_cmds_CXX \
+ allow_undefined_flag_CXX \
+ no_undefined_flag_CXX \
+ export_symbols_cmds_CXX \
+ hardcode_libdir_flag_spec_CXX \
+ hardcode_libdir_flag_spec_ld_CXX \
+ hardcode_libdir_separator_CXX \
+ hardcode_automatic_CXX \
+ module_cmds_CXX \
+ module_expsym_cmds_CXX \
+ lt_cv_prog_compiler_c_o_CXX \
+ exclude_expsyms_CXX \
+ include_expsyms_CXX; do
- cygwin*)
- lt_cv_dlopen="dlopen"
- lt_cv_dlopen_libs=
- ;;
+ case $var in
+ old_archive_cmds_CXX | \
+ old_archive_from_new_cmds_CXX | \
+ archive_cmds_CXX | \
+ archive_expsym_cmds_CXX | \
+ module_cmds_CXX | \
+ module_expsym_cmds_CXX | \
+ old_archive_from_expsyms_cmds_CXX | \
+ export_symbols_cmds_CXX | \
+ extract_expsyms_cmds | reload_cmds | finish_cmds | \
+ postinstall_cmds | postuninstall_cmds | \
+ old_postinstall_cmds | old_postuninstall_cmds | \
+ sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+ # Double-quote double-evaled strings.
+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+ ;;
+ *)
+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+ ;;
+ esac
+ done
- darwin*)
- # if libdl is installed we need to link against it
- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
+ case $lt_echo in
+ *'\$0 --fallback-echo"')
+ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
+ ;;
+ esac
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_dl_dlopen=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+cfgfile="$ofile"
-ac_cv_lib_dl_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-if test $ac_cv_lib_dl_dlopen = yes; then
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
+ cat <<__EOF__ >> "$cfgfile"
+# ### BEGIN LIBTOOL TAG CONFIG: $tagname
- lt_cv_dlopen="dyld"
- lt_cv_dlopen_libs=
- lt_cv_dlopen_self=yes
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-fi
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
- ;;
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
- *)
- echo "$as_me:$LINENO: checking for shl_load" >&5
-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
-if test "${ac_cv_func_shl_load+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define shl_load innocuous_shl_load
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char shl_load (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc_CXX
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+# Whether or not to disallow shared libs when runtime libs are static
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
-#undef shl_load
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char shl_load ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_shl_load) || defined (__stub___shl_load)
-choke me
-#else
-char (*f) () = shl_load;
-#endif
-#ifdef __cplusplus
-}
-#endif
+# The host system.
+host_alias=$host_alias
+host=$host
+host_os=$host_os
-int
-main ()
-{
-return f != shl_load;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_func_shl_load=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
-ac_cv_func_shl_load=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-echo "${ECHO_T}$ac_cv_func_shl_load" >&6
-if test $ac_cv_func_shl_load = yes; then
- lt_cv_dlopen="shl_load"
-else
- echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
+# An echo program that does not interpret backslashes.
+echo=$lt_echo
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char shl_load ();
-int
-main ()
-{
-shl_load ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_dld_shl_load=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+# The archiver.
+AR=$lt_AR
+AR_FLAGS=$lt_AR_FLAGS
-ac_cv_lib_dld_shl_load=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
-if test $ac_cv_lib_dld_shl_load = yes; then
- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
-else
- echo "$as_me:$LINENO: checking for dlopen" >&5
-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
-if test "${ac_cv_func_dlopen+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define dlopen innocuous_dlopen
+# A C compiler.
+LTCC=$lt_LTCC
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char dlopen (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
+# LTCC compiler flags.
+LTCFLAGS=$lt_LTCFLAGS
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+# A language-specific compiler.
+CC=$lt_compiler_CXX
-#undef dlopen
+# Is the compiler the GNU C compiler?
+with_gcc=$GCC_CXX
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char dlopen ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_dlopen) || defined (__stub___dlopen)
-choke me
-#else
-char (*f) () = dlopen;
-#endif
-#ifdef __cplusplus
-}
-#endif
+# An ERE matcher.
+EGREP=$lt_EGREP
-int
-main ()
-{
-return f != dlopen;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_func_dlopen=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+# The linker used to build libraries.
+LD=$lt_LD_CXX
-ac_cv_func_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-echo "${ECHO_T}$ac_cv_func_dlopen" >&6
-if test $ac_cv_func_dlopen = yes; then
- lt_cv_dlopen="dlopen"
-else
- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
+# Whether we need hard or soft links.
+LN_S=$lt_LN_S
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_dl_dlopen=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+# A BSD-compatible nm program.
+NM=$lt_NM
-ac_cv_lib_dl_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-if test $ac_cv_lib_dl_dlopen = yes; then
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
- echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsvld $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
+# A symbol stripping program
+STRIP=$lt_STRIP
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_svld_dlopen=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+# Used to examine libraries when file_magic_cmd begins "file"
+MAGIC_CMD=$MAGIC_CMD
-ac_cv_lib_svld_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
-if test $ac_cv_lib_svld_dlopen = yes; then
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-else
- echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
+# Used on cygwin: DLL creation program.
+DLLTOOL="$DLLTOOL"
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char dld_link ();
-int
-main ()
-{
-dld_link ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_dld_dld_link=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+# Used on cygwin: object dumper.
+OBJDUMP="$OBJDUMP"
-ac_cv_lib_dld_dld_link=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
-if test $ac_cv_lib_dld_dld_link = yes; then
- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-fi
+# Used on cygwin: assembler.
+AS="$AS"
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
-fi
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl_CXX
-fi
+# Object file suffix (normally "o").
+objext="$ac_objext"
+# Old archive suffix (normally "a").
+libext="$libext"
-fi
+# Shared library suffix (normally ".so").
+shrext_cmds='$shrext_cmds'
+# Executable file suffix (normally "").
+exeext="$exeext"
-fi
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic_CXX
+pic_mode=$pic_mode
+# What is the maximum length of a command?
+max_cmd_len=$lt_cv_sys_max_cmd_len
-fi
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
- ;;
- esac
+# Must we lock files when doing compilation?
+need_locks=$lt_need_locks
- if test "x$lt_cv_dlopen" != xno; then
- enable_dlopen=yes
- else
- enable_dlopen=no
- fi
+# Do we need the lib prefix for modules?
+need_lib_prefix=$need_lib_prefix
- case $lt_cv_dlopen in
- dlopen)
- save_CPPFLAGS="$CPPFLAGS"
- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+# Do we need a version for libraries?
+need_version=$need_version
- save_LDFLAGS="$LDFLAGS"
- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
- save_LIBS="$LIBS"
- LIBS="$lt_cv_dlopen_libs $LIBS"
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
- echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
-if test "${lt_cv_dlopen_self+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test "$cross_compiling" = yes; then :
- lt_cv_dlopen_self=cross
-else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
-#line 12881 "configure"
-#include "confdefs.h"
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static_CXX
-#include <stdio.h>
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
-#else
-# ifdef DL_GLOBAL
-# define LT_DLGLOBAL DL_GLOBAL
-# else
-# define LT_DLGLOBAL 0
-# endif
-#endif
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
- find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-# ifdef RTLD_LAZY
-# define LT_DLLAZY_OR_NOW RTLD_LAZY
-# else
-# ifdef DL_LAZY
-# define LT_DLLAZY_OR_NOW DL_LAZY
-# else
-# ifdef RTLD_NOW
-# define LT_DLLAZY_OR_NOW RTLD_NOW
-# else
-# ifdef DL_NOW
-# define LT_DLLAZY_OR_NOW DL_NOW
-# else
-# define LT_DLLAZY_OR_NOW 0
-# endif
-# endif
-# endif
-# endif
-#endif
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
+# Compiler flag to generate thread-safe objects.
+thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
-void fnord() { int i=42;}
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
+# Library versioning type.
+version_type=$version_type
- if (self)
- {
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
-
- exit (status);
-}
-EOF
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
- (./conftest; exit; ) 2>/dev/null
- lt_status=$?
- case x$lt_status in
- x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
- x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
- x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
- esac
- else :
- # compilation failed
- lt_cv_dlopen_self=no
- fi
-fi
-rm -fr conftest*
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
+# List of archive names. First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME.
+library_names_spec=$lt_library_names_spec
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
- if test "x$lt_cv_dlopen_self" = xyes; then
- LDFLAGS="$LDFLAGS $link_static_flag"
- echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
-if test "${lt_cv_dlopen_self_static+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test "$cross_compiling" = yes; then :
- lt_cv_dlopen_self_static=cross
-else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
-#line 12979 "configure"
-#include "confdefs.h"
+# Commands used to build and install an old-style archive.
+RANLIB=$lt_RANLIB
+old_archive_cmds=$lt_old_archive_cmds_CXX
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
-#include <stdio.h>
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
-#else
-# ifdef DL_GLOBAL
-# define LT_DLGLOBAL DL_GLOBAL
-# else
-# define LT_DLGLOBAL 0
-# endif
-#endif
+# Commands used to build and install a shared archive.
+archive_cmds=$lt_archive_cmds_CXX
+archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
+postinstall_cmds=$lt_postinstall_cmds
+postuninstall_cmds=$lt_postuninstall_cmds
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
- find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-# ifdef RTLD_LAZY
-# define LT_DLLAZY_OR_NOW RTLD_LAZY
-# else
-# ifdef DL_LAZY
-# define LT_DLLAZY_OR_NOW DL_LAZY
-# else
-# ifdef RTLD_NOW
-# define LT_DLLAZY_OR_NOW RTLD_NOW
-# else
-# ifdef DL_NOW
-# define LT_DLLAZY_OR_NOW DL_NOW
-# else
-# define LT_DLLAZY_OR_NOW 0
-# endif
-# endif
-# endif
-# endif
-#endif
+# Commands used to build a loadable module (assumed same as above if empty)
+module_cmds=$lt_module_cmds_CXX
+module_expsym_cmds=$lt_module_expsym_cmds_CXX
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
-void fnord() { int i=42;}
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predep_objects=$lt_predep_objects_CXX
- if (self)
- {
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdep_objects=$lt_postdep_objects_CXX
- exit (status);
-}
-EOF
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
- (./conftest; exit; ) 2>/dev/null
- lt_status=$?
- case x$lt_status in
- x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
- x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
- x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
- esac
- else :
- # compilation failed
- lt_cv_dlopen_self_static=no
- fi
-fi
-rm -fr conftest*
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predeps=$lt_predeps_CXX
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdeps=$lt_postdeps_CXX
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
- fi
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
- CPPFLAGS="$save_CPPFLAGS"
- LDFLAGS="$save_LDFLAGS"
- LIBS="$save_LIBS"
- ;;
- esac
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
- case $lt_cv_dlopen_self in
- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
- *) enable_dlopen_self=unknown ;;
- esac
+# Command to use when deplibs_check_method == file_magic.
+file_magic_cmd=$lt_file_magic_cmd
- case $lt_cv_dlopen_self_static in
- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
- *) enable_dlopen_self_static=unknown ;;
- esac
-fi
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag_CXX
+# Flag that forces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag_CXX
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
- # See if we are running on zsh, and set the options which allow our commands through
- # without removal of \ escapes.
- if test -n "${ZSH_VERSION+set}" ; then
- setopt NO_GLOB_SUBST
- fi
- # Now quote all the things that may contain metacharacters while being
- # careful not to overquote the AC_SUBSTed values. We take copies of the
- # variables and quote the copies for generation of the libtool script.
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
- SED SHELL STRIP \
- libname_spec library_names_spec soname_spec extract_expsyms_cmds \
- old_striplib striplib file_magic_cmd finish_cmds finish_eval \
- deplibs_check_method reload_flag reload_cmds need_locks \
- lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
- lt_cv_sys_global_symbol_to_c_name_address \
- sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
- old_postinstall_cmds old_postuninstall_cmds \
- compiler_CXX \
- CC_CXX \
- LD_CXX \
- lt_prog_compiler_wl_CXX \
- lt_prog_compiler_pic_CXX \
- lt_prog_compiler_static_CXX \
- lt_prog_compiler_no_builtin_flag_CXX \
- export_dynamic_flag_spec_CXX \
- thread_safe_flag_spec_CXX \
- whole_archive_flag_spec_CXX \
- enable_shared_with_static_runtimes_CXX \
- old_archive_cmds_CXX \
- old_archive_from_new_cmds_CXX \
- predep_objects_CXX \
- postdep_objects_CXX \
- predeps_CXX \
- postdeps_CXX \
- compiler_lib_search_path_CXX \
- archive_cmds_CXX \
- archive_expsym_cmds_CXX \
- postinstall_cmds_CXX \
- postuninstall_cmds_CXX \
- old_archive_from_expsyms_cmds_CXX \
- allow_undefined_flag_CXX \
- no_undefined_flag_CXX \
- export_symbols_cmds_CXX \
- hardcode_libdir_flag_spec_CXX \
- hardcode_libdir_flag_spec_ld_CXX \
- hardcode_libdir_separator_CXX \
- hardcode_automatic_CXX \
- module_cmds_CXX \
- module_expsym_cmds_CXX \
- lt_cv_prog_compiler_c_o_CXX \
- exclude_expsyms_CXX \
- include_expsyms_CXX; do
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
- case $var in
- old_archive_cmds_CXX | \
- old_archive_from_new_cmds_CXX | \
- archive_cmds_CXX | \
- archive_expsym_cmds_CXX | \
- module_cmds_CXX | \
- module_expsym_cmds_CXX | \
- old_archive_from_expsyms_cmds_CXX | \
- export_symbols_cmds_CXX | \
- extract_expsyms_cmds | reload_cmds | finish_cmds | \
- postinstall_cmds | postuninstall_cmds | \
- old_postinstall_cmds | old_postuninstall_cmds | \
- sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
- # Double-quote double-evaled strings.
- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
- ;;
- *)
- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
- ;;
- esac
- done
-
- case $lt_echo in
- *'\$0 --fallback-echo"')
- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
- ;;
- esac
-
-cfgfile="$ofile"
-
- cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_CXX
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# A language-specific compiler.
-CC=$lt_compiler_CXX
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_CXX
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD_CXX
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_CXX
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_CXX
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_CXX
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names. First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds_CXX
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_CXX
-archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds_CXX
-module_expsym_cmds=$lt_module_expsym_cmds_CXX
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects_CXX
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_CXX
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_CXX
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_CXX
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_CXX
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_CXX
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
+# Same as above, but a single script fragment to be evaled but not shown.
+finish_eval=$lt_finish_eval
# Take the output of nm and produce a listing of raw symbols and C names.
global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
@@ -13553,6 +13052,9 @@ lt_simple_link_test_code=" program
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
# Allow CC to be a program name with arguments.
compiler=$CC
@@ -13560,13 +13062,13 @@ compiler=$CC
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_compiler_boilerplate=`cat conftest.err`
$rm conftest*
ac_outfile=conftest.$ac_objext
printf "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
@@ -13598,7 +13100,7 @@ test "$can_build_shared" = "no" && enabl
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
-case "$host_os" in
+case $host_os in
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
@@ -13622,8 +13124,6 @@ test "$enable_shared" = yes || enable_st
echo "$as_me:$LINENO: result: $enable_static" >&5
echo "${ECHO_T}$enable_static" >&6
-test "$ld_shlibs_F77" = no && can_build_shared=no
-
GCC_F77="$G77"
LD_F77="$LD"
@@ -13670,6 +13170,11 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_pic_F77='-fno-common'
;;
+ interix3*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+ # Instead, we relocate shared libraries at runtime.
+ ;;
+
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
@@ -13686,7 +13191,7 @@ echo $ECHO_N "checking for $compiler opt
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
- case "$host_cpu" in
+ case $host_cpu in
hppa*64*|ia64*)
# +Z the default
;;
@@ -13733,7 +13238,7 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_wl_F77='-Wl,'
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
- case "$host_cpu" in
+ case $host_cpu in
hppa*64*|ia64*)
# +Z the default
;;
@@ -13763,12 +13268,12 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_pic_F77='-KPIC'
lt_prog_compiler_static_F77='-static'
;;
- pgcc* | pgf77* | pgf90*)
+ pgcc* | pgf77* | pgf90* | pgf95*)
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
lt_prog_compiler_wl_F77='-Wl,'
lt_prog_compiler_pic_F77='-fpic'
- lt_prog_compiler_static_F77='-static'
+ lt_prog_compiler_static_F77='-Bstatic'
;;
ccc*)
lt_prog_compiler_wl_F77='-Wl,'
@@ -13784,11 +13289,6 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_static_F77='-non_shared'
;;
- sco3.2v5*)
- lt_prog_compiler_pic_F77='-Kpic'
- lt_prog_compiler_static_F77='-dn'
- ;;
-
solaris*)
lt_prog_compiler_pic_F77='-KPIC'
lt_prog_compiler_static_F77='-Bstatic'
@@ -13806,7 +13306,7 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_static_F77='-Bstatic'
;;
- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+ sysv4 | sysv4.2uw2* | sysv4.3*)
lt_prog_compiler_wl_F77='-Wl,'
lt_prog_compiler_pic_F77='-KPIC'
lt_prog_compiler_static_F77='-Bstatic'
@@ -13819,6 +13319,12 @@ echo $ECHO_N "checking for $compiler opt
fi
;;
+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+ lt_prog_compiler_wl_F77='-Wl,'
+ lt_prog_compiler_pic_F77='-KPIC'
+ lt_prog_compiler_static_F77='-Bstatic'
+ ;;
+
unicos*)
lt_prog_compiler_wl_F77='-Wl,'
lt_prog_compiler_can_build_shared_F77=no
@@ -13858,20 +13364,20 @@ else
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13864: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13370: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13868: \$? = $ac_status" >&5
+ echo "$as_me:13374: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
- $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
- $SED '/^$/d' conftest.err >conftest.er2
- if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_prog_compiler_pic_works_F77=yes
fi
fi
@@ -13892,7 +13398,7 @@ else
fi
fi
-case "$host_os" in
+case $host_os in
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_F77=
@@ -13902,43 +13408,85 @@ case "$host_os" in
;;
esac
-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
-if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
+if test "${lt_prog_compiler_static_works_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- lt_cv_prog_compiler_c_o_F77=no
- $rm -r conftest 2>/dev/null
- mkdir conftest
- cd conftest
- mkdir out
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- lt_compiler_flag="-o out/conftest2.$ac_objext"
+ lt_prog_compiler_static_works_F77=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+ printf "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+ # The linker can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+ if test -s conftest.err; then
+ # Append any errors to the config.log.
+ cat conftest.err 1>&5
+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if diff conftest.exp conftest.er2 >/dev/null; then
+ lt_prog_compiler_static_works_F77=yes
+ fi
+ else
+ lt_prog_compiler_static_works_F77=yes
+ fi
+ fi
+ $rm conftest*
+ LDFLAGS="$save_LDFLAGS"
+
+fi
+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
+echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6
+
+if test x"$lt_prog_compiler_static_works_F77" = xyes; then
+ :
+else
+ lt_prog_compiler_static_F77=
+fi
+
+
+echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ lt_cv_prog_compiler_c_o_F77=no
+ $rm -r conftest 2>/dev/null
+ mkdir conftest
+ cd conftest
+ mkdir out
+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
# Note that $ac_compile itself does not contain backslashes and begins
# with a dollar sign (not a hyphen), so the echo should work correctly.
lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13926: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13474: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13930: \$? = $ac_status" >&5
+ echo "$as_me:13478: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
- $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
- $SED '/^$/d' out/conftest.err >out/conftest.er2
- if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o_F77=yes
fi
fi
- chmod u+w .
+ chmod u+w . 2>&5
$rm conftest*
# SGI C++ compiler will create directory out/ii_files/ for
# template instantiation
@@ -14034,6 +13582,10 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -
with_gnu_ld=no
fi
;;
+ interix*)
+ # we just hope/assume this is gcc and not c89 (= MSVC++)
+ with_gnu_ld=yes
+ ;;
openbsd*)
with_gnu_ld=no
;;
@@ -14118,7 +13670,7 @@ EOF
export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
@@ -14127,22 +13679,37 @@ EOF
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
else
ld_shlibs_F77=no
fi
;;
+ interix3*)
+ hardcode_direct_F77=no
+ hardcode_shlibpath_var_F77=no
+ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+ export_dynamic_flag_spec_F77='${wl}-E'
+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+ # Instead, shared libraries are loaded at an image base (0x10000000 by
+ # default) and relocated if they conflict, which is a slow very memory
+ # consuming and fragmenting process. To avoid this, we pick a random,
+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
+ archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
+
linux*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
pgcc*) # Portland Group C compiler
- whole_archive_flag_spec_F77='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
tmp_addflag=' $pic_flag'
;;
- pgf77* | pgf90* ) # Portland Group f77 and f90 compilers
- whole_archive_flag_spec_F77='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
+ whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
@@ -14174,7 +13741,7 @@ EOF
fi
;;
- solaris* | sysv5*)
+ solaris*)
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs_F77=no
cat <<EOF 1>&2
@@ -14195,6 +13762,33 @@ EOF
fi
;;
+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+ case `$LD -v 2>&1` in
+ *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+ ld_shlibs_F77=no
+ cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems. Therefore, libtool
+*** is disabling shared libraries support. We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+ ;;
+ *)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
+ archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
+ else
+ ld_shlibs_F77=no
+ fi
+ ;;
+ esac
+ ;;
+
sunos4*)
archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
@@ -14228,7 +13822,7 @@ EOF
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_F77=yes
- if test "$GCC" = yes && test -z "$link_static_flag"; then
+ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_F77=unsupported
@@ -14262,6 +13856,7 @@ EOF
break
fi
done
+ ;;
esac
exp_sym_flag='-bexport'
@@ -14299,6 +13894,7 @@ EOF
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_libdir_separator_F77=
fi
+ ;;
esac
shared_flag='-shared'
if test "$aix_use_runtimelinking" = yes; then
@@ -14311,11 +13907,11 @@ EOF
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
- if test "$aix_use_runtimelinking" = yes; then
+ if test "$aix_use_runtimelinking" = yes; then
shared_flag='${wl}-G'
else
shared_flag='${wl}-bM:SRE'
- fi
+ fi
fi
fi
@@ -14370,12 +13966,12 @@ rm -f conftest.err conftest.$ac_objext \
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
- archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
else
if test "$host_cpu" = ia64; then
hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib'
allow_undefined_flag_F77="-z nodefs"
- archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+ archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
@@ -14425,13 +14021,11 @@ if test -z "$aix_libpath"; then aix_libp
# -berok will link without error, but may produce a broken library.
no_undefined_flag_F77=' ${wl}-bernotok'
allow_undefined_flag_F77=' ${wl}-berok'
- # -bexpall does not export symbols beginning with underscore (_)
- always_export_symbols_F77=yes
# Exported symbols can be pulled into shared objects from archives
- whole_archive_flag_spec_F77=' '
+ whole_archive_flag_spec_F77='$convenience'
archive_cmds_need_lc_F77=yes
- # This is similar to how AIX traditionally builds it's shared libraries.
- archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ # This is similar to how AIX traditionally builds its shared libraries.
+ archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
fi
fi
;;
@@ -14470,7 +14064,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
darwin* | rhapsody*)
- case "$host_os" in
+ case $host_os in
rhapsody* | darwin1.[012])
allow_undefined_flag_F77='${wl}-undefined ${wl}suppress'
;;
@@ -14499,7 +14093,7 @@ if test -z "$aix_libpath"; then aix_libp
output_verbose_link_cmd='echo'
archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
else
@@ -14508,7 +14102,7 @@ if test -z "$aix_libpath"; then aix_libp
output_verbose_link_cmd='echo'
archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
@@ -14572,47 +14166,62 @@ if test -z "$aix_libpath"; then aix_libp
export_dynamic_flag_spec_F77='${wl}-E'
;;
- hpux10* | hpux11*)
+ hpux10*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- case "$host_cpu" in
- hppa*64*|ia64*)
+ archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+ fi
+ if test "$with_gnu_ld" = no; then
+ hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
+ hardcode_libdir_separator_F77=:
+
+ hardcode_direct_F77=yes
+ export_dynamic_flag_spec_F77='${wl}-E'
+
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+ hardcode_minus_L_F77=yes
+ fi
+ ;;
+
+ hpux11*)
+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ case $host_cpu in
+ hppa*64*)
archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
+ ia64*)
+ archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
*)
archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
else
- case "$host_cpu" in
- hppa*64*|ia64*)
- archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+ case $host_cpu in
+ hppa*64*)
+ archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ ia64*)
+ archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+ archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
fi
if test "$with_gnu_ld" = no; then
- case "$host_cpu" in
- hppa*64*)
- hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
+ hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
+ hardcode_libdir_separator_F77=:
+
+ case $host_cpu in
+ hppa*64*|ia64*)
hardcode_libdir_flag_spec_ld_F77='+b $libdir'
- hardcode_libdir_separator_F77=:
- hardcode_direct_F77=no
- hardcode_shlibpath_var_F77=no
- ;;
- ia64*)
- hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_direct_F77=no
hardcode_shlibpath_var_F77=no
-
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- hardcode_minus_L_F77=yes
;;
*)
- hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
- hardcode_libdir_separator_F77=:
hardcode_direct_F77=yes
export_dynamic_flag_spec_F77='${wl}-E'
@@ -14714,14 +14323,6 @@ if test -z "$aix_libpath"; then aix_libp
hardcode_libdir_separator_F77=:
;;
- sco3.2v5*)
- archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_shlibpath_var_F77=no
- export_dynamic_flag_spec_F77='${wl}-Bexport'
- runpath_var=LD_RUN_PATH
- hardcode_runpath_var=yes
- ;;
-
solaris*)
no_undefined_flag_F77=' -z text'
if test "$GCC" = yes; then
@@ -14807,36 +14408,45 @@ if test -z "$aix_libpath"; then aix_libp
fi
;;
- sysv4.2uw2*)
- archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
- hardcode_direct_F77=yes
- hardcode_minus_L_F77=no
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+ no_undefined_flag_F77='${wl}-z,text'
+ archive_cmds_need_lc_F77=no
hardcode_shlibpath_var_F77=no
- hardcode_runpath_var=yes
- runpath_var=LD_RUN_PATH
- ;;
+ runpath_var='LD_RUN_PATH'
- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
- no_undefined_flag_F77='${wl}-z ${wl}text'
if test "$GCC" = yes; then
- archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
else
- archive_cmds_F77='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
fi
- runpath_var='LD_RUN_PATH'
- hardcode_shlibpath_var_F77=no
;;
- sysv5*)
- no_undefined_flag_F77=' -z text'
- # $CC -shared without GNU ld will not create a library from C++
- # object files and a static libstdc++, better avoid it by now
- archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
- hardcode_libdir_flag_spec_F77=
+ sysv5* | sco3.2v5* | sco5v6*)
+ # Note: We can NOT use -z defs as we might desire, because we do not
+ # link with -lc, and that would cause any symbols used from libc to
+ # always be unresolved, which means just about no library would
+ # ever link correctly. If we're not using GNU ld we use -z text
+ # though, which does catch some bad symbols but isn't as heavy-handed
+ # as -z defs.
+ no_undefined_flag_F77='${wl}-z,text'
+ allow_undefined_flag_F77='${wl}-z,nodefs'
+ archive_cmds_need_lc_F77=no
hardcode_shlibpath_var_F77=no
+ hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+ hardcode_libdir_separator_F77=':'
+ link_all_deplibs_F77=yes
+ export_dynamic_flag_spec_F77='${wl}-Bexport'
runpath_var='LD_RUN_PATH'
+
+ if test "$GCC" = yes; then
+ archive_cmds_F77='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ archive_cmds_F77='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ fi
;;
uts4*)
@@ -14855,11 +14465,6 @@ echo "$as_me:$LINENO: result: $ld_shlibs
echo "${ECHO_T}$ld_shlibs_F77" >&6
test "$ld_shlibs_F77" = no && can_build_shared=no
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
#
# Do we need to explicitly link libc?
#
@@ -14892,6 +14497,7 @@ echo $ECHO_N "checking whether -lc shoul
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_F77
+ pic_flag=$lt_prog_compiler_pic_F77
compiler_flags=-v
linker_flags=-v
verstring=
@@ -15052,7 +14658,8 @@ cygwin* | mingw* | pw32*)
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
- $install_prog $dir/$dlname \$dldir/$dlname'
+ $install_prog $dir/$dlname \$dldir/$dlname~
+ chmod a+x \$dldir/$dlname'
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
@@ -15105,7 +14712,7 @@ darwin* | rhapsody*)
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
- shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
@@ -15143,7 +14750,14 @@ kfreebsd*-gnu)
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+ if test -x /usr/bin/objformat; then
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+ freebsd[123]*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
@@ -15165,10 +14779,15 @@ freebsd* | dragonfly*)
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
- *) # from 3.2 on
+ freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+ freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
+ freebsd*) # from 4.6 on
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
esac
;;
@@ -15188,7 +14807,7 @@ hpux9* | hpux10* | hpux11*)
version_type=sunos
need_lib_prefix=no
need_version=no
- case "$host_cpu" in
+ case $host_cpu in
ia64*)
shrext_cmds='.so'
hardcode_into_libs=yes
@@ -15228,6 +14847,18 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib'
;;
+interix3*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
@@ -15289,7 +14920,7 @@ linux*)
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 15292 "configure"' > conftest.$ac_ext
+ echo '#line 14923 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -15370,6 +15001,7 @@ nto-qnx*)
openbsd*)
version_type=sunos
+ sys_lib_dlsearch_path_spec="/usr/lib"
need_lib_prefix=no
# Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
case $host_os in
@@ -15413,13 +15045,6 @@ osf3* | osf4* | osf5*)
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
-sco3.2v5*)
- version_type=osf
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- ;;
-
solaris*)
version_type=linux
need_lib_prefix=no
@@ -15445,7 +15070,7 @@ sunos4*)
need_version=yes
;;
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+sysv4 | sysv4.3*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
@@ -15478,6 +15103,29 @@ sysv4*MP*)
fi
;;
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ version_type=freebsd-elf
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ hardcode_into_libs=yes
+ if test "$with_gnu_ld" = yes; then
+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+ shlibpath_overrides_runpath=no
+ else
+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+ shlibpath_overrides_runpath=yes
+ case $host_os in
+ sco3.2v5*)
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+ ;;
+ esac
+ fi
+ sys_lib_dlsearch_path_spec='/usr/lib'
+ ;;
+
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -15493,6 +15141,11 @@ echo "$as_me:$LINENO: result: $dynamic_l
echo "${ECHO_T}$dynamic_linker" >&6
test "$dynamic_linker" = no && can_build_shared=no
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
hardcode_action_F77=
@@ -15530,36 +15183,6 @@ elif test "$shlibpath_overrides_runpath"
enable_fast_install=needless
fi
-striplib=
-old_striplib=
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
- test -z "$striplib" && striplib="$STRIP --strip-unneeded"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-# FIXME - insert some real tests, host_os isn't really good enough
- case $host_os in
- darwin*)
- if test -n "$STRIP" ; then
- striplib="$STRIP -x"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
- ;;
- *)
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- ;;
- esac
-fi
-
-
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
@@ -15574,7 +15197,7 @@ if test -f "$ltmain"; then
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
SED SHELL STRIP \
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
@@ -15692,6 +15315,9 @@ AR_FLAGS=$lt_AR_FLAGS
# A C compiler.
LTCC=$lt_LTCC
+# LTCC compiler flags.
+LTCFLAGS=$lt_LTCFLAGS
+
# A language-specific compiler.
CC=$lt_compiler_F77
@@ -16002,6 +15628,9 @@ lt_simple_link_test_code='public class c
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
# Allow CC to be a program name with arguments.
compiler=$CC
@@ -16009,13 +15638,13 @@ compiler=$CC
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_compiler_boilerplate=`cat conftest.err`
$rm conftest*
ac_outfile=conftest.$ac_objext
printf "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
@@ -16063,20 +15692,20 @@ else
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16069: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15698: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16073: \$? = $ac_status" >&5
+ echo "$as_me:15702: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
- $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
- $SED '/^$/d' conftest.err >conftest.er2
- if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_rtti_exceptions=yes
fi
fi
@@ -16137,6 +15766,11 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_pic_GCJ='-fno-common'
;;
+ interix3*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+ # Instead, we relocate shared libraries at runtime.
+ ;;
+
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
@@ -16153,7 +15787,7 @@ echo $ECHO_N "checking for $compiler opt
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
- case "$host_cpu" in
+ case $host_cpu in
hppa*64*|ia64*)
# +Z the default
;;
@@ -16200,7 +15834,7 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_wl_GCJ='-Wl,'
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
- case "$host_cpu" in
+ case $host_cpu in
hppa*64*|ia64*)
# +Z the default
;;
@@ -16230,12 +15864,12 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_pic_GCJ='-KPIC'
lt_prog_compiler_static_GCJ='-static'
;;
- pgcc* | pgf77* | pgf90*)
+ pgcc* | pgf77* | pgf90* | pgf95*)
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
lt_prog_compiler_wl_GCJ='-Wl,'
lt_prog_compiler_pic_GCJ='-fpic'
- lt_prog_compiler_static_GCJ='-static'
+ lt_prog_compiler_static_GCJ='-Bstatic'
;;
ccc*)
lt_prog_compiler_wl_GCJ='-Wl,'
@@ -16251,11 +15885,6 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_static_GCJ='-non_shared'
;;
- sco3.2v5*)
- lt_prog_compiler_pic_GCJ='-Kpic'
- lt_prog_compiler_static_GCJ='-dn'
- ;;
-
solaris*)
lt_prog_compiler_pic_GCJ='-KPIC'
lt_prog_compiler_static_GCJ='-Bstatic'
@@ -16273,7 +15902,7 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_static_GCJ='-Bstatic'
;;
- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+ sysv4 | sysv4.2uw2* | sysv4.3*)
lt_prog_compiler_wl_GCJ='-Wl,'
lt_prog_compiler_pic_GCJ='-KPIC'
lt_prog_compiler_static_GCJ='-Bstatic'
@@ -16286,6 +15915,12 @@ echo $ECHO_N "checking for $compiler opt
fi
;;
+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+ lt_prog_compiler_wl_GCJ='-Wl,'
+ lt_prog_compiler_pic_GCJ='-KPIC'
+ lt_prog_compiler_static_GCJ='-Bstatic'
+ ;;
+
unicos*)
lt_prog_compiler_wl_GCJ='-Wl,'
lt_prog_compiler_can_build_shared_GCJ=no
@@ -16325,20 +15960,20 @@ else
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16331: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15966: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16335: \$? = $ac_status" >&5
+ echo "$as_me:15970: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
- $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
- $SED '/^$/d' conftest.err >conftest.er2
- if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_prog_compiler_pic_works_GCJ=yes
fi
fi
@@ -16359,7 +15994,7 @@ else
fi
fi
-case "$host_os" in
+case $host_os in
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_GCJ=
@@ -16369,6 +16004,48 @@ case "$host_os" in
;;
esac
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
+if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ lt_prog_compiler_static_works_GCJ=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+ printf "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+ # The linker can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+ if test -s conftest.err; then
+ # Append any errors to the config.log.
+ cat conftest.err 1>&5
+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if diff conftest.exp conftest.er2 >/dev/null; then
+ lt_prog_compiler_static_works_GCJ=yes
+ fi
+ else
+ lt_prog_compiler_static_works_GCJ=yes
+ fi
+ fi
+ $rm conftest*
+ LDFLAGS="$save_LDFLAGS"
+
+fi
+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
+echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6
+
+if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
+ :
+else
+ lt_prog_compiler_static_GCJ=
+fi
+
+
echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
@@ -16387,25 +16064,25 @@ else
# Note that $ac_compile itself does not contain backslashes and begins
# with a dollar sign (not a hyphen), so the echo should work correctly.
lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16393: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16070: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16397: \$? = $ac_status" >&5
+ echo "$as_me:16074: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
- $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
- $SED '/^$/d' out/conftest.err >out/conftest.er2
- if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o_GCJ=yes
fi
fi
- chmod u+w .
+ chmod u+w . 2>&5
$rm conftest*
# SGI C++ compiler will create directory out/ii_files/ for
# template instantiation
@@ -16501,6 +16178,10 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -
with_gnu_ld=no
fi
;;
+ interix*)
+ # we just hope/assume this is gcc and not c89 (= MSVC++)
+ with_gnu_ld=yes
+ ;;
openbsd*)
with_gnu_ld=no
;;
@@ -16585,7 +16266,7 @@ EOF
export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
@@ -16594,22 +16275,37 @@ EOF
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
else
ld_shlibs_GCJ=no
fi
;;
+ interix3*)
+ hardcode_direct_GCJ=no
+ hardcode_shlibpath_var_GCJ=no
+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+ export_dynamic_flag_spec_GCJ='${wl}-E'
+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+ # Instead, shared libraries are loaded at an image base (0x10000000 by
+ # default) and relocated if they conflict, which is a slow very memory
+ # consuming and fragmenting process. To avoid this, we pick a random,
+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
+ archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
+
linux*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
pgcc*) # Portland Group C compiler
- whole_archive_flag_spec_GCJ='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
tmp_addflag=' $pic_flag'
;;
- pgf77* | pgf90* ) # Portland Group f77 and f90 compilers
- whole_archive_flag_spec_GCJ='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
+ whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
@@ -16641,7 +16337,7 @@ EOF
fi
;;
- solaris* | sysv5*)
+ solaris*)
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs_GCJ=no
cat <<EOF 1>&2
@@ -16662,6 +16358,33 @@ EOF
fi
;;
+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+ case `$LD -v 2>&1` in
+ *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+ ld_shlibs_GCJ=no
+ cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems. Therefore, libtool
+*** is disabling shared libraries support. We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+ ;;
+ *)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
+ archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
+ else
+ ld_shlibs_GCJ=no
+ fi
+ ;;
+ esac
+ ;;
+
sunos4*)
archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
@@ -16695,7 +16418,7 @@ EOF
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_GCJ=yes
- if test "$GCC" = yes && test -z "$link_static_flag"; then
+ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_GCJ=unsupported
@@ -16729,6 +16452,7 @@ EOF
break
fi
done
+ ;;
esac
exp_sym_flag='-bexport'
@@ -16766,6 +16490,7 @@ EOF
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_libdir_separator_GCJ=
fi
+ ;;
esac
shared_flag='-shared'
if test "$aix_use_runtimelinking" = yes; then
@@ -16778,11 +16503,11 @@ EOF
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
- if test "$aix_use_runtimelinking" = yes; then
+ if test "$aix_use_runtimelinking" = yes; then
shared_flag='${wl}-G'
else
shared_flag='${wl}-bM:SRE'
- fi
+ fi
fi
fi
@@ -16847,12 +16572,12 @@ rm -f conftest.err conftest.$ac_objext \
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
- archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
else
if test "$host_cpu" = ia64; then
hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib'
allow_undefined_flag_GCJ="-z nodefs"
- archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+ archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
@@ -16912,13 +16637,11 @@ if test -z "$aix_libpath"; then aix_libp
# -berok will link without error, but may produce a broken library.
no_undefined_flag_GCJ=' ${wl}-bernotok'
allow_undefined_flag_GCJ=' ${wl}-berok'
- # -bexpall does not export symbols beginning with underscore (_)
- always_export_symbols_GCJ=yes
# Exported symbols can be pulled into shared objects from archives
- whole_archive_flag_spec_GCJ=' '
+ whole_archive_flag_spec_GCJ='$convenience'
archive_cmds_need_lc_GCJ=yes
- # This is similar to how AIX traditionally builds it's shared libraries.
- archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ # This is similar to how AIX traditionally builds its shared libraries.
+ archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
fi
fi
;;
@@ -16957,7 +16680,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
darwin* | rhapsody*)
- case "$host_os" in
+ case $host_os in
rhapsody* | darwin1.[012])
allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress'
;;
@@ -16986,7 +16709,7 @@ if test -z "$aix_libpath"; then aix_libp
output_verbose_link_cmd='echo'
archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
else
@@ -16995,7 +16718,7 @@ if test -z "$aix_libpath"; then aix_libp
output_verbose_link_cmd='echo'
archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
@@ -17059,47 +16782,62 @@ if test -z "$aix_libpath"; then aix_libp
export_dynamic_flag_spec_GCJ='${wl}-E'
;;
- hpux10* | hpux11*)
+ hpux10*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- case "$host_cpu" in
- hppa*64*|ia64*)
+ archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+ fi
+ if test "$with_gnu_ld" = no; then
+ hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
+ hardcode_libdir_separator_GCJ=:
+
+ hardcode_direct_GCJ=yes
+ export_dynamic_flag_spec_GCJ='${wl}-E'
+
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+ hardcode_minus_L_GCJ=yes
+ fi
+ ;;
+
+ hpux11*)
+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ case $host_cpu in
+ hppa*64*)
archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
+ ia64*)
+ archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
*)
archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
else
- case "$host_cpu" in
- hppa*64*|ia64*)
- archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+ case $host_cpu in
+ hppa*64*)
+ archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ ia64*)
+ archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+ archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
fi
if test "$with_gnu_ld" = no; then
- case "$host_cpu" in
- hppa*64*)
- hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
+ hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
+ hardcode_libdir_separator_GCJ=:
+
+ case $host_cpu in
+ hppa*64*|ia64*)
hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
- hardcode_libdir_separator_GCJ=:
hardcode_direct_GCJ=no
hardcode_shlibpath_var_GCJ=no
;;
- ia64*)
- hardcode_libdir_flag_spec_GCJ='-L$libdir'
- hardcode_direct_GCJ=no
- hardcode_shlibpath_var_GCJ=no
-
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- hardcode_minus_L_GCJ=yes
- ;;
*)
- hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
- hardcode_libdir_separator_GCJ=:
hardcode_direct_GCJ=yes
export_dynamic_flag_spec_GCJ='${wl}-E'
@@ -17201,14 +16939,6 @@ if test -z "$aix_libpath"; then aix_libp
hardcode_libdir_separator_GCJ=:
;;
- sco3.2v5*)
- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_shlibpath_var_GCJ=no
- export_dynamic_flag_spec_GCJ='${wl}-Bexport'
- runpath_var=LD_RUN_PATH
- hardcode_runpath_var=yes
- ;;
-
solaris*)
no_undefined_flag_GCJ=' -z text'
if test "$GCC" = yes; then
@@ -17294,36 +17024,45 @@ if test -z "$aix_libpath"; then aix_libp
fi
;;
- sysv4.2uw2*)
- archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
- hardcode_direct_GCJ=yes
- hardcode_minus_L_GCJ=no
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+ no_undefined_flag_GCJ='${wl}-z,text'
+ archive_cmds_need_lc_GCJ=no
hardcode_shlibpath_var_GCJ=no
- hardcode_runpath_var=yes
- runpath_var=LD_RUN_PATH
- ;;
+ runpath_var='LD_RUN_PATH'
- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
- no_undefined_flag_GCJ='${wl}-z ${wl}text'
if test "$GCC" = yes; then
- archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
else
- archive_cmds_GCJ='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
fi
- runpath_var='LD_RUN_PATH'
- hardcode_shlibpath_var_GCJ=no
;;
- sysv5*)
- no_undefined_flag_GCJ=' -z text'
- # $CC -shared without GNU ld will not create a library from C++
- # object files and a static libstdc++, better avoid it by now
- archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
- hardcode_libdir_flag_spec_GCJ=
+ sysv5* | sco3.2v5* | sco5v6*)
+ # Note: We can NOT use -z defs as we might desire, because we do not
+ # link with -lc, and that would cause any symbols used from libc to
+ # always be unresolved, which means just about no library would
+ # ever link correctly. If we're not using GNU ld we use -z text
+ # though, which does catch some bad symbols but isn't as heavy-handed
+ # as -z defs.
+ no_undefined_flag_GCJ='${wl}-z,text'
+ allow_undefined_flag_GCJ='${wl}-z,nodefs'
+ archive_cmds_need_lc_GCJ=no
hardcode_shlibpath_var_GCJ=no
+ hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+ hardcode_libdir_separator_GCJ=':'
+ link_all_deplibs_GCJ=yes
+ export_dynamic_flag_spec_GCJ='${wl}-Bexport'
runpath_var='LD_RUN_PATH'
+
+ if test "$GCC" = yes; then
+ archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ fi
;;
uts4*)
@@ -17342,11 +17081,6 @@ echo "$as_me:$LINENO: result: $ld_shlibs
echo "${ECHO_T}$ld_shlibs_GCJ" >&6
test "$ld_shlibs_GCJ" = no && can_build_shared=no
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
#
# Do we need to explicitly link libc?
#
@@ -17379,6 +17113,7 @@ echo $ECHO_N "checking whether -lc shoul
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_GCJ
+ pic_flag=$lt_prog_compiler_pic_GCJ
compiler_flags=-v
linker_flags=-v
verstring=
@@ -17539,7 +17274,8 @@ cygwin* | mingw* | pw32*)
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
- $install_prog $dir/$dlname \$dldir/$dlname'
+ $install_prog $dir/$dlname \$dldir/$dlname~
+ chmod a+x \$dldir/$dlname'
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
@@ -17592,7 +17328,7 @@ darwin* | rhapsody*)
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
- shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
@@ -17630,7 +17366,14 @@ kfreebsd*-gnu)
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+ if test -x /usr/bin/objformat; then
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+ freebsd[123]*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
@@ -17652,10 +17395,15 @@ freebsd* | dragonfly*)
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
- *) # from 3.2 on
+ freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+ freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
+ freebsd*) # from 4.6 on
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
esac
;;
@@ -17675,7 +17423,7 @@ hpux9* | hpux10* | hpux11*)
version_type=sunos
need_lib_prefix=no
need_version=no
- case "$host_cpu" in
+ case $host_cpu in
ia64*)
shrext_cmds='.so'
hardcode_into_libs=yes
@@ -17715,1141 +17463,340 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib'
;;
-irix5* | irix6* | nonstopux*)
- case $host_os in
- nonstopux*) version_type=nonstopux ;;
- *)
- if test "$lt_cv_prog_gnu_ld" = yes; then
- version_type=linux
- else
- version_type=irix
- fi ;;
- esac
- need_lib_prefix=no
- need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
- case $host_os in
- irix5* | nonstopux*)
- libsuff= shlibsuff=
- ;;
- *)
- case $LD in # libtool.m4 will add one of these switches to LD
- *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
- libsuff= shlibsuff= libmagic=32-bit;;
- *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
- libsuff=32 shlibsuff=N32 libmagic=N32;;
- *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
- libsuff=64 shlibsuff=64 libmagic=64-bit;;
- *) libsuff= shlibsuff= libmagic=never-match;;
- esac
- ;;
- esac
- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
- shlibpath_overrides_runpath=no
- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
- hardcode_into_libs=yes
- ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
- dynamic_linker=no
- ;;
-
-# This must be Linux ELF.
-linux*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- # This implies no fast_install, which is unacceptable.
- # Some rework will be needed to allow for fast_install
- # before this can be enabled.
- hardcode_into_libs=yes
-
- # find out which ABI we are using
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
- echo '#line 17779 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- case `/usr/bin/file conftest.$ac_objext` in
- *64-bit*)
- libsuff=64
- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
- esac
-
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
- fi
-
- # We used to test for /lib/ld.so.1 and disable shared libraries on
- # powerpc, because MkLinux only supported shared libraries with the
- # GNU dynamic linker. Since this was broken with cross compilers,
- # most powerpc-linux boxes support dynamic linking these days and
- # people can always --disable-shared, the test was removed, and we
- # assume the GNU/Linux dynamic linker is in use.
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
-knetbsd*-gnu)
+interix3*)
version_type=linux
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
-netbsd*)
- version_type=sunos
- need_lib_prefix=no
- need_version=no
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- dynamic_linker='NetBSD (a.out) ld.so'
- else
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- dynamic_linker='NetBSD ld.elf_so'
- fi
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
-
-newsos6)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- ;;
-
-nto-qnx*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
;;
-openbsd*)
- version_type=sunos
- need_lib_prefix=no
- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+irix5* | irix6* | nonstopux*)
case $host_os in
- openbsd3.3 | openbsd3.3.*) need_version=yes ;;
- *) need_version=no ;;
+ nonstopux*) version_type=nonstopux ;;
+ *)
+ if test "$lt_cv_prog_gnu_ld" = yes; then
+ version_type=linux
+ else
+ version_type=irix
+ fi ;;
esac
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- case $host_os in
- openbsd2.[89] | openbsd2.[89].*)
- shlibpath_overrides_runpath=no
- ;;
- *)
- shlibpath_overrides_runpath=yes
- ;;
- esac
- else
- shlibpath_overrides_runpath=yes
- fi
- ;;
-
-os2*)
- libname_spec='$name'
- shrext_cmds=".dll"
- need_lib_prefix=no
- library_names_spec='$libname${shared_ext} $libname.a'
- dynamic_linker='OS/2 ld.exe'
- shlibpath_var=LIBPATH
- ;;
-
-osf3* | osf4* | osf5*)
- version_type=osf
need_lib_prefix=no
need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
- ;;
-
-sco3.2v5*)
- version_type=osf
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- ;;
-
-solaris*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- # ldd complains unless libraries are executable
- postinstall_cmds='chmod +x $lib'
- ;;
-
-sunos4*)
- version_type=sunos
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- fi
- need_version=yes
- ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- case $host_vendor in
- sni)
- shlibpath_overrides_runpath=no
- need_lib_prefix=no
- export_dynamic_flag_spec='${wl}-Blargedynsym'
- runpath_var=LD_RUN_PATH
- ;;
- siemens)
- need_lib_prefix=no
- ;;
- motorola)
- need_lib_prefix=no
- need_version=no
- shlibpath_overrides_runpath=no
- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
- ;;
- esac
- ;;
-
-sysv4*MP*)
- if test -d /usr/nec ;then
- version_type=linux
- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
- soname_spec='$libname${shared_ext}.$major'
- shlibpath_var=LD_LIBRARY_PATH
- fi
- ;;
-
-uts4*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- ;;
-
-*)
- dynamic_linker=no
- ;;
-esac
-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6
-test "$dynamic_linker" = no && can_build_shared=no
-
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
-hardcode_action_GCJ=
-if test -n "$hardcode_libdir_flag_spec_GCJ" || \
- test -n "$runpath_var_GCJ" || \
- test "X$hardcode_automatic_GCJ" = "Xyes" ; then
-
- # We can hardcode non-existant directories.
- if test "$hardcode_direct_GCJ" != no &&
- # If the only mechanism to avoid hardcoding is shlibpath_var, we
- # have to relink, otherwise we might link with an installed library
- # when we should be linking with a yet-to-be-installed one
- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
- test "$hardcode_minus_L_GCJ" != no; then
- # Linking always hardcodes the temporary library directory.
- hardcode_action_GCJ=relink
- else
- # We can link without hardcoding, and we can hardcode nonexisting dirs.
- hardcode_action_GCJ=immediate
- fi
-else
- # We cannot hardcode anything, or else we can only hardcode existing
- # directories.
- hardcode_action_GCJ=unsupported
-fi
-echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
-echo "${ECHO_T}$hardcode_action_GCJ" >&6
-
-if test "$hardcode_action_GCJ" = relink; then
- # Fast installation is not supported
- enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
- test "$enable_shared" = no; then
- # Fast installation is not necessary
- enable_fast_install=needless
-fi
-
-striplib=
-old_striplib=
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
- test -z "$striplib" && striplib="$STRIP --strip-unneeded"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-# FIXME - insert some real tests, host_os isn't really good enough
- case $host_os in
- darwin*)
- if test -n "$STRIP" ; then
- striplib="$STRIP -x"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
- ;;
- *)
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- ;;
- esac
-fi
-
-if test "x$enable_dlopen" != xyes; then
- enable_dlopen=unknown
- enable_dlopen_self=unknown
- enable_dlopen_self_static=unknown
-else
- lt_cv_dlopen=no
- lt_cv_dlopen_libs=
-
- case $host_os in
- beos*)
- lt_cv_dlopen="load_add_on"
- lt_cv_dlopen_libs=
- lt_cv_dlopen_self=yes
- ;;
-
- mingw* | pw32*)
- lt_cv_dlopen="LoadLibrary"
- lt_cv_dlopen_libs=
- ;;
-
- cygwin*)
- lt_cv_dlopen="dlopen"
- lt_cv_dlopen_libs=
- ;;
-
- darwin*)
- # if libdl is installed we need to link against it
- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_dl_dlopen=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dl_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-if test $ac_cv_lib_dl_dlopen = yes; then
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-
- lt_cv_dlopen="dyld"
- lt_cv_dlopen_libs=
- lt_cv_dlopen_self=yes
-
-fi
-
- ;;
-
- *)
- echo "$as_me:$LINENO: checking for shl_load" >&5
-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
-if test "${ac_cv_func_shl_load+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define shl_load innocuous_shl_load
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char shl_load (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef shl_load
-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char shl_load ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_shl_load) || defined (__stub___shl_load)
-choke me
-#else
-char (*f) () = shl_load;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != shl_load;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_func_shl_load=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_shl_load=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-echo "${ECHO_T}$ac_cv_func_shl_load" >&6
-if test $ac_cv_func_shl_load = yes; then
- lt_cv_dlopen="shl_load"
-else
- echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char shl_load ();
-int
-main ()
-{
-shl_load ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_dld_shl_load=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dld_shl_load=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
-if test $ac_cv_lib_dld_shl_load = yes; then
- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
-else
- echo "$as_me:$LINENO: checking for dlopen" >&5
-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
-if test "${ac_cv_func_dlopen+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define dlopen innocuous_dlopen
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char dlopen (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef dlopen
-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char dlopen ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_dlopen) || defined (__stub___dlopen)
-choke me
-#else
-char (*f) () = dlopen;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != dlopen;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_func_dlopen=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-echo "${ECHO_T}$ac_cv_func_dlopen" >&6
-if test $ac_cv_func_dlopen = yes; then
- lt_cv_dlopen="dlopen"
-else
- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_dl_dlopen=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dl_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-if test $ac_cv_lib_dl_dlopen = yes; then
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
- echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsvld $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_svld_dlopen=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_svld_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
-if test $ac_cv_lib_svld_dlopen = yes; then
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-else
- echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char dld_link ();
-int
-main ()
-{
-dld_link ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_dld_dld_link=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dld_dld_link=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
-if test $ac_cv_lib_dld_dld_link = yes; then
- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
+ soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+ case $host_os in
+ irix5* | nonstopux*)
+ libsuff= shlibsuff=
+ ;;
+ *)
+ case $LD in # libtool.m4 will add one of these switches to LD
+ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+ libsuff= shlibsuff= libmagic=32-bit;;
+ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+ libsuff=32 shlibsuff=N32 libmagic=N32;;
+ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+ libsuff=64 shlibsuff=64 libmagic=64-bit;;
+ *) libsuff= shlibsuff= libmagic=never-match;;
+ esac
+ ;;
+ esac
+ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+ shlibpath_overrides_runpath=no
+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+ hardcode_into_libs=yes
+ ;;
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+ dynamic_linker=no
+ ;;
-fi
+# This must be Linux ELF.
+linux*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ # This implies no fast_install, which is unacceptable.
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
+ # find out which ABI we are using
+ libsuff=
+ case "$host_cpu" in
+ x86_64*|s390x*|powerpc64*)
+ echo '#line 17539 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *64-bit*)
+ libsuff=64
+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+ ;;
+ esac
+ fi
+ rm -rf conftest*
;;
esac
- if test "x$lt_cv_dlopen" != xno; then
- enable_dlopen=yes
- else
- enable_dlopen=no
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
- case $lt_cv_dlopen in
- dlopen)
- save_CPPFLAGS="$CPPFLAGS"
- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
- save_LDFLAGS="$LDFLAGS"
- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
- save_LIBS="$LIBS"
- LIBS="$lt_cv_dlopen_libs $LIBS"
-
- echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
-if test "${lt_cv_dlopen_self+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test "$cross_compiling" = yes; then :
- lt_cv_dlopen_self=cross
-else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
-#line 18654 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
-#else
-# ifdef DL_GLOBAL
-# define LT_DLGLOBAL DL_GLOBAL
-# else
-# define LT_DLGLOBAL 0
-# endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
- find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-# ifdef RTLD_LAZY
-# define LT_DLLAZY_OR_NOW RTLD_LAZY
-# else
-# ifdef DL_LAZY
-# define LT_DLLAZY_OR_NOW DL_LAZY
-# else
-# ifdef RTLD_NOW
-# define LT_DLLAZY_OR_NOW RTLD_NOW
-# else
-# ifdef DL_NOW
-# define LT_DLLAZY_OR_NOW DL_NOW
-# else
-# define LT_DLLAZY_OR_NOW 0
-# endif
-# endif
-# endif
-# endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+ # powerpc, because MkLinux only supported shared libraries with the
+ # GNU dynamic linker. Since this was broken with cross compilers,
+ # most powerpc-linux boxes support dynamic linking these days and
+ # people can always --disable-shared, the test was removed, and we
+ # assume the GNU/Linux dynamic linker is in use.
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
- if (self)
- {
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
+knetbsd*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='GNU ld.so'
+ ;;
- exit (status);
-}
-EOF
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
- (./conftest; exit; ) 2>/dev/null
- lt_status=$?
- case x$lt_status in
- x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
- x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
- x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
- esac
- else :
- # compilation failed
- lt_cv_dlopen_self=no
+netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+ need_version=no
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ dynamic_linker='NetBSD (a.out) ld.so'
+ else
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ dynamic_linker='NetBSD ld.elf_so'
fi
-fi
-rm -fr conftest*
-
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
+newsos6)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ ;;
- if test "x$lt_cv_dlopen_self" = xyes; then
- LDFLAGS="$LDFLAGS $link_static_flag"
- echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
-if test "${lt_cv_dlopen_self_static+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test "$cross_compiling" = yes; then :
- lt_cv_dlopen_self_static=cross
-else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
-#line 18752 "configure"
-#include "confdefs.h"
+nto-qnx*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ ;;
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
+openbsd*)
+ version_type=sunos
+ sys_lib_dlsearch_path_spec="/usr/lib"
+ need_lib_prefix=no
+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+ case $host_os in
+ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+ *) need_version=no ;;
+ esac
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ case $host_os in
+ openbsd2.[89] | openbsd2.[89].*)
+ shlibpath_overrides_runpath=no
+ ;;
+ *)
+ shlibpath_overrides_runpath=yes
+ ;;
+ esac
+ else
+ shlibpath_overrides_runpath=yes
+ fi
+ ;;
-#include <stdio.h>
+os2*)
+ libname_spec='$name'
+ shrext_cmds=".dll"
+ need_lib_prefix=no
+ library_names_spec='$libname${shared_ext} $libname.a'
+ dynamic_linker='OS/2 ld.exe'
+ shlibpath_var=LIBPATH
+ ;;
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
-#else
-# ifdef DL_GLOBAL
-# define LT_DLGLOBAL DL_GLOBAL
-# else
-# define LT_DLGLOBAL 0
-# endif
-#endif
+osf3* | osf4* | osf5*)
+ version_type=osf
+ need_lib_prefix=no
+ need_version=no
+ soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ ;;
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
- find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-# ifdef RTLD_LAZY
-# define LT_DLLAZY_OR_NOW RTLD_LAZY
-# else
-# ifdef DL_LAZY
-# define LT_DLLAZY_OR_NOW DL_LAZY
-# else
-# ifdef RTLD_NOW
-# define LT_DLLAZY_OR_NOW RTLD_NOW
-# else
-# ifdef DL_NOW
-# define LT_DLLAZY_OR_NOW DL_NOW
-# else
-# define LT_DLLAZY_OR_NOW 0
-# endif
-# endif
-# endif
-# endif
-#endif
+solaris*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ # ldd complains unless libraries are executable
+ postinstall_cmds='chmod +x $lib'
+ ;;
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
+sunos4*)
+ version_type=sunos
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ if test "$with_gnu_ld" = yes; then
+ need_lib_prefix=no
+ fi
+ need_version=yes
+ ;;
-void fnord() { int i=42;}
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
+sysv4 | sysv4.3*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_vendor in
+ sni)
+ shlibpath_overrides_runpath=no
+ need_lib_prefix=no
+ export_dynamic_flag_spec='${wl}-Blargedynsym'
+ runpath_var=LD_RUN_PATH
+ ;;
+ siemens)
+ need_lib_prefix=no
+ ;;
+ motorola)
+ need_lib_prefix=no
+ need_version=no
+ shlibpath_overrides_runpath=no
+ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+ ;;
+ esac
+ ;;
- if (self)
- {
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
+sysv4*MP*)
+ if test -d /usr/nec ;then
+ version_type=linux
+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+ soname_spec='$libname${shared_ext}.$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ fi
+ ;;
- exit (status);
-}
-EOF
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
- (./conftest; exit; ) 2>/dev/null
- lt_status=$?
- case x$lt_status in
- x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
- x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
- x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ version_type=freebsd-elf
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ hardcode_into_libs=yes
+ if test "$with_gnu_ld" = yes; then
+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+ shlibpath_overrides_runpath=no
+ else
+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+ shlibpath_overrides_runpath=yes
+ case $host_os in
+ sco3.2v5*)
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+ ;;
esac
- else :
- # compilation failed
- lt_cv_dlopen_self_static=no
fi
-fi
-rm -fr conftest*
+ sys_lib_dlsearch_path_spec='/usr/lib'
+ ;;
+
+uts4*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+*)
+ dynamic_linker=no
+ ;;
+esac
+echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+echo "${ECHO_T}$dynamic_linker" >&6
+test "$dynamic_linker" = no && can_build_shared=no
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
- fi
- CPPFLAGS="$save_CPPFLAGS"
- LDFLAGS="$save_LDFLAGS"
- LIBS="$save_LIBS"
- ;;
- esac
+echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+hardcode_action_GCJ=
+if test -n "$hardcode_libdir_flag_spec_GCJ" || \
+ test -n "$runpath_var_GCJ" || \
+ test "X$hardcode_automatic_GCJ" = "Xyes" ; then
- case $lt_cv_dlopen_self in
- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
- *) enable_dlopen_self=unknown ;;
- esac
+ # We can hardcode non-existant directories.
+ if test "$hardcode_direct_GCJ" != no &&
+ # If the only mechanism to avoid hardcoding is shlibpath_var, we
+ # have to relink, otherwise we might link with an installed library
+ # when we should be linking with a yet-to-be-installed one
+ ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
+ test "$hardcode_minus_L_GCJ" != no; then
+ # Linking always hardcodes the temporary library directory.
+ hardcode_action_GCJ=relink
+ else
+ # We can link without hardcoding, and we can hardcode nonexisting dirs.
+ hardcode_action_GCJ=immediate
+ fi
+else
+ # We cannot hardcode anything, or else we can only hardcode existing
+ # directories.
+ hardcode_action_GCJ=unsupported
+fi
+echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
+echo "${ECHO_T}$hardcode_action_GCJ" >&6
- case $lt_cv_dlopen_self_static in
- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
- *) enable_dlopen_self_static=unknown ;;
- esac
+if test "$hardcode_action_GCJ" = relink; then
+ # Fast installation is not supported
+ enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+ test "$enable_shared" = no; then
+ # Fast installation is not necessary
+ enable_fast_install=needless
fi
@@ -18866,7 +17813,7 @@ if test -f "$ltmain"; then
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
SED SHELL STRIP \
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
@@ -18984,6 +17931,9 @@ AR_FLAGS=$lt_AR_FLAGS
# A C compiler.
LTCC=$lt_LTCC
+# LTCC compiler flags.
+LTCFLAGS=$lt_LTCFLAGS
+
# A language-specific compiler.
CC=$lt_compiler_GCJ
@@ -19293,6 +18243,9 @@ lt_simple_link_test_code="$lt_simple_com
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
# Allow CC to be a program name with arguments.
compiler=$CC
@@ -19300,13 +18253,13 @@ compiler=$CC
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_compiler_boilerplate=`cat conftest.err`
$rm conftest*
ac_outfile=conftest.$ac_objext
printf "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
@@ -19341,7 +18294,7 @@ if test -f "$ltmain"; then
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
SED SHELL STRIP \
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
@@ -19459,6 +18412,9 @@ AR_FLAGS=$lt_AR_FLAGS
# A C compiler.
LTCC=$lt_LTCC
+# LTCC compiler flags.
+LTCFLAGS=$lt_LTCFLAGS
+
# A language-specific compiler.
CC=$lt_compiler_RC
@@ -19810,19 +18766,19 @@ echo "$as_me: error: Automake 1.5 or new
;;
esac
-if test -n "0.31"; then
- echo "$as_me:$LINENO: checking for intltool >= 0.31" >&5
-echo $ECHO_N "checking for intltool >= 0.31... $ECHO_C" >&6
+if test -n "0.35.0"; then
+ echo "$as_me:$LINENO: checking for intltool >= 0.35.0" >&5
+echo $ECHO_N "checking for intltool >= 0.35.0... $ECHO_C" >&6
- INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.31 | awk -F. '{ print $ 1 * 100 + $ 2; }'`
+ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
- INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 100 + VERSION[2];}' ${ac_aux_dir}/intltool-update.in`
+ INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6
test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
- { { echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.31 or later." >&5
-echo "$as_me: error: Your intltool is too old. You need intltool 0.31 or later." >&2;}
+ { { echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.35.0 or later." >&5
+echo "$as_me: error: Your intltool is too old. You need intltool 0.35.0 or later." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -20095,6 +19051,9 @@ echo "${ECHO_T}no" >&6
fi
+# Substitute ALL_LINGUAS so we can use it in po/Makefile
+
+
@@ -21016,6 +19975,9 @@ echo "$as_me:$LINENO: checking for DEP"
echo $ECHO_N "checking for DEP... $ECHO_C" >&6
if test -n "$PKG_CONFIG"; then
+ if test -n "$DEP_CFLAGS"; then
+ pkg_cv_DEP_CFLAGS="$DEP_CFLAGS"
+ else
if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION
libxml-2.0 >= \$LIBXML_REQUIRED_VERSION\"") >&5
@@ -21029,10 +19991,14 @@ if test -n "$PKG_CONFIG"; then
else
pkg_failed=yes
fi
+ fi
else
pkg_failed=untried
fi
if test -n "$PKG_CONFIG"; then
+ if test -n "$DEP_LIBS"; then
+ pkg_cv_DEP_LIBS="$DEP_LIBS"
+ else
if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION
libxml-2.0 >= \$LIBXML_REQUIRED_VERSION\"") >&5
@@ -21046,41 +20012,63 @@ if test -n "$PKG_CONFIG"; then
else
pkg_failed=yes
fi
+ fi
else
pkg_failed=untried
fi
+
+
if test $pkg_failed = yes; then
- DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
+ libxml-2.0 >= $LIBXML_REQUIRED_VERSION"`
+ else
+ DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
libxml-2.0 >= $LIBXML_REQUIRED_VERSION"`
+ fi
# Put the nasty error message in config.log where it belongs
- echo "$DEP_PKG_ERRORS" 1>&5
+ echo "$DEP_PKG_ERRORS" >&5
{ { echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED_VERSION
- libxml-2.0 >= $LIBXML_REQUIRED_VERSION) were not met.
+ libxml-2.0 >= $LIBXML_REQUIRED_VERSION) were not met:
+
+$DEP_PKG_ERRORS
+
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
-Alternatively you may set the DEP_CFLAGS and DEP_LIBS environment variables
-to avoid the need to call pkg-config. See the pkg-config man page for
-more details." >&5
+Alternatively, you may set the environment variables DEP_CFLAGS
+and DEP_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&5
echo "$as_me: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED_VERSION
- libxml-2.0 >= $LIBXML_REQUIRED_VERSION) were not met.
+ libxml-2.0 >= $LIBXML_REQUIRED_VERSION) were not met:
+
+$DEP_PKG_ERRORS
+
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
-Alternatively you may set the DEP_CFLAGS and DEP_LIBS environment variables
-to avoid the need to call pkg-config. See the pkg-config man page for
-more details." >&2;}
+Alternatively, you may set the environment variables DEP_CFLAGS
+and DEP_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
{ { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-Alternatively you may set the DEP_CFLAGS and DEP_LIBS environment variables
-to avoid the need to call pkg-config. See the pkg-config man page for
-more details.
+Alternatively, you may set the environment variables DEP_CFLAGS
+and DEP_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
See \`config.log' for more details." >&5
@@ -21088,9 +20076,9 @@ echo "$as_me: error: The pkg-config scri
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-Alternatively you may set the DEP_CFLAGS and DEP_LIBS environment variables
-to avoid the need to call pkg-config. See the pkg-config man page for
-more details.
+Alternatively, you may set the environment variables DEP_CFLAGS
+and DEP_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
See \`config.log' for more details." >&2;}
@@ -21138,6 +20126,9 @@ echo "$as_me:$LINENO: checking for GNOME
echo $ECHO_N "checking for GNOMEPRINT... $ECHO_C" >&6
if test -n "$PKG_CONFIG"; then
+ if test -n "$GNOMEPRINT_CFLAGS"; then
+ pkg_cv_GNOMEPRINT_CFLAGS="$GNOMEPRINT_CFLAGS"
+ else
if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeprint-2.2 >= \$GNOME_PRINT_REQUIRED_VERSION\"") >&5
($PKG_CONFIG --exists --print-errors "libgnomeprint-2.2 >= $GNOME_PRINT_REQUIRED_VERSION") 2>&5
@@ -21148,10 +20139,14 @@ if test -n "$PKG_CONFIG"; then
else
pkg_failed=yes
fi
+ fi
else
pkg_failed=untried
fi
if test -n "$PKG_CONFIG"; then
+ if test -n "$GNOMEPRINT_LIBS"; then
+ pkg_cv_GNOMEPRINT_LIBS="$GNOMEPRINT_LIBS"
+ else
if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeprint-2.2 >= \$GNOME_PRINT_REQUIRED_VERSION\"") >&5
($PKG_CONFIG --exists --print-errors "libgnomeprint-2.2 >= $GNOME_PRINT_REQUIRED_VERSION") 2>&5
@@ -21162,14 +20157,27 @@ if test -n "$PKG_CONFIG"; then
else
pkg_failed=yes
fi
+ fi
else
pkg_failed=untried
fi
+
+
if test $pkg_failed = yes; then
- GNOMEPRINT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomeprint-2.2 >= $GNOME_PRINT_REQUIRED_VERSION"`
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ GNOMEPRINT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgnomeprint-2.2 >= $GNOME_PRINT_REQUIRED_VERSION"`
+ else
+ GNOMEPRINT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomeprint-2.2 >= $GNOME_PRINT_REQUIRED_VERSION"`
+ fi
# Put the nasty error message in config.log where it belongs
- echo "$GNOMEPRINT_PKG_ERRORS" 1>&5
+ echo "$GNOMEPRINT_PKG_ERRORS" >&5
@@ -21386,6 +20394,9 @@ echo "$as_me:$LINENO: checking for TESTS
echo $ECHO_N "checking for TESTS... $ECHO_C" >&6
if test -n "$PKG_CONFIG"; then
+ if test -n "$TESTS_CFLAGS"; then
+ pkg_cv_TESTS_CFLAGS="$TESTS_CFLAGS"
+ else
if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeprintui-2.2 >= \$GNOME_PRINT_REQUIRED_VERSION
gnome-vfs-2.0 >= \$GNOME_VFS_REQUIRED_VERSION\"") >&5
@@ -21399,10 +20410,14 @@ if test -n "$PKG_CONFIG"; then
else
pkg_failed=yes
fi
+ fi
else
pkg_failed=untried
fi
if test -n "$PKG_CONFIG"; then
+ if test -n "$TESTS_LIBS"; then
+ pkg_cv_TESTS_LIBS="$TESTS_LIBS"
+ else
if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeprintui-2.2 >= \$GNOME_PRINT_REQUIRED_VERSION
gnome-vfs-2.0 >= \$GNOME_VFS_REQUIRED_VERSION\"") >&5
@@ -21416,15 +20431,29 @@ if test -n "$PKG_CONFIG"; then
else
pkg_failed=yes
fi
+ fi
else
pkg_failed=untried
fi
+
+
if test $pkg_failed = yes; then
- TESTS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomeprintui-2.2 >= $GNOME_PRINT_REQUIRED_VERSION
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ TESTS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgnomeprintui-2.2 >= $GNOME_PRINT_REQUIRED_VERSION
gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED_VERSION"`
+ else
+ TESTS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomeprintui-2.2 >= $GNOME_PRINT_REQUIRED_VERSION
+ gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED_VERSION"`
+ fi
# Put the nasty error message in config.log where it belongs
- echo "$TESTS_PKG_ERRORS" 1>&5
+ echo "$TESTS_PKG_ERRORS" >&5
@@ -21476,14 +20505,11 @@ fi
# I18N stuff
GETTEXT_PACKAGE=gtksourceview-1.0
-CONFIG_STATUS_DEPENDENCIES='$(top_srcdir)/po/LINGUAS'
-
cat >>confdefs.h <<_ACEOF
#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE"
_ACEOF
-ALL_LINGUAS="`cat "$srcdir/po/LINGUAS" | grep -v '^#'`"
@@ -23656,7 +22682,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
-This file was extended by gtksourceview $as_me 1.6.1, which was
+This file was extended by gtksourceview $as_me 1.7.1, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -23719,7 +22745,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-gtksourceview config.status 1.6.1
+gtksourceview config.status 1.7.1
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
@@ -24031,6 +23057,7 @@ s,@INTLTOOL_ICONV@,$INTLTOOL_ICONV,;t t
s,@INTLTOOL_MSGFMT@,$INTLTOOL_MSGFMT,;t t
s,@INTLTOOL_MSGMERGE@,$INTLTOOL_MSGMERGE,;t t
s,@INTLTOOL_XGETTEXT@,$INTLTOOL_XGETTEXT,;t t
+s,@ALL_LINGUAS@,$ALL_LINGUAS,;t t
s,@GTK_REQUIRED_VERSION@,$GTK_REQUIRED_VERSION,;t t
s,@GNOME_VFS_REQUIRED_VERSION@,$GNOME_VFS_REQUIRED_VERSION,;t t
s,@LIBXML_REQUIRED_VERSION@,$LIBXML_REQUIRED_VERSION,;t t
@@ -24054,7 +23081,6 @@ s,@BUILD_TESTS_FALSE@,$BUILD_TESTS_FALSE
s,@TESTS_CFLAGS@,$TESTS_CFLAGS,;t t
s,@TESTS_LIBS@,$TESTS_LIBS,;t t
s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
-s,@CONFIG_STATUS_DEPENDENCIES@,$CONFIG_STATUS_DEPENDENCIES,;t t
s,@USE_NLS@,$USE_NLS,;t t
s,@MSGFMT@,$MSGFMT,;t t
s,@GMSGFMT@,$GMSGFMT,;t t
diff -pruN 1.6.1-3/configure.in 1.7.1-0ubuntu2/configure.in
--- 1.6.1-3/configure.in 2006-04-10 09:21:44.000000000 +0100
+++ 1.7.1-0ubuntu2/configure.in 2006-07-24 18:33:50.000000000 +0100
@@ -3,7 +3,7 @@ dnl Process this file with autoconf to p
AC_PREREQ(2.53)
# Initialization and versioning
-AC_INIT(gtksourceview, 1.6.1, http://bugzilla.gnome.org/enter_bug.cgi?product=gtksourceview)
+AC_INIT(gtksourceview, 1.7.1, http://bugzilla.gnome.org/enter_bug.cgi?product=gtksourceview)
AC_CONFIG_SRCDIR([gtksourceview/gtksourcebuffer.h])
AM_CONFIG_HEADER(config.h)
@@ -19,7 +19,7 @@ AC_PROG_CC
AC_PROG_INSTALL
AM_DISABLE_STATIC
AM_PROG_LIBTOOL
-AC_PROG_INTLTOOL([0.31])
+IT_PROG_INTLTOOL([0.35.0])
# Check for headers and functions
AC_HEADER_STDC
@@ -125,9 +125,7 @@ fi
# I18N stuff
GETTEXT_PACKAGE=gtksourceview-1.0
AC_SUBST(GETTEXT_PACKAGE)
-AC_SUBST([CONFIG_STATUS_DEPENDENCIES],['$(top_srcdir)/po/LINGUAS'])
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext])
-ALL_LINGUAS="`cat "$srcdir/po/LINGUAS" | grep -v '^#'`"
AM_GLIB_GNU_GETTEXT
AM_GLIB_DEFINE_LOCALEDIR(LOCALEDIR)
diff -pruN 1.6.1-3/debian/boo.lang 1.7.1-0ubuntu2/debian/boo.lang
--- 1.6.1-3/debian/boo.lang 2006-07-25 13:37:21.000000000 +0100
+++ 1.7.1-0ubuntu2/debian/boo.lang 1970-01-01 01:00:00.000000000 +0100
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
-<!--
-INSTALLATION PROCEDURES
-=======================
-
-1) copy this file to /usr/share/gtksourceview-*/language-specs/
-
-2) add the following text to /usr/share/mime-info/gtksourceview-sharp.keys
-
-text/x-boo
- category=Software Development/Source Code
- can_be_executable=true
- default_action_type=application
- description=boo source code
- short_list_application_ids_for_novice_user_level=monodevelop,gedit
-
-3) add the following text to /usr/share/mime-info/gtksourceview-sharp.mime
-text/x-boo
- ext: boo
-
-4) copy the file boo-mime-info.xml to /usr/share/mime/packages
-
-5) run update-mime-database /usr/share/mime
-
-
-OR
-
-./install-gtksourceview-mode
-
-:-)
-
--->
-<language name="Boo" version="1.0" _section="Sources" mimetypes="text/x-boo">
-
- <escape-char>\</escape-char>
-
- <string name = "Multiline String" style = "String" end-at-line-end = "false">
- <start-regex>"""</start-regex>
- <end-regex>"""</end-regex>
- </string>
-
- <string name = "Double Quoted String" style = "String" end-at-line-end = "true">
- <start-regex>"</start-regex>
- <end-regex>"</end-regex>
- </string>
-
- <string name = "Single Quoted String" style = "String" end-at-line-end = "true">
- <start-regex>'</start-regex>
- <end-regex>'</end-regex>
- </string>
-
- <line-comment name = "Line Comment" style= "Comment">
- <start-regex>#</start-regex>
- </line-comment>
-
- <line-comment name="C Style Line Comment" style="Comment">
- <start-regex>//</start-regex>
- </line-comment>
-
- <string name = "Regular Expression" style = "String" end-at-line-end = "true">
- <start-regex>/[^/]</start-regex>
- <end-regex>/</end-regex>
- </string>
-
- <block-comment name = "Block Comment" style = "Comment">
- <start-regex>/\*</start-regex>
- <end-regex>\*/</end-regex>
- </block-comment>
-
- <keyword-list name = "Namespace" style = "Preprocessor" case-sensitive="true">
- <keyword>import</keyword>
- <keyword>from</keyword>
- <keyword>as</keyword>
- <keyword>namespace</keyword>
- </keyword-list>
-
- <keyword-list _name = "Primitives" style = "Data Type" case-sensitive="true">
- <keyword>bool</keyword>
- <keyword>byte</keyword>
- <keyword>sbyte</keyword>
- <keyword>double</keyword>
- <keyword>decimal</keyword>
- <keyword>single</keyword>
- <keyword>short</keyword>
- <keyword>ushort</keyword>
- <keyword>int</keyword>
- <keyword>char</keyword>
- <keyword>uint</keyword>
- <keyword>long</keyword>
- <keyword>ulong</keyword>
- <keyword>object</keyword>
- <keyword>duck</keyword>
- <keyword>string</keyword>
- <keyword>regex</keyword>
- <keyword>date</keyword>
- <keyword>timespan</keyword>
- </keyword-list>
-
- <keyword-list name="Definitions" style = "Keyword" case-sensitive="true">
- <keyword>abstract</keyword>
- <keyword>virtual</keyword>
- <keyword>override</keyword>
- <keyword>static</keyword>
- <keyword>final</keyword>
- <keyword>transient</keyword>
-
- <keyword>protected</keyword>
- <keyword>private</keyword>
- <keyword>public</keyword>
- <keyword>internal</keyword>
- <keyword>partial</keyword>
-
- <keyword>class</keyword>
- <keyword>struct</keyword>
- <keyword>interface</keyword>
- <keyword>enum</keyword>
- <keyword>callable</keyword>
- <keyword>of</keyword>
-
- <keyword>def</keyword>
- <keyword>constructor</keyword>
- <keyword>destructor</keyword>
-
- <keyword>do</keyword>
- <keyword>get</keyword>
- <keyword>set</keyword>
- <keyword>event</keyword>
-
- <keyword>return</keyword>
- <keyword>yield</keyword>
- </keyword-list>
-
- <pattern-item _name = "Number" style = "Decimal">
- <regex>\b[0-9][0-9\.]*(m|ms|d|h|s|f|F|l|L)?\b</regex>
- </pattern-item>
-
- <keyword-list _name = "True And False" style = "Decimal" case-sensitive="true">
- <keyword>true</keyword>
- <keyword>false</keyword>
- </keyword-list>
-
- <keyword-list _name = "Literals" style="Keyword" case-sensitive="true">
- <keyword>null</keyword>
- <keyword>self</keyword>
- <keyword>super</keyword>
- </keyword-list>
-
- <keyword-list _name = "Keywords" style = "Keyword" case-sensitive="true">
- <keyword>and</keyword>
- <keyword>break</keyword>
- <keyword>cast</keyword>
- <keyword>continue</keyword>
- <keyword>elif</keyword>
- <keyword>else</keyword>
- <keyword>except</keyword>
- <keyword>ensure</keyword>
- <keyword>for</keyword>
- <keyword>given</keyword>
- <keyword>goto</keyword>
- <keyword>if</keyword>
- <keyword>in</keyword>
- <keyword>is</keyword>
- <keyword>isa</keyword>
- <keyword>not</keyword>
- <keyword>or</keyword>
- <keyword>otherwise</keyword>
- <keyword>pass</keyword>
- <keyword>raise</keyword>
- <keyword>try</keyword>
- <keyword>unless</keyword>
- <keyword>when</keyword>
- <keyword>while</keyword>
- <keyword>ref</keyword>
- </keyword-list>
-
- <keyword-list name = "Builtins" style = "Others" case-sensitive="true">
- <keyword>assert</keyword>
- <keyword>__eval__</keyword>
- <keyword>__switch__</keyword>
- <keyword>enumerate</keyword>
- <keyword>filter</keyword>
- <keyword>len</keyword>
- <keyword>typeof</keyword>
- <keyword>map</keyword>
- <keyword>max</keyword>
- <keyword>min</keyword>
- <keyword>property</keyword>
- <keyword>using</keyword>
- <keyword>getter</keyword>
- <keyword>required</keyword>
- <keyword>lock</keyword>
- <keyword>range</keyword>
- <keyword>zip</keyword>
- <keyword>checked</keyword>
- <keyword>unchecked</keyword>
- <keyword>rawArrayIndexing</keyword>
- <keyword>normalArrayIndexing</keyword>
- <keyword>print</keyword>
- <keyword>array</keyword>
- <keyword>matrix</keyword>
- <keyword>yieldAll</keyword>
- </keyword-list>
-</language>
diff -pruN 1.6.1-3/debian/changelog 1.7.1-0ubuntu2/debian/changelog
--- 1.6.1-3/debian/changelog 2006-07-25 13:37:21.000000000 +0100
+++ 1.7.1-0ubuntu2/debian/changelog 2006-07-25 13:29:31.000000000 +0100
@@ -1,3 +1,27 @@
+gtksourceview (1.7.1-0ubuntu2) edgy; urgency=low
+
+ * debian/boo.lang,
+ debian/libgtksourceview-common.install:
+ + Don't install our custom boo syntax file now that it is upstream
+
+ -- Sebastian Dröge <slomo ubuntu com> Mon, 24 Jul 2006 21:49:40 +0200
+
+gtksourceview (1.7.1-0ubuntu1) edgy; urgency=low
+
+ * New usptream release:
+ - New Lang files (D, boo)
+ - Updated translations
+
+ -- Daniel Holbach <daniel holbach ubuntu com> Mon, 24 Jul 2006 20:05:16 +0200
+
+gtksourceview (1.6.1-3ubuntu1) edgy; urgency=low
+
+ * Sync with Debian
+ * debian/patches/01_xml_mimetypes_list.patch:
+ - list some variants of the xml mimetype (Ubuntu: #27106)
+
+ -- Sebastien Bacher <seb128 canonical com> Fri, 7 Jul 2006 14:51:55 +0200
+
gtksourceview (1.6.1-3) unstable; urgency=low
* Readd boo.lang as it was removed from boo in 0.7.6.2237-1.
diff -pruN 1.6.1-3/debian/control 1.7.1-0ubuntu2/debian/control
--- 1.6.1-3/debian/control 2006-07-25 13:37:21.000000000 +0100
+++ 1.7.1-0ubuntu2/debian/control 2006-07-25 13:29:31.000000000 +0100
@@ -3,7 +3,7 @@ Section: libs
Priority: optional
Maintainer: Andrew Lau <netsnipe users sourceforge net>
Build-Depends: autotools-dev, cdbs, debhelper (>= 5), dh-buildinfo, gnome-pkg-tools, dpkg-dev (>= 1.13.19), libgnomeprintui2.2-dev (>= 2.8), libgnomevfs2-dev (>= 2.8.4-2), libgtk2.0-dev (>= 2.8.0), libxml2-dev (>= 2.5), libxml-parser-perl
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers lists alioth debian org>, Akira TAGOH <tagoh debian org>, Andreas Rottmann <rotty debian org>, Clément Stenac <zorglub debian org>, Dafydd Harries <daf debian org>, Guilherme de S. Pastore <gpastore debian org>, Gustavo Franco <stratus debian org>, Gustavo Noronha Silva <kov debian org>, J.H.M. Dassen (Ray) <jdassen debian org>, Jordi Mallach <jordi debian org>, Jose Carlos Garcia Sogo <jsogo debian org>, Josselin Mouette <joss debian org>, Loic Minier <lool dooz org>, Marc 'HE' Brockschmidt <he debian org>, Marco Cabizza <marco87 gmail com>, OndÅ?ej Surý <ondrej debian org>, Ross Burton <ross debian org>, Sebastien Bacher <seb128 debian org>, Sjoerd Simons <sjoerd debian org>, Takuo KITAME <kitame debian org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers lists alioth debian org>, Clément Stenac <zorglub debian org>, Dafydd Harries <daf debian org>, Guilherme de S. Pastore <gpastore debian org>, Gustavo Franco <stratus debian org>, Gustavo Noronha Silva <kov debian org>, J.H.M. Dassen (Ray) <jdassen debian org>, Jordi Mallach <jordi debian org>, Jose Carlos Garcia Sogo <jsogo debian org>, Josselin Mouette <joss debian org>, Loic Minier <lool dooz org>, Marc 'HE' Brockschmidt <he debian org>, Marco Cabizza <marco87 gmail com>, Oystein Gisnas <oystein gisnas net>, OndÅ?ej Surý <ondrej debian org>, Ross Burton <ross debian org>, Sebastien Bacher <seb128 debian org>, Sjoerd Simons <sjoerd debian org>
Standards-Version: 3.7.2
Package: libgtksourceview1.0-0
diff -pruN 1.6.1-3/debian/libgtksourceview-common.install 1.7.1-0ubuntu2/debian/libgtksourceview-common.install
--- 1.6.1-3/debian/libgtksourceview-common.install 2006-07-25 13:37:21.000000000 +0100
+++ 1.7.1-0ubuntu2/debian/libgtksourceview-common.install 2006-07-25 13:29:31.000000000 +0100
@@ -1,4 +1,3 @@
debian/tmp/usr/share/gtksourceview-1.0
debian/tmp/usr/share/locale
-debian/boo.lang /usr/share/gtksourceview-1.0/language-specs
debian/ocaml.lang /usr/share/gtksourceview-1.0/language-specs
diff -pruN 1.6.1-3/debian/patches/01_xml_mimetypes_list.patch 1.7.1-0ubuntu2/debian/patches/01_xml_mimetypes_list.patch
--- 1.6.1-3/debian/patches/01_xml_mimetypes_list.patch 1970-01-01 01:00:00.000000000 +0100
+++ 1.7.1-0ubuntu2/debian/patches/01_xml_mimetypes_list.patch 2006-07-25 13:29:31.000000000 +0100
@@ -0,0 +1,11 @@
+diff -Nur gtksourceview-1.6.1/gtksourceview/language-specs/xml.lang gtksourceview-1.6.1.new/gtksourceview/language-specs/xml.lang
+--- gtksourceview-1.6.1/gtksourceview/language-specs/xml.lang 2006-04-10 07:19:38.000000000 +0200
++++ gtksourceview-1.6.1.new/gtksourceview/language-specs/xml.lang 2006-04-13 12:27:54.000000000 +0200
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!DOCTYPE language SYSTEM "language.dtd">
+-<language _name="XML" version="1.0" _section="Markup" mimetypes="application/xml;text/xml;image/svg+xml;text/rdf;text/xsl">
++<language _name="XML" version="1.0" _section="Markup" mimetypes="application/xml;text/xml;image/svg+xml;text/rdf;text/xsl;application/vnd.mozilla.xul+xml;application/docbook+xml;application/xslt+xml">
+
+ <block-comment _name="Block Comment" style="Comment">
+ <start-regex><!--</start-regex>
diff -pruN 1.6.1-3/docs/Makefile.in 1.7.1-0ubuntu2/docs/Makefile.in
--- 1.6.1-3/docs/Makefile.in 2006-04-10 09:25:42.000000000 +0100
+++ 1.7.1-0ubuntu2/docs/Makefile.in 2006-07-24 18:40:54.000000000 +0100
@@ -58,6 +58,7 @@ DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ALL_LINGUAS = @ALL_LINGUAS@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
@@ -75,7 +76,6 @@ CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
diff -pruN 1.6.1-3/docs/reference/Makefile.in 1.7.1-0ubuntu2/docs/reference/Makefile.in
--- 1.6.1-3/docs/reference/Makefile.in 2006-04-10 09:25:43.000000000 +0100
+++ 1.7.1-0ubuntu2/docs/reference/Makefile.in 2006-07-24 18:40:54.000000000 +0100
@@ -56,6 +56,7 @@ DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ALL_LINGUAS = @ALL_LINGUAS@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
@@ -73,7 +74,6 @@ CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
diff -pruN 1.6.1-3/docs/reference/html/GtkSourceBuffer.html 1.7.1-0ubuntu2/docs/reference/html/GtkSourceBuffer.html
--- 1.6.1-3/docs/reference/html/GtkSourceBuffer.html 2006-04-10 09:39:56.000000000 +0100
+++ 1.7.1-0ubuntu2/docs/reference/html/GtkSourceBuffer.html 2006-07-24 18:41:19.000000000 +0100
@@ -184,18 +184,18 @@ tag table.
<div class="refsect1" lang="en">
<a name="details"></a><h2>Details</h2>
<div class="refsect2" lang="en">
-<a name="id2564011"></a><h3>
+<a name="id2563980"></a><h3>
<a name="GtkSourceBuffer-struct"></a>GtkSourceBuffer</h3>
-<a class="indexterm" name="id2564023"></a><pre class="programlisting">typedef struct _GtkSourceBuffer GtkSourceBuffer;</pre>
+<a class="indexterm" name="id2563991"></a><pre class="programlisting">typedef struct _GtkSourceBuffer GtkSourceBuffer;</pre>
<p>
</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2564039"></a><h3>
+<a name="id2564005"></a><h3>
<a name="gtk-source-buffer-new"></a>gtk_source_buffer_new ()</h3>
-<a class="indexterm" name="id2564050"></a><pre class="programlisting"><a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a>* gtk_source_buffer_new (<a href="GtkSourceTagTable.html" title="GtkSourceTagTable">GtkSourceTagTable</a> *table);</pre>
+<a class="indexterm" name="id2564016"></a><pre class="programlisting"><a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a>* gtk_source_buffer_new (<a href="GtkSourceTagTable.html" title="GtkSourceTagTable">GtkSourceTagTable</a> *table);</pre>
<p>
Creates a new source buffer.</p>
<p>
@@ -221,9 +221,9 @@ Creates a new source buffer.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2564124"></a><h3>
+<a name="id2564081"></a><h3>
<a name="gtk-source-buffer-new-with-language"></a>gtk_source_buffer_new_with_language ()</h3>
-<a class="indexterm" name="id2564138"></a><pre class="programlisting"><a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a>* gtk_source_buffer_new_with_language
+<a class="indexterm" name="id2564094"></a><pre class="programlisting"><a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a>* gtk_source_buffer_new_with_language
(<a href="GtkSourceLanguage.html" title="GtkSourceLanguage">GtkSourceLanguage</a> *language);</pre>
<p>
Creates a new source buffer using the highlighting patterns in
@@ -254,9 +254,9 @@ according to <em class="parameter"><code
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2548752"></a><h3>
+<a name="id2564179"></a><h3>
<a name="gtk-source-buffer-get-check-brackets"></a>gtk_source_buffer_get_check_brackets ()</h3>
-<a class="indexterm" name="id2543942"></a><pre class="programlisting">gboolean gtk_source_buffer_get_check_brackets
+<a class="indexterm" name="id2564192"></a><pre class="programlisting">gboolean gtk_source_buffer_get_check_brackets
(<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer);</pre>
<p>
Determines whether bracket match highlighting is activated for the
@@ -285,9 +285,9 @@ brackets.
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2564299"></a><h3>
+<a name="id2564260"></a><h3>
<a name="gtk-source-buffer-set-check-brackets"></a>gtk_source_buffer_set_check_brackets ()</h3>
-<a class="indexterm" name="id2564311"></a><pre class="programlisting">void gtk_source_buffer_set_check_brackets
+<a class="indexterm" name="id2564273"></a><pre class="programlisting">void gtk_source_buffer_set_check_brackets
(<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer,
gboolean check_brackets);</pre>
<p>
@@ -320,9 +320,9 @@ function.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2564403"></a><h3>
+<a name="id2564365"></a><h3>
<a name="gtk-source-buffer-set-bracket-match-style"></a>gtk_source_buffer_set_bracket_match_style ()</h3>
-<a class="indexterm" name="id2564416"></a><pre class="programlisting">void gtk_source_buffer_set_bracket_match_style
+<a class="indexterm" name="id2564378"></a><pre class="programlisting">void gtk_source_buffer_set_bracket_match_style
(<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *source_buffer,
const <a href="gtksourceview-GtkSourceTagStyle.html#GtkSourceTagStyle">GtkSourceTagStyle</a> *style);</pre>
<p>
@@ -351,9 +351,9 @@ attributes.
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2564495"></a><h3>
+<a name="id2564457"></a><h3>
<a name="gtk-source-buffer-get-highlight"></a>gtk_source_buffer_get_highlight ()</h3>
-<a class="indexterm" name="id2564507"></a><pre class="programlisting">gboolean gtk_source_buffer_get_highlight (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer);</pre>
+<a class="indexterm" name="id2564469"></a><pre class="programlisting">gboolean gtk_source_buffer_get_highlight (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer);</pre>
<p>
Determines whether text highlighting is activated in the source
buffer.</p>
@@ -380,9 +380,9 @@ buffer.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2564575"></a><h3>
+<a name="id2564536"></a><h3>
<a name="gtk-source-buffer-set-highlight"></a>gtk_source_buffer_set_highlight ()</h3>
-<a class="indexterm" name="id2564587"></a><pre class="programlisting">void gtk_source_buffer_set_highlight (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer,
+<a class="indexterm" name="id2564549"></a><pre class="programlisting">void gtk_source_buffer_set_highlight (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer,
gboolean highlight);</pre>
<p>
Controls whether text is highlighted in the buffer. If <em class="parameter"><code>highlight</code></em>
@@ -426,9 +426,9 @@ and enable it when finished.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2564731"></a><h3>
+<a name="id2564693"></a><h3>
<a name="gtk-source-buffer-get-max-undo-levels"></a>gtk_source_buffer_get_max_undo_levels ()</h3>
-<a class="indexterm" name="id2564744"></a><pre class="programlisting">gint gtk_source_buffer_get_max_undo_levels
+<a class="indexterm" name="id2564705"></a><pre class="programlisting">gint gtk_source_buffer_get_max_undo_levels
(<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer);</pre>
<p>
Determines the number of undo levels the buffer will track for
@@ -456,9 +456,9 @@ buffer edits.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2564807"></a><h3>
+<a name="id2564769"></a><h3>
<a name="gtk-source-buffer-set-max-undo-levels"></a>gtk_source_buffer_set_max_undo_levels ()</h3>
-<a class="indexterm" name="id2564820"></a><pre class="programlisting">void gtk_source_buffer_set_max_undo_levels
+<a class="indexterm" name="id2564782"></a><pre class="programlisting">void gtk_source_buffer_set_max_undo_levels
(<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer,
gint max_undo_levels);</pre>
<p>
@@ -496,9 +496,9 @@ But, inserting a newline does start a ne
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2564913"></a><h3>
+<a name="id2564875"></a><h3>
<a name="gtk-source-buffer-get-language"></a>gtk_source_buffer_get_language ()</h3>
-<a class="indexterm" name="id2564925"></a><pre class="programlisting"><a href="GtkSourceLanguage.html" title="GtkSourceLanguage">GtkSourceLanguage</a>* gtk_source_buffer_get_language
+<a class="indexterm" name="id2564887"></a><pre class="programlisting"><a href="GtkSourceLanguage.html" title="GtkSourceLanguage">GtkSourceLanguage</a>* gtk_source_buffer_get_language
(<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer);</pre>
<p>
Determines the <a href="GtkSourceLanguage.html" title="GtkSourceLanguage"><span class="type">GtkSourceLanguage</span></a> used by the buffer. The returned
@@ -527,9 +527,9 @@ object should not be unreferenced by the
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2565015"></a><h3>
+<a name="id2564977"></a><h3>
<a name="gtk-source-buffer-set-language"></a>gtk_source_buffer_set_language ()</h3>
-<a class="indexterm" name="id2565027"></a><pre class="programlisting">void gtk_source_buffer_set_language (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer,
+<a class="indexterm" name="id2564989"></a><pre class="programlisting">void gtk_source_buffer_set_language (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer,
<a href="GtkSourceLanguage.html" title="GtkSourceLanguage">GtkSourceLanguage</a> *language);</pre>
<p>
Sets the <a href="GtkSourceLanguage.html" title="GtkSourceLanguage"><span class="type">GtkSourceLanguage</span></a> the source buffer will use, adding
@@ -561,9 +561,9 @@ set.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2565146"></a><h3>
+<a name="id2565108"></a><h3>
<a name="gtk-source-buffer-get-escape-char"></a>gtk_source_buffer_get_escape_char ()</h3>
-<a class="indexterm" name="id2565160"></a><pre class="programlisting">gunichar gtk_source_buffer_get_escape_char
+<a class="indexterm" name="id2565121"></a><pre class="programlisting">gunichar gtk_source_buffer_get_escape_char
(<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer);</pre>
<p>
Determines the escaping character used by the source buffer
@@ -592,9 +592,9 @@ buffer is using.
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2565222"></a><h3>
+<a name="id2565184"></a><h3>
<a name="gtk-source-buffer-set-escape-char"></a>gtk_source_buffer_set_escape_char ()</h3>
-<a class="indexterm" name="id2565236"></a><pre class="programlisting">void gtk_source_buffer_set_escape_char
+<a class="indexterm" name="id2565198"></a><pre class="programlisting">void gtk_source_buffer_set_escape_char
(<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer,
gunichar escape_char);</pre>
<p>
@@ -632,9 +632,9 @@ This setting affects only syntax pattern
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2565325"></a><h3>
+<a name="id2565287"></a><h3>
<a name="gtk-source-buffer-can-undo"></a>gtk_source_buffer_can_undo ()</h3>
-<a class="indexterm" name="id2565336"></a><pre class="programlisting">gboolean gtk_source_buffer_can_undo (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer);</pre>
+<a class="indexterm" name="id2565298"></a><pre class="programlisting">gboolean gtk_source_buffer_can_undo (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer);</pre>
<p>
Determines whether a source buffer can undo the last action.</p>
<p>
@@ -660,9 +660,9 @@ Determines whether a source buffer can u
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2565403"></a><h3>
+<a name="id2565365"></a><h3>
<a name="gtk-source-buffer-can-redo"></a>gtk_source_buffer_can_redo ()</h3>
-<a class="indexterm" name="id2565414"></a><pre class="programlisting">gboolean gtk_source_buffer_can_redo (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer);</pre>
+<a class="indexterm" name="id2565376"></a><pre class="programlisting">gboolean gtk_source_buffer_can_redo (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer);</pre>
<p>
Determines whether a source buffer can redo the last action
(i.e. if the last operation was an undo).</p>
@@ -689,9 +689,9 @@ Determines whether a source buffer can r
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2565481"></a><h3>
+<a name="id2565443"></a><h3>
<a name="gtk-source-buffer-undo"></a>gtk_source_buffer_undo ()</h3>
-<a class="indexterm" name="id2565491"></a><pre class="programlisting">void gtk_source_buffer_undo (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer);</pre>
+<a class="indexterm" name="id2565453"></a><pre class="programlisting">void gtk_source_buffer_undo (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer);</pre>
<p>
Undoes the last user action which modified the buffer. Use
<a href="GtkSourceBuffer.html#gtk-source-buffer-can-undo"><code class="function">gtk_source_buffer_can_undo()</code></a> to check whether a call to this
@@ -717,9 +717,9 @@ Actions are defined as groups of operati
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2565578"></a><h3>
+<a name="id2565540"></a><h3>
<a name="gtk-source-buffer-redo"></a>gtk_source_buffer_redo ()</h3>
-<a class="indexterm" name="id2565588"></a><pre class="programlisting">void gtk_source_buffer_redo (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer);</pre>
+<a class="indexterm" name="id2565550"></a><pre class="programlisting">void gtk_source_buffer_redo (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer);</pre>
<p>
Redoes the last undo operation. Use <a href="GtkSourceBuffer.html#gtk-source-buffer-can-redo"><code class="function">gtk_source_buffer_can_redo()</code></a>
to check whether a call to this function will have any effect.</p>
@@ -738,9 +738,9 @@ to check whether a call to this function
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2565649"></a><h3>
+<a name="id2565611"></a><h3>
<a name="gtk-source-buffer-begin-not-undoable-action"></a>gtk_source_buffer_begin_not_undoable_action ()</h3>
-<a class="indexterm" name="id2565663"></a><pre class="programlisting">void gtk_source_buffer_begin_not_undoable_action
+<a class="indexterm" name="id2565625"></a><pre class="programlisting">void gtk_source_buffer_begin_not_undoable_action
(<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer);</pre>
<p>
Marks the beginning of a not undoable action on the buffer,
@@ -766,9 +766,9 @@ You may nest <a href="GtkSourceBuffer.ht
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2565741"></a><h3>
+<a name="id2565702"></a><h3>
<a name="gtk-source-buffer-end-not-undoable-action"></a>gtk_source_buffer_end_not_undoable_action ()</h3>
-<a class="indexterm" name="id2565754"></a><pre class="programlisting">void gtk_source_buffer_end_not_undoable_action
+<a class="indexterm" name="id2565716"></a><pre class="programlisting">void gtk_source_buffer_end_not_undoable_action
(<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer);</pre>
<p>
Marks the end of a not undoable action on the buffer. When the
@@ -790,9 +790,9 @@ is re-enabled.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2565809"></a><h3>
+<a name="id2565771"></a><h3>
<a name="gtk-source-buffer-create-marker"></a>gtk_source_buffer_create_marker ()</h3>
-<a class="indexterm" name="id2565821"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a>* gtk_source_buffer_create_marker
+<a class="indexterm" name="id2565783"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a>* gtk_source_buffer_create_marker
(<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer,
const gchar *name,
const gchar *type,
@@ -867,9 +867,9 @@ executing instruction indication in a so
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2566041"></a><h3>
+<a name="id2566002"></a><h3>
<a name="gtk-source-buffer-move-marker"></a>gtk_source_buffer_move_marker ()</h3>
-<a class="indexterm" name="id2566053"></a><pre class="programlisting">void gtk_source_buffer_move_marker (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer,
+<a class="indexterm" name="id2566015"></a><pre class="programlisting">void gtk_source_buffer_move_marker (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer,
<a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a> *marker,
const GtkTextIter *where);</pre>
<p>
@@ -903,9 +903,9 @@ Moves <em class="parameter"><code>marker
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2566164"></a><h3>
+<a name="id2566126"></a><h3>
<a name="gtk-source-buffer-delete-marker"></a>gtk_source_buffer_delete_marker ()</h3>
-<a class="indexterm" name="id2566177"></a><pre class="programlisting">void gtk_source_buffer_delete_marker (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer,
+<a class="indexterm" name="id2566138"></a><pre class="programlisting">void gtk_source_buffer_delete_marker (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer,
<a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a> *marker);</pre>
<p>
Deletes <em class="parameter"><code>marker</code></em> from the source buffer. The same conditions as for
@@ -935,9 +935,9 @@ destroyed.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2566272"></a><h3>
+<a name="id2566234"></a><h3>
<a name="gtk-source-buffer-get-marker"></a>gtk_source_buffer_get_marker ()</h3>
-<a class="indexterm" name="id2566285"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a>* gtk_source_buffer_get_marker
+<a class="indexterm" name="id2566247"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a>* gtk_source_buffer_get_marker
(<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer,
const gchar *name);</pre>
<p>
@@ -972,9 +972,9 @@ Looks up the <a href="gtksourceview-GtkS
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2566404"></a><h3>
+<a name="id2566366"></a><h3>
<a name="gtk-source-buffer-get-markers-in-region"></a>gtk_source_buffer_get_markers_in_region ()</h3>
-<a class="indexterm" name="id2566417"></a><pre class="programlisting">GSList* gtk_source_buffer_get_markers_in_region
+<a class="indexterm" name="id2566379"></a><pre class="programlisting">GSList* gtk_source_buffer_get_markers_in_region
(<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer,
const GtkTextIter *begin,
const GtkTextIter *end);</pre>
@@ -1017,9 +1017,9 @@ Returns an <span class="emphasis"><em>or
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2566563"></a><h3>
+<a name="id2566525"></a><h3>
<a name="gtk-source-buffer-get-first-marker"></a>gtk_source_buffer_get_first_marker ()</h3>
-<a class="indexterm" name="id2566576"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a>* gtk_source_buffer_get_first_marker
+<a class="indexterm" name="id2566538"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a>* gtk_source_buffer_get_first_marker
(<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer);</pre>
<p>
Returns the first (nearest to the top of the buffer) marker in
@@ -1048,9 +1048,9 @@ there are no markers in the buffer.
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2566655"></a><h3>
+<a name="id2566626"></a><h3>
<a name="gtk-source-buffer-get-last-marker"></a>gtk_source_buffer_get_last_marker ()</h3>
-<a class="indexterm" name="id2566668"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a>* gtk_source_buffer_get_last_marker
+<a class="indexterm" name="id2566641"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a>* gtk_source_buffer_get_last_marker
(<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer);</pre>
<p>
Returns the last (nearest to the bottom of the buffer) marker in
@@ -1079,9 +1079,9 @@ there are no markers in the buffer.
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2566747"></a><h3>
+<a name="id2566731"></a><h3>
<a name="gtk-source-buffer-get-iter-at-marker"></a>gtk_source_buffer_get_iter_at_marker ()</h3>
-<a class="indexterm" name="id2566760"></a><pre class="programlisting">void gtk_source_buffer_get_iter_at_marker
+<a class="indexterm" name="id2566746"></a><pre class="programlisting">void gtk_source_buffer_get_iter_at_marker
(<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer,
GtkTextIter *iter,
<a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a> *marker);</pre>
@@ -1116,9 +1116,9 @@ Initializes <em class="parameter"><code>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2566877"></a><h3>
+<a name="id2566879"></a><h3>
<a name="gtk-source-buffer-get-next-marker"></a>gtk_source_buffer_get_next_marker ()</h3>
-<a class="indexterm" name="id2566891"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a>* gtk_source_buffer_get_next_marker
+<a class="indexterm" name="id2566894"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a>* gtk_source_buffer_get_next_marker
(<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer,
GtkTextIter *iter);</pre>
<p>
@@ -1157,9 +1157,9 @@ or <code class="literal">NULL</code> if
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2567024"></a><h3>
+<a name="id2567030"></a><h3>
<a name="gtk-source-buffer-get-prev-marker"></a>gtk_source_buffer_get_prev_marker ()</h3>
-<a class="indexterm" name="id2567038"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a>* gtk_source_buffer_get_prev_marker
+<a class="indexterm" name="id2567044"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a>* gtk_source_buffer_get_prev_marker
(<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer,
GtkTextIter *iter);</pre>
<p>
@@ -1200,7 +1200,7 @@ or <code class="literal">NULL</code> if
<div class="refsect1" lang="en">
<a name="property_details"></a><h2>Property Details</h2>
<div class="refsect2" lang="en">
-<a name="id2567189"></a><h3>
+<a name="id2567196"></a><h3>
<a name="GtkSourceBuffer--check-brackets"></a>The "<code class="literal">check-brackets</code>" property</h3>
<pre class="programlisting"> "check-brackets" gboolean : Read / Write</pre>
<p>Whether to check and highlight matching brackets.</p>
@@ -1208,7 +1208,7 @@ or <code class="literal">NULL</code> if
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2567226"></a><h3>
+<a name="id2567232"></a><h3>
<a name="GtkSourceBuffer--escape-char"></a>The "<code class="literal">escape-char</code>" property</h3>
<pre class="programlisting"> "escape-char" guint : Read / Write</pre>
<p>Escaping character for syntax patterns.</p>
@@ -1216,7 +1216,7 @@ or <code class="literal">NULL</code> if
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2567262"></a><h3>
+<a name="id2567269"></a><h3>
<a name="GtkSourceBuffer--highlight"></a>The "<code class="literal">highlight</code>" property</h3>
<pre class="programlisting"> "highlight" gboolean : Read / Write</pre>
<p>Whether to highlight syntax in the buffer.</p>
@@ -1224,14 +1224,14 @@ or <code class="literal">NULL</code> if
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2567299"></a><h3>
+<a name="id2567305"></a><h3>
<a name="GtkSourceBuffer--language"></a>The "<code class="literal">language</code>" property</h3>
<pre class="programlisting"> "language" <a href="GtkSourceLanguage.html" title="GtkSourceLanguage">GtkSourceLanguage</a> : Read / Write</pre>
<p>Language object to get highlighting patterns from.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2567332"></a><h3>
+<a name="id2567338"></a><h3>
<a name="GtkSourceBuffer--max-undo-levels"></a>The "<code class="literal">max-undo-levels</code>" property</h3>
<pre class="programlisting"> "max-undo-levels" gint : Read / Write</pre>
<p>Number of undo levels for the buffer.</p>
@@ -1242,7 +1242,7 @@ or <code class="literal">NULL</code> if
<div class="refsect1" lang="en">
<a name="signals"></a><h2>Signal Details</h2>
<div class="refsect2" lang="en">
-<a name="id2567387"></a><h3>
+<a name="id2567393"></a><h3>
<a name="GtkSourceBuffer-can-redo"></a>The "can-redo" signal</h3>
<pre class="programlisting">void user_function (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *sourcebuffer,
gboolean arg1,
@@ -1277,7 +1277,7 @@ operation.
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2567482"></a><h3>
+<a name="id2567488"></a><h3>
<a name="GtkSourceBuffer-can-undo"></a>The "can-undo" signal</h3>
<pre class="programlisting">void user_function (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *sourcebuffer,
gboolean arg1,
@@ -1312,7 +1312,7 @@ operation.
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2567577"></a><h3>
+<a name="id2567583"></a><h3>
<a name="GtkSourceBuffer-highlight-updated"></a>The "highlight-updated" signal</h3>
<pre class="programlisting">void user_function (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *sourcebuffer,
GtkTextIter *arg1,
@@ -1358,7 +1358,7 @@ this signal.
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2567708"></a><h3>
+<a name="id2567714"></a><h3>
<a name="GtkSourceBuffer-marker-updated"></a>The "marker-updated" signal</h3>
<pre class="programlisting">void user_function (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *sourcebuffer,
GtkTextIter *arg1,
@@ -1399,7 +1399,7 @@ one for the old location and one for the
</div>
</div>
<div class="refsect1" lang="en">
-<a name="id2567824"></a><h2>See Also</h2>
+<a name="id2567830"></a><h2>See Also</h2>
<p>
There is an introduction document
describing the basic concepts of the buffer/view interactions.
diff -pruN 1.6.1-3/docs/reference/html/GtkSourceLanguage.html 1.7.1-0ubuntu2/docs/reference/html/GtkSourceLanguage.html
--- 1.6.1-3/docs/reference/html/GtkSourceLanguage.html 2006-04-10 09:39:56.000000000 +0100
+++ 1.7.1-0ubuntu2/docs/reference/html/GtkSourceLanguage.html 2006-07-24 18:41:19.000000000 +0100
@@ -101,18 +101,18 @@ void <a href="GtkSourceLanguage.h
<div class="refsect1" lang="en">
<a name="details"></a><h2>Details</h2>
<div class="refsect2" lang="en">
-<a name="id2559809"></a><h3>
+<a name="id2519255"></a><h3>
<a name="GtkSourceLanguage-struct"></a>GtkSourceLanguage</h3>
-<a class="indexterm" name="id2559820"></a><pre class="programlisting">typedef struct _GtkSourceLanguage GtkSourceLanguage;</pre>
+<a class="indexterm" name="id2519267"></a><pre class="programlisting">typedef struct _GtkSourceLanguage GtkSourceLanguage;</pre>
<p>
</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2559836"></a><h3>
+<a name="id2519283"></a><h3>
<a name="gtk-source-language-get-name"></a>gtk_source_language_get_name ()</h3>
-<a class="indexterm" name="id2559849"></a><pre class="programlisting">gchar* gtk_source_language_get_name (<a href="GtkSourceLanguage.html" title="GtkSourceLanguage">GtkSourceLanguage</a> *language);</pre>
+<a class="indexterm" name="id2519295"></a><pre class="programlisting">gchar* gtk_source_language_get_name (<a href="GtkSourceLanguage.html" title="GtkSourceLanguage">GtkSourceLanguage</a> *language);</pre>
<p>
Returns the localized name of the language.</p>
<p>
@@ -138,9 +138,9 @@ Returns the localized name of the langua
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2559924"></a><h3>
+<a name="id2519370"></a><h3>
<a name="gtk-source-language-get-section"></a>gtk_source_language_get_section ()</h3>
-<a class="indexterm" name="id2559937"></a><pre class="programlisting">gchar* gtk_source_language_get_section (<a href="GtkSourceLanguage.html" title="GtkSourceLanguage">GtkSourceLanguage</a> *language);</pre>
+<a class="indexterm" name="id2519384"></a><pre class="programlisting">gchar* gtk_source_language_get_section (<a href="GtkSourceLanguage.html" title="GtkSourceLanguage">GtkSourceLanguage</a> *language);</pre>
<p>
Returns the localized section of the language.
Each language belong to a section (ex. HTML belogs to the
@@ -168,9 +168,9 @@ Markup section).</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2560014"></a><h3>
+<a name="id2519460"></a><h3>
<a name="gtk-source-language-get-tags"></a>gtk_source_language_get_tags ()</h3>
-<a class="indexterm" name="id2560027"></a><pre class="programlisting">GSList* gtk_source_language_get_tags (<a href="GtkSourceLanguage.html" title="GtkSourceLanguage">GtkSourceLanguage</a> *language);</pre>
+<a class="indexterm" name="id2519473"></a><pre class="programlisting">GSList* gtk_source_language_get_tags (<a href="GtkSourceLanguage.html" title="GtkSourceLanguage">GtkSourceLanguage</a> *language);</pre>
<p>
Returns a list of tags for the given <em class="parameter"><code>language</code></em>. You should unref the tags
and free the list after usage.</p>
@@ -197,9 +197,9 @@ and free the list after usage.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2518569"></a><h3>
+<a name="id2569134"></a><h3>
<a name="gtk-source-language-get-escape-char"></a>gtk_source_language_get_escape_char ()</h3>
-<a class="indexterm" name="id2518583"></a><pre class="programlisting">gunichar gtk_source_language_get_escape_char
+<a class="indexterm" name="id2569148"></a><pre class="programlisting">gunichar gtk_source_language_get_escape_char
(<a href="GtkSourceLanguage.html" title="GtkSourceLanguage">GtkSourceLanguage</a> *language);</pre>
<p>
Gets the value of the ESC character in the given <em class="parameter"><code>language</code></em>.</p>
@@ -226,9 +226,9 @@ Gets the value of the ESC character in t
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2518658"></a><h3>
+<a name="id2569224"></a><h3>
<a name="gtk-source-language-get-mime-types"></a>gtk_source_language_get_mime_types ()</h3>
-<a class="indexterm" name="id2518672"></a><pre class="programlisting">GSList* gtk_source_language_get_mime_types
+<a class="indexterm" name="id2569238"></a><pre class="programlisting">GSList* gtk_source_language_get_mime_types
(<a href="GtkSourceLanguage.html" title="GtkSourceLanguage">GtkSourceLanguage</a> *language);</pre>
<p>
Returns a list of mime types for the given <em class="parameter"><code>language</code></em>. After usage you should
@@ -256,9 +256,9 @@ free each element of the list as well as
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2518749"></a><h3>
+<a name="id2569314"></a><h3>
<a name="gtk-source-language-set-mime-types"></a>gtk_source_language_set_mime_types ()</h3>
-<a class="indexterm" name="id2518763"></a><pre class="programlisting">void gtk_source_language_set_mime_types
+<a class="indexterm" name="id2569328"></a><pre class="programlisting">void gtk_source_language_set_mime_types
(<a href="GtkSourceLanguage.html" title="GtkSourceLanguage">GtkSourceLanguage</a> *language,
const GSList *mime_types);</pre>
<p>
@@ -288,9 +288,9 @@ types from the language file.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2522855"></a><h3>
+<a name="id2522261"></a><h3>
<a name="gtk-source-language-get-style-scheme"></a>gtk_source_language_get_style_scheme ()</h3>
-<a class="indexterm" name="id2522868"></a><pre class="programlisting"><a href="GtkSourceStyleScheme.html" title="GtkSourceStyleScheme">GtkSourceStyleScheme</a>* gtk_source_language_get_style_scheme
+<a class="indexterm" name="id2522275"></a><pre class="programlisting"><a href="GtkSourceStyleScheme.html" title="GtkSourceStyleScheme">GtkSourceStyleScheme</a>* gtk_source_language_get_style_scheme
(<a href="GtkSourceLanguage.html" title="GtkSourceLanguage">GtkSourceLanguage</a> *language);</pre>
<p>
Gets the style scheme associated with the given <em class="parameter"><code>language</code></em>.</p>
@@ -317,9 +317,9 @@ Gets the style scheme associated with th
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2522950"></a><h3>
+<a name="id2522357"></a><h3>
<a name="gtk-source-language-set-style-scheme"></a>gtk_source_language_set_style_scheme ()</h3>
-<a class="indexterm" name="id2522964"></a><pre class="programlisting">void gtk_source_language_set_style_scheme
+<a class="indexterm" name="id2522370"></a><pre class="programlisting">void gtk_source_language_set_style_scheme
(<a href="GtkSourceLanguage.html" title="GtkSourceLanguage">GtkSourceLanguage</a> *language,
<a href="GtkSourceStyleScheme.html" title="GtkSourceStyleScheme">GtkSourceStyleScheme</a> *scheme);</pre>
<p>
@@ -347,9 +347,9 @@ Sets the style scheme of the given <em c
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2523056"></a><h3>
+<a name="id2522462"></a><h3>
<a name="gtk-source-language-get-tag-style"></a>gtk_source_language_get_tag_style ()</h3>
-<a class="indexterm" name="id2523070"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceTagStyle.html#GtkSourceTagStyle">GtkSourceTagStyle</a>* gtk_source_language_get_tag_style
+<a class="indexterm" name="id2522476"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceTagStyle.html#GtkSourceTagStyle">GtkSourceTagStyle</a>* gtk_source_language_get_tag_style
(<a href="GtkSourceLanguage.html" title="GtkSourceLanguage">GtkSourceLanguage</a> *language,
const gchar *tag_id);</pre>
<p>
@@ -384,9 +384,9 @@ not defined then returns the default sty
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2523182"></a><h3>
+<a name="id2522588"></a><h3>
<a name="gtk-source-language-set-tag-style"></a>gtk_source_language_set_tag_style ()</h3>
-<a class="indexterm" name="id2523196"></a><pre class="programlisting">void gtk_source_language_set_tag_style
+<a class="indexterm" name="id2522602"></a><pre class="programlisting">void gtk_source_language_set_tag_style
(<a href="GtkSourceLanguage.html" title="GtkSourceLanguage">GtkSourceLanguage</a> *language,
const gchar *tag_id,
const <a href="gtksourceview-GtkSourceTagStyle.html#GtkSourceTagStyle">GtkSourceTagStyle</a> *style);</pre>
@@ -422,9 +422,9 @@ restore the default style.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2523334"></a><h3>
+<a name="id2522741"></a><h3>
<a name="gtk-source-language-get-tag-default-style"></a>gtk_source_language_get_tag_default_style ()</h3>
-<a class="indexterm" name="id2523349"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceTagStyle.html#GtkSourceTagStyle">GtkSourceTagStyle</a>* gtk_source_language_get_tag_default_style
+<a class="indexterm" name="id2522755"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceTagStyle.html#GtkSourceTagStyle">GtkSourceTagStyle</a>* gtk_source_language_get_tag_default_style
(<a href="GtkSourceLanguage.html" title="GtkSourceLanguage">GtkSourceLanguage</a> *language,
const gchar *tag_id);</pre>
<p>
@@ -460,7 +460,7 @@ Gets the default style of the tag whose
<div class="refsect1" lang="en">
<a name="signals"></a><h2>Signal Details</h2>
<div class="refsect2" lang="en">
-<a name="id2523473"></a><h3>
+<a name="id2522879"></a><h3>
<a name="GtkSourceLanguage-tag-style-changed"></a>The "tag-style-changed" signal</h3>
<pre class="programlisting">void user_function (<a href="GtkSourceLanguage.html" title="GtkSourceLanguage">GtkSourceLanguage</a> *sourcelanguage,
gchar *arg1,
diff -pruN 1.6.1-3/docs/reference/html/GtkSourceLanguagesManager.html 1.7.1-0ubuntu2/docs/reference/html/GtkSourceLanguagesManager.html
--- 1.6.1-3/docs/reference/html/GtkSourceLanguagesManager.html 2006-04-10 09:39:56.000000000 +0100
+++ 1.7.1-0ubuntu2/docs/reference/html/GtkSourceLanguagesManager.html 2006-07-24 18:41:19.000000000 +0100
@@ -82,18 +82,18 @@ const GSList* <a href="GtkSourceLanguage
<div class="refsect1" lang="en">
<a name="details"></a><h2>Details</h2>
<div class="refsect2" lang="en">
-<a name="id2551863"></a><h3>
+<a name="id2533246"></a><h3>
<a name="GtkSourceLanguagesManager-struct"></a>GtkSourceLanguagesManager</h3>
-<a class="indexterm" name="id2551874"></a><pre class="programlisting">typedef struct _GtkSourceLanguagesManager GtkSourceLanguagesManager;</pre>
+<a class="indexterm" name="id2519897"></a><pre class="programlisting">typedef struct _GtkSourceLanguagesManager GtkSourceLanguagesManager;</pre>
<p>
</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2551890"></a><h3>
+<a name="id2519913"></a><h3>
<a name="gtk-source-languages-manager-new"></a>gtk_source_languages_manager_new ()</h3>
-<a class="indexterm" name="id2551901"></a><pre class="programlisting"><a href="GtkSourceLanguagesManager.html" title="GtkSourceLanguagesManager">GtkSourceLanguagesManager</a>* gtk_source_languages_manager_new
+<a class="indexterm" name="id2519924"></a><pre class="programlisting"><a href="GtkSourceLanguagesManager.html" title="GtkSourceLanguagesManager">GtkSourceLanguagesManager</a>* gtk_source_languages_manager_new
(void);</pre>
<p>
Creates a new language manager.</p>
@@ -112,9 +112,9 @@ Creates a new language manager.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2551947"></a><h3>
+<a name="id2519970"></a><h3>
<a name="gtk-source-languages-manager-get-available-languages"></a>gtk_source_languages_manager_get_available_languages ()</h3>
-<a class="indexterm" name="id2533275"></a><pre class="programlisting">const GSList* gtk_source_languages_manager_get_available_languages
+<a class="indexterm" name="id2519985"></a><pre class="programlisting">const GSList* gtk_source_languages_manager_get_available_languages
(<a href="GtkSourceLanguagesManager.html" title="GtkSourceLanguagesManager">GtkSourceLanguagesManager</a> *lm);</pre>
<p>
Gets a list of available languages for the given language manager.
@@ -143,9 +143,9 @@ free it after usage.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2533354"></a><h3>
+<a name="id2568724"></a><h3>
<a name="gtk-source-languages-manager-get-language-from-mime-type"></a>gtk_source_languages_manager_get_language_from_mime_type ()</h3>
-<a class="indexterm" name="id2533368"></a><pre class="programlisting"><a href="GtkSourceLanguage.html" title="GtkSourceLanguage">GtkSourceLanguage</a>* gtk_source_languages_manager_get_language_from_mime_type
+<a class="indexterm" name="id2568738"></a><pre class="programlisting"><a href="GtkSourceLanguage.html" title="GtkSourceLanguage">GtkSourceLanguage</a>* gtk_source_languages_manager_get_language_from_mime_type
(<a href="GtkSourceLanguagesManager.html" title="GtkSourceLanguagesManager">GtkSourceLanguagesManager</a> *lm,
const gchar *mime_type);</pre>
<p>
@@ -181,9 +181,9 @@ associated with the given <em class="par
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2568774"></a><h3>
+<a name="id2568861"></a><h3>
<a name="gtk-source-languages-manager-get-lang-files-dirs"></a>gtk_source_languages_manager_get_lang_files_dirs ()</h3>
-<a class="indexterm" name="id2568788"></a><pre class="programlisting">const GSList* gtk_source_languages_manager_get_lang_files_dirs
+<a class="indexterm" name="id2568875"></a><pre class="programlisting">const GSList* gtk_source_languages_manager_get_lang_files_dirs
(<a href="GtkSourceLanguagesManager.html" title="GtkSourceLanguagesManager">GtkSourceLanguagesManager</a> *lm);</pre>
<p>
Gets a list of language files directories for the given language manager.</p>
@@ -212,7 +212,7 @@ Gets a list of language files directorie
<div class="refsect1" lang="en">
<a name="property_details"></a><h2>Property Details</h2>
<div class="refsect2" lang="en">
-<a name="id2568871"></a><h3>
+<a name="id2568958"></a><h3>
<a name="GtkSourceLanguagesManager--lang-files-dirs"></a>The "<code class="literal">lang-files-dirs</code>" property</h3>
<pre class="programlisting"> "lang-files-dirs" gpointer : Read / Write / Construct Only</pre>
<p>List of directories where the language specification files (.lang) are located.</p>
diff -pruN 1.6.1-3/docs/reference/html/GtkSourcePrintJob.html 1.7.1-0ubuntu2/docs/reference/html/GtkSourcePrintJob.html
--- 1.6.1-3/docs/reference/html/GtkSourcePrintJob.html 2006-04-10 09:39:56.000000000 +0100
+++ 1.7.1-0ubuntu2/docs/reference/html/GtkSourcePrintJob.html 2006-07-24 18:41:19.000000000 +0100
@@ -307,7 +307,7 @@ print_source_buffer_from_view (GtkSource
<div class="refsect2" lang="en">
<a name="id2584427"></a><h3>
<a name="GtkSourcePrintJob-struct"></a>GtkSourcePrintJob</h3>
-<a class="indexterm" name="id2584438"></a><pre class="programlisting">typedef struct _GtkSourcePrintJob GtkSourcePrintJob;</pre>
+<a class="indexterm" name="id2584437"></a><pre class="programlisting">typedef struct _GtkSourcePrintJob GtkSourcePrintJob;</pre>
<p>
</p>
@@ -316,7 +316,7 @@ print_source_buffer_from_view (GtkSource
<div class="refsect2" lang="en">
<a name="id2584452"></a><h3>
<a name="gtk-source-print-job-new"></a>gtk_source_print_job_new ()</h3>
-<a class="indexterm" name="id2584463"></a><pre class="programlisting"><a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a>* gtk_source_print_job_new (GnomePrintConfig *config);</pre>
+<a class="indexterm" name="id2584462"></a><pre class="programlisting"><a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a>* gtk_source_print_job_new (GnomePrintConfig *config);</pre>
<p>
Creates a new print job object, initially setting the print configuration.</p>
<p>
@@ -342,7 +342,7 @@ Creates a new print job object, initiall
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2584524"></a><h3>
+<a name="id2584523"></a><h3>
<a name="gtk-source-print-job-new-with-buffer"></a>gtk_source_print_job_new_with_buffer ()</h3>
<a class="indexterm" name="id2584536"></a><pre class="programlisting"><a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a>* gtk_source_print_job_new_with_buffer
(GnomePrintConfig *config,
@@ -378,7 +378,7 @@ Creates a new print job to print <em cla
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2584634"></a><h3>
+<a name="id2584633"></a><h3>
<a name="gtk-source-print-job-set-config"></a>gtk_source_print_job_set_config ()</h3>
<a class="indexterm" name="id2584646"></a><pre class="programlisting">void gtk_source_print_job_set_config (<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job,
GnomePrintConfig *config);</pre>
@@ -411,7 +411,7 @@ created with <code class="function">gnom
<div class="refsect2" lang="en">
<a name="id2584734"></a><h3>
<a name="gtk-source-print-job-get-config"></a>gtk_source_print_job_get_config ()</h3>
-<a class="indexterm" name="id2584747"></a><pre class="programlisting">GnomePrintConfig* gtk_source_print_job_get_config
+<a class="indexterm" name="id2584746"></a><pre class="programlisting">GnomePrintConfig* gtk_source_print_job_get_config
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job);</pre>
<p>
Gets the current <span class="type">GnomePrintConfig</span> the print job will use. If not
@@ -442,7 +442,7 @@ it. The returned object reference is ow
<div class="refsect2" lang="en">
<a name="id2584823"></a><h3>
<a name="gtk-source-print-job-set-buffer"></a>gtk_source_print_job_set_buffer ()</h3>
-<a class="indexterm" name="id2584836"></a><pre class="programlisting">void gtk_source_print_job_set_buffer (<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job,
+<a class="indexterm" name="id2584835"></a><pre class="programlisting">void gtk_source_print_job_set_buffer (<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job,
<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer);</pre>
<p>
Sets the <a href="GtkSourceBuffer.html" title="GtkSourceBuffer"><span class="type">GtkSourceBuffer</span></a> the print job will print. You need to
@@ -471,7 +471,7 @@ creating the print job with <a href="Gtk
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2584930"></a><h3>
+<a name="id2584929"></a><h3>
<a name="gtk-source-print-job-get-buffer"></a>gtk_source_print_job_get_buffer ()</h3>
<a class="indexterm" name="id2584942"></a><pre class="programlisting"><a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a>* gtk_source_print_job_get_buffer
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job);</pre>
@@ -535,9 +535,9 @@ and default font.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2585123"></a><h3>
+<a name="id2585122"></a><h3>
<a name="gtk-source-print-job-set-tabs-width"></a>gtk_source_print_job_set_tabs_width ()</h3>
-<a class="indexterm" name="id2585136"></a><pre class="programlisting">void gtk_source_print_job_set_tabs_width
+<a class="indexterm" name="id2585135"></a><pre class="programlisting">void gtk_source_print_job_set_tabs_width
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job,
guint tabs_width);</pre>
<p>
@@ -600,7 +600,7 @@ tabulations. The default value is 8.</p
<div class="refsect2" lang="en">
<a name="id2585292"></a><h3>
<a name="gtk-source-print-job-set-wrap-mode"></a>gtk_source_print_job_set_wrap_mode ()</h3>
-<a class="indexterm" name="id2585306"></a><pre class="programlisting">void gtk_source_print_job_set_wrap_mode
+<a class="indexterm" name="id2585305"></a><pre class="programlisting">void gtk_source_print_job_set_wrap_mode
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job,
GtkWrapMode wrap);</pre>
<p>
@@ -629,9 +629,9 @@ width. See <span class="type">GtkWrapMo
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2585384"></a><h3>
+<a name="id2585383"></a><h3>
<a name="gtk-source-print-job-get-wrap-mode"></a>gtk_source_print_job_get_wrap_mode ()</h3>
-<a class="indexterm" name="id2585397"></a><pre class="programlisting">GtkWrapMode gtk_source_print_job_get_wrap_mode
+<a class="indexterm" name="id2585396"></a><pre class="programlisting">GtkWrapMode gtk_source_print_job_get_wrap_mode
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job);</pre>
<p>
Determines the wrapping style for text lines wider than the
@@ -753,7 +753,7 @@ Sets the default font for the printed te
<div class="refsect2" lang="en">
<a name="id2585724"></a><h3>
<a name="gtk-source-print-job-set-font"></a>gtk_source_print_job_set_font ()</h3>
-<a class="indexterm" name="id2585737"></a><pre class="programlisting">void gtk_source_print_job_set_font (<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job,
+<a class="indexterm" name="id2585736"></a><pre class="programlisting">void gtk_source_print_job_set_font (<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job,
const gchar *font_name);</pre>
<p>
Sets the default font for the printed text. <em class="parameter"><code>font_name</code></em> should be a
@@ -823,7 +823,7 @@ should be freed when no longer needed.</
<div class="refsect2" lang="en">
<a name="id2585930"></a><h3>
<a name="gtk-source-print-job-get-font"></a>gtk_source_print_job_get_font ()</h3>
-<a class="indexterm" name="id2585943"></a><pre class="programlisting">gchar* gtk_source_print_job_get_font (<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job);</pre>
+<a class="indexterm" name="id2585942"></a><pre class="programlisting">gchar* gtk_source_print_job_get_font (<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job);</pre>
<p>
Determines the default font to be used for the printed text. The
returned string is of the form "Fontfamily Style Size",
@@ -891,9 +891,9 @@ text) will be used instead.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2586135"></a><h3>
+<a name="id2586134"></a><h3>
<a name="gtk-source-print-job-set-numbers-font"></a>gtk_source_print_job_set_numbers_font ()</h3>
-<a class="indexterm" name="id2586148"></a><pre class="programlisting">void gtk_source_print_job_set_numbers_font
+<a class="indexterm" name="id2586147"></a><pre class="programlisting">void gtk_source_print_job_set_numbers_font
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job,
const gchar *font_name);</pre>
<p>
@@ -1000,9 +1000,9 @@ line numbers font, or <code class="liter
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2586475"></a><h3>
+<a name="id2586474"></a><h3>
<a name="gtk-source-print-job-set-print-numbers"></a>gtk_source_print_job_set_print_numbers ()</h3>
-<a class="indexterm" name="id2586488"></a><pre class="programlisting">void gtk_source_print_job_set_print_numbers
+<a class="indexterm" name="id2586487"></a><pre class="programlisting">void gtk_source_print_job_set_print_numbers
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job,
guint interval);</pre>
<p>
@@ -1034,7 +1034,7 @@ printed every <em class="parameter"><cod
<div class="refsect2" lang="en">
<a name="id2586573"></a><h3>
<a name="gtk-source-print-job-get-print-numbers"></a>gtk_source_print_job_get_print_numbers ()</h3>
-<a class="indexterm" name="id2586586"></a><pre class="programlisting">guint gtk_source_print_job_get_print_numbers
+<a class="indexterm" name="id2586585"></a><pre class="programlisting">guint gtk_source_print_job_get_print_numbers
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job);</pre>
<p>
Determines the interval used for line number printing. If the
@@ -1063,9 +1063,9 @@ value is 0, no line numbers will be prin
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2586651"></a><h3>
+<a name="id2586650"></a><h3>
<a name="gtk-source-print-job-set-text-margins"></a>gtk_source_print_job_set_text_margins ()</h3>
-<a class="indexterm" name="id2586664"></a><pre class="programlisting">void gtk_source_print_job_set_text_margins
+<a class="indexterm" name="id2586663"></a><pre class="programlisting">void gtk_source_print_job_set_text_margins
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job,
gdouble top,
gdouble bottom,
@@ -1125,9 +1125,9 @@ this function.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2586822"></a><h3>
+<a name="id2586829"></a><h3>
<a name="gtk-source-print-job-get-text-margins"></a>gtk_source_print_job_get_text_margins ()</h3>
-<a class="indexterm" name="id2586834"></a><pre class="programlisting">void gtk_source_print_job_get_text_margins
+<a class="indexterm" name="id2586843"></a><pre class="programlisting">void gtk_source_print_job_get_text_margins
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job,
gdouble *top,
gdouble *bottom,
@@ -1180,9 +1180,9 @@ ignore that value.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2587024"></a><h3>
+<a name="id2587035"></a><h3>
<a name="gtk-source-print-job-print"></a>gtk_source_print_job_print ()</h3>
-<a class="indexterm" name="id2587038"></a><pre class="programlisting">GnomePrintJob* gtk_source_print_job_print (<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job);</pre>
+<a class="indexterm" name="id2587050"></a><pre class="programlisting">GnomePrintJob* gtk_source_print_job_print (<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job);</pre>
<p>
Produces a <span class="type">GnomePrintJob</span> with the printed document. The whole
contents of the configured <a href="GtkSourceBuffer.html" title="GtkSourceBuffer"><span class="type">GtkSourceBuffer</span></a> are printed. The
@@ -1215,9 +1215,9 @@ can be printed again with different sett
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2587156"></a><h3>
+<a name="id2587168"></a><h3>
<a name="gtk-source-print-job-print-range"></a>gtk_source_print_job_print_range ()</h3>
-<a class="indexterm" name="id2587170"></a><pre class="programlisting">GnomePrintJob* gtk_source_print_job_print_range
+<a class="indexterm" name="id2587182"></a><pre class="programlisting">GnomePrintJob* gtk_source_print_job_print_range
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job,
const GtkTextIter *start,
const GtkTextIter *end);</pre>
@@ -1261,9 +1261,9 @@ out of order.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2587333"></a><h3>
+<a name="id2587345"></a><h3>
<a name="gtk-source-print-job-print-range-async"></a>gtk_source_print_job_print_range_async ()</h3>
-<a class="indexterm" name="id2587347"></a><pre class="programlisting">gboolean gtk_source_print_job_print_range_async
+<a class="indexterm" name="id2587359"></a><pre class="programlisting">gboolean gtk_source_print_job_print_range_async
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job,
const GtkTextIter *start,
const GtkTextIter *end);</pre>
@@ -1319,9 +1319,9 @@ You may cancel the job with <a href="Gtk
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2587528"></a><h3>
+<a name="id2587539"></a><h3>
<a name="gtk-source-print-job-cancel"></a>gtk_source_print_job_cancel ()</h3>
-<a class="indexterm" name="id2587542"></a><pre class="programlisting">void gtk_source_print_job_cancel (<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job);</pre>
+<a class="indexterm" name="id2587553"></a><pre class="programlisting">void gtk_source_print_job_cancel (<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job);</pre>
<p>
Cancels an asynchronous printing operation. This will remove any
pending print idle handler and unref the current <span class="type">GnomePrintJob</span>.
@@ -1351,9 +1351,9 @@ print operation.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2587638"></a><h3>
+<a name="id2587649"></a><h3>
<a name="gtk-source-print-job-get-print-job"></a>gtk_source_print_job_get_print_job ()</h3>
-<a class="indexterm" name="id2587653"></a><pre class="programlisting">GnomePrintJob* gtk_source_print_job_get_print_job
+<a class="indexterm" name="id2587664"></a><pre class="programlisting">GnomePrintJob* gtk_source_print_job_get_print_job
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job);</pre>
<p>
Gets a reference to the <span class="type">GnomePrintJob</span> which the <em class="parameter"><code>job</code></em> is printing
@@ -1389,9 +1389,9 @@ signal is emitted.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2587775"></a><h3>
+<a name="id2587787"></a><h3>
<a name="gtk-source-print-job-get-page"></a>gtk_source_print_job_get_page ()</h3>
-<a class="indexterm" name="id2587790"></a><pre class="programlisting">guint gtk_source_print_job_get_page (<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job);</pre>
+<a class="indexterm" name="id2587801"></a><pre class="programlisting">guint gtk_source_print_job_get_page (<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job);</pre>
<p>
Determines the currently printing page number. This function is
only valid while printing (either synchronously or asynchronously).</p>
@@ -1418,9 +1418,9 @@ only valid while printing (either synchr
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2587860"></a><h3>
+<a name="id2587872"></a><h3>
<a name="gtk-source-print-job-get-page-count"></a>gtk_source_print_job_get_page_count ()</h3>
-<a class="indexterm" name="id2587875"></a><pre class="programlisting">guint gtk_source_print_job_get_page_count
+<a class="indexterm" name="id2587886"></a><pre class="programlisting">guint gtk_source_print_job_get_page_count
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job);</pre>
<p>
Determines the total number of pages the job will print. The
@@ -1451,9 +1451,9 @@ returned.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2587964"></a><h3>
+<a name="id2587975"></a><h3>
<a name="gtk-source-print-job-get-print-context"></a>gtk_source_print_job_get_print_context ()</h3>
-<a class="indexterm" name="id2587978"></a><pre class="programlisting">GnomePrintContext* gtk_source_print_job_get_print_context
+<a class="indexterm" name="id2587990"></a><pre class="programlisting">GnomePrintContext* gtk_source_print_job_get_print_context
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job);</pre>
<p>
Determines the <span class="type">GnomePrintContext</span> of the current job. This
@@ -1485,9 +1485,9 @@ is owned by <em class="parameter"><code>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2588088"></a><h3>
+<a name="id2588100"></a><h3>
<a name="gtk-source-print-job-set-print-header"></a>gtk_source_print_job_set_print_header ()</h3>
-<a class="indexterm" name="id2588102"></a><pre class="programlisting">void gtk_source_print_job_set_print_header
+<a class="indexterm" name="id2588114"></a><pre class="programlisting">void gtk_source_print_job_set_print_header
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job,
gboolean setting);</pre>
<p>
@@ -1522,9 +1522,9 @@ empty it will not be printed, regardless
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2588207"></a><h3>
+<a name="id2588219"></a><h3>
<a name="gtk-source-print-job-get-print-header"></a>gtk_source_print_job_get_print_header ()</h3>
-<a class="indexterm" name="id2588222"></a><pre class="programlisting">gboolean gtk_source_print_job_get_print_header
+<a class="indexterm" name="id2588233"></a><pre class="programlisting">gboolean gtk_source_print_job_get_print_header
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job);</pre>
<p>
Determines if a header is set to be printed for each page. A
@@ -1554,9 +1554,9 @@ with <a href="GtkSourcePrintJob.html#gtk
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2588320"></a><h3>
+<a name="id2588332"></a><h3>
<a name="gtk-source-print-job-set-print-footer"></a>gtk_source_print_job_set_print_footer ()</h3>
-<a class="indexterm" name="id2588334"></a><pre class="programlisting">void gtk_source_print_job_set_print_footer
+<a class="indexterm" name="id2588346"></a><pre class="programlisting">void gtk_source_print_job_set_print_footer
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job,
gboolean setting);</pre>
<p>
@@ -1591,9 +1591,9 @@ empty it will not be printed, regardless
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2588439"></a><h3>
+<a name="id2588450"></a><h3>
<a name="gtk-source-print-job-get-print-footer"></a>gtk_source_print_job_get_print_footer ()</h3>
-<a class="indexterm" name="id2588453"></a><pre class="programlisting">gboolean gtk_source_print_job_get_print_footer
+<a class="indexterm" name="id2588464"></a><pre class="programlisting">gboolean gtk_source_print_job_get_print_footer
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job);</pre>
<p>
Determines if a footer is set to be printed for each page. A
@@ -1623,9 +1623,9 @@ with <a href="GtkSourcePrintJob.html#gtk
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2588551"></a><h3>
+<a name="id2588563"></a><h3>
<a name="gtk-source-print-job-set-header-footer-font-desc"></a>gtk_source_print_job_set_header_footer_font_desc ()</h3>
-<a class="indexterm" name="id2588566"></a><pre class="programlisting">void gtk_source_print_job_set_header_footer_font_desc
+<a class="indexterm" name="id2588578"></a><pre class="programlisting">void gtk_source_print_job_set_header_footer_font_desc
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job,
PangoFontDescription *desc);</pre>
<p>
@@ -1655,9 +1655,9 @@ will be used instead.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2588669"></a><h3>
+<a name="id2588681"></a><h3>
<a name="gtk-source-print-job-set-header-footer-font"></a>gtk_source_print_job_set_header_footer_font ()</h3>
-<a class="indexterm" name="id2588684"></a><pre class="programlisting">void gtk_source_print_job_set_header_footer_font
+<a class="indexterm" name="id2588696"></a><pre class="programlisting">void gtk_source_print_job_set_header_footer_font
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job,
const gchar *font_name);</pre>
<p>
@@ -1693,9 +1693,9 @@ should use <a href="GtkSourcePrintJob.ht
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2588815"></a><h3>
+<a name="id2588827"></a><h3>
<a name="gtk-source-print-job-get-header-footer-font-desc"></a>gtk_source_print_job_get_header_footer_font_desc ()</h3>
-<a class="indexterm" name="id2588830"></a><pre class="programlisting">PangoFontDescription* gtk_source_print_job_get_header_footer_font_desc
+<a class="indexterm" name="id2588841"></a><pre class="programlisting">PangoFontDescription* gtk_source_print_job_get_header_footer_font_desc
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job);</pre>
<p>
Determines the font to be used for the header and footer. This function
@@ -1724,9 +1724,9 @@ owned by the job and must not be modifie
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2588915"></a><h3>
+<a name="id2588927"></a><h3>
<a name="gtk-source-print-job-get-header-footer-font"></a>gtk_source_print_job_get_header_footer_font ()</h3>
-<a class="indexterm" name="id2588930"></a><pre class="programlisting">gchar* gtk_source_print_job_get_header_footer_font
+<a class="indexterm" name="id2588942"></a><pre class="programlisting">gchar* gtk_source_print_job_get_header_footer_font
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job);</pre>
<p>
Determines the font to be used for the header and footer. The
@@ -1764,9 +1764,9 @@ header and footer font, or <code class="
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2589047"></a><h3>
+<a name="id2589059"></a><h3>
<a name="gtk-source-print-job-set-header-format"></a>gtk_source_print_job_set_header_format ()</h3>
-<a class="indexterm" name="id2589062"></a><pre class="programlisting">void gtk_source_print_job_set_header_format
+<a class="indexterm" name="id2589073"></a><pre class="programlisting">void gtk_source_print_job_set_header_format
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job,
const gchar *left,
const gchar *center,
@@ -1829,9 +1829,9 @@ printing with <a href="GtkSourcePrintJob
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2589274"></a><h3>
+<a name="id2589285"></a><h3>
<a name="gtk-source-print-job-set-footer-format"></a>gtk_source_print_job_set_footer_format ()</h3>
-<a class="indexterm" name="id2589288"></a><pre class="programlisting">void gtk_source_print_job_set_footer_format
+<a class="indexterm" name="id2589300"></a><pre class="programlisting">void gtk_source_print_job_set_footer_format
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job,
const gchar *left,
const gchar *center,
@@ -1882,21 +1882,21 @@ Like <a href="GtkSourcePrintJob.html#gtk
<div class="refsect1" lang="en">
<a name="property_details"></a><h2>Property Details</h2>
<div class="refsect2" lang="en">
-<a name="id2589466"></a><h3>
+<a name="id2589477"></a><h3>
<a name="GtkSourcePrintJob--buffer"></a>The "<code class="literal">buffer</code>" property</h3>
<pre class="programlisting"> "buffer" <a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> : Read / Write</pre>
<p>GtkSourceBuffer object to print.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2589496"></a><h3>
+<a name="id2589508"></a><h3>
<a name="GtkSourcePrintJob--config"></a>The "<code class="literal">config</code>" property</h3>
<pre class="programlisting"> "config" GnomePrintConfig : Read / Write</pre>
<p>Configuration options for the print job.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2589529"></a><h3>
+<a name="id2589541"></a><h3>
<a name="GtkSourcePrintJob--font"></a>The "<code class="literal">font</code>" property</h3>
<pre class="programlisting"> "font" gchararray : Read / Write</pre>
<p>GnomeFont name to use for the document text (deprecated).</p>
@@ -1904,14 +1904,14 @@ Like <a href="GtkSourcePrintJob.html#gtk
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2589566"></a><h3>
+<a name="id2589578"></a><h3>
<a name="GtkSourcePrintJob--font-desc"></a>The "<code class="literal">font-desc</code>" property</h3>
<pre class="programlisting"> "font-desc" PangoFontDescription : Read / Write</pre>
<p>Font to use for the document text (e.g. "Monospace 10").</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2589600"></a><h3>
+<a name="id2589612"></a><h3>
<a name="GtkSourcePrintJob--header-footer-font"></a>The "<code class="literal">header-footer-font</code>" property</h3>
<pre class="programlisting"> "header-footer-font" gchararray : Read / Write</pre>
<p>GnomeFont name to use for the header and footer (deprecated).</p>
@@ -1919,14 +1919,14 @@ Like <a href="GtkSourcePrintJob.html#gtk
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2589638"></a><h3>
+<a name="id2589650"></a><h3>
<a name="GtkSourcePrintJob--header-footer-font-desc"></a>The "<code class="literal">header-footer-font-desc</code>" property</h3>
<pre class="programlisting"> "header-footer-font-desc" PangoFontDescription : Read / Write</pre>
<p>Font to use for headers and footers (e.g. "Monospace 10").</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2589672"></a><h3>
+<a name="id2589684"></a><h3>
<a name="GtkSourcePrintJob--highlight"></a>The "<code class="literal">highlight</code>" property</h3>
<pre class="programlisting"> "highlight" gboolean : Read / Write</pre>
<p>Whether to print the document with highlighted syntax.</p>
@@ -1934,7 +1934,7 @@ Like <a href="GtkSourcePrintJob.html#gtk
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2589709"></a><h3>
+<a name="id2589720"></a><h3>
<a name="GtkSourcePrintJob--numbers-font"></a>The "<code class="literal">numbers-font</code>" property</h3>
<pre class="programlisting"> "numbers-font" gchararray : Read / Write</pre>
<p>GnomeFont name to use for the line numbers (deprecated).</p>
@@ -1942,14 +1942,14 @@ Like <a href="GtkSourcePrintJob.html#gtk
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2589747"></a><h3>
+<a name="id2589759"></a><h3>
<a name="GtkSourcePrintJob--numbers-font-desc"></a>The "<code class="literal">numbers-font-desc</code>" property</h3>
<pre class="programlisting"> "numbers-font-desc" PangoFontDescription : Read / Write</pre>
<p>Font description to use for the line numbers.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2589781"></a><h3>
+<a name="id2589792"></a><h3>
<a name="GtkSourcePrintJob--print-footer"></a>The "<code class="literal">print-footer</code>" property</h3>
<pre class="programlisting"> "print-footer" gboolean : Read / Write</pre>
<p>Whether to print a footer in each page.</p>
@@ -1957,7 +1957,7 @@ Like <a href="GtkSourcePrintJob.html#gtk
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2589816"></a><h3>
+<a name="id2589828"></a><h3>
<a name="GtkSourcePrintJob--print-header"></a>The "<code class="literal">print-header</code>" property</h3>
<pre class="programlisting"> "print-header" gboolean : Read / Write</pre>
<p>Whether to print a header in each page.</p>
@@ -1965,7 +1965,7 @@ Like <a href="GtkSourcePrintJob.html#gtk
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2589854"></a><h3>
+<a name="id2589865"></a><h3>
<a name="GtkSourcePrintJob--print-numbers"></a>The "<code class="literal">print-numbers</code>" property</h3>
<pre class="programlisting"> "print-numbers" guint : Read / Write</pre>
<p>Interval of printed line numbers (0 means no numbers).</p>
@@ -1974,7 +1974,7 @@ Like <a href="GtkSourcePrintJob.html#gtk
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2589895"></a><h3>
+<a name="id2589906"></a><h3>
<a name="GtkSourcePrintJob--tabs-width"></a>The "<code class="literal">tabs-width</code>" property</h3>
<pre class="programlisting"> "tabs-width" guint : Read / Write</pre>
<p>Width in equivalent space characters of tabs.</p>
@@ -1983,7 +1983,7 @@ Like <a href="GtkSourcePrintJob.html#gtk
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2589936"></a><h3>
+<a name="id2589948"></a><h3>
<a name="GtkSourcePrintJob--wrap-mode"></a>The "<code class="literal">wrap-mode</code>" property</h3>
<pre class="programlisting"> "wrap-mode" GtkWrapMode : Read / Write</pre>
<p>Word wrapping mode.</p>
@@ -1993,7 +1993,7 @@ Like <a href="GtkSourcePrintJob.html#gtk
<div class="refsect1" lang="en">
<a name="signals"></a><h2>Signal Details</h2>
<div class="refsect2" lang="en">
-<a name="id2589986"></a><h3>
+<a name="id2589998"></a><h3>
<a name="GtkSourcePrintJob-begin-page"></a>The "begin-page" signal</h3>
<pre class="programlisting">void user_function (<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *sourceprintjob,
gpointer user_data) : Run last</pre>
@@ -2023,7 +2023,7 @@ page by for example, printing your own h
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2590068"></a><h3>
+<a name="id2590080"></a><h3>
<a name="GtkSourcePrintJob-finished"></a>The "finished" signal</h3>
<pre class="programlisting">void user_function (<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *sourceprintjob,
gpointer user_data) : Run first</pre>
@@ -2054,7 +2054,7 @@ printed to the physical device.
</div>
</div>
<div class="refsect1" lang="en">
-<a name="id2590160"></a><h2>See Also</h2>
+<a name="id2590172"></a><h2>See Also</h2>
<p>
The reference documentation for <a href="GtkSourceBuffer.html" title="GtkSourceBuffer"><span class="type">GtkSourceBuffer</span></a>. You might also want
to check the Gnome Print library reference
diff -pruN 1.6.1-3/docs/reference/html/GtkSourceStyleScheme.html 1.7.1-0ubuntu2/docs/reference/html/GtkSourceStyleScheme.html
--- 1.6.1-3/docs/reference/html/GtkSourceStyleScheme.html 2006-04-10 09:39:56.000000000 +0100
+++ 1.7.1-0ubuntu2/docs/reference/html/GtkSourceStyleScheme.html 2006-07-24 18:41:19.000000000 +0100
@@ -72,18 +72,18 @@ const gchar* <a href="GtkSourceStyleSche
<div class="refsect1" lang="en">
<a name="details"></a><h2>Details</h2>
<div class="refsect2" lang="en">
-<a name="id2569315"></a><h3>
+<a name="id2529319"></a><h3>
<a name="GtkSourceStyleScheme-struct"></a>GtkSourceStyleScheme</h3>
-<a class="indexterm" name="id2569326"></a><pre class="programlisting">typedef struct _GtkSourceStyleScheme GtkSourceStyleScheme;</pre>
+<a class="indexterm" name="id2529330"></a><pre class="programlisting">typedef struct _GtkSourceStyleScheme GtkSourceStyleScheme;</pre>
<p>
</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2560043"></a><h3>
+<a name="id2529346"></a><h3>
<a name="GtkSourceStyleSchemeClass"></a>GtkSourceStyleSchemeClass</h3>
-<a class="indexterm" name="id2560054"></a><pre class="programlisting">typedef struct {
+<a class="indexterm" name="id2529357"></a><pre class="programlisting">typedef struct {
GTypeInterface base_iface;
/* signals */
@@ -109,9 +109,9 @@ const gchar* <a href="GtkSourceStyleSche
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2518806"></a><h3>
+<a name="id2472315"></a><h3>
<a name="gtk-source-style-scheme-get-tag-style"></a>gtk_source_style_scheme_get_tag_style ()</h3>
-<a class="indexterm" name="id2535170"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceTagStyle.html#GtkSourceTagStyle">GtkSourceTagStyle</a>* gtk_source_style_scheme_get_tag_style
+<a class="indexterm" name="id2535780"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceTagStyle.html#GtkSourceTagStyle">GtkSourceTagStyle</a>* gtk_source_style_scheme_get_tag_style
(<a href="GtkSourceStyleScheme.html" title="GtkSourceStyleScheme">GtkSourceStyleScheme</a> *scheme,
const gchar *style_name);</pre>
<p>
@@ -145,9 +145,9 @@ Gets the tag associated with the given <
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2560162"></a><h3>
+<a name="id2523007"></a><h3>
<a name="gtk-source-style-scheme-get-name"></a>gtk_source_style_scheme_get_name ()</h3>
-<a class="indexterm" name="id2524363"></a><pre class="programlisting">const gchar* gtk_source_style_scheme_get_name
+<a class="indexterm" name="id2523018"></a><pre class="programlisting">const gchar* gtk_source_style_scheme_get_name
(<a href="GtkSourceStyleScheme.html" title="GtkSourceStyleScheme">GtkSourceStyleScheme</a> *scheme);</pre>
<p>
Gets the name of the given style <em class="parameter"><code>scheme</code></em>.</p>
@@ -174,9 +174,9 @@ Gets the name of the given style <em cla
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2524436"></a><h3>
+<a name="id2523091"></a><h3>
<a name="gtk-source-style-scheme-get-default"></a>gtk_source_style_scheme_get_default ()</h3>
-<a class="indexterm" name="id2524447"></a><pre class="programlisting"><a href="GtkSourceStyleScheme.html" title="GtkSourceStyleScheme">GtkSourceStyleScheme</a>* gtk_source_style_scheme_get_default
+<a class="indexterm" name="id2523103"></a><pre class="programlisting"><a href="GtkSourceStyleScheme.html" title="GtkSourceStyleScheme">GtkSourceStyleScheme</a>* gtk_source_style_scheme_get_default
(void);</pre>
<p>
Gets the default style scheme.</p>
diff -pruN 1.6.1-3/docs/reference/html/GtkSourceTag.html 1.7.1-0ubuntu2/docs/reference/html/GtkSourceTag.html
--- 1.6.1-3/docs/reference/html/GtkSourceTag.html 2006-04-10 09:39:56.000000000 +0100
+++ 1.7.1-0ubuntu2/docs/reference/html/GtkSourceTag.html 2006-07-24 18:41:19.000000000 +0100
@@ -123,63 +123,63 @@ GtkTextTag* <a href="GtkSourceTag.html#g
<div class="refsect1" lang="en">
<a name="details"></a><h2>Details</h2>
<div class="refsect2" lang="en">
-<a name="id2522533"></a><h3>
+<a name="id2532073"></a><h3>
<a name="GtkSourceTag-struct"></a>GtkSourceTag</h3>
-<a class="indexterm" name="id2522545"></a><pre class="programlisting">typedef struct _GtkSourceTag GtkSourceTag;</pre>
+<a class="indexterm" name="id2532085"></a><pre class="programlisting">typedef struct _GtkSourceTag GtkSourceTag;</pre>
<p>
</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2522560"></a><h3>
+<a name="id2532100"></a><h3>
<a name="GtkSourceTagClass"></a>GtkSourceTagClass</h3>
-<a class="indexterm" name="id2522572"></a><pre class="programlisting">typedef struct _GtkSourceTagClass GtkSourceTagClass;</pre>
+<a class="indexterm" name="id2532113"></a><pre class="programlisting">typedef struct _GtkSourceTagClass GtkSourceTagClass;</pre>
<p>
</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2522589"></a><h3>
+<a name="id2532129"></a><h3>
<a name="GtkSyntaxTag-struct"></a>GtkSyntaxTag</h3>
-<a class="indexterm" name="id2522601"></a><pre class="programlisting">typedef struct _GtkSyntaxTag GtkSyntaxTag;</pre>
+<a class="indexterm" name="id2532142"></a><pre class="programlisting">typedef struct _GtkSyntaxTag GtkSyntaxTag;</pre>
<p>
</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2522617"></a><h3>
+<a name="id2532157"></a><h3>
<a name="GtkSyntaxTagClass"></a>GtkSyntaxTagClass</h3>
-<a class="indexterm" name="id2522629"></a><pre class="programlisting">typedef struct _GtkSyntaxTagClass GtkSyntaxTagClass;</pre>
+<a class="indexterm" name="id2532170"></a><pre class="programlisting">typedef struct _GtkSyntaxTagClass GtkSyntaxTagClass;</pre>
<p>
</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2522646"></a><h3>
+<a name="id2518708"></a><h3>
<a name="GtkPatternTag-struct"></a>GtkPatternTag</h3>
-<a class="indexterm" name="id2559516"></a><pre class="programlisting">typedef struct _GtkPatternTag GtkPatternTag;</pre>
+<a class="indexterm" name="id2518719"></a><pre class="programlisting">typedef struct _GtkPatternTag GtkPatternTag;</pre>
<p>
</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2559533"></a><h3>
+<a name="id2518736"></a><h3>
<a name="GtkPatternTagClass"></a>GtkPatternTagClass</h3>
-<a class="indexterm" name="id2559545"></a><pre class="programlisting">typedef struct _GtkPatternTagClass GtkPatternTagClass;</pre>
+<a class="indexterm" name="id2518748"></a><pre class="programlisting">typedef struct _GtkPatternTagClass GtkPatternTagClass;</pre>
<p>
</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2559562"></a><h3>
+<a name="id2518764"></a><h3>
<a name="gtk-source-tag-get-style"></a>gtk_source_tag_get_style ()</h3>
-<a class="indexterm" name="id2559573"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceTagStyle.html#GtkSourceTagStyle">GtkSourceTagStyle</a>* gtk_source_tag_get_style (<a href="GtkSourceTag.html" title="GtkSourceTag">GtkSourceTag</a> *tag);</pre>
+<a class="indexterm" name="id2518776"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceTagStyle.html#GtkSourceTagStyle">GtkSourceTagStyle</a>* gtk_source_tag_get_style (<a href="GtkSourceTag.html" title="GtkSourceTag">GtkSourceTag</a> *tag);</pre>
<p>
Gets the style associated with the given <em class="parameter"><code>tag</code></em>.</p>
<p>
@@ -205,9 +205,9 @@ Gets the style associated with the given
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2559659"></a><h3>
+<a name="id2518862"></a><h3>
<a name="gtk-source-tag-set-style"></a>gtk_source_tag_set_style ()</h3>
-<a class="indexterm" name="id2559670"></a><pre class="programlisting">void gtk_source_tag_set_style (<a href="GtkSourceTag.html" title="GtkSourceTag">GtkSourceTag</a> *tag,
+<a class="indexterm" name="id2518873"></a><pre class="programlisting">void gtk_source_tag_set_style (<a href="GtkSourceTag.html" title="GtkSourceTag">GtkSourceTag</a> *tag,
const <a href="gtksourceview-GtkSourceTagStyle.html#GtkSourceTagStyle">GtkSourceTagStyle</a> *style);</pre>
<p>
Associates a given <em class="parameter"><code>style</code></em> with the given <em class="parameter"><code>tag</code></em>.</p>
@@ -234,9 +234,9 @@ Associates a given <em class="parameter"
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2559767"></a><h3>
+<a name="id2518970"></a><h3>
<a name="gtk-syntax-tag-new"></a>gtk_syntax_tag_new ()</h3>
-<a class="indexterm" name="id2559779"></a><pre class="programlisting">GtkTextTag* gtk_syntax_tag_new (const gchar *id,
+<a class="indexterm" name="id2574257"></a><pre class="programlisting">GtkTextTag* gtk_syntax_tag_new (const gchar *id,
const gchar *name,
const gchar *pattern_start,
const gchar *pattern_end);</pre>
@@ -283,9 +283,9 @@ Creates a new syntax tag object with the
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2574382"></a><h3>
+<a name="id2574374"></a><h3>
<a name="gtk-pattern-tag-new"></a>gtk_pattern_tag_new ()</h3>
-<a class="indexterm" name="id2574392"></a><pre class="programlisting">GtkTextTag* gtk_pattern_tag_new (const gchar *id,
+<a class="indexterm" name="id2574384"></a><pre class="programlisting">GtkTextTag* gtk_pattern_tag_new (const gchar *id,
const gchar *name,
const gchar *pattern);</pre>
<p>
@@ -325,9 +325,9 @@ Creates a new pattern tag object with th
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2574498"></a><h3>
+<a name="id2574462"></a><h3>
<a name="gtk-keyword-list-tag-new"></a>gtk_keyword_list_tag_new ()</h3>
-<a class="indexterm" name="id2574509"></a><pre class="programlisting">GtkTextTag* gtk_keyword_list_tag_new (const gchar *id,
+<a class="indexterm" name="id2574472"></a><pre class="programlisting">GtkTextTag* gtk_keyword_list_tag_new (const gchar *id,
const gchar *name,
const GSList *keywords,
gboolean case_sensitive,
@@ -404,19 +404,18 @@ string at the end.
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2574727"></a><h3>
+<a name="id2574671"></a><h3>
<a name="gtk-block-comment-tag-new"></a>gtk_block_comment_tag_new</h3>
-<a class="indexterm" name="id2574738"></a><pre class="programlisting">#define gtk_block_comment_tag_new gtk_syntax_tag_new
-</pre>
+<a class="indexterm" name="id2574682"></a><pre class="programlisting">#define gtk_block_comment_tag_new</pre>
<p>
</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2574754"></a><h3>
+<a name="id2574696"></a><h3>
<a name="gtk-line-comment-tag-new"></a>gtk_line_comment_tag_new ()</h3>
-<a class="indexterm" name="id2574766"></a><pre class="programlisting">GtkTextTag* gtk_line_comment_tag_new (const gchar *id,
+<a class="indexterm" name="id2574706"></a><pre class="programlisting">GtkTextTag* gtk_line_comment_tag_new (const gchar *id,
const gchar *name,
const gchar *pattern_start);</pre>
<p>
@@ -456,9 +455,9 @@ Creates a new line comment tag object wi
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2574876"></a><h3>
+<a name="id2574806"></a><h3>
<a name="gtk-string-tag-new"></a>gtk_string_tag_new ()</h3>
-<a class="indexterm" name="id2574888"></a><pre class="programlisting">GtkTextTag* gtk_string_tag_new (const gchar *id,
+<a class="indexterm" name="id2574816"></a><pre class="programlisting">GtkTextTag* gtk_string_tag_new (const gchar *id,
const gchar *name,
const gchar *pattern_start,
const gchar *pattern_end,
@@ -514,7 +513,7 @@ Creates a new string tag object with the
<div class="refsect1" lang="en">
<a name="property_details"></a><h2>Property Details</h2>
<div class="refsect2" lang="en">
-<a name="id2575053"></a><h3>
+<a name="id2574965"></a><h3>
<a name="GtkSourceTag--id"></a>The "<code class="literal">id</code>" property</h3>
<pre class="programlisting"> "id" gchararray : Read / Write / Construct Only</pre>
<p>ID used to refer to the source tag.</p>
@@ -522,7 +521,7 @@ Creates a new string tag object with the
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2575088"></a><h3>
+<a name="id2574996"></a><h3>
<a name="GtkSourceTag--tag-style"></a>The "<code class="literal">tag-style</code>" property</h3>
<pre class="programlisting"> "tag-style" <a href="gtksourceview-GtkSourceTagStyle.html#GtkSourceTagStyle">GtkSourceTagStyle</a> : Read / Write</pre>
<p>The style associated with the source tag.</p>
diff -pruN 1.6.1-3/docs/reference/html/GtkSourceTagTable.html 1.7.1-0ubuntu2/docs/reference/html/GtkSourceTagTable.html
--- 1.6.1-3/docs/reference/html/GtkSourceTagTable.html 2006-04-10 09:39:56.000000000 +0100
+++ 1.7.1-0ubuntu2/docs/reference/html/GtkSourceTagTable.html 2006-07-24 18:41:19.000000000 +0100
@@ -80,18 +80,18 @@ void <a href="GtkSourceTagTable.h
<div class="refsect1" lang="en">
<a name="details"></a><h2>Details</h2>
<div class="refsect2" lang="en">
-<a name="id2518241"></a><h3>
+<a name="id2568423"></a><h3>
<a name="GtkSourceTagTable-struct"></a>GtkSourceTagTable</h3>
-<a class="indexterm" name="id2518253"></a><pre class="programlisting">typedef struct _GtkSourceTagTable GtkSourceTagTable;</pre>
+<a class="indexterm" name="id2531766"></a><pre class="programlisting">typedef struct _GtkSourceTagTable GtkSourceTagTable;</pre>
<p>
</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2518269"></a><h3>
+<a name="id2531783"></a><h3>
<a name="gtk-source-tag-table-new"></a>gtk_source_tag_table_new ()</h3>
-<a class="indexterm" name="id2518280"></a><pre class="programlisting"><a href="GtkSourceTagTable.html" title="GtkSourceTagTable">GtkSourceTagTable</a>* gtk_source_tag_table_new (void);</pre>
+<a class="indexterm" name="id2531794"></a><pre class="programlisting"><a href="GtkSourceTagTable.html" title="GtkSourceTagTable">GtkSourceTagTable</a>* gtk_source_tag_table_new (void);</pre>
<p>
Creates a new <a href="GtkSourceTagTable.html" title="GtkSourceTagTable"><span class="type">GtkSourceTagTable</span></a>. The table contains no tags by
default.</p>
@@ -110,9 +110,9 @@ default.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2518334"></a><h3>
+<a name="id2531847"></a><h3>
<a name="gtk-source-tag-table-add-tags"></a>gtk_source_tag_table_add_tags ()</h3>
-<a class="indexterm" name="id2518345"></a><pre class="programlisting">void gtk_source_tag_table_add_tags (<a href="GtkSourceTagTable.html" title="GtkSourceTagTable">GtkSourceTagTable</a> *table,
+<a class="indexterm" name="id2531859"></a><pre class="programlisting">void gtk_source_tag_table_add_tags (<a href="GtkSourceTagTable.html" title="GtkSourceTagTable">GtkSourceTagTable</a> *table,
const GSList *tags);</pre>
<p>
Adds a list of tag to the table. The added tags are assigned the highest priority
@@ -144,9 +144,9 @@ then it is not added to the table.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2568158"></a><h3>
+<a name="id2568155"></a><h3>
<a name="gtk-source-tag-table-remove-source-tags"></a>gtk_source_tag_table_remove_source_tags ()</h3>
-<a class="indexterm" name="id2568172"></a><pre class="programlisting">void gtk_source_tag_table_remove_source_tags
+<a class="indexterm" name="id2568168"></a><pre class="programlisting">void gtk_source_tag_table_remove_source_tags
(<a href="GtkSourceTagTable.html" title="GtkSourceTagTable">GtkSourceTagTable</a> *table);</pre>
<p>
Removes all the source tags from the table. This will remove the table's
@@ -169,7 +169,7 @@ up destroyed if you don't have a referen
<div class="refsect1" lang="en">
<a name="signals"></a><h2>Signal Details</h2>
<div class="refsect2" lang="en">
-<a name="id2572387"></a><h3>
+<a name="id2568242"></a><h3>
<a name="GtkSourceTagTable-changed"></a>The "changed" signal</h3>
<pre class="programlisting">void user_function (<a href="GtkSourceTagTable.html" title="GtkSourceTagTable">GtkSourceTagTable</a> *sourcetagtable,
gpointer user_data) : Run last</pre>
diff -pruN 1.6.1-3/docs/reference/html/GtkSourceView.html 1.7.1-0ubuntu2/docs/reference/html/GtkSourceView.html
--- 1.6.1-3/docs/reference/html/GtkSourceView.html 2006-04-10 09:39:56.000000000 +0100
+++ 1.7.1-0ubuntu2/docs/reference/html/GtkSourceView.html 2006-07-24 18:41:19.000000000 +0100
@@ -163,7 +163,7 @@ GtkSourceView implements
<div class="refsect1" lang="en">
<a name="details"></a><h2>Details</h2>
<div class="refsect2" lang="en">
-<a name="id2569489"></a><h3>
+<a name="id2569488"></a><h3>
<a name="GtkSourceView-struct"></a>GtkSourceView</h3>
<a class="indexterm" name="id2569499"></a><pre class="programlisting">typedef struct _GtkSourceView GtkSourceView;</pre>
<p>
@@ -172,7 +172,7 @@ GtkSourceView implements
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2569514"></a><h3>
+<a name="id2569513"></a><h3>
<a name="gtk-source-view-new"></a>gtk_source_view_new ()</h3>
<a class="indexterm" name="id2569524"></a><pre class="programlisting">GtkWidget* gtk_source_view_new (void);</pre>
<p>
@@ -194,9 +194,9 @@ created for you. If you want to specify
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2569588"></a><h3>
+<a name="id2569585"></a><h3>
<a name="gtk-source-view-new-with-buffer"></a>gtk_source_view_new_with_buffer ()</h3>
-<a class="indexterm" name="id2569601"></a><pre class="programlisting">GtkWidget* gtk_source_view_new_with_buffer (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer);</pre>
+<a class="indexterm" name="id2569598"></a><pre class="programlisting">GtkWidget* gtk_source_view_new_with_buffer (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer);</pre>
<p>
Creates a new <a href="GtkSourceView.html" title="GtkSourceView"><span class="type">GtkSourceView</span></a> widget displaying the buffer
<em class="parameter"><code>buffer</code></em>. One buffer can be shared among many widgets.</p>
@@ -223,9 +223,9 @@ Creates a new <a href="GtkSourceView.htm
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2569691"></a><h3>
+<a name="id2569688"></a><h3>
<a name="gtk-source-view-set-show-line-numbers"></a>gtk_source_view_set_show_line_numbers ()</h3>
-<a class="indexterm" name="id2569704"></a><pre class="programlisting">void gtk_source_view_set_show_line_numbers
+<a class="indexterm" name="id2569701"></a><pre class="programlisting">void gtk_source_view_set_show_line_numbers
(<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view,
gboolean show);</pre>
<p>
@@ -253,9 +253,9 @@ If <code class="literal">TRUE</code> lin
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2569791"></a><h3>
+<a name="id2569788"></a><h3>
<a name="gtk-source-view-get-show-line-numbers"></a>gtk_source_view_get_show_line_numbers ()</h3>
-<a class="indexterm" name="id2569805"></a><pre class="programlisting">gboolean gtk_source_view_get_show_line_numbers
+<a class="indexterm" name="id2569802"></a><pre class="programlisting">gboolean gtk_source_view_get_show_line_numbers
(<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view);</pre>
<p>
Returns whether line numbers are displayed beside the text.</p>
@@ -282,9 +282,9 @@ Returns whether line numbers are display
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2569880"></a><h3>
+<a name="id2569877"></a><h3>
<a name="gtk-source-view-set-show-line-markers"></a>gtk_source_view_set_show_line_markers ()</h3>
-<a class="indexterm" name="id2569894"></a><pre class="programlisting">void gtk_source_view_set_show_line_markers
+<a class="indexterm" name="id2569891"></a><pre class="programlisting">void gtk_source_view_set_show_line_markers
(<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view,
gboolean show);</pre>
<p>
@@ -312,9 +312,9 @@ If <code class="literal">TRUE</code> lin
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2569980"></a><h3>
+<a name="id2569977"></a><h3>
<a name="gtk-source-view-get-show-line-markers"></a>gtk_source_view_get_show_line_markers ()</h3>
-<a class="indexterm" name="id2569994"></a><pre class="programlisting">gboolean gtk_source_view_get_show_line_markers
+<a class="indexterm" name="id2569991"></a><pre class="programlisting">gboolean gtk_source_view_get_show_line_markers
(<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view);</pre>
<p>
Returns whether line markers are displayed beside the text.</p>
@@ -341,9 +341,9 @@ Returns whether line markers are display
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2570070"></a><h3>
+<a name="id2570067"></a><h3>
<a name="gtk-source-view-set-tabs-width"></a>gtk_source_view_set_tabs_width ()</h3>
-<a class="indexterm" name="id2570084"></a><pre class="programlisting">void gtk_source_view_set_tabs_width (<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view,
+<a class="indexterm" name="id2570081"></a><pre class="programlisting">void gtk_source_view_set_tabs_width (<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view,
guint width);</pre>
<p>
Sets the width of tabulation in characters.</p>
@@ -370,9 +370,9 @@ Sets the width of tabulation in characte
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2570163"></a><h3>
+<a name="id2570160"></a><h3>
<a name="gtk-source-view-get-tabs-width"></a>gtk_source_view_get_tabs_width ()</h3>
-<a class="indexterm" name="id2570176"></a><pre class="programlisting">guint gtk_source_view_get_tabs_width (<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view);</pre>
+<a class="indexterm" name="id2570173"></a><pre class="programlisting">guint gtk_source_view_get_tabs_width (<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view);</pre>
<p>
Returns the width of tabulation in characters.</p>
<p>
@@ -398,9 +398,9 @@ Returns the width of tabulation in chara
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2570245"></a><h3>
+<a name="id2570242"></a><h3>
<a name="gtk-source-view-set-auto-indent"></a>gtk_source_view_set_auto_indent ()</h3>
-<a class="indexterm" name="id2570258"></a><pre class="programlisting">void gtk_source_view_set_auto_indent (<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view,
+<a class="indexterm" name="id2570256"></a><pre class="programlisting">void gtk_source_view_set_auto_indent (<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view,
gboolean enable);</pre>
<p>
If <code class="literal">TRUE</code> auto indentation of text is enabled.</p>
@@ -427,9 +427,9 @@ If <code class="literal">TRUE</code> aut
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2570344"></a><h3>
+<a name="id2570341"></a><h3>
<a name="gtk-source-view-get-auto-indent"></a>gtk_source_view_get_auto_indent ()</h3>
-<a class="indexterm" name="id2570357"></a><pre class="programlisting">gboolean gtk_source_view_get_auto_indent (<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view);</pre>
+<a class="indexterm" name="id2570354"></a><pre class="programlisting">gboolean gtk_source_view_get_auto_indent (<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view);</pre>
<p>
Returns whether auto indentation of text is enabled.</p>
<p>
@@ -455,9 +455,9 @@ Returns whether auto indentation of text
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2570433"></a><h3>
+<a name="id2570430"></a><h3>
<a name="gtk-source-view-set-insert-spaces-instead-of-tabs"></a>gtk_source_view_set_insert_spaces_instead_of_tabs ()</h3>
-<a class="indexterm" name="id2570447"></a><pre class="programlisting">void gtk_source_view_set_insert_spaces_instead_of_tabs
+<a class="indexterm" name="id2570444"></a><pre class="programlisting">void gtk_source_view_set_insert_spaces_instead_of_tabs
(<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view,
gboolean enable);</pre>
<p>
@@ -486,9 +486,9 @@ of space characters.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2570534"></a><h3>
+<a name="id2570531"></a><h3>
<a name="gtk-source-view-get-insert-spaces-instead-of-tabs"></a>gtk_source_view_get_insert_spaces_instead_of_tabs ()</h3>
-<a class="indexterm" name="id2570548"></a><pre class="programlisting">gboolean gtk_source_view_get_insert_spaces_instead_of_tabs
+<a class="indexterm" name="id2570546"></a><pre class="programlisting">gboolean gtk_source_view_get_insert_spaces_instead_of_tabs
(<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view);</pre>
<p>
Returns whether when inserting a tabulator character it should
@@ -516,9 +516,9 @@ be replaced by a group of space characte
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2570626"></a><h3>
+<a name="id2570600"></a><h3>
<a name="gtk-source-view-set-show-margin"></a>gtk_source_view_set_show_margin ()</h3>
-<a class="indexterm" name="id2570639"></a><pre class="programlisting">void gtk_source_view_set_show_margin (<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view,
+<a class="indexterm" name="id2570612"></a><pre class="programlisting">void gtk_source_view_set_show_margin (<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view,
gboolean show);</pre>
<p>
If <code class="literal">TRUE</code> a margin is displayed</p>
@@ -545,9 +545,9 @@ If <code class="literal">TRUE</code> a m
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2570723"></a><h3>
+<a name="id2570687"></a><h3>
<a name="gtk-source-view-get-show-margin"></a>gtk_source_view_get_show_margin ()</h3>
-<a class="indexterm" name="id2570736"></a><pre class="programlisting">gboolean gtk_source_view_get_show_margin (<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view);</pre>
+<a class="indexterm" name="id2570700"></a><pre class="programlisting">gboolean gtk_source_view_get_show_margin (<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view);</pre>
<p>
Returns whether a margin is displayed.</p>
<p>
@@ -573,9 +573,9 @@ Returns whether a margin is displayed.</
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2570811"></a><h3>
+<a name="id2570766"></a><h3>
<a name="gtk-source-view-set-margin"></a>gtk_source_view_set_margin ()</h3>
-<a class="indexterm" name="id2570823"></a><pre class="programlisting">void gtk_source_view_set_margin (<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view,
+<a class="indexterm" name="id2570777"></a><pre class="programlisting">void gtk_source_view_set_margin (<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view,
guint margin);</pre>
<p>
Sets the position of the right margin in the given <em class="parameter"><code>view</code></em>.</p>
@@ -602,9 +602,9 @@ Sets the position of the right margin in
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2570908"></a><h3>
+<a name="id2570853"></a><h3>
<a name="gtk-source-view-get-margin"></a>gtk_source_view_get_margin ()</h3>
-<a class="indexterm" name="id2570920"></a><pre class="programlisting">guint gtk_source_view_get_margin (<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view);</pre>
+<a class="indexterm" name="id2570864"></a><pre class="programlisting">guint gtk_source_view_get_margin (<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view);</pre>
<p>
Gets the position of the right margin in the given <em class="parameter"><code>view</code></em>.</p>
<p>
@@ -630,9 +630,9 @@ Gets the position of the right margin in
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2563249"></a><h3>
+<a name="id2570931"></a><h3>
<a name="gtk-source-view-set-highlight-current-line"></a>gtk_source_view_set_highlight_current_line ()</h3>
-<a class="indexterm" name="id2570992"></a><pre class="programlisting">void gtk_source_view_set_highlight_current_line
+<a class="indexterm" name="id2570944"></a><pre class="programlisting">void gtk_source_view_set_highlight_current_line
(<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view,
gboolean show);</pre>
<p>
@@ -660,9 +660,9 @@ If TRUE the current line is highlighted<
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2571064"></a><h3>
+<a name="id2571016"></a><h3>
<a name="gtk-source-view-get-highlight-current-line"></a>gtk_source_view_get_highlight_current_line ()</h3>
-<a class="indexterm" name="id2571078"></a><pre class="programlisting">gboolean gtk_source_view_get_highlight_current_line
+<a class="indexterm" name="id2571030"></a><pre class="programlisting">gboolean gtk_source_view_get_highlight_current_line
(<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view);</pre>
<p>
Returns whether the current line is highlighted</p>
@@ -689,9 +689,9 @@ Returns whether the current line is high
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2571140"></a><h3>
+<a name="id2571092"></a><h3>
<a name="gtk-source-view-set-marker-pixbuf"></a>gtk_source_view_set_marker_pixbuf ()</h3>
-<a class="indexterm" name="id2571153"></a><pre class="programlisting">void gtk_source_view_set_marker_pixbuf
+<a class="indexterm" name="id2571105"></a><pre class="programlisting">void gtk_source_view_set_marker_pixbuf
(<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view,
const gchar *marker_type,
GdkPixbuf *pixbuf);</pre>
@@ -726,9 +726,9 @@ Associates a given <em class="parameter"
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2571259"></a><h3>
+<a name="id2571210"></a><h3>
<a name="gtk-source-view-get-marker-pixbuf"></a>gtk_source_view_get_marker_pixbuf ()</h3>
-<a class="indexterm" name="id2571272"></a><pre class="programlisting">GdkPixbuf* gtk_source_view_get_marker_pixbuf
+<a class="indexterm" name="id2571224"></a><pre class="programlisting">GdkPixbuf* gtk_source_view_get_marker_pixbuf
(<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view,
const gchar *marker_type);</pre>
<p>
@@ -762,9 +762,9 @@ Gets the pixbuf which is associated with
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2571369"></a><h3>
+<a name="id2571321"></a><h3>
<a name="gtk-source-view-set-smart-home-end"></a>gtk_source_view_set_smart_home_end ()</h3>
-<a class="indexterm" name="id2571382"></a><pre class="programlisting">void gtk_source_view_set_smart_home_end
+<a class="indexterm" name="id2571334"></a><pre class="programlisting">void gtk_source_view_set_smart_home_end
(<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view,
gboolean enable);</pre>
<p>
@@ -793,9 +793,9 @@ character of the line before moving to t
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2571460"></a><h3>
+<a name="id2571412"></a><h3>
<a name="gtk-source-view-get-smart-home-end"></a>gtk_source_view_get_smart_home_end ()</h3>
-<a class="indexterm" name="id2571473"></a><pre class="programlisting">gboolean gtk_source_view_get_smart_home_end
+<a class="indexterm" name="id2571425"></a><pre class="programlisting">gboolean gtk_source_view_get_smart_home_end
(<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view);</pre>
<p>
Returns whether HOME and END keys will move to the first/last non-space
@@ -825,7 +825,7 @@ character of the line before moving to t
<div class="refsect1" lang="en">
<a name="property_details"></a><h2>Property Details</h2>
<div class="refsect2" lang="en">
-<a name="id2571553"></a><h3>
+<a name="id2571504"></a><h3>
<a name="GtkSourceView--auto-indent"></a>The "<code class="literal">auto-indent</code>" property</h3>
<pre class="programlisting"> "auto-indent" gboolean : Read / Write</pre>
<p>Whether to enable auto indentation.</p>
@@ -833,7 +833,7 @@ character of the line before moving to t
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2571583"></a><h3>
+<a name="id2571535"></a><h3>
<a name="GtkSourceView--highlight-current-line"></a>The "<code class="literal">highlight-current-line</code>" property</h3>
<pre class="programlisting"> "highlight-current-line" gboolean : Read / Write</pre>
<p>Whether to highlight the current line.</p>
@@ -841,7 +841,7 @@ character of the line before moving to t
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2571616"></a><h3>
+<a name="id2571567"></a><h3>
<a name="GtkSourceView--insert-spaces-instead-of-tabs"></a>The "<code class="literal">insert-spaces-instead-of-tabs</code>" property</h3>
<pre class="programlisting"> "insert-spaces-instead-of-tabs" gboolean : Read / Write</pre>
<p>Whether to insert spaces instead of tabs.</p>
@@ -849,7 +849,7 @@ character of the line before moving to t
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2571650"></a><h3>
+<a name="id2571601"></a><h3>
<a name="GtkSourceView--margin"></a>The "<code class="literal">margin</code>" property</h3>
<pre class="programlisting"> "margin" guint : Read / Write</pre>
<p>Position of the right margin.</p>
@@ -858,7 +858,7 @@ character of the line before moving to t
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2571684"></a><h3>
+<a name="id2571635"></a><h3>
<a name="GtkSourceView--show-line-markers"></a>The "<code class="literal">show-line-markers</code>" property</h3>
<pre class="programlisting"> "show-line-markers" gboolean : Read / Write</pre>
<p>Whether to display line marker pixbufs.</p>
@@ -866,7 +866,7 @@ character of the line before moving to t
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2571716"></a><h3>
+<a name="id2571667"></a><h3>
<a name="GtkSourceView--show-line-numbers"></a>The "<code class="literal">show-line-numbers</code>" property</h3>
<pre class="programlisting"> "show-line-numbers" gboolean : Read / Write</pre>
<p>Whether to display line numbers.</p>
@@ -874,7 +874,7 @@ character of the line before moving to t
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2571748"></a><h3>
+<a name="id2571699"></a><h3>
<a name="GtkSourceView--show-margin"></a>The "<code class="literal">show-margin</code>" property</h3>
<pre class="programlisting"> "show-margin" gboolean : Read / Write</pre>
<p>Whether to display the right margin.</p>
@@ -882,7 +882,7 @@ character of the line before moving to t
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2571779"></a><h3>
+<a name="id2571730"></a><h3>
<a name="GtkSourceView--smart-home-end"></a>The "<code class="literal">smart-home-end</code>" property</h3>
<pre class="programlisting"> "smart-home-end" gboolean : Read / Write</pre>
<p>HOME and END keys move to first/last non whitespace characters on line before going to the start/end of the line.</p>
@@ -890,7 +890,7 @@ character of the line before moving to t
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2571812"></a><h3>
+<a name="id2571764"></a><h3>
<a name="GtkSourceView--tabs-width"></a>The "<code class="literal">tabs-width</code>" property</h3>
<pre class="programlisting"> "tabs-width" guint : Read / Write</pre>
<p>Tabs Width.</p>
@@ -901,7 +901,7 @@ character of the line before moving to t
<div class="refsect1" lang="en">
<a name="style_properties_details"></a><h2>Style Property Details</h2>
<div class="refsect2" lang="en">
-<a name="id2571858"></a><h3>
+<a name="id2571809"></a><h3>
<a name="GtkSourceView--right-margin-line-alpha"></a>The "<code class="literal">right-margin-line-alpha</code>" style property</h3>
<pre class="programlisting"> "right-margin-line-alpha" gint : Read</pre>
<p>
@@ -919,7 +919,7 @@ be visible).</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2571903"></a><h3>
+<a name="id2571854"></a><h3>
<a name="GtkSourceView--right-margin-line-color"></a>The "<code class="literal">right-margin-line-color</code>" style property</h3>
<pre class="programlisting"> "right-margin-line-color" GdkColor : Read</pre>
<p>
@@ -934,7 +934,7 @@ margin) will be drawn.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2571940"></a><h3>
+<a name="id2571892"></a><h3>
<a name="GtkSourceView--right-margin-overlay-alpha"></a>The "<code class="literal">right-margin-overlay-alpha</code>" style property</h3>
<pre class="programlisting"> "right-margin-overlay-alpha" gint : Read</pre>
<p>
@@ -952,7 +952,7 @@ won't be visible).</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2571985"></a><h3>
+<a name="id2571937"></a><h3>
<a name="GtkSourceView--right-margin-overlay-color"></a>The "<code class="literal">right-margin-overlay-color</code>" style property</h3>
<pre class="programlisting"> "right-margin-overlay-color" GdkColor : Read</pre>
<p>
@@ -967,7 +967,7 @@ will only have an effect if ::right-marg
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2572024"></a><h3>
+<a name="id2571975"></a><h3>
<a name="GtkSourceView--right-margin-overlay-toggle"></a>The "<code class="literal">right-margin-overlay-toggle</code>" style property</h3>
<pre class="programlisting"> "right-margin-overlay-toggle" gchararray : Read</pre>
<p>
@@ -986,7 +986,7 @@ noticable performance impact, so this pr
<div class="refsect1" lang="en">
<a name="signals"></a><h2>Signal Details</h2>
<div class="refsect2" lang="en">
-<a name="id2572076"></a><h3>
+<a name="id2572028"></a><h3>
<a name="GtkSourceView-redo"></a>The "redo" signal</h3>
<pre class="programlisting">void user_function (<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *sourceview,
gpointer user_data) : Run last / Action</pre>
@@ -1013,7 +1013,7 @@ noticable performance impact, so this pr
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2572139"></a><h3>
+<a name="id2572090"></a><h3>
<a name="GtkSourceView-undo"></a>The "undo" signal</h3>
<pre class="programlisting">void user_function (<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *sourceview,
gpointer user_data) : Run last / Action</pre>
diff -pruN 1.6.1-3/docs/reference/html/gtksourceview-GtkSourceMarker.html 1.7.1-0ubuntu2/docs/reference/html/gtksourceview-GtkSourceMarker.html
--- 1.6.1-3/docs/reference/html/gtksourceview-GtkSourceMarker.html 2006-04-10 09:39:56.000000000 +0100
+++ 1.7.1-0ubuntu2/docs/reference/html/gtksourceview-GtkSourceMarker.html 2006-07-24 18:41:19.000000000 +0100
@@ -65,19 +65,17 @@ const gchar* <a href="gtksourceview-GtkS
<div class="refsect1" lang="en">
<a name="details"></a><h2>Details</h2>
<div class="refsect2" lang="en">
-<a name="id2547177"></a><h3>
+<a name="id2526783"></a><h3>
<a name="GtkSourceMarker"></a>GtkSourceMarker</h3>
-<a class="indexterm" name="id2526466"></a><pre class="programlisting">typedef GtkTextMark GtkSourceMarker;
-</pre>
-<p>
+<a class="indexterm" name="id2528356"></a><p>
</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2526482"></a><h3>
+<a name="id2528365"></a><h3>
<a name="gtk-source-marker-set-marker-type"></a>gtk_source_marker_set_marker_type ()</h3>
-<a class="indexterm" name="id2526493"></a><pre class="programlisting">void gtk_source_marker_set_marker_type
+<a class="indexterm" name="id2528376"></a><pre class="programlisting">void gtk_source_marker_set_marker_type
(<a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a> *marker,
const gchar *type);</pre>
<p>
@@ -105,9 +103,9 @@ const gchar* <a href="gtksourceview-GtkS
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2526559"></a><h3>
+<a name="id2528443"></a><h3>
<a name="gtk-source-marker-get-marker-type"></a>gtk_source_marker_get_marker_type ()</h3>
-<a class="indexterm" name="id2526571"></a><pre class="programlisting">gchar* gtk_source_marker_get_marker_type
+<a class="indexterm" name="id2528456"></a><pre class="programlisting">gchar* gtk_source_marker_get_marker_type
(<a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a> *marker);</pre>
<p>
Gets the marker type of this <em class="parameter"><code>marker</code></em>.</p>
@@ -134,9 +132,9 @@ Gets the marker type of this <em class="
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2562020"></a><h3>
+<a name="id2562097"></a><h3>
<a name="gtk-source-marker-get-line"></a>gtk_source_marker_get_line ()</h3>
-<a class="indexterm" name="id2562032"></a><pre class="programlisting">gint gtk_source_marker_get_line (<a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a> *marker);</pre>
+<a class="indexterm" name="id2562108"></a><pre class="programlisting">gint gtk_source_marker_get_line (<a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a> *marker);</pre>
<p>
Gets the line number of this <em class="parameter"><code>marker</code></em>.</p>
<p>
@@ -162,9 +160,9 @@ Gets the line number of this <em class="
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2562106"></a><h3>
+<a name="id2562181"></a><h3>
<a name="gtk-source-marker-get-name"></a>gtk_source_marker_get_name ()</h3>
-<a class="indexterm" name="id2562118"></a><pre class="programlisting">const gchar* gtk_source_marker_get_name (<a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a> *marker);</pre>
+<a class="indexterm" name="id2562193"></a><pre class="programlisting">const gchar* gtk_source_marker_get_name (<a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a> *marker);</pre>
<p>
Gets the name of this <em class="parameter"><code>marker</code></em>.</p>
<p>
@@ -190,9 +188,9 @@ Gets the name of this <em class="paramet
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2562192"></a><h3>
+<a name="id2562268"></a><h3>
<a name="gtk-source-marker-get-buffer"></a>gtk_source_marker_get_buffer ()</h3>
-<a class="indexterm" name="id2562205"></a><pre class="programlisting"><a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a>* gtk_source_marker_get_buffer
+<a class="indexterm" name="id2562281"></a><pre class="programlisting"><a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a>* gtk_source_marker_get_buffer
(<a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a> *marker);</pre>
<p>
Gets the buffer associated with this <em class="parameter"><code>marker</code></em>.</p>
@@ -219,9 +217,9 @@ Gets the buffer associated with this <em
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2562377"></a><h3>
+<a name="id2526198"></a><h3>
<a name="gtk-source-marker-next"></a>gtk_source_marker_next ()</h3>
-<a class="indexterm" name="id2562388"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a>* gtk_source_marker_next (<a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a> *marker);</pre>
+<a class="indexterm" name="id2526209"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a>* gtk_source_marker_next (<a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a> *marker);</pre>
<p>
Gets the next marker after <em class="parameter"><code>marker</code></em>.</p>
<p>
@@ -247,9 +245,9 @@ Gets the next marker after <em class="pa
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2562469"></a><h3>
+<a name="id2526290"></a><h3>
<a name="gtk-source-marker-prev"></a>gtk_source_marker_prev ()</h3>
-<a class="indexterm" name="id2562480"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a>* gtk_source_marker_prev (<a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a> *marker);</pre>
+<a class="indexterm" name="id2526301"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a>* gtk_source_marker_prev (<a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a> *marker);</pre>
<p>
Gets the previous marker before <em class="parameter"><code>marker</code></em>.</p>
<p>
diff -pruN 1.6.1-3/docs/reference/html/gtksourceview-GtkSourceTagStyle.html 1.7.1-0ubuntu2/docs/reference/html/gtksourceview-GtkSourceTagStyle.html
--- 1.6.1-3/docs/reference/html/gtksourceview-GtkSourceTagStyle.html 2006-04-10 09:39:56.000000000 +0100
+++ 1.7.1-0ubuntu2/docs/reference/html/gtksourceview-GtkSourceTagStyle.html 2006-07-24 18:41:19.000000000 +0100
@@ -60,9 +60,9 @@ void <a href="gtksourceview-GtkSo
<div class="refsect1" lang="en">
<a name="details"></a><h2>Details</h2>
<div class="refsect2" lang="en">
-<a name="id2529068"></a><h3>
+<a name="id2573754"></a><h3>
<a name="GtkSourceTagStyle"></a>GtkSourceTagStyle</h3>
-<a class="indexterm" name="id2529080"></a><pre class="programlisting">typedef struct {
+<a class="indexterm" name="id2573766"></a><pre class="programlisting">typedef struct {
/* readonly */
gboolean is_default;
@@ -86,9 +86,9 @@ void <a href="gtksourceview-GtkSo
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2529100"></a><h3>
+<a name="id2573786"></a><h3>
<a name="GtkSourceTagStyleMask"></a>enum GtkSourceTagStyleMask</h3>
-<a class="indexterm" name="id2529112"></a><pre class="programlisting">typedef enum {
+<a class="indexterm" name="id2573797"></a><pre class="programlisting">typedef enum {
GTK_SOURCE_TAG_STYLE_USE_BACKGROUND = 1 << 0, /*< nick=use_background >*/
GTK_SOURCE_TAG_STYLE_USE_FOREGROUND = 1 << 1 /*< nick=use_foreground >*/
} GtkSourceTagStyleMask;
@@ -99,19 +99,18 @@ void <a href="gtksourceview-GtkSo
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2529130"></a><h3>
+<a name="id2573815"></a><h3>
<a name="GTK-TYPE-SOURCE-TAG-STYLE:CAPS"></a>GTK_TYPE_SOURCE_TAG_STYLE</h3>
-<a class="indexterm" name="id2529141"></a><pre class="programlisting">#define GTK_TYPE_SOURCE_TAG_STYLE (gtk_source_tag_style_get_type ())
-</pre>
+<a class="indexterm" name="id2573827"></a><pre class="programlisting">#define GTK_TYPE_SOURCE_TAG_STYLE</pre>
<p>
</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2529158"></a><h3>
+<a name="id2573912"></a><h3>
<a name="gtk-source-tag-style-get-type"></a>gtk_source_tag_style_get_type ()</h3>
-<a class="indexterm" name="id2529169"></a><pre class="programlisting">GType gtk_source_tag_style_get_type (void);</pre>
+<a class="indexterm" name="id2573923"></a><pre class="programlisting">GType gtk_source_tag_style_get_type (void);</pre>
<p>
Retrieves the GType object which is associated with the
<a href="gtksourceview-GtkSourceTagStyle.html#GtkSourceTagStyle"><span class="type">GtkSourceTagStyle</span></a> class.</p>
@@ -130,9 +129,9 @@ Retrieves the GType object which is asso
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2568350"></a><h3>
+<a name="id2573978"></a><h3>
<a name="gtk-source-tag-style-new"></a>gtk_source_tag_style_new ()</h3>
-<a class="indexterm" name="id2568361"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceTagStyle.html#GtkSourceTagStyle">GtkSourceTagStyle</a>* gtk_source_tag_style_new (void);</pre>
+<a class="indexterm" name="id2573989"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceTagStyle.html#GtkSourceTagStyle">GtkSourceTagStyle</a>* gtk_source_tag_style_new (void);</pre>
<p>
Creates a new tag style object.</p>
<p>
@@ -150,9 +149,9 @@ Creates a new tag style object.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2568407"></a><h3>
+<a name="id2574035"></a><h3>
<a name="gtk-source-tag-style-copy"></a>gtk_source_tag_style_copy ()</h3>
-<a class="indexterm" name="id2568418"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceTagStyle.html#GtkSourceTagStyle">GtkSourceTagStyle</a>* gtk_source_tag_style_copy
+<a class="indexterm" name="id2574046"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceTagStyle.html#GtkSourceTagStyle">GtkSourceTagStyle</a>* gtk_source_tag_style_copy
(const <a href="gtksourceview-GtkSourceTagStyle.html#GtkSourceTagStyle">GtkSourceTagStyle</a> *style);</pre>
<p>
Makes a copy of the given <em class="parameter"><code>style</code></em>.</p>
@@ -179,9 +178,9 @@ Makes a copy of the given <em class="par
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2575132"></a><h3>
+<a name="id2574128"></a><h3>
<a name="gtk-source-tag-style-free"></a>gtk_source_tag_style_free ()</h3>
-<a class="indexterm" name="id2575144"></a><pre class="programlisting">void gtk_source_tag_style_free (<a href="gtksourceview-GtkSourceTagStyle.html#GtkSourceTagStyle">GtkSourceTagStyle</a> *style);</pre>
+<a class="indexterm" name="id2574139"></a><pre class="programlisting">void gtk_source_tag_style_free (<a href="gtksourceview-GtkSourceTagStyle.html#GtkSourceTagStyle">GtkSourceTagStyle</a> *style);</pre>
<p>
Frees the resources allocated by the given <em class="parameter"><code>style</code></em>.</p>
<p>
diff -pruN 1.6.1-3/docs/reference/html/gtksourceview-Searching-in-a-GtkSourceBuffer.html 1.7.1-0ubuntu2/docs/reference/html/gtksourceview-Searching-in-a-GtkSourceBuffer.html
--- 1.6.1-3/docs/reference/html/gtksourceview-Searching-in-a-GtkSourceBuffer.html 2006-04-10 09:39:56.000000000 +0100
+++ 1.7.1-0ubuntu2/docs/reference/html/gtksourceview-Searching-in-a-GtkSourceBuffer.html 2006-07-24 18:41:19.000000000 +0100
@@ -67,9 +67,9 @@ gboolean <a href="gtksourceview-Searc
<div class="refsect1" lang="en">
<a name="details"></a><h2>Details</h2>
<div class="refsect2" lang="en">
-<a name="id2526763"></a><h3>
+<a name="id2532847"></a><h3>
<a name="GtkSourceSearchFlags"></a>enum GtkSourceSearchFlags</h3>
-<a class="indexterm" name="id2526774"></a><pre class="programlisting">typedef enum
+<a class="indexterm" name="id2532859"></a><pre class="programlisting">typedef enum
{
GTK_SOURCE_SEARCH_VISIBLE_ONLY = 1 << 0,
GTK_SOURCE_SEARCH_TEXT_ONLY = 1 << 1,
@@ -83,9 +83,9 @@ gboolean <a href="gtksourceview-Searc
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2528356"></a><h3>
+<a name="id2532884"></a><h3>
<a name="gtk-source-iter-backward-search"></a>gtk_source_iter_backward_search ()</h3>
-<a class="indexterm" name="id2528367"></a><pre class="programlisting">gboolean gtk_source_iter_backward_search (const GtkTextIter *iter,
+<a class="indexterm" name="id2532895"></a><pre class="programlisting">gboolean gtk_source_iter_backward_search (const GtkTextIter *iter,
const gchar *str,
<a href="gtksourceview-Searching-in-a-GtkSourceBuffer.html#GtkSourceSearchFlags">GtkSourceSearchFlags</a> flags,
GtkTextIter *match_start,
@@ -147,9 +147,9 @@ searching.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2517733"></a><h3>
+<a name="id2471321"></a><h3>
<a name="gtk-source-iter-forward-search"></a>gtk_source_iter_forward_search ()</h3>
-<a class="indexterm" name="id2517746"></a><pre class="programlisting">gboolean gtk_source_iter_forward_search (const GtkTextIter *iter,
+<a class="indexterm" name="id2471335"></a><pre class="programlisting">gboolean gtk_source_iter_forward_search (const GtkTextIter *iter,
const gchar *str,
<a href="gtksourceview-Searching-in-a-GtkSourceBuffer.html#GtkSourceSearchFlags">GtkSourceSearchFlags</a> flags,
GtkTextIter *match_start,
@@ -230,9 +230,9 @@ searching.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2471358"></a><h3>
+<a name="id2517831"></a><h3>
<a name="gtk-source-iter-find-matching-bracket"></a>gtk_source_iter_find_matching_bracket ()</h3>
-<a class="indexterm" name="id2471371"></a><pre class="programlisting">gboolean gtk_source_iter_find_matching_bracket
+<a class="indexterm" name="id2517844"></a><pre class="programlisting">gboolean gtk_source_iter_find_matching_bracket
(GtkTextIter *iter);</pre>
<p>
Tries to match the bracket character currently at <em class="parameter"><code>iter</code></em> with its
diff -pruN 1.6.1-3/docs/reference/html/index.html 1.7.1-0ubuntu2/docs/reference/html/index.html
--- 1.6.1-3/docs/reference/html/index.html 2006-04-10 09:39:56.000000000 +0100
+++ 1.7.1-0ubuntu2/docs/reference/html/index.html 2006-07-24 18:41:19.000000000 +0100
@@ -14,7 +14,7 @@
<div class="titlepage">
<div>
<div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">GtkSourceView Reference Manual</p></th></tr></table></div>
-<div><p class="releaseinfo">for GtkSourceView 1.6.1
+<div><p class="releaseinfo">for GtkSourceView 1.7.1
</p></div>
</div>
<hr>
diff -pruN 1.6.1-3/docs/reference/html/rn01.html 1.7.1-0ubuntu2/docs/reference/html/rn01.html
--- 1.6.1-3/docs/reference/html/rn01.html 2006-04-10 09:39:56.000000000 +0100
+++ 1.7.1-0ubuntu2/docs/reference/html/rn01.html 2006-07-24 18:41:19.000000000 +0100
@@ -21,9 +21,9 @@
<td><a accesskey="n" href="GtkSourceBuffer.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
</tr></table>
<div class="reference" lang="en">
-<a name="id2477089"></a><div class="titlepage">
+<a name="id2477098"></a><div class="titlepage">
<div><div><h1 class="title">
-<a name="id2477089"></a>API reference</h1></div></div>
+<a name="id2477098"></a>API reference</h1></div></div>
<hr>
</div>
</div>
diff -pruN 1.6.1-3/docs/reference/version.xml 1.7.1-0ubuntu2/docs/reference/version.xml
--- 1.6.1-3/docs/reference/version.xml 2006-04-10 09:25:55.000000000 +0100
+++ 1.7.1-0ubuntu2/docs/reference/version.xml 2006-07-24 18:41:12.000000000 +0100
@@ -1 +1 @@
-1.6.1
+1.7.1
diff -pruN 1.6.1-3/docs/reference/xml/marker.xml 1.7.1-0ubuntu2/docs/reference/xml/marker.xml
--- 1.6.1-3/docs/reference/xml/marker.xml 2006-04-10 09:39:56.000000000 +0100
+++ 1.7.1-0ubuntu2/docs/reference/xml/marker.xml 2006-07-24 18:41:19.000000000 +0100
@@ -59,9 +59,7 @@ const <link linkend="gchar">gchar</link>
<title id="details.title">Details</title>
<refsect2>
<title><anchor id="GtkSourceMarker" role="typedef"/>GtkSourceMarker</title>
-<indexterm><primary>GtkSourceMarker</primary></indexterm><programlisting>typedef GtkTextMark GtkSourceMarker;
-</programlisting>
-<para>
+<indexterm><primary>GtkSourceMarker</primary></indexterm><para>
</para></refsect2>
<refsect2>
diff -pruN 1.6.1-3/docs/reference/xml/tag.xml 1.7.1-0ubuntu2/docs/reference/xml/tag.xml
--- 1.6.1-3/docs/reference/xml/tag.xml 2006-04-10 09:39:56.000000000 +0100
+++ 1.7.1-0ubuntu2/docs/reference/xml/tag.xml 2006-07-24 18:41:19.000000000 +0100
@@ -272,8 +272,7 @@ string at the end.
</variablelist></refsect2>
<refsect2>
<title><anchor id="gtk-block-comment-tag-new" role="macro"/>gtk_block_comment_tag_new</title>
-<indexterm><primary>gtk_block_comment_tag_new</primary></indexterm><programlisting>#define gtk_block_comment_tag_new gtk_syntax_tag_new
-</programlisting>
+<indexterm><primary>gtk_block_comment_tag_new</primary></indexterm><programlisting>#define gtk_block_comment_tag_new</programlisting>
<para>
</para></refsect2>
diff -pruN 1.6.1-3/docs/reference/xml/tagstyle.xml 1.7.1-0ubuntu2/docs/reference/xml/tagstyle.xml
--- 1.6.1-3/docs/reference/xml/tagstyle.xml 2006-04-10 09:39:56.000000000 +0100
+++ 1.7.1-0ubuntu2/docs/reference/xml/tagstyle.xml 2006-07-24 18:41:19.000000000 +0100
@@ -87,8 +87,7 @@ enum <link linkend="GtkSourceTagS
</para></refsect2>
<refsect2>
<title><anchor id="GTK-TYPE-SOURCE-TAG-STYLE:CAPS" role="macro"/>GTK_TYPE_SOURCE_TAG_STYLE</title>
-<indexterm><primary>GTK_TYPE_SOURCE_TAG_STYLE</primary></indexterm><programlisting>#define GTK_TYPE_SOURCE_TAG_STYLE (gtk_source_tag_style_get_type ())
-</programlisting>
+<indexterm><primary>GTK_TYPE_SOURCE_TAG_STYLE</primary></indexterm><programlisting>#define GTK_TYPE_SOURCE_TAG_STYLE</programlisting>
<para>
</para></refsect2>
diff -pruN 1.6.1-3/gtksourceview/Makefile.in 1.7.1-0ubuntu2/gtksourceview/Makefile.in
--- 1.6.1-3/gtksourceview/Makefile.in 2006-04-10 09:25:44.000000000 +0100
+++ 1.7.1-0ubuntu2/gtksourceview/Makefile.in 2006-07-24 18:40:54.000000000 +0100
@@ -123,6 +123,7 @@ DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ALL_LINGUAS = @ALL_LINGUAS@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
@@ -140,7 +141,6 @@ CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
diff -pruN 1.6.1-3/gtksourceview/gnu-regex/Makefile.in 1.7.1-0ubuntu2/gtksourceview/gnu-regex/Makefile.in
--- 1.6.1-3/gtksourceview/gnu-regex/Makefile.in 2006-04-10 09:25:44.000000000 +0100
+++ 1.7.1-0ubuntu2/gtksourceview/gnu-regex/Makefile.in 2006-07-24 18:40:54.000000000 +0100
@@ -69,6 +69,7 @@ CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ALL_LINGUAS = @ALL_LINGUAS@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
@@ -86,7 +87,6 @@ CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
diff -pruN 1.6.1-3/gtksourceview/gtksourceview.c 1.7.1-0ubuntu2/gtksourceview/gtksourceview.c
--- 1.6.1-3/gtksourceview/gtksourceview.c 2006-04-08 11:07:10.000000000 +0100
+++ 1.7.1-0ubuntu2/gtksourceview/gtksourceview.c 2006-07-24 16:17:17.000000000 +0100
@@ -1958,7 +1958,9 @@ gtk_source_view_key_press_event (GtkWidg
mark = gtk_text_buffer_get_insert (buf);
gtk_text_buffer_get_iter_at_mark (buf, &cur, mark);
- if ((key == GDK_Return) && !(event->state & GDK_SHIFT_MASK) && view->priv->auto_indent)
+ if ((key == GDK_Return || key == GDK_KP_Enter) &&
+ !(event->state & GDK_SHIFT_MASK) &&
+ view->priv->auto_indent)
{
/* Auto-indent means that when you press ENTER at the end of a
* line, the new line is automatically indented at the same
diff -pruN 1.6.1-3/gtksourceview/language-specs/Makefile.am 1.7.1-0ubuntu2/gtksourceview/language-specs/Makefile.am
--- 1.6.1-3/gtksourceview/language-specs/Makefile.am 2006-01-16 00:02:37.000000000 +0000
+++ 1.7.1-0ubuntu2/gtksourceview/language-specs/Makefile.am 2006-07-24 17:02:58.000000000 +0100
@@ -1,13 +1,15 @@
EXTRA_DIST = \
language.dtd \
ada.lang \
+ boo.lang \
c.lang \
changelog.lang \
csharp.lang \
css.lang \
cpp.lang \
- diff.lang \
+ d.lang \
desktop.lang \
+ diff.lang \
fortran.lang \
gtkrc.lang \
haskell.lang \
diff -pruN 1.6.1-3/gtksourceview/language-specs/Makefile.in 1.7.1-0ubuntu2/gtksourceview/language-specs/Makefile.in
--- 1.6.1-3/gtksourceview/language-specs/Makefile.in 2006-04-10 09:25:44.000000000 +0100
+++ 1.7.1-0ubuntu2/gtksourceview/language-specs/Makefile.in 2006-07-24 18:40:55.000000000 +0100
@@ -59,6 +59,7 @@ DATA = $(languages_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ALL_LINGUAS = @ALL_LINGUAS@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
@@ -76,7 +77,6 @@ CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
@@ -230,13 +230,15 @@ target_alias = @target_alias@
EXTRA_DIST = \
language.dtd \
ada.lang \
+ boo.lang \
c.lang \
changelog.lang \
csharp.lang \
css.lang \
cpp.lang \
- diff.lang \
+ d.lang \
desktop.lang \
+ diff.lang \
fortran.lang \
gtkrc.lang \
haskell.lang \
diff -pruN 1.6.1-3/gtksourceview/language-specs/boo.lang 1.7.1-0ubuntu2/gtksourceview/language-specs/boo.lang
--- 1.6.1-3/gtksourceview/language-specs/boo.lang 1970-01-01 01:00:00.000000000 +0100
+++ 1.7.1-0ubuntu2/gtksourceview/language-specs/boo.lang 2006-07-24 17:00:58.000000000 +0100
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd">
+<language name="Boo" version="1.0" _section="Sources" mimetypes="text/x-boo">
+
+ <escape-char>\</escape-char>
+
+ <string name = "Multiline String" style = "String" end-at-line-end = "false">
+ <start-regex>"""</start-regex>
+ <end-regex>"""</end-regex>
+ </string>
+
+ <string name = "Double Quoted String" style = "String" end-at-line-end = "true">
+ <start-regex>"</start-regex>
+ <end-regex>"</end-regex>
+ </string>
+
+ <string name = "Single Quoted String" style = "String" end-at-line-end = "true">
+ <start-regex>'</start-regex>
+ <end-regex>'</end-regex>
+ </string>
+
+ <line-comment name = "Line Comment" style= "Comment">
+ <start-regex>#</start-regex>
+ </line-comment>
+
+ <line-comment name = "C Style Line Comment" style = "Comment">
+ <start-regex>//</start-regex>
+ </line-comment>
+
+ <string name = "Regular Expression" style = "String" end-at-line-end = "true">
+ <start-regex>/[^/]</start-regex>
+ <end-regex>/</end-regex>
+ </string>
+
+ <block-comment name = "Block Comment" style = "Comment">
+ <start-regex>/\*</start-regex>
+ <end-regex>\*/</end-regex>
+ </block-comment>
+
+ <keyword-list name = "Namespace" style = "Preprocessor" case-sensitive = "true">
+ <keyword>import</keyword>
+ <keyword>from</keyword>
+ <keyword>as</keyword>
+ <keyword>namespace</keyword>
+ </keyword-list>
+
+ <keyword-list _name = "Primitive" style = "Data Type" case-sensitive = "true">
+ <keyword>bool</keyword>
+ <keyword>byte</keyword>
+ <keyword>sbyte</keyword>
+ <keyword>double</keyword>
+ <keyword>decimal</keyword>
+ <keyword>single</keyword>
+ <keyword>short</keyword>
+ <keyword>ushort</keyword>
+ <keyword>int</keyword>
+ <keyword>char</keyword>
+ <keyword>uint</keyword>
+ <keyword>long</keyword>
+ <keyword>ulong</keyword>
+ <keyword>object</keyword>
+ <keyword>duck</keyword>
+ <keyword>string</keyword>
+ <keyword>regex</keyword>
+ <keyword>date</keyword>
+ <keyword>timespan</keyword>
+ </keyword-list>
+
+ <keyword-list name="Definition" style = "Keyword" case-sensitive="true">
+ <keyword>abstract</keyword>
+ <keyword>virtual</keyword>
+ <keyword>override</keyword>
+ <keyword>static</keyword>
+ <keyword>final</keyword>
+ <keyword>transient</keyword>
+
+ <keyword>protected</keyword>
+ <keyword>private</keyword>
+ <keyword>public</keyword>
+ <keyword>internal</keyword>
+ <keyword>partial</keyword>
+
+ <keyword>class</keyword>
+ <keyword>struct</keyword>
+ <keyword>interface</keyword>
+ <keyword>enum</keyword>
+ <keyword>callable</keyword>
+ <keyword>of</keyword>
+
+ <keyword>def</keyword>
+ <keyword>constructor</keyword>
+ <keyword>destructor</keyword>
+
+ <keyword>do</keyword>
+ <keyword>get</keyword>
+ <keyword>set</keyword>
+ <keyword>event</keyword>
+
+ <keyword>return</keyword>
+ <keyword>yield</keyword>
+ </keyword-list>
+
+ <pattern-item _name = "Number" style = "Decimal">
+ <regex>\b[0-9][0-9\.]*(m|ms|d|h|s|f|F|l|L)?\b</regex>
+ </pattern-item>
+
+ <keyword-list _name = "Boolean" style = "Decimal" case-sensitive="true">
+ <keyword>true</keyword>
+ <keyword>false</keyword>
+ </keyword-list>
+
+ <keyword-list _name = "Literals" style="Keyword" case-sensitive="true">
+ <keyword>null</keyword>
+ <keyword>self</keyword>
+ <keyword>super</keyword>
+ </keyword-list>
+
+ <keyword-list _name = "Keywords" style = "Keyword" case-sensitive="true">
+ <keyword>and</keyword>
+ <keyword>break</keyword>
+ <keyword>cast</keyword>
+ <keyword>continue</keyword>
+ <keyword>elif</keyword>
+ <keyword>else</keyword>
+ <keyword>except</keyword>
+ <keyword>ensure</keyword>
+ <keyword>for</keyword>
+ <keyword>given</keyword>
+ <keyword>goto</keyword>
+ <keyword>if</keyword>
+ <keyword>in</keyword>
+ <keyword>is</keyword>
+ <keyword>isa</keyword>
+ <keyword>not</keyword>
+ <keyword>or</keyword>
+ <keyword>otherwise</keyword>
+ <keyword>pass</keyword>
+ <keyword>raise</keyword>
+ <keyword>try</keyword>
+ <keyword>unless</keyword>
+ <keyword>when</keyword>
+ <keyword>while</keyword>
+ <keyword>ref</keyword>
+ </keyword-list>
+
+ <keyword-list name = "Builtins" style = "Others" case-sensitive="true">
+ <keyword>assert</keyword>
+ <keyword>__eval__</keyword>
+ <keyword>__switch__</keyword>
+ <keyword>enumerate</keyword>
+ <keyword>filter</keyword>
+ <keyword>len</keyword>
+ <keyword>typeof</keyword>
+ <keyword>map</keyword>
+ <keyword>max</keyword>
+ <keyword>min</keyword>
+ <keyword>property</keyword>
+ <keyword>using</keyword>
+ <keyword>getter</keyword>
+ <keyword>required</keyword>
+ <keyword>lock</keyword>
+ <keyword>range</keyword>
+ <keyword>zip</keyword>
+ <keyword>checked</keyword>
+ <keyword>unchecked</keyword>
+ <keyword>rawArrayIndexing</keyword>
+ <keyword>normalArrayIndexing</keyword>
+ <keyword>print</keyword>
+ <keyword>array</keyword>
+ <keyword>matrix</keyword>
+ <keyword>yieldAll</keyword>
+ </keyword-list>
+</language>
diff -pruN 1.6.1-3/gtksourceview/language-specs/d.lang 1.7.1-0ubuntu2/gtksourceview/language-specs/d.lang
--- 1.6.1-3/gtksourceview/language-specs/d.lang 1970-01-01 01:00:00.000000000 +0100
+++ 1.7.1-0ubuntu2/gtksourceview/language-specs/d.lang 2006-07-24 16:44:27.000000000 +0100
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd">
+<!--
+ D Language specification
+
+ Reference:
+ http://www.digitalmars.com/d/lex.html
+-->
+
+<language _name="D" version="1.0" _section="Sources"
+ mimetypes="text/x-dsrc">
+
+ <escape-char>\</escape-char>
+
+ <line-comment _name="Line Comment" style="Comment">
+ <start-regex>//</start-regex>
+ </line-comment>
+
+ <block-comment _name="Block Comment" style="Comment">
+ <start-regex>/\*</start-regex>
+ <end-regex>\*/</end-regex>
+ </block-comment>
+
+ <block-comment _name="Nested Comment" style="Comment">
+ <start-regex>/\+</start-regex>
+ <end-regex>\+/</end-regex>
+ </block-comment>
+
+ <string _name="Grave Literal" style="String" end-at-line-end="false">
+ <start-regex>`</start-regex>
+ <end-regex>`</end-regex>
+ </string>
+
+ <string _name="String Literal" style="String" end-at-line-end="false">
+ <start-regex>"</start-regex>
+ <end-regex>"</end-regex>
+ </string>
+
+ <string _name="Char Literal" style="String" end-at-line-end="true">
+ <start-regex>'</start-regex>
+ <end-regex>'</end-regex>
+ </string>
+
+ <keyword-list _name="Keywords" style="Keyword" case-sensitive="true">
+ <keyword>abstract</keyword>
+ <keyword>alias</keyword>
+ <keyword>align</keyword>
+ <keyword>asm</keyword>
+ <keyword>assert</keyword>
+ <keyword>body</keyword>
+ <keyword>break</keyword>
+ <keyword>case</keyword>
+ <keyword>cast</keyword>
+ <keyword>catch</keyword>
+ <keyword>continue</keyword>
+ <keyword>debug</keyword>
+ <keyword>default</keyword>
+ <keyword>delegate</keyword>
+ <keyword>delete</keyword>
+ <keyword>deprecated</keyword>
+ <keyword>do</keyword>
+ <keyword>else</keyword>
+ <keyword>false</keyword>
+ <keyword>final</keyword>
+ <keyword>finally</keyword>
+ <keyword>for</keyword>
+ <keyword>foreach</keyword>
+ <keyword>function</keyword>
+ <keyword>goto</keyword>
+ <keyword>if</keyword>
+ <keyword>import</keyword>
+ <keyword>in</keyword>
+ <keyword>inout</keyword>
+ <keyword>is</keyword>
+ <keyword>mixin</keyword>
+ <keyword>new</keyword>
+ <keyword>out</keyword>
+ <keyword>override</keyword>
+ <keyword>pragma</keyword>
+ <keyword>private</keyword>
+ <keyword>protected</keyword>
+ <keyword>public</keyword>
+ <keyword>return</keyword>
+ <keyword>scope</keyword>
+ <keyword>super</keyword>
+ <keyword>switch</keyword>
+ <keyword>synchronized</keyword>
+ <keyword>this</keyword>
+ <keyword>throw</keyword>
+ <keyword>true</keyword>
+ <keyword>try</keyword>
+ <keyword>typeid</keyword>
+ <keyword>typeof</keyword>
+ <keyword>unittest</keyword>
+ <keyword>version</keyword>
+ <keyword>while</keyword>
+ <keyword>with</keyword>
+ </keyword-list>
+
+ <keyword-list _name="Types" style="Data Type" case-sensitive="true">
+ <keyword>auto</keyword>
+ <keyword>bool</keyword>
+ <keyword>byte</keyword>
+ <keyword>cdouble</keyword>
+ <keyword>cent</keyword>
+ <keyword>cfloat</keyword>
+ <keyword>char</keyword>
+ <keyword>class</keyword>
+ <keyword>const</keyword>
+ <keyword>creal</keyword>
+ <keyword>dchar</keyword>
+ <keyword>double</keyword>
+ <keyword>enum</keyword>
+ <keyword>export</keyword>
+ <keyword>extern</keyword>
+ <keyword>float</keyword>
+ <keyword>idouble</keyword>
+ <keyword>ifloat</keyword>
+ <keyword>int</keyword>
+ <keyword>interface</keyword>
+ <keyword>invariant</keyword>
+ <keyword>ireal</keyword>
+ <keyword>long</keyword>
+ <keyword>module</keyword>
+ <keyword>null</keyword>
+ <keyword>package</keyword>
+ <keyword>real</keyword>
+ <keyword>short</keyword>
+ <keyword>static</keyword>
+ <keyword>struct</keyword>
+ <keyword>template</keyword>
+ <keyword>typedef</keyword>
+ <keyword>ubyte</keyword>
+ <keyword>ucent</keyword>
+ <keyword>uint</keyword>
+ <keyword>ulong</keyword>
+ <keyword>union</keyword>
+ <keyword>ushort</keyword>
+ <keyword>void</keyword>
+ <keyword>volatile</keyword>
+ <keyword>wchar</keyword>
+ </keyword-list>
+
+ <pattern-item _name="Binary Number" style="Base-N Integer">
+ <regex>\b0[bB][01_]*\b</regex>
+ </pattern-item>
+
+ <pattern-item _name="Decimal" style="Decimal">
+ <regex>\b([1-9][0-9_]*|0)([Uu]([Ll]|LL|ll)?|([Ll]|LL|ll)[Uu]?)?\b</regex>
+ </pattern-item>
+
+ <pattern-item _name="Floating Point Number" style="Floating Point">
+ <regex>\b([0-9_]+[Ee][-]?[0-9_]+|([0-9_]*\.[0-9_]+|[0-9_]+\.)([Ee][-]?[0-9_]+)?)[fFLi]?</regex>
+ </pattern-item>
+
+ <pattern-item _name="Octal Number" style="Base-N Integer">
+ <regex>\b0[0-7_]+([Uu]([Ll]|LL|ll)?|([Ll]|LL|ll)[Uu]?)?\b</regex>
+ </pattern-item>
+
+ <pattern-item _name="Hex Number" style="Base-N Integer">
+ <regex>\b0[xX][0-9a-fA-F_]+([Uu]([Ll]|LL|ll)?|([Ll]|LL|ll)[Uu]?)?\b</regex>
+ </pattern-item>
+
+ <keyword-list _name="Special Tokens" style="Preprocessor" case-sensitive="true">
+ <keyword>#line</keyword>
+ <keyword>__FILE__</keyword>
+ <keyword>__LINE__</keyword>
+ <keyword>__DATE__</keyword>
+ <keyword>__TIME__</keyword>
+ <keyword>__TIMESTAMP__</keyword>
+ </keyword-list>
+</language>
diff -pruN 1.6.1-3/intltool-extract.in 1.7.1-0ubuntu2/intltool-extract.in
--- 1.6.1-3/intltool-extract.in 2006-04-10 09:25:31.000000000 +0100
+++ 1.7.1-0ubuntu2/intltool-extract.in 2006-07-24 17:20:52.000000000 +0100
@@ -32,7 +32,7 @@
## Release information
my $PROGRAM = "intltool-extract";
my $PACKAGE = "intltool";
-my $VERSION = "0.34.2";
+my $VERSION = "0.35.0";
## Loaded modules
use strict;
diff -pruN 1.6.1-3/intltool-merge.in 1.7.1-0ubuntu2/intltool-merge.in
--- 1.6.1-3/intltool-merge.in 2006-04-10 09:25:31.000000000 +0100
+++ 1.7.1-0ubuntu2/intltool-merge.in 2006-07-24 17:20:52.000000000 +0100
@@ -35,7 +35,7 @@
## Release information
my $PROGRAM = "intltool-merge";
my $PACKAGE = "intltool";
-my $VERSION = "0.34.2";
+my $VERSION = "0.35.0";
## Loaded modules
use strict;
@@ -395,7 +395,7 @@ sub create_translation_database
}
else
{
- print STDERR "WARNING: $po_file is not in UTF-8 but $encoding, converting...\n" unless $QUIET_ARG;;
+ print "NOTICE: $po_file is not in UTF-8 but $encoding, converting...\n" unless $QUIET_ARG;;
open PO_FILE, "$iconv -f $encoding -t UTF-8 $po_file|";
}
diff -pruN 1.6.1-3/intltool-update.in 1.7.1-0ubuntu2/intltool-update.in
--- 1.6.1-3/intltool-update.in 2006-04-10 09:25:31.000000000 +0100
+++ 1.7.1-0ubuntu2/intltool-update.in 2006-07-24 17:20:52.000000000 +0100
@@ -30,7 +30,7 @@
## Release information
my $PROGRAM = "intltool-update";
-my $VERSION = "0.34.2";
+my $VERSION = "0.35.0";
my $PACKAGE = "intltool";
## Loaded modules
@@ -722,6 +722,8 @@ sub GeneratePOTemplate
"--files-from\=\.\/POTFILES\.in\.temp");
my $XGETTEXT_KEYWORDS = &FindPOTKeywords;
push @xgettext_argument, $XGETTEXT_KEYWORDS;
+ my $MSGID_BUGS_ADDRESS = &FindMakevarsBugAddress;
+ push @xgettext_argument, "--msgid-bugs-address\=$MSGID_BUGS_ADDRESS" if $MSGID_BUGS_ADDRESS;
push @xgettext_argument, "--from-code\=$encoding" if ($gettext_support_nonascii);
push @xgettext_argument, $XGETTEXT_ARGS if $XGETTEXT_ARGS;
my $xgettext_command = join ' ', @xgettext_argument;
@@ -1065,3 +1067,23 @@ sub FindMakevarsDomain
return $domain;
}
+
+sub FindMakevarsBugAddress
+{
+
+ my $address = "";
+ my $makevars_source; {
+ local (*IN);
+ open (IN, "<Makevars") || return undef;
+ seek (IN, 0, 0);
+ local $/; # slurp mode
+ $makevars_source = <IN>;
+ close IN;
+ }
+
+ $address = $1 if $makevars_source =~ /^MSGID_BUGS_ADDRESS[ ]*=\[?([^\n\]\$]+)/m;
+ $address =~ s/^\s+//;
+ $address =~ s/\s+$//;
+
+ return $address;
+}
diff -pruN 1.6.1-3/ltmain.sh 1.7.1-0ubuntu2/ltmain.sh
--- 1.6.1-3/ltmain.sh 2006-02-28 11:56:47.000000000 +0000
+++ 1.7.1-0ubuntu2/ltmain.sh 2006-07-23 11:02:07.000000000 +0100
@@ -43,8 +43,8 @@ EXIT_FAILURE=1
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION=1.5.18
-TIMESTAMP=" (1.1220.2.245 2005/05/16 08:55:27)"
+VERSION=1.5.22
+TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
# See if we are running on zsh, and set the options which allow our
# commands through without removal of \ escapes.
@@ -88,14 +88,15 @@ rm="rm -f"
Xsed="${SED}"' -e 1s/^X//'
sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
# test EBCDIC or ASCII
-case `echo A|tr A '\301'` in
- A) # EBCDIC based system
- SP2NL="tr '\100' '\n'"
- NL2SP="tr '\r\n' '\100\100'"
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+ # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+ SP2NL='tr \040 \012'
+ NL2SP='tr \015\012 \040\040'
;;
- *) # Assume ASCII based system
- SP2NL="tr '\040' '\012'"
- NL2SP="tr '\015\012' '\040\040'"
+ *) # EBCDIC based system
+ SP2NL='tr \100 \n'
+ NL2SP='tr \r\n \100\100'
;;
esac
@@ -131,14 +132,52 @@ run=
show="$echo"
show_help=
execute_dlfiles=
+duplicate_deps=no
+preserve_args=
lo2o="s/\\.lo\$/.${objext}/"
o2lo="s/\\.${objext}\$/.lo/"
-quote_scanset='[[~#^*{};<>?'"'"' ]'
#####################################
# Shell function definitions:
# This seems to be the best place for them
+# func_mktempdir [string]
+# Make a temporary directory that won't clash with other running
+# libtool processes, and avoids race conditions if possible. If
+# given, STRING is the basename for that directory.
+func_mktempdir ()
+{
+ my_template="${TMPDIR-/tmp}/${1-$progname}"
+
+ if test "$run" = ":"; then
+ # Return a directory name, but don't create it in dry-run mode
+ my_tmpdir="${my_template}-$$"
+ else
+
+ # If mktemp works, use that first and foremost
+ my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
+
+ if test ! -d "$my_tmpdir"; then
+ # Failing that, at least try and use $RANDOM to avoid a race
+ my_tmpdir="${my_template}-${RANDOM-0}$$"
+
+ save_mktempdir_umask=`umask`
+ umask 0077
+ $mkdir "$my_tmpdir"
+ umask $save_mktempdir_umask
+ fi
+
+ # If we're not in dry-run mode, bomb out on failure
+ test -d "$my_tmpdir" || {
+ $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2
+ exit $EXIT_FAILURE
+ }
+ fi
+
+ $echo "X$my_tmpdir" | $Xsed
+}
+
+
# func_win32_libid arg
# return the library type of file 'arg'
#
@@ -157,12 +196,11 @@ func_win32_libid ()
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
$EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
win32_nmres=`eval $NM -f posix -A $1 | \
- sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'`
- if test "X$win32_nmres" = "Ximport" ; then
- win32_libid_type="x86 archive import"
- else
- win32_libid_type="x86 archive static"
- fi
+ $SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
+ case $win32_nmres in
+ import*) win32_libid_type="x86 archive import";;
+ *) win32_libid_type="x86 archive static";;
+ esac
fi
;;
*DLL*)
@@ -192,7 +230,7 @@ func_infer_tag ()
CC_quoted=
for arg in $CC; do
case $arg in
- *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
arg="\"$arg\""
;;
esac
@@ -213,7 +251,7 @@ func_infer_tag ()
for arg in $CC; do
# Double-quote args containing other shell metacharacters.
case $arg in
- *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
arg="\"$arg\""
;;
esac
@@ -295,9 +333,9 @@ func_extract_archives ()
$run ${rm}r "$my_xdir"
$show "$mkdir $my_xdir"
$run $mkdir "$my_xdir"
- status=$?
- if test "$status" -ne 0 && test ! -d "$my_xdir"; then
- exit $status
+ exit_status=$?
+ if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then
+ exit $exit_status
fi
case $host in
*-darwin*)
@@ -337,7 +375,7 @@ func_extract_archives ()
func_extract_an_archive "$my_xdir" "$my_xabs"
fi # $darwin_arches
fi # $run
- ;;
+ ;;
*)
func_extract_an_archive "$my_xdir" "$my_xabs"
;;
@@ -352,6 +390,8 @@ func_extract_archives ()
# Darwin sucks
eval std_shrext=\"$shrext_cmds\"
+disable_libs=no
+
# Parse our command line options once, thoroughly.
while test "$#" -gt 0
do
@@ -468,7 +508,11 @@ do
preserve_args="$preserve_args $arg"
;;
- --tag) prevopt="--tag" prev=tag ;;
+ --tag)
+ prevopt="--tag"
+ prev=tag
+ preserve_args="$preserve_args --tag"
+ ;;
--tag=*)
set tag "$optarg" ${1+"$@"}
shift
@@ -500,6 +544,18 @@ if test -n "$prevopt"; then
exit $EXIT_FAILURE
fi
+case $disable_libs in
+no)
+ ;;
+shared)
+ build_libtool_libs=no
+ build_old_libs=yes
+ ;;
+static)
+ build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
+ ;;
+esac
+
# If this variable is set in any of the actions, the command in it
# will be execed at the end. This prevents here-documents from being
# left over by shells.
@@ -576,7 +632,7 @@ if test -z "$show_help"; then
for arg
do
- case "$arg_mode" in
+ case $arg_mode in
arg )
# do not "continue". Instead, add this to base_compile
lastarg="$arg"
@@ -627,7 +683,7 @@ if test -z "$show_help"; then
# Many Bourne shells cannot handle close brackets correctly
# in scan sets, so we specify it separately.
case $arg in
- *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
arg="\"$arg\""
;;
esac
@@ -662,7 +718,7 @@ if test -z "$show_help"; then
# in scan sets (worked around with variable expansion),
# and furthermore cannot handle '|' '&' '(' ')' in scan sets
# at all, so we specify them separately.
- *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
lastarg="\"$lastarg\""
;;
esac
@@ -737,13 +793,12 @@ if test -z "$show_help"; then
qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
case $qlibobj in
- *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
qlibobj="\"$qlibobj\"" ;;
esac
- if test "X$libobj" != "X$qlibobj"; then
- $echo "$modename: libobj name \`$libobj' may not contain shell special characters."
- exit $EXIT_FAILURE
- fi
+ test "X$libobj" != "X$qlibobj" \
+ && $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' &()|`$[]' \
+ && $echo "$modename: libobj name \`$libobj' may not contain shell special characters."
objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
if test "X$xdir" = "X$obj"; then
@@ -824,7 +879,7 @@ compiler."
fi
qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
case $qsrcfile in
- *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
qsrcfile="\"$qsrcfile\"" ;;
esac
@@ -857,9 +912,9 @@ EOF
if test ! -d "${xdir}$objdir"; then
$show "$mkdir ${xdir}$objdir"
$run $mkdir ${xdir}$objdir
- status=$?
- if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then
- exit $status
+ exit_status=$?
+ if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then
+ exit $exit_status
fi
fi
@@ -1062,6 +1117,7 @@ EOF
no_install=no
objs=
non_pic_objects=
+ notinst_path= # paths that contain not-installed libtool libraries
precious_files_regex=
prefer_static_libs=no
preload=no
@@ -1090,14 +1146,15 @@ EOF
if test -n "$link_static_flag"; then
dlopen_self=$dlopen_self_static
fi
+ prefer_static_libs=yes
else
if test -z "$pic_flag" && test -n "$link_static_flag"; then
dlopen_self=$dlopen_self_static
fi
+ prefer_static_libs=built
fi
build_libtool_libs=no
build_old_libs=yes
- prefer_static_libs=yes
break
;;
esac
@@ -1111,7 +1168,7 @@ EOF
arg="$1"
shift
case $arg in
- *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test
;;
*) qarg=$arg ;;
@@ -1272,6 +1329,11 @@ EOF
if test -z "$pic_object" || test "$pic_object" = none ; then
arg="$non_pic_object"
fi
+ else
+ # If the PIC object exists, use it instead.
+ # $xdir was prepended to $pic_object above.
+ non_pic_object="$pic_object"
+ non_pic_objects="$non_pic_objects $non_pic_object"
fi
else
# Only an error if not doing a dry-run.
@@ -1355,8 +1417,8 @@ EOF
prev=
continue
;;
- darwin_framework)
- compiler_flags="$compiler_flags $arg"
+ darwin_framework|darwin_framework_skip)
+ test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg"
compile_command="$compile_command $arg"
finalize_command="$finalize_command $arg"
prev=
@@ -1420,13 +1482,17 @@ EOF
continue
;;
- -framework)
- prev=darwin_framework
- compiler_flags="$compiler_flags $arg"
+ -framework|-arch|-isysroot)
+ case " $CC " in
+ *" ${arg} ${1} "* | *" ${arg} ${1} "*)
+ prev=darwin_framework_skip ;;
+ *) compiler_flags="$compiler_flags $arg"
+ prev=darwin_framework ;;
+ esac
compile_command="$compile_command $arg"
finalize_command="$finalize_command $arg"
- continue
- ;;
+ continue
+ ;;
-inst-prefix-dir)
prev=inst_prefix
@@ -1454,7 +1520,8 @@ EOF
absdir=`cd "$dir" && pwd`
if test -z "$absdir"; then
$echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
- exit $EXIT_FAILURE
+ absdir="$dir"
+ notinst_path="$notinst_path $dir"
fi
dir="$absdir"
;;
@@ -1468,10 +1535,15 @@ EOF
esac
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+ testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'`
case :$dllsearchpath: in
*":$dir:"*) ;;
*) dllsearchpath="$dllsearchpath:$dir";;
esac
+ case :$dllsearchpath: in
+ *":$testbindir:"*) ;;
+ *) dllsearchpath="$dllsearchpath:$testbindir";;
+ esac
;;
esac
continue
@@ -1480,11 +1552,11 @@ EOF
-l*)
if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
case $host in
- *-*-cygwin* | *-*-pw32* | *-*-beos*)
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)
# These systems don't actually have a C or math library (as such)
continue
;;
- *-*-mingw* | *-*-os2*)
+ *-*-os2*)
# These systems don't actually have a C library (as such)
test "X$arg" = "X-lc" && continue
;;
@@ -1496,6 +1568,15 @@ EOF
# Rhapsody C and math libraries are in the System framework
deplibs="$deplibs -framework System"
continue
+ ;;
+ *-*-sco3.2v5* | *-*-sco5v6*)
+ # Causes problems with __ctype
+ test "X$arg" = "X-lc" && continue
+ ;;
+ *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+ # Compiler inserts libc in the correct place for threads to work
+ test "X$arg" = "X-lc" && continue
+ ;;
esac
elif test "X$arg" = "X-lc_r"; then
case $host in
@@ -1537,21 +1618,24 @@ EOF
# +DA*, +DD* enable 64-bit mode on the HP compiler
# -q* pass through compiler args for the IBM compiler
# -m* pass through architecture-specific compiler args for GCC
- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*)
+ # -m*, -t[45]*, -txscale* pass through architecture-specific
+ # compiler args for GCC
+ # -pg pass through profiling flag for GCC
+ # @file GCC response files
+ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
+ -t[45]*|-txscale*|@*)
# Unknown arguments in both finalize_command and compile_command need
# to be aesthetically quoted because they are evaled later.
arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
case $arg in
- *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
arg="\"$arg\""
;;
esac
compile_command="$compile_command $arg"
finalize_command="$finalize_command $arg"
- if test "$with_gcc" = "yes" ; then
- compiler_flags="$compiler_flags $arg"
- fi
+ compiler_flags="$compiler_flags $arg"
continue
;;
@@ -1659,7 +1743,7 @@ EOF
for flag in $args; do
IFS="$save_ifs"
case $flag in
- *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
flag="\"$flag\""
;;
esac
@@ -1677,7 +1761,7 @@ EOF
for flag in $args; do
IFS="$save_ifs"
case $flag in
- *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
flag="\"$flag\""
;;
esac
@@ -1710,7 +1794,7 @@ EOF
# to be aesthetically quoted because they are evaled later.
arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
case $arg in
- *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
arg="\"$arg\""
;;
esac
@@ -1789,6 +1873,11 @@ EOF
if test -z "$pic_object" || test "$pic_object" = none ; then
arg="$non_pic_object"
fi
+ else
+ # If the PIC object exists, use it instead.
+ # $xdir was prepended to $pic_object above.
+ non_pic_object="$pic_object"
+ non_pic_objects="$non_pic_objects $non_pic_object"
fi
else
# Only an error if not doing a dry-run.
@@ -1844,7 +1933,7 @@ EOF
# to be aesthetically quoted because they are evaled later.
arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
case $arg in
- *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
arg="\"$arg\""
;;
esac
@@ -1894,9 +1983,9 @@ EOF
if test ! -d "$output_objdir"; then
$show "$mkdir $output_objdir"
$run $mkdir $output_objdir
- status=$?
- if test "$status" -ne 0 && test ! -d "$output_objdir"; then
- exit $status
+ exit_status=$?
+ if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then
+ exit $exit_status
fi
fi
@@ -1959,7 +2048,6 @@ EOF
newlib_search_path=
need_relink=no # whether we're linking any uninstalled libtool libraries
notinst_deplibs= # not-installed libtool libraries
- notinst_path= # paths that contain not-installed libtool libraries
case $linkmode in
lib)
passes="conv link"
@@ -2195,7 +2283,7 @@ EOF
esac # case $deplib
if test "$found" = yes || test -f "$lib"; then :
else
- $echo "$modename: cannot find the library \`$lib'" 1>&2
+ $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2
exit $EXIT_FAILURE
fi
@@ -2409,7 +2497,7 @@ EOF
case "$temp_rpath " in
*" $dir "*) ;;
*" $absdir "*) ;;
- *) temp_rpath="$temp_rpath $dir" ;;
+ *) temp_rpath="$temp_rpath $absdir" ;;
esac
fi
@@ -2446,8 +2534,12 @@ EOF
fi
link_static=no # Whether the deplib will be linked statically
+ use_static_libs=$prefer_static_libs
+ if test "$use_static_libs" = built && test "$installed" = yes ; then
+ use_static_libs=no
+ fi
if test -n "$library_names" &&
- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+ { test "$use_static_libs" = no || test -z "$old_library"; }; then
if test "$installed" = no; then
notinst_deplibs="$notinst_deplibs $lib"
need_relink=yes
@@ -2560,11 +2652,15 @@ EOF
if test "$hardcode_direct" = no; then
add="$dir/$linklib"
case $host in
- *-*-sco3.2v5* ) add_dir="-L$dir" ;;
+ *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
+ *-*-sysv4*uw2*) add_dir="-L$dir" ;;
+ *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
+ *-*-unixware7*) add_dir="-L$dir" ;;
*-*-darwin* )
# if the lib is a module then we can not link against
# it, someone is ignoring the new warnings I added
- if /usr/bin/file -L $add 2> /dev/null | $EGREP "bundle" >/dev/null ; then
+ if /usr/bin/file -L $add 2> /dev/null |
+ $EGREP ": [^:]* bundle" >/dev/null ; then
$echo "** Warning, lib $linklib is a module, not a shared library"
if test -z "$old_library" ; then
$echo
@@ -2595,7 +2691,7 @@ EOF
add_dir="-L$dir"
# Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then
- case "$libdir" in
+ case $libdir in
[\\/]*)
add_dir="$add_dir -L$inst_prefix_dir$libdir"
;;
@@ -2668,7 +2764,7 @@ EOF
add_dir="-L$libdir"
# Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then
- case "$libdir" in
+ case $libdir in
[\\/]*)
add_dir="$add_dir -L$inst_prefix_dir$libdir"
;;
@@ -2729,8 +2825,6 @@ EOF
fi
fi
else
- convenience="$convenience $dir/$old_library"
- old_convenience="$old_convenience $dir/$old_library"
deplibs="$dir/$old_library $deplibs"
link_static=yes
fi
@@ -3317,9 +3411,9 @@ EOF
# Eliminate all temporary directories.
for path in $notinst_path; do
- lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
- deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
- dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
+ lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
+ deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
+ dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
done
if test -n "$xrpath"; then
@@ -3372,7 +3466,12 @@ EOF
;;
*-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
# Do not include libc due to us having libc/libc_r.
- test "X$arg" = "X-lc" && continue
+ ;;
+ *-*-sco3.2v5* | *-*-sco5v6*)
+ # Causes problems with __ctype
+ ;;
+ *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+ # Compiler inserts libc in the correct place for threads to work
;;
*)
# Add libc to deplibs on all other systems if necessary.
@@ -3416,11 +3515,11 @@ EOF
int main() { return 0; }
EOF
$rm conftest
- $LTCC -o conftest conftest.c $deplibs
+ $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
if test "$?" -eq 0 ; then
ldd_output=`ldd conftest`
for i in $deplibs; do
- name="`expr $i : '-l\(.*\)'`"
+ name=`expr $i : '-l\(.*\)'`
# If $name is empty we are operating on a -L argument.
if test "$name" != "" && test "$name" -ne "0"; then
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
@@ -3457,11 +3556,11 @@ EOF
# Error occurred in the first compile. Let's try to salvage
# the situation: Compile a separate program for each library.
for i in $deplibs; do
- name="`expr $i : '-l\(.*\)'`"
+ name=`expr $i : '-l\(.*\)'`
# If $name is empty we are operating on a -L argument.
if test "$name" != "" && test "$name" != "0"; then
$rm conftest
- $LTCC -o conftest conftest.c $i
+ $LTCC $LTCFLAGS -o conftest conftest.c $i
# Did it work?
if test "$?" -eq 0 ; then
ldd_output=`ldd conftest`
@@ -3509,7 +3608,7 @@ EOF
set dummy $deplibs_check_method
file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
for a_deplib in $deplibs; do
- name="`expr $a_deplib : '-l\(.*\)'`"
+ name=`expr $a_deplib : '-l\(.*\)'`
# If $name is empty we are operating on a -L argument.
if test "$name" != "" && test "$name" != "0"; then
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
@@ -3578,7 +3677,7 @@ EOF
set dummy $deplibs_check_method
match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
for a_deplib in $deplibs; do
- name="`expr $a_deplib : '-l\(.*\)'`"
+ name=`expr $a_deplib : '-l\(.*\)'`
# If $name is empty we are operating on a -L argument.
if test -n "$name" && test "$name" != "0"; then
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
@@ -3708,6 +3807,35 @@ EOF
deplibs=$newdeplibs
fi
+
+ # move library search paths that coincide with paths to not yet
+ # installed libraries to the beginning of the library search list
+ new_libs=
+ for path in $notinst_path; do
+ case " $new_libs " in
+ *" -L$path/$objdir "*) ;;
+ *)
+ case " $deplibs " in
+ *" -L$path/$objdir "*)
+ new_libs="$new_libs -L$path/$objdir" ;;
+ esac
+ ;;
+ esac
+ done
+ for deplib in $deplibs; do
+ case $deplib in
+ -L*)
+ case " $new_libs " in
+ *" $deplib "*) ;;
+ *) new_libs="$new_libs $deplib" ;;
+ esac
+ ;;
+ *) new_libs="$new_libs $deplib" ;;
+ esac
+ done
+ deplibs="$new_libs"
+
+
# All the library-specific variables (install_libdir is set above).
library_names=
old_library=
@@ -3791,6 +3919,7 @@ EOF
fi
lib="$output_objdir/$realname"
+ linknames=
for link
do
linknames="$linknames $link"
@@ -3819,6 +3948,9 @@ EOF
# The command line is too long to execute in one step.
$show "using reloadable object file for export list..."
skipped_export=:
+ # Break out early, otherwise skipped_export may be
+ # set to false by a later but shorter cmd.
+ break
fi
done
IFS="$save_ifs"
@@ -3888,7 +4020,8 @@ EOF
fi
fi
- if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` &&
+ if test "X$skipped_export" != "X:" &&
+ len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
:
else
@@ -3923,7 +4056,7 @@ EOF
do
eval test_cmds=\"$reload_cmds $objlist $last_robj\"
if test "X$objlist" = X ||
- { len=`expr "X$test_cmds" : ".*"` &&
+ { len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
test "$len" -le "$max_cmd_len"; }; then
objlist="$objlist $obj"
else
@@ -4013,13 +4146,30 @@ EOF
IFS="$save_ifs"
eval cmd=\"$cmd\"
$show "$cmd"
- $run eval "$cmd" || exit $?
+ $run eval "$cmd" || {
+ lt_exit=$?
+
+ # Restore the uninstalled library and exit
+ if test "$mode" = relink; then
+ $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
+ fi
+
+ exit $lt_exit
+ }
done
IFS="$save_ifs"
# Restore the uninstalled library and exit
if test "$mode" = relink; then
$run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
+
+ if test -n "$convenience"; then
+ if test -z "$whole_archive_flag_spec"; then
+ $show "${rm}r $gentop"
+ $run ${rm}r "$gentop"
+ fi
+ fi
+
exit $EXIT_SUCCESS
fi
@@ -4201,6 +4351,35 @@ EOF
;;
esac
+
+ # move library search paths that coincide with paths to not yet
+ # installed libraries to the beginning of the library search list
+ new_libs=
+ for path in $notinst_path; do
+ case " $new_libs " in
+ *" -L$path/$objdir "*) ;;
+ *)
+ case " $compile_deplibs " in
+ *" -L$path/$objdir "*)
+ new_libs="$new_libs -L$path/$objdir" ;;
+ esac
+ ;;
+ esac
+ done
+ for deplib in $compile_deplibs; do
+ case $deplib in
+ -L*)
+ case " $new_libs " in
+ *" $deplib "*) ;;
+ *) new_libs="$new_libs $deplib" ;;
+ esac
+ ;;
+ *) new_libs="$new_libs $deplib" ;;
+ esac
+ done
+ compile_deplibs="$new_libs"
+
+
compile_command="$compile_command $compile_deplibs"
finalize_command="$finalize_command $finalize_deplibs"
@@ -4245,10 +4424,15 @@ EOF
fi
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+ testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'`
case :$dllsearchpath: in
*":$libdir:"*) ;;
*) dllsearchpath="$dllsearchpath:$libdir";;
esac
+ case :$dllsearchpath: in
+ *":$testbindir:"*) ;;
+ *) dllsearchpath="$dllsearchpath:$testbindir";;
+ esac
;;
esac
done
@@ -4364,11 +4548,23 @@ extern \"C\" {
if test -z "$export_symbols"; then
export_symbols="$output_objdir/$outputname.exp"
$run $rm $export_symbols
- $run eval "${SED} -n -e '/^: @PROGRAM $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+ $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+ case $host in
+ *cygwin* | *mingw* )
+ $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+ $run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
+ ;;
+ esac
else
- $run eval "${SED} -e 's/\([ ][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
+ $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
$run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
$run eval 'mv "$nlist"T "$nlist"'
+ case $host in
+ *cygwin* | *mingw* )
+ $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+ $run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
+ ;;
+ esac
fi
fi
@@ -4485,16 +4681,29 @@ static const void *lt_preloaded_setup()
esac
# Now compile the dynamic symbol file.
- $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
- $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
+ $show "(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
+ $run eval '(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
# Clean up the generated files.
$show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
$run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
# Transform the symbol file into the correct name.
- compile_command=`$echo "X$compile_command" | $Xsed -e "s% SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+ case $host in
+ *cygwin* | *mingw* )
+ if test -f "$output_objdir/${outputname}.def" ; then
+ compile_command=`$echo "X$compile_command" | $Xsed -e "s% SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
+ finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
+ else
+ compile_command=`$echo "X$compile_command" | $Xsed -e "s% SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+ finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+ fi
+ ;;
+ * )
+ compile_command=`$echo "X$compile_command" | $Xsed -e "s% SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+ finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+ ;;
+ esac
;;
*)
$echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
@@ -4519,7 +4728,7 @@ static const void *lt_preloaded_setup()
# We have no uninstalled library dependencies, so finalize right now.
$show "$link_command"
$run eval "$link_command"
- status=$?
+ exit_status=$?
# Delete the generated files.
if test -n "$dlsyms"; then
@@ -4527,7 +4736,7 @@ static const void *lt_preloaded_setup()
$run $rm "$output_objdir/${outputname}S.${objext}"
fi
- exit $status
+ exit $exit_status
fi
if test -n "$shlibpath_var"; then
@@ -4667,10 +4876,12 @@ static const void *lt_preloaded_setup()
esac
case $host in
*cygwin* | *mingw* )
- cwrappersource=`$echo ${objdir}/lt-${outputname}.c`
- cwrapper=`$echo ${output}.exe`
- $rm $cwrappersource $cwrapper
- trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
+ output_name=`basename $output`
+ output_path=`dirname $output`
+ cwrappersource="$output_path/$objdir/lt-$output_name.c"
+ cwrapper="$output_path/$output_name.exe"
+ $rm $cwrappersource $cwrapper
+ trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
cat > $cwrappersource <<EOF
@@ -4695,6 +4906,9 @@ EOF
#include <malloc.h>
#include <stdarg.h>
#include <assert.h>
+#include <string.h>
+#include <ctype.h>
+#include <sys/stat.h>
#if defined(PATH_MAX)
# define LT_PATHMAX PATH_MAX
@@ -4705,15 +4919,19 @@ EOF
#endif
#ifndef DIR_SEPARATOR
-#define DIR_SEPARATOR '/'
+# define DIR_SEPARATOR '/'
+# define PATH_SEPARATOR ':'
#endif
#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
defined (__OS2__)
-#define HAVE_DOS_BASED_FILE_SYSTEM
-#ifndef DIR_SEPARATOR_2
-#define DIR_SEPARATOR_2 '\\'
-#endif
+# define HAVE_DOS_BASED_FILE_SYSTEM
+# ifndef DIR_SEPARATOR_2
+# define DIR_SEPARATOR_2 '\\'
+# endif
+# ifndef PATH_SEPARATOR_2
+# define PATH_SEPARATOR_2 ';'
+# endif
#endif
#ifndef DIR_SEPARATOR_2
@@ -4723,17 +4941,32 @@ EOF
(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
#endif /* DIR_SEPARATOR_2 */
+#ifndef PATH_SEPARATOR_2
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
+#else /* PATH_SEPARATOR_2 */
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
+#endif /* PATH_SEPARATOR_2 */
+
#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type)))
#define XFREE(stale) do { \
if (stale) { free ((void *) stale); stale = 0; } \
} while (0)
+/* -DDEBUG is fairly common in CFLAGS. */
+#undef DEBUG
+#if defined DEBUGWRAPPER
+# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__)
+#else
+# define DEBUG(format, ...)
+#endif
+
const char *program_name = NULL;
void * xmalloc (size_t num);
char * xstrdup (const char *string);
-char * basename (const char *name);
-char * fnqualify(const char *path);
+const char * base_name (const char *name);
+char * find_executable(const char *wrapper);
+int check_executable(const char *path);
char * strendzap(char *str, const char *pat);
void lt_fatal (const char *message, ...);
@@ -4743,29 +4976,51 @@ main (int argc, char *argv[])
char **newargz;
int i;
- program_name = (char *) xstrdup ((char *) basename (argv[0]));
+ program_name = (char *) xstrdup (base_name (argv[0]));
+ DEBUG("(main) argv[0] : %s\n",argv[0]);
+ DEBUG("(main) program_name : %s\n",program_name);
newargz = XMALLOC(char *, argc+2);
EOF
- cat >> $cwrappersource <<EOF
- newargz[0] = "$SHELL";
+ cat >> $cwrappersource <<EOF
+ newargz[0] = (char *) xstrdup("$SHELL");
EOF
- cat >> $cwrappersource <<"EOF"
- newargz[1] = fnqualify(argv[0]);
+ cat >> $cwrappersource <<"EOF"
+ newargz[1] = find_executable(argv[0]);
+ if (newargz[1] == NULL)
+ lt_fatal("Couldn't find %s", argv[0]);
+ DEBUG("(main) found exe at : %s\n",newargz[1]);
/* we know the script has the same name, without the .exe */
/* so make sure newargz[1] doesn't end in .exe */
strendzap(newargz[1],".exe");
for (i = 1; i < argc; i++)
newargz[i+1] = xstrdup(argv[i]);
newargz[argc+1] = NULL;
+
+ for (i=0; i<argc+1; i++)
+ {
+ DEBUG("(main) newargz[%d] : %s\n",i,newargz[i]);
+ ;
+ }
+
EOF
- cat >> $cwrappersource <<EOF
+ case $host_os in
+ mingw*)
+ cat >> $cwrappersource <<EOF
+ execv("$SHELL",(char const **)newargz);
+EOF
+ ;;
+ *)
+ cat >> $cwrappersource <<EOF
execv("$SHELL",newargz);
EOF
+ ;;
+ esac
- cat >> $cwrappersource <<"EOF"
+ cat >> $cwrappersource <<"EOF"
+ return 127;
}
void *
@@ -4785,48 +5040,148 @@ xstrdup (const char *string)
;
}
-char *
-basename (const char *name)
+const char *
+base_name (const char *name)
{
const char *base;
#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
/* Skip over the disk name in MSDOS pathnames. */
- if (isalpha (name[0]) && name[1] == ':')
+ if (isalpha ((unsigned char)name[0]) && name[1] == ':')
name += 2;
#endif
for (base = name; *name; name++)
if (IS_DIR_SEPARATOR (*name))
base = name + 1;
- return (char *) base;
+ return base;
}
+int
+check_executable(const char * path)
+{
+ struct stat st;
+
+ DEBUG("(check_executable) : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!");
+ if ((!path) || (!*path))
+ return 0;
+
+ if ((stat (path, &st) >= 0) &&
+ (
+ /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */
+#if defined (S_IXOTH)
+ ((st.st_mode & S_IXOTH) == S_IXOTH) ||
+#endif
+#if defined (S_IXGRP)
+ ((st.st_mode & S_IXGRP) == S_IXGRP) ||
+#endif
+ ((st.st_mode & S_IXUSR) == S_IXUSR))
+ )
+ return 1;
+ else
+ return 0;
+}
+
+/* Searches for the full path of the wrapper. Returns
+ newly allocated full path name if found, NULL otherwise */
char *
-fnqualify(const char *path)
+find_executable (const char* wrapper)
{
- size_t size;
- char *p;
+ int has_slash = 0;
+ const char* p;
+ const char* p_next;
+ /* static buffer for getcwd */
char tmp[LT_PATHMAX + 1];
+ int tmp_len;
+ char* concat_name;
+
+ DEBUG("(find_executable) : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!");
- assert(path != NULL);
+ if ((wrapper == NULL) || (*wrapper == '\0'))
+ return NULL;
- /* Is it qualified already? */
+ /* Absolute path? */
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+ if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':')
+ {
+ concat_name = xstrdup (wrapper);
+ if (check_executable(concat_name))
+ return concat_name;
+ XFREE(concat_name);
+ }
+ else
+ {
+#endif
+ if (IS_DIR_SEPARATOR (wrapper[0]))
+ {
+ concat_name = xstrdup (wrapper);
+ if (check_executable(concat_name))
+ return concat_name;
+ XFREE(concat_name);
+ }
#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
- if (isalpha (path[0]) && path[1] == ':')
- return xstrdup (path);
+ }
#endif
- if (IS_DIR_SEPARATOR (path[0]))
- return xstrdup (path);
- /* prepend the current directory */
- /* doesn't handle '~' */
+ for (p = wrapper; *p; p++)
+ if (*p == '/')
+ {
+ has_slash = 1;
+ break;
+ }
+ if (!has_slash)
+ {
+ /* no slashes; search PATH */
+ const char* path = getenv ("PATH");
+ if (path != NULL)
+ {
+ for (p = path; *p; p = p_next)
+ {
+ const char* q;
+ size_t p_len;
+ for (q = p; *q; q++)
+ if (IS_PATH_SEPARATOR(*q))
+ break;
+ p_len = q - p;
+ p_next = (*q == '\0' ? q : q + 1);
+ if (p_len == 0)
+ {
+ /* empty path: current directory */
+ if (getcwd (tmp, LT_PATHMAX) == NULL)
+ lt_fatal ("getcwd failed");
+ tmp_len = strlen(tmp);
+ concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
+ memcpy (concat_name, tmp, tmp_len);
+ concat_name[tmp_len] = '/';
+ strcpy (concat_name + tmp_len + 1, wrapper);
+ }
+ else
+ {
+ concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1);
+ memcpy (concat_name, p, p_len);
+ concat_name[p_len] = '/';
+ strcpy (concat_name + p_len + 1, wrapper);
+ }
+ if (check_executable(concat_name))
+ return concat_name;
+ XFREE(concat_name);
+ }
+ }
+ /* not found in PATH; assume curdir */
+ }
+ /* Relative path | not found in path: prepend cwd */
if (getcwd (tmp, LT_PATHMAX) == NULL)
lt_fatal ("getcwd failed");
- size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */
- p = XMALLOC(char, size);
- sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path);
- return p;
+ tmp_len = strlen(tmp);
+ concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
+ memcpy (concat_name, tmp, tmp_len);
+ concat_name[tmp_len] = '/';
+ strcpy (concat_name + tmp_len + 1, wrapper);
+
+ if (check_executable(concat_name))
+ return concat_name;
+ XFREE(concat_name);
+ return NULL;
}
char *
@@ -4870,16 +5225,16 @@ lt_fatal (const char *message, ...)
va_end (ap);
}
EOF
- # we should really use a build-platform specific compiler
- # here, but OTOH, the wrappers (shell script and this C one)
- # are only useful if you want to execute the "real" binary.
- # Since the "real" binary is built for $host, then this
- # wrapper might as well be built for $host, too.
- $run $LTCC -s -o $cwrapper $cwrappersource
- ;;
- esac
- $rm $output
- trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
+ # we should really use a build-platform specific compiler
+ # here, but OTOH, the wrappers (shell script and this C one)
+ # are only useful if you want to execute the "real" binary.
+ # Since the "real" binary is built for $host, then this
+ # wrapper might as well be built for $host, too.
+ $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource
+ ;;
+ esac
+ $rm $output
+ trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
$echo > $output "\
#! $SHELL
@@ -5029,13 +5384,13 @@ else
# Backslashes separate directories on plain windows
*-*-mingw | *-*-os2*)
$echo >> $output "\
- exec \$progdir\\\\\$program \${1+\"\$ \"}
+ exec \"\$progdir\\\\\$program\" \${1+\"\$ \"}
"
;;
*)
$echo >> $output "\
- exec \$progdir/\$program \${1+\"\$ \"}
+ exec \"\$progdir/\$program\" \${1+\"\$ \"}
"
;;
esac
@@ -5045,7 +5400,7 @@ else
fi
else
# The program doesn't exist.
- \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
+ \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
\$echo \"This script is just a wrapper for \$program.\" 1>&2
$echo \"See the $PACKAGE documentation for more information.\" 1>&2
exit $EXIT_FAILURE
@@ -5109,9 +5464,9 @@ fi\
$run ${rm}r "$gentop"
$show "$mkdir $gentop"
$run $mkdir "$gentop"
- status=$?
- if test "$status" -ne 0 && test ! -d "$gentop"; then
- exit $status
+ exit_status=$?
+ if test "$exit_status" -ne 0 && test ! -d "$gentop"; then
+ exit $exit_status
fi
fi
@@ -5168,7 +5523,7 @@ fi\
oldobjs="$objlist $obj"
objlist="$objlist $obj"
eval test_cmds=\"$old_archive_cmds\"
- if len=`expr "X$test_cmds" : ".*"` &&
+ if len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
test "$len" -le "$max_cmd_len"; then
:
else
@@ -5365,11 +5720,11 @@ relink_command=\"$relink_command\""
# install_prog (especially on Windows NT).
if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
# Allow the use of GNU shtool's install command.
- $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
+ $echo "X$nonopt" | grep shtool > /dev/null; then
# Aesthetically quote it.
arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
case $arg in
- *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
arg="\"$arg\""
;;
esac
@@ -5378,14 +5733,14 @@ relink_command=\"$relink_command\""
shift
else
install_prog=
- arg="$nonopt"
+ arg=$nonopt
fi
# The real first argument should be the name of the installation program.
# Aesthetically quote it.
arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
case $arg in
- *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
arg="\"$arg\""
;;
esac
@@ -5403,28 +5758,31 @@ relink_command=\"$relink_command\""
do
if test -n "$dest"; then
files="$files $dest"
- dest="$arg"
+ dest=$arg
continue
fi
case $arg in
-d) isdir=yes ;;
- -f) prev="-f" ;;
- -g) prev="-g" ;;
- -m) prev="-m" ;;
- -o) prev="-o" ;;
+ -f)
+ case " $install_prog " in
+ *[\\\ /]cp\ *) ;;
+ *) prev=$arg ;;
+ esac
+ ;;
+ -g | -m | -o) prev=$arg ;;
-s)
stripme=" -s"
continue
;;
- -*) ;;
-
+ -*)
+ ;;
*)
# If the previous option needed an argument, then skip it.
if test -n "$prev"; then
prev=
else
- dest="$arg"
+ dest=$arg
continue
fi
;;
@@ -5433,7 +5791,7 @@ relink_command=\"$relink_command\""
# Aesthetically quote the argument.
arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
case $arg in
- *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
arg="\"$arg\""
;;
esac
@@ -5602,11 +5960,14 @@ relink_command=\"$relink_command\""
if test "$#" -gt 0; then
# Delete the old symlinks, and create new ones.
+ # Try `ln -sf' first, because the `ln' binary might depend on
+ # the symlink we replace! Solaris /bin/ln does not understand -f,
+ # so we also need to try rm && ln -s.
for linkname
do
if test "$linkname" != "$realname"; then
- $show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
- $run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
+ $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
+ $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
fi
done
fi
@@ -5619,7 +5980,16 @@ relink_command=\"$relink_command\""
IFS="$save_ifs"
eval cmd=\"$cmd\"
$show "$cmd"
- $run eval "$cmd" || exit $?
+ $run eval "$cmd" || {
+ lt_exit=$?
+
+ # Restore the uninstalled library and exit
+ if test "$mode" = relink; then
+ $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
+ fi
+
+ exit $lt_exit
+ }
done
IFS="$save_ifs"
fi
@@ -5713,17 +6083,15 @@ relink_command=\"$relink_command\""
notinst_deplibs=
relink_command=
- # To insure that "foo" is sourced, and not "foo.exe",
- # finese the cygwin/MSYS system by explicitly sourcing "foo."
- # which disallows the automatic-append-.exe behavior.
- case $build in
- *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
- *) wrapperdot=${wrapper} ;;
- esac
+ # Note that it is not necessary on cygwin/mingw to append a dot to
+ # foo even if both foo and FILE.exe exist: automatic-append-.exe
+ # behavior happens only for exec(3), not for open(2)! Also, sourcing
+ # `FILE.' does not work on cygwin managed mounts.
+ #
# If there is no directory component, then add one.
- case $file in
- */* | *\\*) . ${wrapperdot} ;;
- *) . ./${wrapperdot} ;;
+ case $wrapper in
+ */* | *\\*) . ${wrapper} ;;
+ *) . ./${wrapper} ;;
esac
# Check the variables that should have been set.
@@ -5751,34 +6119,21 @@ relink_command=\"$relink_command\""
done
relink_command=
- # To insure that "foo" is sourced, and not "foo.exe",
- # finese the cygwin/MSYS system by explicitly sourcing "foo."
- # which disallows the automatic-append-.exe behavior.
- case $build in
- *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
- *) wrapperdot=${wrapper} ;;
- esac
+ # Note that it is not necessary on cygwin/mingw to append a dot to
+ # foo even if both foo and FILE.exe exist: automatic-append-.exe
+ # behavior happens only for exec(3), not for open(2)! Also, sourcing
+ # `FILE.' does not work on cygwin managed mounts.
+ #
# If there is no directory component, then add one.
- case $file in
- */* | *\\*) . ${wrapperdot} ;;
- *) . ./${wrapperdot} ;;
+ case $wrapper in
+ */* | *\\*) . ${wrapper} ;;
+ *) . ./${wrapper} ;;
esac
outputname=
if test "$fast_install" = no && test -n "$relink_command"; then
if test "$finalize" = yes && test -z "$run"; then
- tmpdir="/tmp"
- test -n "$TMPDIR" && tmpdir="$TMPDIR"
- tmpdir="$tmpdir/libtool-$$"
- save_umask=`umask`
- umask 0077
- if $mkdir "$tmpdir"; then
- umask $save_umask
- else
- umask $save_umask
- $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
- continue
- fi
+ tmpdir=`func_mktempdir`
file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
outputname="$tmpdir/$file"
# Replace the output file specification.
@@ -5802,7 +6157,7 @@ relink_command=\"$relink_command\""
fi
# remove .exe since cygwin /usr/bin/install will append another
- # one anyways
+ # one anyway
case $install_prog,$host in
*/usr/bin/install*,*cygwin*)
case $file:$destfile in
@@ -5902,7 +6257,7 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = : && exit $EXIT_SUCCESS
- $echo "----------------------------------------------------------------------"
+ $echo "X----------------------------------------------------------------------" | $Xsed
$echo "Libraries have been installed in:"
for libdir in $libdirs; do
$echo " $libdir"
@@ -5935,7 +6290,7 @@ relink_command=\"$relink_command\""
$echo
$echo "See any operating system documentation about shared libraries for"
$echo "more information, such as the ld(1) and ld.so(8) manual pages."
- $echo "----------------------------------------------------------------------"
+ $echo "X----------------------------------------------------------------------" | $Xsed
exit $EXIT_SUCCESS
;;
@@ -6152,9 +6507,17 @@ relink_command=\"$relink_command\""
rmfiles="$rmfiles $objdir/$n"
done
test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
- test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
- if test "$mode" = uninstall; then
+ case "$mode" in
+ clean)
+ case " $library_names " in
+ # " " in the beginning catches empty $dlname
+ *" $dlname "*) ;;
+ *) rmfiles="$rmfiles $objdir/$dlname" ;;
+ esac
+ test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+ ;;
+ uninstall)
if test -n "$library_names"; then
# Do each command in the postuninstall commands.
cmds=$postuninstall_cmds
@@ -6187,7 +6550,8 @@ relink_command=\"$relink_command\""
IFS="$save_ifs"
fi
# FIXME: should reinstall the best remaining shared library.
- fi
+ ;;
+ esac
fi
;;
@@ -6486,12 +6850,11 @@ exit $?
# configuration. But we'll never go from static-only to shared-only.
# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
-build_libtool_libs=no
-build_old_libs=yes
+disable_libs=shared
# ### END LIBTOOL TAG CONFIG: disable-shared
# ### BEGIN LIBTOOL TAG CONFIG: disable-static
-build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
+disable_libs=static
# ### END LIBTOOL TAG CONFIG: disable-static
# Local Variables:
diff -pruN 1.6.1-3/po/ChangeLog 1.7.1-0ubuntu2/po/ChangeLog
--- 1.6.1-3/po/ChangeLog 2006-04-10 09:38:35.000000000 +0100
+++ 1.7.1-0ubuntu2/po/ChangeLog 2006-07-24 18:40:25.000000000 +0100
@@ -1,4 +1,62 @@
+=== gtksourceview 1.7.1 ===
+
+2006-07-21 Gabor Kelemen <kelemeng gnome hu>
+
+ * hu.po: Translation updated.
+
+2006-07-09 Changwoo Ryu <cwryu debian org>
+
+ * ko.po: Updated Korean translation.
+
+2006-07-04 Raivis Dejus <orvils gmail com>
+
+ * lv.po: Added Latvian translation.
+ * LINGUAS: Added 'lv'
+
+2006-07-03 Runa Bhattacharjee <runabh gmail com>
+
+ * bn_IN.po: Added Bengali India Translation
+ * LINGUAS: Added Bengali India (bn_IN) to the list of languages.
+
+2006-06-28 I. Felix <ifelix25 gmail com>
+
+ * ta.po: Updated Tamil translation.
+
+2006-06-15 Ahmad Riza H Nst <rizahnst eriagempita co id>
+
+ * id.po: Updated.
+
+2006-05-22 Benoît Dejean <benoit placenet org>
+
+ * fr.po: Updated French translation.
+
+2006-05-10 Benoît Dejean <benoit placenet org>
+
+ * fr.po: Updated French translation.
+
+2006-04-28 Lukas Novotny <lukasnov cvs gnome org>
+
+ * cs.po: Updated Czech translation.
+
+2006-04-19 Artur Flinta <aflinta cvs gnome org>
+
+ * pl.po: Updated Polish translation by GNOME PL Team.
+
+2006-04-18 William Jon McCann <mccann jhu edu>
+
+ * LINGUAS: Don't split on multiple lines since it
+ seems to break the build.
+
+2006-04-18 Kjartan Maraas <kmaraas gnome org>
+
+ * LINGUAS: Remove obsolete entry for no_NO
+ * nb.po: Update this.
+ * no.po: Remove the translation.
+
=== gtksourceview 1.6.1 ===
+2006-04-16 Pema Geyleg <pema geyleg gmail com>
+
+ * dz.po: Updated Dzongkha translation.
2006-03-25 Tommi Vainikainen <thv iki fi>
diff -pruN 1.6.1-3/po/LINGUAS 1.7.1-0ubuntu2/po/LINGUAS
--- 1.6.1-3/po/LINGUAS 2006-04-09 19:34:21.000000000 +0100
+++ 1.7.1-0ubuntu2/po/LINGUAS 2006-07-24 18:35:36.000000000 +0100
@@ -2,6 +2,66 @@
#
# please keep this list sorted alphabetically
#
-ar az be bg bn bs ca cs cy da de dz el en_CA en_GB es et eu fa fi fr ga gl gu he
-hi hr hu id it ja ko lt mk ml mn ms nb ne nl no pa pl pt pt_BR ro ru rw sk sq sr
-sr Latn sv ta th tr uk vi xh zh_CN zh_HK zh_TW
+ar
+az
+be
+bg
+bn
+bn_IN
+bs
+ca
+cs
+cy
+da
+de
+dz
+el
+en_CA
+en_GB
+es
+et
+eu
+fa
+fi
+fr
+ga
+gl
+gu
+he
+hi
+hr
+hu
+id
+it
+ja
+ko
+lt
+lv
+mk
+ml
+mn
+ms
+nb
+ne
+nl
+pa
+pl
+pt
+pt_BR
+ro
+ru
+rw
+sk
+sq
+sr
+sr Latn
+sv
+ta
+th
+tr
+uk
+vi
+xh
+zh_CN
+zh_HK
+zh_TW
diff -pruN 1.6.1-3/po/Makefile.in.in 1.7.1-0ubuntu2/po/Makefile.in.in
--- 1.6.1-3/po/Makefile.in.in 2006-04-10 09:25:31.000000000 +0100
+++ 1.7.1-0ubuntu2/po/Makefile.in.in 2006-07-24 17:20:52.000000000 +0100
@@ -22,7 +22,6 @@ PACKAGE = @PACKAGE@
VERSION = @VERSION@
SHELL = /bin/sh
- SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@@ -34,9 +33,8 @@ exec_prefix = @exec_prefix@
datadir = @datadir@
datarootdir = @datarootdir@
libdir = @libdir@
-localedir = $(libdir)/locale
-gnulocaledir = $(datadir)/locale
-gettextsrcdir = $(datadir)/glib-2.0/gettext/po
+DATADIRNAME = @DATADIRNAME@
+itlocaledir = $(prefix)/$(DATADIRNAME)/locale
subdir = po
install_sh = @install_sh@
# Automake >= 1.8 provides @mkdir_p
@@ -46,7 +44,6 @@ mkdir_p = $(install_sh) -d
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
-CC = @CC@
GMSGFMT = @GMSGFMT@
MSGFMT = @MSGFMT@
XGETTEXT = @XGETTEXT@
@@ -55,32 +52,22 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
-DEFS = @DEFS@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
-
-INCLUDES = -I.. -I$(top_srcdir)/intl
-
-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
-
-SOURCES =
-POFILES = @POFILES@
-GMOFILES = @GMOFILES@
-DISTFILES = ChangeLog Makefile.in.in POTFILES.in \
-$(POFILES) $(SOURCES)
+ALL_LINGUAS = @ALL_LINGUAS@
+
+PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi)
+
+POFILES=$(shell if test -n "$(PO_LINGUAS)"; then LINGUAS="$(PO_LINGUAS)"; else LINGUAS="$(ALL_LINGUAS)"; fi; for lang in $$LINGUAS; do printf "$$lang.po "; done)
+
+DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES)
EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS
POTFILES = \
#This Gets Replace for some reason
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
+CATALOGS=$(shell if test -n "$(PO_LINGUAS)"; then LINGUAS="$(PO_LINGUAS)"; else LINGUAS="$(ALL_LINGUAS)"; fi; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
.SUFFIXES:
-.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
-
-.c.o:
- $(COMPILE) $<
+.SUFFIXES: .po .pox .gmo .mo .msg .cat
.po.pox:
$(MAKE) $(GETTEXT_PACKAGE).pot
@@ -106,76 +93,63 @@ all-no:
$(GETTEXT_PACKAGE).pot: $(POTFILES)
$(GENPOT)
-install: install-exec install-data
-install-exec:
+install: install-data
install-data: install-data- USE_NLS@
install-data-no: all
install-data-yes: all
- $(mkdir_p) $(DESTDIR)$(datadir)
- @catalogs='$(CATALOGS)'; \
- for cat in $$catalogs; do \
- cat=`basename $$cat`; \
- case "$$cat" in \
- *.gmo) destdir=$(gnulocaledir);; \
- *) destdir=$(localedir);; \
- esac; \
- lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
- dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
+ $(mkdir_p) $(DESTDIR)$(itlocaledir)
+ if test -n "$(PO_LINGUAS)"; then \
+ linguas="$(PO_LINGUAS)"; \
+ else \
+ linguas="$(ALL_LINGUAS)"; \
+ fi; \
+ for lang in $$linguas; do \
+ dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
$(mkdir_p) $$dir; \
- if test -r $$cat; then \
- $(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE).mo; \
- echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE).mo"; \
+ if test -r $$lang.gmo; then \
+ $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
+ echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \
else \
- $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(GETTEXT_PACKAGE).mo; \
- echo "installing $(srcdir)/$$cat as" \
+ $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
+ echo "installing $(srcdir)/$$lang.gmo as" \
"$$dir/$(GETTEXT_PACKAGE).mo"; \
fi; \
- if test -r $$cat.m; then \
- $(INSTALL_DATA) $$cat.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
- echo "installing $$cat.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
+ if test -r $$lang.gmo.m; then \
+ $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
+ echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
else \
- if test -r $(srcdir)/$$cat.m ; then \
- $(INSTALL_DATA) $(srcdir)/$$cat.m \
+ if test -r $(srcdir)/$$lang.gmo.m ; then \
+ $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \
$$dir/$(GETTEXT_PACKAGE).mo.m; \
- echo "installing $(srcdir)/$$cat as" \
+ echo "installing $(srcdir)/$$lang.gmo.m as" \
"$$dir/$(GETTEXT_PACKAGE).mo.m"; \
else \
true; \
fi; \
fi; \
done
- if test "$(PACKAGE)" = "glib"; then \
- $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
- $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
- $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
- else \
- : ; \
- fi
+
+# Empty stubs to satisfy archaic automake needs
+dvi info tags TAGS ID:
# Define this as empty until I found a useful application.
installcheck:
uninstall:
- catalogs='$(CATALOGS)'; \
- for cat in $$catalogs; do \
- cat=`basename $$cat`; \
- lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
- rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
- rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
- rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
- rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
+ if test -n "$(PO_LINGUAS)"; then \
+ linguas="$(PO_LINGUAS)"; \
+ else \
+ linguas="$(ALL_LINGUAS)"; \
+ fi; \
+ for lang in $$linguas; do \
+ rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
+ rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
done
- if test "$(PACKAGE)" = "glib"; then \
- rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
- fi
check: all $(GETTEXT_PACKAGE).pot
-dvi info tags TAGS ID:
-
mostlyclean:
- rm -f core core.* *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
- rm -fr *.o
+ rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
rm -f .intltool-merge-cache
clean: mostlyclean
@@ -189,7 +163,7 @@ maintainer-clean: distclean
@echo "it deletes files that may require special tools to rebuild."
rm -f Makefile.in.in
-distdir = ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir)
+distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
dist distdir: $(DISTFILES)
dists="$(DISTFILES)"; \
extra_dists="$(EXTRA_DISTFILES)"; \
@@ -205,10 +179,12 @@ dist distdir: $(DISTFILES)
update-po: Makefile
$(MAKE) $(GETTEXT_PACKAGE).pot
tmpdir=`pwd`; \
- catalogs='$(CATALOGS)'; \
- for cat in $$catalogs; do \
- cat=`basename $$cat`; \
- lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+ if test -n "$(PO_LINGUAS)"; then \
+ linguas="$(PO_LINGUAS)"; \
+ else \
+ linguas="$(ALL_LINGUAS)"; \
+ fi; \
+ for lang in $$linguas; do \
echo "$$lang:"; \
result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
if $$result; then \
@@ -224,7 +200,7 @@ update-po: Makefile
fi; \
fi; \
else \
- echo "msgmerge for $$cat failed!"; \
+ echo "msgmerge for $$lang.gmo failed!"; \
rm -f $$tmpdir/$$lang.new.po; \
fi; \
done
diff -pruN 1.6.1-3/po/POTFILES.in 1.7.1-0ubuntu2/po/POTFILES.in
--- 1.6.1-3/po/POTFILES.in 2006-01-10 03:04:05.000000000 +0000
+++ 1.7.1-0ubuntu2/po/POTFILES.in 2006-07-24 16:56:44.000000000 +0100
@@ -5,11 +5,13 @@ gtksourceview/gtksourcestylescheme.c
gtksourceview/gtksourcetag.c
gtksourceview/gtksourceview.c
gtksourceview/language-specs/ada.lang
+gtksourceview/language-specs/boo.lang
gtksourceview/language-specs/c.lang
gtksourceview/language-specs/changelog.lang
gtksourceview/language-specs/cpp.lang
gtksourceview/language-specs/csharp.lang
gtksourceview/language-specs/css.lang
+gtksourceview/language-specs/d.lang
gtksourceview/language-specs/desktop.lang
gtksourceview/language-specs/diff.lang
gtksourceview/language-specs/html.lang
diff -pruN 1.6.1-3/po/bn_IN.po 1.7.1-0ubuntu2/po/bn_IN.po
--- 1.6.1-3/po/bn_IN.po 1970-01-01 01:00:00.000000000 +0100
+++ 1.7.1-0ubuntu2/po/bn_IN.po 2006-07-03 14:53:19.000000000 +0100
@@ -0,0 +1,1743 @@
+# Bengali translation of gtksourceview.
+# Copyright (C) 2003 Free Software Foundation, Inc.
+# This file is distributed under the same license as the gtksourceview package.
+# Sayamindu Dasgupta <unmadindu bengalinux org>, 2003.
+# Mahay Alam Khan <makl10n yahoo com>, 2005.
+# Samia Niamatullah <mailsamia2001 yahoo com>, 2005.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: GTKSourceView HEAD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-07-03 07:43+0200\n"
+"PO-Revision-Date: 2005-10-01 00:37+0600\n"
+"Last-Translator: Mahay Alam Khan <makl10n yahoo com>\n"
+"Language-Team: Bengali <gnome-translation bengalinux org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../gtksourceview/gtksourcebuffer.c:278
+msgid "Escape Character"
+msgstr "�স���প ��যার����ার"
+
+#: ../gtksourceview/gtksourcebuffer.c:279
+msgid "Escaping character for syntax patterns"
+msgstr "সিন���যা��স প�যা�ার�ণ�র �ন�য �স���প ��যার����ার"
+
+#: ../gtksourceview/gtksourcebuffer.c:287
+msgid "Check Brackets"
+msgstr "ব�র�যা��� পর���ষা �র� দ���"
+
+#: ../gtksourceview/gtksourcebuffer.c:288
+msgid "Whether to check and highlight matching brackets"
+msgstr "ব�র�যা��� পর���ষা �র� হা�লা�� �রা হব� �িনা"
+
+#: ../gtksourceview/gtksourcebuffer.c:296
+#: ../gtksourceview/gtksourceprintjob.c:296
+msgid "Highlight"
+msgstr "হা�লা��"
+
+#: ../gtksourceview/gtksourcebuffer.c:297
+msgid "Whether to highlight syntax in the buffer"
+msgstr "বাফার� সিন���যা��স হা�লা�� �রা হব� �িনা"
+
+#: ../gtksourceview/gtksourcebuffer.c:305
+msgid "Maximum Undo Levels"
+msgstr "সরà§?বà§?à¦?à§?à¦? \"à¦à§?ল à¦?রà§?à¦?ি\"-র সà¦?à¦?à§?যা "
+
+#: ../gtksourceview/gtksourcebuffer.c:306
+msgid "Number of undo levels for the buffer"
+msgstr "বাফারà§?র à¦?নà§?য সরà§?বà§?à¦?à§?à¦? \"à¦à§?ল à¦?রà§?à¦?ি\"-র সà¦?à¦?à§?যা "
+
+#: ../gtksourceview/gtksourcebuffer.c:316
+#: ../gtksourceview/language-specs/desktop.lang.h:6
+#: ../gtksourceview/language-specs/ini.lang.h:7
+msgid "Language"
+msgstr "à¦à¦¾à¦·à¦¾"
+
+#: ../gtksourceview/gtksourcebuffer.c:317
+msgid "Language object to get highlighting patterns from"
+msgstr "হাà¦?লাà¦?à¦? পà§?যাà¦?ারà§?ণà§?র à¦?নà§?য যà§? à¦à¦¾à¦·à¦¾ à¦?বà¦?à§?à¦?à§?à¦? বà§?যবহার à¦?রা হবà§?"
+
+#: ../gtksourceview/gtksourcelanguagesmanager.c:114
+msgid "Language specification directories"
+msgstr "à¦à¦¾à¦·à¦¾ সà§?পà§?সিফিà¦?à§?শন ডিরà§?à¦?à§?à¦?রà§?"
+
+#: ../gtksourceview/gtksourcelanguagesmanager.c:115
+msgid ""
+"List of directories where the language specification files (.lang) are "
+"located"
+msgstr "à¦à¦¾à¦·à¦¾ সà§?পà§?সিফিà¦?à§?শন ফাà¦?ল (.lang) যà§? ডিরà§?à¦?à§?à¦?রà§? সমà§?হতà§? à¦?à¦?à§? - তার তালিà¦?া "
+
+#: ../gtksourceview/gtksourceprintjob.c:265
+msgid "Configuration"
+msgstr "�নফি�ার�শন"
+
+#: ../gtksourceview/gtksourceprintjob.c:266
+msgid "Configuration options for the print job"
+msgstr "ম�দ�রণ �র�ম�র �ন�য �নফি�ার�শন �পশন সম�হ"
+
+#: ../gtksourceview/gtksourceprintjob.c:273
+msgid "Source Buffer"
+msgstr "স�র�স বাফার"
+
+#: ../gtksourceview/gtksourceprintjob.c:274
+msgid "GtkSourceBuffer object to print"
+msgstr "য� GtkSourceBuffer �ব����� �াপা হব�"
+
+#: ../gtksourceview/gtksourceprintjob.c:280
+#: ../gtksourceview/gtksourceview.c:233 ../gtksourceview/gtksourceview.c:234
+msgid "Tabs Width"
+msgstr "��যাব�র প�রস�থ"
+
+#: ../gtksourceview/gtksourceprintjob.c:281
+msgid "Width in equivalent space characters of tabs"
+msgstr "��যাব�র প�রস�থ (স�প�স ��যার����ার ব�যবহার �র� ��না)"
+
+#: ../gtksourceview/gtksourceprintjob.c:288
+msgid "Wrap Mode"
+msgstr "রâ??à§?যাপ মà§?ড"
+
+#: ../gtksourceview/gtksourceprintjob.c:289
+msgid "Word wrapping mode"
+msgstr "à¦?à§?ারà§?ড রâ??à§?যাপ মà§?ড"
+
+#: ../gtksourceview/gtksourceprintjob.c:297
+msgid "Whether to print the document with highlighted syntax"
+msgstr "সিন���যা��স হা�লা�� �রা �বস�থা� নথ� ম�দ�রণ �রা হব� �িনা"
+
+#: ../gtksourceview/gtksourceprintjob.c:305
+msgid "Font"
+msgstr "ফন��"
+
+#: ../gtksourceview/gtksourceprintjob.c:306
+msgid "GnomeFont name to use for the document text (deprecated)"
+msgstr "ড��ম�ন�� ����স��র �ন�য য� GnomeFont নাম ব�যবহ�ত হব� (�র ব�যবহার �রা হ� না)"
+
+#: ../gtksourceview/gtksourceprintjob.c:313
+msgid "Font Description"
+msgstr "ফন�� বর�ণনা"
+
+#: ../gtksourceview/gtksourceprintjob.c:314
+msgid "Font to use for the document text (e.g. \"Monospace 10\")"
+msgstr "ড��ম�ন�� ����স��র �ন�য য� ফন�� ব�যবহ�ত হব� (য�মন \"Monospace 10\")"
+
+#: ../gtksourceview/gtksourceprintjob.c:321
+#: ../gtksourceview/gtksourceprintjob.c:329
+msgid "Numbers Font"
+msgstr "নম�বর�র �ন�য ফন��"
+
+#: ../gtksourceview/gtksourceprintjob.c:322
+msgid "GnomeFont name to use for the line numbers (deprecated)"
+msgstr "লা�ন নম�বর�র �ন�য য� GnomeFont নাম ব�যবহ�ত হব� (�র ব�যবহার �রা হ� না)"
+
+#: ../gtksourceview/gtksourceprintjob.c:330
+msgid "Font description to use for the line numbers"
+msgstr "লা�ন নম�বর�র �ন�য য� ফন�� বিবরণ ব�যবহ�ত হব�"
+
+#: ../gtksourceview/gtksourceprintjob.c:337
+msgid "Print Line Numbers"
+msgstr "লা�ন নম�বর �াপ�"
+
+#: ../gtksourceview/gtksourceprintjob.c:338
+msgid "Interval of printed line numbers (0 means no numbers)"
+msgstr "�াপা লা�ন নম�বর�র মধ�য� ফা�� (০ মান� ��ন লা�ন নম�বর ন��)"
+
+#: ../gtksourceview/gtksourceprintjob.c:345
+msgid "Print Header"
+msgstr "হ�ডার �াপ�"
+
+#: ../gtksourceview/gtksourceprintjob.c:346
+msgid "Whether to print a header in each page"
+msgstr "প�রত�য�� প�ষ�ঠার �ন�য হ�ডার �াপা হব� �িনা"
+
+#: ../gtksourceview/gtksourceprintjob.c:353
+msgid "Print Footer"
+msgstr "ফ��ার �াপ�"
+
+#: ../gtksourceview/gtksourceprintjob.c:354
+msgid "Whether to print a footer in each page"
+msgstr "প�রত�য�� প�ষ�ঠার �ন�য ফ��ার �াপা হব� �িনা"
+
+#: ../gtksourceview/gtksourceprintjob.c:361
+msgid "Header and Footer Font"
+msgstr "হ�ডার �ব� ফ��ার�র �ন�য ফন��"
+
+#: ../gtksourceview/gtksourceprintjob.c:362
+msgid "GnomeFont name to use for the header and footer (deprecated)"
+msgstr "হ�ডার �ব� ফ��ার�র �ন�য য� GnomeFont নাম ব�যবহ�ত হব� (�র ব�যবহার �রা হ� না)"
+
+#: ../gtksourceview/gtksourceprintjob.c:369
+msgid "Header and Footer Font Description"
+msgstr "হ�ডার �ব� ফ��ার�র �ন�য ফন���র বিবরণ"
+
+#: ../gtksourceview/gtksourceprintjob.c:370
+msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
+msgstr "হ�ডার �ব� ফ��ার�র �ন�য য� নাম ব�যবহ�ত হব� (য�মন \"Monospace 10\")"
+
+#: ../gtksourceview/gtksourcestylescheme.c:264
+msgid "Base-N Integer"
+msgstr "ব�স-ন �ন����ার"
+
+#: ../gtksourceview/gtksourcestylescheme.c:269
+msgid "Character"
+msgstr "���ষর"
+
+#: ../gtksourceview/gtksourcestylescheme.c:274
+#: ../gtksourceview/language-specs/latex.lang.h:2
+#: ../gtksourceview/language-specs/po.lang.h:1
+msgid "Comment"
+msgstr "মন�তব�য (�ম�ন��)"
+
+#. $this = (datatype)
+#: ../gtksourceview/gtksourcestylescheme.c:279
+#: ../gtksourceview/language-specs/php.lang.h:14
+msgid "Data Type"
+msgstr "ডা�া �া�প"
+
+#.
+#. CSS functions, such as rgb(), clip(), or lang().
+#.
+#: ../gtksourceview/gtksourcestylescheme.c:284
+#: ../gtksourceview/language-specs/ada.lang.h:3
+#: ../gtksourceview/language-specs/css.lang.h:18
+#: ../gtksourceview/language-specs/octave.lang.h:4
+#: ../gtksourceview/language-specs/python.lang.h:5
+#: ../gtksourceview/language-specs/scheme.lang.h:2
+#: ../gtksourceview/language-specs/sh.lang.h:4
+msgid "Function"
+msgstr "ফা�শন"
+
+#: ../gtksourceview/gtksourcestylescheme.c:289
+#: ../gtksourceview/language-specs/c.lang.h:6
+#: ../gtksourceview/language-specs/cpp.lang.h:6
+#: ../gtksourceview/language-specs/fortran.lang.h:1
+#: ../gtksourceview/language-specs/haskell.lang.h:3
+#: ../gtksourceview/language-specs/nemerle.lang.h:6
+#: ../gtksourceview/language-specs/octave.lang.h:1
+#: ../gtksourceview/language-specs/python.lang.h:2
+msgid "Decimal"
+msgstr "দশমি�"
+
+#: ../gtksourceview/gtksourcestylescheme.c:294
+msgid "Floating Point"
+msgstr "দশমি� �িহ�ন"
+
+#. We cannot match \b at the end of a keyword automatically
+#. because it fails for let* etc. So we need to manually add it to the
+#. other keywords and match ([ \t]|$) for the one ending with a
+#. special character. Unfortnately this also means that if the highlight
+#. style for keywords sets the background color, for let* etc also the
+#. trailing space will be highlighted.
+#: ../gtksourceview/gtksourcestylescheme.c:299
+#: ../gtksourceview/language-specs/ada.lang.h:4
+#: ../gtksourceview/language-specs/gtkrc.lang.h:6
+#: ../gtksourceview/language-specs/haskell.lang.h:9
+#: ../gtksourceview/language-specs/latex.lang.h:5
+#: ../gtksourceview/language-specs/octave.lang.h:6
+#: ../gtksourceview/language-specs/po.lang.h:3
+#: ../gtksourceview/language-specs/python.lang.h:7
+#: ../gtksourceview/language-specs/R.lang.h:6
+#: ../gtksourceview/language-specs/scheme.lang.h:9
+#: ../gtksourceview/language-specs/tcl.lang.h:1
+#: ../gtksourceview/language-specs/texinfo.lang.h:8
+#: ../gtksourceview/language-specs/vhdl.lang.h:2
+msgid "Keyword"
+msgstr "����ার�ড"
+
+#: ../gtksourceview/gtksourcestylescheme.c:304
+msgid "Preprocessor"
+msgstr "প�রিপ�রস�সর"
+
+#.
+#. <pattern-item _name = "Operator" style = "Operators">
+#. <regex>[:!#$%&*+./>=<? \\^|~\-]+</regex>
+#. </pattern-item>
+#.
+#. <keyword-list _name="Keysymbol" style = "Keyword">
+#. <keyword>::</keyword>
+#. <keyword>-></keyword>
+#. <keyword><-</keyword>
+#. <keyword>=></keyword>
+#. <keyword>=</keyword>
+#. <keyword>|</keyword>`
+#. <keyword>\</keyword>
+#. <keyword>@</keyword>
+#. <keyword>~</keyword>
+#. </keyword-list>
+#.
+#: ../gtksourceview/gtksourcestylescheme.c:309
+#: ../gtksourceview/language-specs/ada.lang.h:9
+#: ../gtksourceview/language-specs/c.lang.h:15
+#: ../gtksourceview/language-specs/cpp.lang.h:15
+#: ../gtksourceview/language-specs/csharp.lang.h:9
+#: ../gtksourceview/language-specs/css.lang.h:58
+#: ../gtksourceview/language-specs/html.lang.h:8
+#: ../gtksourceview/language-specs/fortran.lang.h:13
+#: ../gtksourceview/language-specs/haskell.lang.h:31
+#: ../gtksourceview/language-specs/idl.lang.h:9
+#: ../gtksourceview/language-specs/java.lang.h:11
+#: ../gtksourceview/language-specs/javascript.lang.h:23
+#: ../gtksourceview/language-specs/lua.lang.h:10
+#: ../gtksourceview/language-specs/makefile.lang.h:8
+#: ../gtksourceview/language-specs/nemerle.lang.h:15
+#: ../gtksourceview/language-specs/pascal.lang.h:18
+#: ../gtksourceview/language-specs/perl.lang.h:8
+#: ../gtksourceview/language-specs/po.lang.h:6
+#: ../gtksourceview/language-specs/scheme.lang.h:13
+#: ../gtksourceview/language-specs/sh.lang.h:13
+#: ../gtksourceview/language-specs/tcl.lang.h:4
+#: ../gtksourceview/language-specs/vbnet.lang.h:11
+#: ../gtksourceview/language-specs/vhdl.lang.h:6
+#: ../gtksourceview/language-specs/xml.lang.h:7
+msgid "String"
+msgstr "স���রি�"
+
+#: ../gtksourceview/gtksourcestylescheme.c:314
+msgid "Specials"
+msgstr "স�প�শাল"
+
+#: ../gtksourceview/gtksourcestylescheme.c:321
+#: ../gtksourceview/language-specs/changelog.lang.h:6
+#: ../gtksourceview/language-specs/css.lang.h:36
+#: ../gtksourceview/language-specs/desktop.lang.h:10
+#: ../gtksourceview/language-specs/diff.lang.h:7
+#: ../gtksourceview/language-specs/gtkrc.lang.h:9
+#: ../gtksourceview/language-specs/ini.lang.h:10
+#: ../gtksourceview/language-specs/msil.lang.h:2
+#: ../gtksourceview/language-specs/po.lang.h:5
+msgid "Others"
+msgstr "�ন�যান�য"
+
+#: ../gtksourceview/gtksourcestylescheme.c:326
+msgid "Others 2"
+msgstr "�ন�যান�য ২"
+
+#: ../gtksourceview/gtksourcestylescheme.c:331
+msgid "Others 3"
+msgstr "�ন�যান�য ৩"
+
+#: ../gtksourceview/gtksourcestylescheme.c:368
+msgid "Default"
+msgstr "ডিফল��"
+
+#: ../gtksourceview/gtksourcetag.c:109
+msgid "Tag ID"
+msgstr "��যা� ��ডি"
+
+#: ../gtksourceview/gtksourcetag.c:110
+msgid "ID used to refer to the source tag"
+msgstr "স�র�স ��যা��� �িহ�নিত �রার �ন�য য� ��ডি ব�যবহ�ত হব�"
+
+#: ../gtksourceview/gtksourcetag.c:117
+msgid "Tag style"
+msgstr "��যা��র বিন�যাস"
+
+#: ../gtksourceview/gtksourcetag.c:118
+msgid "The style associated with the source tag"
+msgstr "স�র�স ��যা��র স���� য� বিন�যাস ব�যবহ�ত হব�"
+
+#: ../gtksourceview/gtksourceview.c:217
+msgid "Show Line Numbers"
+msgstr "লা�ন নম�বর দ��া�"
+
+#: ../gtksourceview/gtksourceview.c:218
+msgid "Whether to display line numbers"
+msgstr "লা�ন নম�বর দ��ান� হব� �িনা"
+
+#: ../gtksourceview/gtksourceview.c:225
+msgid "Show Line Markers"
+msgstr "লা�ন মার��ার দ��া�"
+
+#: ../gtksourceview/gtksourceview.c:226
+msgid "Whether to display line marker pixbufs"
+msgstr "লা�ন মার��ার পি��সবাফ দ��ান� হব� �িনা"
+
+#: ../gtksourceview/gtksourceview.c:243
+msgid "Auto Indentation"
+msgstr "স�ব����র�� �ব����দ (�ন�ড�ন���শন)"
+
+#: ../gtksourceview/gtksourceview.c:244
+msgid "Whether to enable auto indentation"
+msgstr "স�ব����র�� �ব����দ (�ন�ড�ন���শন) �াল� �রা হব� �িনা"
+
+#: ../gtksourceview/gtksourceview.c:250
+msgid "Insert Spaces Instead of Tabs"
+msgstr "��যাব�র বদল� স�প�স ব�যবহার �র�"
+
+#: ../gtksourceview/gtksourceview.c:251
+msgid "Whether to insert spaces instead of tabs"
+msgstr "��যাব�র বদল� স�প�স ব�যবহার �রা হব� �িনা"
+
+#: ../gtksourceview/gtksourceview.c:258
+msgid "Show Right Margin"
+msgstr "ডান দি��র মার��িন দ��া�"
+
+#: ../gtksourceview/gtksourceview.c:259
+msgid "Whether to display the right margin"
+msgstr "ডান দি��র মার��িন দ��ান� হব� �িনা"
+
+#: ../gtksourceview/gtksourceview.c:266
+msgid "Margin position"
+msgstr "মার��িন�র �বস�থান"
+
+#: ../gtksourceview/gtksourceview.c:267
+msgid "Position of the right margin"
+msgstr "মার��িন�র �বস�থান"
+
+#: ../gtksourceview/gtksourceview.c:276
+msgid "Use smart home/end"
+msgstr "ব�দ�ধিমান home/end ব�যবহার �র�"
+
+#: ../gtksourceview/gtksourceview.c:277
+msgid ""
+"HOME and END keys move to first/last non whitespace characters on line "
+"before going to the start/end of the line"
+msgstr ""
+"HOME �ব� END �� �ার�সার-�� লা�ন�র প�রথম�/শ�ষ� নি�� যা��ার ��� প�রথম/শ�ষ ���ষর� "
+"নি�� যা�"
+
+#: ../gtksourceview/gtksourceview.c:286
+msgid "Highlight current line"
+msgstr "বর�তমান লা�ন �িহ�নিত �র�"
+
+#: ../gtksourceview/gtksourceview.c:287
+msgid "Whether to highlight the current line"
+msgstr "বর�তমান লা�ন হা�লা�� �রা হব� �িনা"
+
+#: ../gtksourceview/gtksourceview.c:303
+msgid "Margin Line Alpha"
+msgstr ""
+
+#: ../gtksourceview/gtksourceview.c:304
+msgid "Transparency of the margin line"
+msgstr ""
+
+#: ../gtksourceview/gtksourceview.c:321
+msgid "Margin Line Color"
+msgstr ""
+
+#: ../gtksourceview/gtksourceview.c:322
+#, fuzzy
+msgid "Color to use for the right margin line"
+msgstr "মার��িন�র �বস�থান"
+
+#: ../gtksourceview/gtksourceview.c:338
+msgid "Margin Overlay Toggle"
+msgstr ""
+
+#: ../gtksourceview/gtksourceview.c:339
+#, fuzzy
+msgid "Whether to draw the right margin overlay"
+msgstr "ডান দি��র মার��িন দ��ান� হব� �িনা"
+
+#: ../gtksourceview/gtksourceview.c:355
+msgid "Margin Overlay Alpha"
+msgstr ""
+
+#: ../gtksourceview/gtksourceview.c:356
+msgid "Transparency of the margin overlay"
+msgstr ""
+
+#: ../gtksourceview/gtksourceview.c:373
+msgid "Margin Overlay Color"
+msgstr ""
+
+#: ../gtksourceview/gtksourceview.c:374
+msgid "Color to use for drawing the margin overlay"
+msgstr ""
+
+#: ../gtksourceview/language-specs/ada.lang.h:1
+msgid "Ada"
+msgstr "�ডা"
+
+#: ../gtksourceview/language-specs/ada.lang.h:2
+#: ../gtksourceview/language-specs/c.lang.h:4
+#: ../gtksourceview/language-specs/cpp.lang.h:4
+#: ../gtksourceview/language-specs/haskell.lang.h:2
+#: ../gtksourceview/language-specs/nemerle.lang.h:3
+#: ../gtksourceview/language-specs/vhdl.lang.h:1
+msgid "Character Constant"
+msgstr "��যার����ার �নস��ান��"
+
+#. Note: contains an hack to avoid considering ^COMMON a comment
+#. <string _name = "String 2" style = "String" end-at-line-end = "TRUE">
+#. <start-regex>'</start-regex>
+#. <end-regex>'</end-regex>
+#. </string>
+#: ../gtksourceview/language-specs/ada.lang.h:5
+#: ../gtksourceview/language-specs/c.lang.h:11
+#: ../gtksourceview/language-specs/cpp.lang.h:11
+#: ../gtksourceview/language-specs/csharp.lang.h:4
+#: ../gtksourceview/language-specs/css.lang.h:29
+#: ../gtksourceview/language-specs/desktop.lang.h:7
+#: ../gtksourceview/language-specs/diff.lang.h:5
+#: ../gtksourceview/language-specs/fortran.lang.h:9
+#: ../gtksourceview/language-specs/gtkrc.lang.h:7
+#: ../gtksourceview/language-specs/haskell.lang.h:10
+#: ../gtksourceview/language-specs/idl.lang.h:5
+#: ../gtksourceview/language-specs/ini.lang.h:8
+#: ../gtksourceview/language-specs/java.lang.h:5
+#: ../gtksourceview/language-specs/javascript.lang.h:13
+#: ../gtksourceview/language-specs/lua.lang.h:4
+#: ../gtksourceview/language-specs/makefile.lang.h:4
+#: ../gtksourceview/language-specs/nemerle.lang.h:10
+#: ../gtksourceview/language-specs/octave.lang.h:7
+#: ../gtksourceview/language-specs/pascal.lang.h:11
+#: ../gtksourceview/language-specs/perl.lang.h:3
+#: ../gtksourceview/language-specs/python.lang.h:8
+#: ../gtksourceview/language-specs/R.lang.h:7
+#: ../gtksourceview/language-specs/ruby.lang.h:10
+#: ../gtksourceview/language-specs/scheme.lang.h:10
+#: ../gtksourceview/language-specs/sh.lang.h:5
+#: ../gtksourceview/language-specs/sql.lang.h:23
+#: ../gtksourceview/language-specs/tcl.lang.h:2
+#: ../gtksourceview/language-specs/texinfo.lang.h:9
+#: ../gtksourceview/language-specs/vbnet.lang.h:6
+#: ../gtksourceview/language-specs/verilog.lang.h:7
+#: ../gtksourceview/language-specs/vhdl.lang.h:3
+msgid "Line Comment"
+msgstr "লা�ন �ম�ন��"
+
+#.
+#. For values like: z-index: 2;
+#. +/- before 0 is not allowed.
+#.
+#: ../gtksourceview/language-specs/ada.lang.h:6
+#: ../gtksourceview/language-specs/css.lang.h:34
+#: ../gtksourceview/language-specs/desktop.lang.h:9
+#: ../gtksourceview/language-specs/gtkrc.lang.h:8
+#: ../gtksourceview/language-specs/javascript.lang.h:16
+#: ../gtksourceview/language-specs/pascal.lang.h:14
+#: ../gtksourceview/language-specs/vhdl.lang.h:4
+msgid "Number"
+msgstr "নম�বর"
+
+#: ../gtksourceview/language-specs/ada.lang.h:7
+#, fuzzy
+msgid "Preprocessor Keyword"
+msgstr "প�র�প�রস�সর ����ার�ড সম�হ"
+
+#: ../gtksourceview/language-specs/ada.lang.h:8
+#: ../gtksourceview/language-specs/c.lang.h:14
+#: ../gtksourceview/language-specs/cpp.lang.h:14
+#: ../gtksourceview/language-specs/csharp.lang.h:8
+#: ../gtksourceview/language-specs/fortran.lang.h:12
+#: ../gtksourceview/language-specs/haskell.lang.h:13
+#: ../gtksourceview/language-specs/idl.lang.h:8
+#: ../gtksourceview/language-specs/java.lang.h:10
+#: ../gtksourceview/language-specs/makefile.lang.h:6
+#: ../gtksourceview/language-specs/nemerle.lang.h:14
+#: ../gtksourceview/language-specs/pascal.lang.h:17
+#: ../gtksourceview/language-specs/scheme.lang.h:12
+#: ../gtksourceview/language-specs/sql.lang.h:48
+#: ../gtksourceview/language-specs/vbnet.lang.h:10
+#: ../gtksourceview/language-specs/verilog.lang.h:9
+#: ../gtksourceview/language-specs/vhdl.lang.h:5
+msgid "Sources"
+msgstr "স�র�স"
+
+#: ../gtksourceview/language-specs/ada.lang.h:10
+msgid "True And False"
+msgstr "��র� � ফল�স"
+
+#: ../gtksourceview/language-specs/ada.lang.h:11
+#: ../gtksourceview/language-specs/vhdl.lang.h:8
+msgid "Type"
+msgstr "�া�প"
+
+#: ../gtksourceview/language-specs/c.lang.h:1
+#: ../gtksourceview/language-specs/cpp.lang.h:1
+msgid "'#if 0' Comment"
+msgstr "'#if 0' মন�তব�য"
+
+#. Comments
+#: ../gtksourceview/language-specs/c.lang.h:2
+#: ../gtksourceview/language-specs/cpp.lang.h:2
+#: ../gtksourceview/language-specs/csharp.lang.h:1
+#: ../gtksourceview/language-specs/css.lang.h:9
+#: ../gtksourceview/language-specs/html.lang.h:2
+#: ../gtksourceview/language-specs/haskell.lang.h:1
+#: ../gtksourceview/language-specs/idl.lang.h:1
+#: ../gtksourceview/language-specs/java.lang.h:1
+#: ../gtksourceview/language-specs/javascript.lang.h:2
+#: ../gtksourceview/language-specs/lua.lang.h:1
+#: ../gtksourceview/language-specs/nemerle.lang.h:2
+#: ../gtksourceview/language-specs/sql.lang.h:9
+#: ../gtksourceview/language-specs/texinfo.lang.h:1
+#: ../gtksourceview/language-specs/verilog.lang.h:2
+#: ../gtksourceview/language-specs/xml.lang.h:2
+msgid "Block Comment"
+msgstr "ব�ল� মন�তব�য"
+
+#: ../gtksourceview/language-specs/c.lang.h:3
+msgid "C"
+msgstr "সি"
+
+#: ../gtksourceview/language-specs/c.lang.h:5
+#: ../gtksourceview/language-specs/cpp.lang.h:5
+msgid "Common Macro"
+msgstr "�মন ম�যা��র�"
+
+#: ../gtksourceview/language-specs/c.lang.h:7
+#: ../gtksourceview/language-specs/cpp.lang.h:7
+#: ../gtksourceview/language-specs/fortran.lang.h:2
+#: ../gtksourceview/language-specs/haskell.lang.h:4
+#: ../gtksourceview/language-specs/nemerle.lang.h:7
+#: ../gtksourceview/language-specs/octave.lang.h:3
+#: ../gtksourceview/language-specs/python.lang.h:4
+#: ../gtksourceview/language-specs/R.lang.h:4
+msgid "Floating Point Number"
+msgstr "ফ�ল��ি� প��ন�� নম�বর"
+
+#. FIXME WHY DOESN'T THIS WORK?
+#: ../gtksourceview/language-specs/c.lang.h:8
+#: ../gtksourceview/language-specs/cpp.lang.h:8
+#: ../gtksourceview/language-specs/fortran.lang.h:4
+#: ../gtksourceview/language-specs/haskell.lang.h:6
+#: ../gtksourceview/language-specs/nemerle.lang.h:8
+#: ../gtksourceview/language-specs/octave.lang.h:5
+#: ../gtksourceview/language-specs/pascal.lang.h:10
+#: ../gtksourceview/language-specs/python.lang.h:6
+msgid "Hex Number"
+msgstr "হ���স নম�বর"
+
+#: ../gtksourceview/language-specs/c.lang.h:9
+#: ../gtksourceview/language-specs/cpp.lang.h:9
+#: ../gtksourceview/language-specs/haskell.lang.h:7
+#: ../gtksourceview/language-specs/idl.lang.h:3
+msgid "Include/Pragma"
+msgstr "���ল�ড/প�রা�মা"
+
+#: ../gtksourceview/language-specs/c.lang.h:10
+#: ../gtksourceview/language-specs/cpp.lang.h:10
+#: ../gtksourceview/language-specs/csharp.lang.h:3
+#: ../gtksourceview/language-specs/fortran.lang.h:7
+#: ../gtksourceview/language-specs/idl.lang.h:4
+#: ../gtksourceview/language-specs/javascript.lang.h:12
+#: ../gtksourceview/language-specs/lua.lang.h:3
+#: ../gtksourceview/language-specs/perl.lang.h:2
+#: ../gtksourceview/language-specs/ruby.lang.h:9
+#: ../gtksourceview/language-specs/vbnet.lang.h:1
+#: ../gtksourceview/language-specs/verilog.lang.h:6
+msgid "Keywords"
+msgstr "����ার�ড"
+
+#: ../gtksourceview/language-specs/c.lang.h:12
+#: ../gtksourceview/language-specs/cpp.lang.h:12
+#: ../gtksourceview/language-specs/fortran.lang.h:10
+#: ../gtksourceview/language-specs/haskell.lang.h:11
+#: ../gtksourceview/language-specs/nemerle.lang.h:12
+#: ../gtksourceview/language-specs/octave.lang.h:10
+#: ../gtksourceview/language-specs/python.lang.h:12
+#: ../gtksourceview/language-specs/verilog.lang.h:8
+msgid "Octal Number"
+msgstr "����াল নম�বর"
+
+#: ../gtksourceview/language-specs/c.lang.h:13
+#: ../gtksourceview/language-specs/cpp.lang.h:13
+#: ../gtksourceview/language-specs/csharp.lang.h:6
+#: ../gtksourceview/language-specs/idl.lang.h:6
+#: ../gtksourceview/language-specs/vbnet.lang.h:8
+msgid "Preprocessor Definitions"
+msgstr "প�র�প�রস�সর ড�ফিন�শন"
+
+#: ../gtksourceview/language-specs/c.lang.h:16
+#: ../gtksourceview/language-specs/cpp.lang.h:16
+#: ../gtksourceview/language-specs/fortran.lang.h:15
+#: ../gtksourceview/language-specs/idl.lang.h:10
+#: ../gtksourceview/language-specs/verilog.lang.h:10
+msgid "Types"
+msgstr "�া�প সম�হ"
+
+#: ../gtksourceview/language-specs/changelog.lang.h:1
+msgid "ChangeLog"
+msgstr ""
+
+#: ../gtksourceview/language-specs/changelog.lang.h:2
+#, fuzzy
+msgid "Date"
+msgstr "��� সম�হ"
+
+#: ../gtksourceview/language-specs/changelog.lang.h:3
+msgid "Email"
+msgstr ""
+
+#: ../gtksourceview/language-specs/changelog.lang.h:4
+msgid "File"
+msgstr ""
+
+#: ../gtksourceview/language-specs/changelog.lang.h:5
+#, fuzzy
+msgid "Marker"
+msgstr "মার���প"
+
+#: ../gtksourceview/language-specs/cpp.lang.h:3
+msgid "C++"
+msgstr "সি++"
+
+#: ../gtksourceview/language-specs/csharp.lang.h:2
+msgid "C#"
+msgstr "সি#"
+
+#: ../gtksourceview/language-specs/csharp.lang.h:5
+#: ../gtksourceview/language-specs/lua.lang.h:7
+#: ../gtksourceview/language-specs/sh.lang.h:6
+msgid "Multiline String"
+msgstr "মাল��িলা�ন স���রি�"
+
+#: ../gtksourceview/language-specs/csharp.lang.h:7
+#: ../gtksourceview/language-specs/java.lang.h:9
+#: ../gtksourceview/language-specs/nemerle.lang.h:13
+#: ../gtksourceview/language-specs/vbnet.lang.h:9
+msgid "Primitives"
+msgstr "প�রিমি�িঠসম�হ"
+
+#: ../gtksourceview/language-specs/csharp.lang.h:10
+#: ../gtksourceview/language-specs/css.lang.h:59
+#: ../gtksourceview/language-specs/fortran.lang.h:14
+#: ../gtksourceview/language-specs/java.lang.h:12
+#: ../gtksourceview/language-specs/javascript.lang.h:24
+#: ../gtksourceview/language-specs/lua.lang.h:11
+#: ../gtksourceview/language-specs/makefile.lang.h:9
+#: ../gtksourceview/language-specs/sh.lang.h:14
+msgid "String 2"
+msgstr "স���রি� ২"
+
+#.
+#. At rules must occur at the start of a line.
+#.
+#: ../gtksourceview/language-specs/css.lang.h:4
+msgid "At Rules"
+msgstr "নি�ম�র মধ�য�"
+
+#.
+#. For CSS 2-style selectors: tag[attr="value"].
+#.
+#: ../gtksourceview/language-specs/css.lang.h:8
+msgid "Attribute Value Delimiters"
+msgstr "ব�শিষ���য মান ডিলিমি�ার"
+
+#: ../gtksourceview/language-specs/css.lang.h:10
+msgid "CSS"
+msgstr "CSS"
+
+#.
+#. Value length specifier. Unless it is 0, must always be like: -1.2em.
+#.
+#: ../gtksourceview/language-specs/css.lang.h:14
+msgid "Dimension"
+msgstr "ডা�ম�নশন/মাত�রা"
+
+#.
+#. Hexadecimal method of specifying colors. Can either be 3 or 6 in
+#. length: #ffcc00 = #fc0.
+#.
+#: ../gtksourceview/language-specs/css.lang.h:23
+msgid "Hexadecimal Color"
+msgstr "হ���সাড�সিমাল র�"
+
+#.
+#. Upgrades a rule set's importance when several rule sets conflict.
+#.
+#: ../gtksourceview/language-specs/css.lang.h:27
+msgid "Importance Modifier"
+msgstr "��র�ত�ব পরিবর�তন�ার�"
+
+#: ../gtksourceview/language-specs/css.lang.h:28
+msgid "Known Property Values"
+msgstr "���াত ব�শিষ���য�র মান"
+
+#: ../gtksourceview/language-specs/css.lang.h:35
+#: ../gtksourceview/language-specs/javascript.lang.h:20
+#: ../gtksourceview/language-specs/php.lang.h:20
+#: ../gtksourceview/language-specs/sql.lang.h:34
+msgid "Operators"
+msgstr "�পার��র"
+
+#: ../gtksourceview/language-specs/css.lang.h:37
+msgid "Property Names"
+msgstr "ব�শিষ���য�র নাম"
+
+#.
+#. Brackets define a declaration block, parentheses define functions.
+#.
+#: ../gtksourceview/language-specs/css.lang.h:41
+#: ../gtksourceview/language-specs/javascript.lang.h:21
+msgid "Punctuators"
+msgstr "বিরাম�িহ�ন"
+
+#.
+#. Used to combine selectors. Example syntax:
+#.
+#. body * div#ID.className > p + ul li:first-child
+#.
+#: ../gtksourceview/language-specs/css.lang.h:47
+msgid "Selector Grammar"
+msgstr "ব�য�রণ নির�বা��"
+
+#.
+#. Pseudo-class rules. Good to have syntax highlighting for these
+#. for mistypings.
+#.
+#: ../gtksourceview/language-specs/css.lang.h:52
+msgid "Selector Pseudo Classes"
+msgstr "স�ড� ��লাস নির�বা��"
+
+#.
+#. Pseudo-element rules. Good to have syntax highlighting for these
+#. for mistypings.
+#.
+#: ../gtksourceview/language-specs/css.lang.h:57
+msgid "Selector Pseudo Elements"
+msgstr "স�ড� �লিম�ন�� নির�বা��"
+
+#.
+#. Escaped unicode characters can contain either 6 hexadecimal characters
+#. or 1-5 hex characters followed by one whitespace character.
+#.
+#: ../gtksourceview/language-specs/css.lang.h:64
+msgid "Unicode Character Reference"
+msgstr "��নি��ড ���ষর তথ�যস�ত�র"
+
+#.
+#. Unicode range values.
+#.
+#: ../gtksourceview/language-specs/css.lang.h:68
+msgid "Unicode Range"
+msgstr "��নি��ড স�মা"
+
+#: ../gtksourceview/language-specs/desktop.lang.h:1
+msgid ".desktop"
+msgstr ".desktop"
+
+#: ../gtksourceview/language-specs/desktop.lang.h:2
+#: ../gtksourceview/language-specs/gtkrc.lang.h:1
+#: ../gtksourceview/language-specs/ini.lang.h:2
+#: ../gtksourceview/language-specs/scheme.lang.h:1
+msgid "Boolean Value"
+msgstr "ব�লি�ান মান"
+
+#: ../gtksourceview/language-specs/desktop.lang.h:3
+msgid "Encoding"
+msgstr "�ন��ডি�"
+
+#: ../gtksourceview/language-specs/desktop.lang.h:4
+msgid "Exec Parameter"
+msgstr "���স�� প�যারামি�ার"
+
+#: ../gtksourceview/language-specs/desktop.lang.h:5
+#: ../gtksourceview/language-specs/ini.lang.h:5
+msgid "Group"
+msgstr "��র�প"
+
+#: ../gtksourceview/language-specs/desktop.lang.h:8
+#: ../gtksourceview/language-specs/ini.lang.h:9
+msgid "Non Standard Key"
+msgstr "নন স���যান�ডার�ড ��"
+
+#: ../gtksourceview/language-specs/desktop.lang.h:11
+msgid "Standard Key"
+msgstr "স���যান�ডার�ড ��"
+
+#: ../gtksourceview/language-specs/diff.lang.h:1
+msgid "Added line"
+msgstr "য�� �রা লা�ন"
+
+#: ../gtksourceview/language-specs/diff.lang.h:2
+msgid "Changed line"
+msgstr "বদলান� লা�ন"
+
+#: ../gtksourceview/language-specs/diff.lang.h:3
+msgid "Diff"
+msgstr "ডিফ"
+
+#: ../gtksourceview/language-specs/diff.lang.h:4
+msgid "Diff file"
+msgstr "ডিফ ফা�ল"
+
+#: ../gtksourceview/language-specs/diff.lang.h:6
+#: ../gtksourceview/language-specs/po.lang.h:4
+msgid "Location"
+msgstr "�বস�থান"
+
+#: ../gtksourceview/language-specs/diff.lang.h:8
+msgid "Removed line"
+msgstr "সরান� লা�ন"
+
+#: ../gtksourceview/language-specs/diff.lang.h:9
+msgid "Special case"
+msgstr "স�প�শাল ��স"
+
+#: ../gtksourceview/language-specs/html.lang.h:1
+#: ../gtksourceview/language-specs/xml.lang.h:1
+#, fuzzy
+msgid "Attribute"
+msgstr "��যা��রিবি��"
+
+#: ../gtksourceview/language-specs/html.lang.h:3
+#: ../gtksourceview/language-specs/xml.lang.h:3
+msgid "Closing Bracket"
+msgstr "বন�ধ �রার ব�র�যা���"
+
+#: ../gtksourceview/language-specs/html.lang.h:4
+msgid "DTD"
+msgstr "DTD"
+
+#: ../gtksourceview/language-specs/html.lang.h:5
+#: ../gtksourceview/language-specs/xml.lang.h:4
+msgid "Entity"
+msgstr "�ন�ি�ি"
+
+#: ../gtksourceview/language-specs/html.lang.h:6
+msgid "HTML"
+msgstr "HTML"
+
+#: ../gtksourceview/language-specs/html.lang.h:7
+#: ../gtksourceview/language-specs/latex.lang.h:7
+#: ../gtksourceview/language-specs/texinfo.lang.h:12
+#: ../gtksourceview/language-specs/xml.lang.h:6
+msgid "Markup"
+msgstr "মার���প"
+
+#: ../gtksourceview/language-specs/html.lang.h:9
+#: ../gtksourceview/language-specs/xml.lang.h:8
+msgid "Tag"
+msgstr "��যা�"
+
+#: ../gtksourceview/language-specs/fortran.lang.h:3
+msgid "Fortran 95"
+msgstr "Fortran 95"
+
+#: ../gtksourceview/language-specs/fortran.lang.h:5
+msgid "Input/Output"
+msgstr "�নপ��/���প��"
+
+#: ../gtksourceview/language-specs/fortran.lang.h:6
+msgid "Intrinsics"
+msgstr "�ন��রিনসি��স"
+
+#: ../gtksourceview/language-specs/fortran.lang.h:11
+msgid "Read/Write"
+msgstr "প��/ল���"
+
+#. "duble-quoted strings"
+#: ../gtksourceview/language-specs/gtkrc.lang.h:2
+#: ../gtksourceview/language-specs/ini.lang.h:4
+#: ../gtksourceview/language-specs/octave.lang.h:2
+#: ../gtksourceview/language-specs/php.lang.h:16
+#: ../gtksourceview/language-specs/python.lang.h:3
+#: ../gtksourceview/language-specs/R.lang.h:3
+#: ../gtksourceview/language-specs/ruby.lang.h:6
+msgid "Double Quoted String"
+msgstr "ডাবল ����ড স���রি�"
+
+#: ../gtksourceview/language-specs/gtkrc.lang.h:3
+msgid "GtkRC"
+msgstr "GtkRC"
+
+#: ../gtksourceview/language-specs/gtkrc.lang.h:4
+msgid "Include Directive"
+msgstr "ডিরà§?à¦?à§?à¦?িঠà¦?নà§?তরà§?à¦à§?à¦?à§?ত à¦?রà§?"
+
+#: ../gtksourceview/language-specs/gtkrc.lang.h:5
+#: ../gtksourceview/language-specs/haskell.lang.h:8
+msgid "Keysymbol"
+msgstr "Keysymbol"
+
+#. 'single-quoted strings'
+#: ../gtksourceview/language-specs/gtkrc.lang.h:10
+#: ../gtksourceview/language-specs/ini.lang.h:11
+#: ../gtksourceview/language-specs/octave.lang.h:14
+#: ../gtksourceview/language-specs/php.lang.h:24
+#: ../gtksourceview/language-specs/python.lang.h:15
+#: ../gtksourceview/language-specs/R.lang.h:11
+#: ../gtksourceview/language-specs/ruby.lang.h:17
+msgid "Single Quoted String"
+msgstr "সি��ল ����ড স���রি�"
+
+#: ../gtksourceview/language-specs/gtkrc.lang.h:11
+msgid "State"
+msgstr "�বস�থা"
+
+#. $variable, $$dynamic-variable and even $$$more
+#: ../gtksourceview/language-specs/gtkrc.lang.h:12
+#: ../gtksourceview/language-specs/ini.lang.h:12
+#: ../gtksourceview/language-specs/php.lang.h:26
+#: ../gtksourceview/language-specs/tcl.lang.h:7
+msgid "Variable"
+msgstr "à¦à§?যারিà§?à§?বল"
+
+#: ../gtksourceview/language-specs/haskell.lang.h:5
+msgid "Haskell"
+msgstr "Haskell"
+
+#: ../gtksourceview/language-specs/haskell.lang.h:12
+#, fuzzy
+msgid "Preprocessor Definition"
+msgstr "প�র�প�রস�সর ড�ফিন�শন"
+
+#: ../gtksourceview/language-specs/haskell.lang.h:32
+msgid "Type or Constructor"
+msgstr "�া�প বা �ন�স��রা��র"
+
+#: ../gtksourceview/language-specs/idl.lang.h:2
+msgid "IDL"
+msgstr "IDL"
+
+#: ../gtksourceview/language-specs/idl.lang.h:7
+msgid "Sectional"
+msgstr "স��শনাল"
+
+#: ../gtksourceview/language-specs/ini.lang.h:1
+msgid ".ini"
+msgstr ".ini"
+
+#: ../gtksourceview/language-specs/ini.lang.h:3
+#: ../gtksourceview/language-specs/verilog.lang.h:3
+msgid "Decimal Number"
+msgstr "দশমি� নম�বর"
+
+#: ../gtksourceview/language-specs/ini.lang.h:6
+msgid "Integer"
+msgstr "প�র�ণ স���যা "
+
+#: ../gtksourceview/language-specs/java.lang.h:2
+msgid "Declarations"
+msgstr "ডি��ল�যার�শন"
+
+#: ../gtksourceview/language-specs/java.lang.h:3
+msgid "Flow"
+msgstr "ফ�ল�"
+
+#: ../gtksourceview/language-specs/java.lang.h:4
+msgid "Java"
+msgstr "Java"
+
+#: ../gtksourceview/language-specs/java.lang.h:6
+msgid "Memory"
+msgstr "ম�মরি"
+
+#: ../gtksourceview/language-specs/java.lang.h:7
+msgid "Modifiers"
+msgstr "মডিফা�ার"
+
+#: ../gtksourceview/language-specs/java.lang.h:8
+msgid "Numeric"
+msgstr "নি�ম�রি�"
+
+#: ../gtksourceview/language-specs/javascript.lang.h:1
+#: ../gtksourceview/language-specs/php.lang.h:1
+msgid "Array Operators"
+msgstr "��যার� �পার��র"
+
+#: ../gtksourceview/language-specs/javascript.lang.h:3
+msgid "Constructors"
+msgstr "�ন�স��রা��রস�"
+
+#: ../gtksourceview/language-specs/javascript.lang.h:4
+msgid "Error Handling"
+msgstr "ত�র��ি হ�যান�ডলি�"
+
+#: ../gtksourceview/language-specs/javascript.lang.h:5
+msgid "Floating-Point Number"
+msgstr "দশমি� স���যা"
+
+#: ../gtksourceview/language-specs/javascript.lang.h:6
+msgid "Flow Keywords"
+msgstr "ফ�ল� ����ার�ড"
+
+#: ../gtksourceview/language-specs/javascript.lang.h:7
+msgid "Future Reserved Words"
+msgstr "à¦à¦¬à¦¿à¦·à§?যতà§?র রিà¦?ারà§?ঠà¦?রা শবà§?দ"
+
+#: ../gtksourceview/language-specs/javascript.lang.h:8
+msgid "Global Functions"
+msgstr "��ল�বাল ফা�শনসম�হ"
+
+# প�থিব�ব�যাপ� is not good, since it would say a value set to golbally for an applicaion not entirely for the world - mak
+#: ../gtksourceview/language-specs/javascript.lang.h:9
+msgid "Global Properties"
+msgstr "��ল�বাল ব�শিষ���য"
+
+#: ../gtksourceview/language-specs/javascript.lang.h:10
+#: ../gtksourceview/language-specs/verilog.lang.h:5
+msgid "Hexadecimal Number"
+msgstr "হ���সাড�সিমাল নম�বর"
+
+#: ../gtksourceview/language-specs/javascript.lang.h:11
+msgid "JavaScript"
+msgstr "JavaScript"
+
+#: ../gtksourceview/language-specs/javascript.lang.h:14
+msgid "Literals"
+msgstr "লি�ার�ল"
+
+#: ../gtksourceview/language-specs/javascript.lang.h:15
+msgid "Math Value Properties"
+msgstr "�াণিতি� মান�র ব�শিষ���য"
+
+#: ../gtksourceview/language-specs/javascript.lang.h:17
+msgid "Object Functions"
+msgstr "�ব����� ফা�শন"
+
+#: ../gtksourceview/language-specs/javascript.lang.h:18
+msgid "Object Properties"
+msgstr "�ব������র ব�শিষ���য"
+
+#: ../gtksourceview/language-specs/javascript.lang.h:19
+msgid "Objects"
+msgstr "�ব�����"
+
+#: ../gtksourceview/language-specs/javascript.lang.h:22
+#: ../gtksourceview/language-specs/lua.lang.h:9
+#: ../gtksourceview/language-specs/octave.lang.h:13
+#: ../gtksourceview/language-specs/perl.lang.h:7
+#: ../gtksourceview/language-specs/php.lang.h:22
+#: ../gtksourceview/language-specs/python.lang.h:14
+#: ../gtksourceview/language-specs/R.lang.h:10
+#: ../gtksourceview/language-specs/ruby.lang.h:16
+#: ../gtksourceview/language-specs/sh.lang.h:11
+#: ../gtksourceview/language-specs/tcl.lang.h:3
+msgid "Scripts"
+msgstr "স���রিপ��"
+
+#: ../gtksourceview/language-specs/javascript.lang.h:25
+msgid "Unicode Escape Sequence"
+msgstr "��নি��ড �স��প ধারা"
+
+#: ../gtksourceview/language-specs/javascript.lang.h:26
+msgid "Word Operators"
+msgstr "শব�দ �পার��র"
+
+#: ../gtksourceview/language-specs/latex.lang.h:1
+#, fuzzy
+msgid "Command"
+msgstr "মন�তব�য (�ম�ন��)"
+
+#: ../gtksourceview/language-specs/latex.lang.h:3
+msgid "Comment Environment"
+msgstr "মন�তব�য পরিব�শ"
+
+#: ../gtksourceview/language-specs/latex.lang.h:4
+#: ../gtksourceview/language-specs/texinfo.lang.h:6
+msgid "Include"
+msgstr "�ন���ল�ড"
+
+#: ../gtksourceview/language-specs/latex.lang.h:6
+msgid "LaTeX"
+msgstr "ল�যা���"
+
+#: ../gtksourceview/language-specs/latex.lang.h:8
+msgid "Math"
+msgstr "�ণিত"
+
+#: ../gtksourceview/language-specs/lua.lang.h:2
+#: ../gtksourceview/language-specs/makefile.lang.h:3
+msgid "Functions"
+msgstr "ফা�শন সম�হ"
+
+#: ../gtksourceview/language-specs/lua.lang.h:5
+msgid "Line Comment 2"
+msgstr "লা�ন �ম�ন�� ২"
+
+#: ../gtksourceview/language-specs/lua.lang.h:6
+msgid "Lua"
+msgstr "ল��া"
+
+#: ../gtksourceview/language-specs/lua.lang.h:8
+#: ../gtksourceview/language-specs/sh.lang.h:7
+msgid "Multiline String 2"
+msgstr "মাল��িলা�ন স���রি� ২"
+
+#. `backticks-quoted strings`
+#: ../gtksourceview/language-specs/makefile.lang.h:1
+#: ../gtksourceview/language-specs/php.lang.h:3
+#: ../gtksourceview/language-specs/sh.lang.h:1
+msgid "Backtick String"
+msgstr "Backtick স���রি�"
+
+#: ../gtksourceview/language-specs/makefile.lang.h:2
+msgid "Directives"
+msgstr "ডিরà§?à¦?à§?à¦?িà¦"
+
+# most programmer won't get ফা�ল ত�র� �র�, since "makefile" is more familiar to 'em. - mak
+#: ../gtksourceview/language-specs/makefile.lang.h:5
+msgid "Makefile"
+msgstr "ম��ফা�ল"
+
+#: ../gtksourceview/language-specs/makefile.lang.h:7
+msgid "Special Targets"
+msgstr "বিশ�ষ ল��ষ�য"
+
+#: ../gtksourceview/language-specs/makefile.lang.h:10
+msgid "Targets"
+msgstr "ল��ষ�যসম�হ"
+
+#: ../gtksourceview/language-specs/makefile.lang.h:11
+#: ../gtksourceview/language-specs/sh.lang.h:15
+msgid "Variable1"
+msgstr "à¦à§?যারিà§?à§?বল১"
+
+#: ../gtksourceview/language-specs/makefile.lang.h:12
+#: ../gtksourceview/language-specs/sh.lang.h:16
+msgid "Variable2"
+msgstr "à¦à§?যারিà§?à§?বল২"
+
+#: ../gtksourceview/language-specs/msil.lang.h:1
+msgid "MSIL"
+msgstr "MSIL"
+
+#: ../gtksourceview/language-specs/nemerle.lang.h:1
+#: ../gtksourceview/language-specs/verilog.lang.h:1
+msgid "Binary Number"
+msgstr "বা�নার� নম�বর"
+
+#: ../gtksourceview/language-specs/nemerle.lang.h:4
+msgid "Core Keywords"
+msgstr "ম�ল ����ার�ড"
+
+#: ../gtksourceview/language-specs/nemerle.lang.h:5
+msgid "Core Types"
+msgstr "ম�ল �া�প"
+
+#: ../gtksourceview/language-specs/nemerle.lang.h:9
+msgid "Keywords Defined by Macros"
+msgstr "ম�যা��র� দ�বারা নির�ধারিত ����ার�ড"
+
+#: ../gtksourceview/language-specs/nemerle.lang.h:11
+msgid "Nemerle"
+msgstr "নম�বর"
+
+#: ../gtksourceview/language-specs/octave.lang.h:8
+#: ../gtksourceview/language-specs/python.lang.h:10
+#, fuzzy
+msgid "Multiline Double Quoted String"
+msgstr "ডাবল ����ড স���রি�"
+
+#: ../gtksourceview/language-specs/octave.lang.h:9
+#: ../gtksourceview/language-specs/python.lang.h:11
+#, fuzzy
+msgid "Multiline Single Quoted String"
+msgstr "সি��ল ����ড স���রি�"
+
+#: ../gtksourceview/language-specs/octave.lang.h:11
+msgid "Octave"
+msgstr ""
+
+#: ../gtksourceview/language-specs/octave.lang.h:12
+#: ../gtksourceview/language-specs/R.lang.h:9
+msgid "Reserved Constant"
+msgstr "রি�ার�ঠ�রা �নস��ান��"
+
+#: ../gtksourceview/language-specs/pascal.lang.h:1
+msgid "Block Comment 1"
+msgstr "ব�ল� মন�তব�য ১"
+
+#: ../gtksourceview/language-specs/pascal.lang.h:2
+msgid "Block Comment 2"
+msgstr "ব�ল� মন�তব�য ২"
+
+#: ../gtksourceview/language-specs/pascal.lang.h:3
+msgid "Boolean Bitwise Operators"
+msgstr "ব�লি�ান বি���া�� �পার��র"
+
+#: ../gtksourceview/language-specs/pascal.lang.h:4
+msgid "Builtin Functions"
+msgstr "বিল���ন ফা�শান"
+
+#: ../gtksourceview/language-specs/pascal.lang.h:5
+msgid "Builtin Types"
+msgstr "বিল���ন ধরন"
+
+#: ../gtksourceview/language-specs/pascal.lang.h:6
+msgid "Builtin Values"
+msgstr "বিল���ন মান"
+
+#: ../gtksourceview/language-specs/pascal.lang.h:7
+msgid "Functions and Function Modifiers"
+msgstr "ফা�শন �ব� ফা�শন পরিবর�তন�ার�"
+
+#: ../gtksourceview/language-specs/pascal.lang.h:8
+msgid "General Format"
+msgstr "সাধারন ফর�ম�যা�"
+
+#: ../gtksourceview/language-specs/pascal.lang.h:12
+msgid "Loop, Flow, and Exceptions Keywords"
+msgstr "ল�প, ফ�ল� �ব� ���স�পশন ����ার�ডসম�হ"
+
+#: ../gtksourceview/language-specs/pascal.lang.h:13
+msgid "Math Operators"
+msgstr "�াণিতি� �পার��র "
+
+#: ../gtksourceview/language-specs/pascal.lang.h:15
+msgid "Pascal"
+msgstr "Pascal"
+
+#: ../gtksourceview/language-specs/pascal.lang.h:16
+msgid "Preprocessor Defines"
+msgstr "প�র�প�রস�সর ডিফা�নসম�হ"
+
+#: ../gtksourceview/language-specs/pascal.lang.h:19
+msgid "Type, Class and Object Keywords"
+msgstr "�া�প, ��লাস �ব� �ব����� ����ার�ডসম�হ"
+
+#: ../gtksourceview/language-specs/perl.lang.h:1
+msgid "Function Call"
+msgstr "ফা�শন �ল"
+
+#: ../gtksourceview/language-specs/perl.lang.h:4
+msgid "Method Call"
+msgstr "ম�থড �ল"
+
+#: ../gtksourceview/language-specs/perl.lang.h:5
+msgid "POD"
+msgstr "POD"
+
+#: ../gtksourceview/language-specs/perl.lang.h:6
+msgid "Perl"
+msgstr "Perl"
+
+#: ../gtksourceview/language-specs/perl.lang.h:9
+#: ../gtksourceview/language-specs/tcl.lang.h:5
+msgid "String2"
+msgstr "স���রি�২"
+
+#: ../gtksourceview/language-specs/perl.lang.h:10
+msgid "String3"
+msgstr "স���রি�৩"
+
+#: ../gtksourceview/language-specs/perl.lang.h:11
+msgid "Variables"
+msgstr "à¦à§?যারিà§?à§?বল"
+
+#. # Bourne Shell Line Comment
+#: ../gtksourceview/language-specs/php.lang.h:5
+msgid "Bash Line Comment"
+msgstr "ব�যাশ লা�ন �ম�ন��"
+
+#. /* C Block Comment
+#: ../gtksourceview/language-specs/php.lang.h:7
+msgid "C Block Comment"
+msgstr "সি ব�ল� �ম�ন��"
+
+#. // C++ Line Comment
+#: ../gtksourceview/language-specs/php.lang.h:9
+msgid "C++ Line Comment"
+msgstr "C++ লা�ন �ম�ন��"
+
+#: ../gtksourceview/language-specs/php.lang.h:10
+msgid "Case Insensitive Keyword"
+msgstr "��স �নস�ন�সি�িঠ����ার�ড"
+
+#. This are keywords, the are recognised by php
+#: ../gtksourceview/language-specs/php.lang.h:12
+msgid "Case Sensitive Keyword"
+msgstr "��স স�ন�সি�িঠ����ার�ড"
+
+#. <? ?> <HTML> inside PHP <?
+#: ../gtksourceview/language-specs/php.lang.h:18
+msgid "First Open PHP Tag"
+msgstr "প�রথম ��লা PHP ��যা�"
+
+#: ../gtksourceview/language-specs/php.lang.h:19
+msgid "HTML Block"
+msgstr "HTML ব�ল�"
+
+#: ../gtksourceview/language-specs/php.lang.h:21
+msgid "PHP"
+msgstr "PHP"
+
+#: ../gtksourceview/language-specs/po.lang.h:2
+msgid "Format"
+msgstr "ফর�ম�যা�"
+
+#: ../gtksourceview/language-specs/po.lang.h:7
+msgid "gettext translation"
+msgstr "gettext �ন�বাদ"
+
+#: ../gtksourceview/language-specs/python.lang.h:1
+#: ../gtksourceview/language-specs/ruby.lang.h:2
+msgid "Builtins"
+msgstr "বিল���নসম�হ"
+
+#: ../gtksourceview/language-specs/python.lang.h:9
+msgid "Module Handler"
+msgstr "মডি�ল হ�যান�ডলার"
+
+#: ../gtksourceview/language-specs/python.lang.h:13
+msgid "Python"
+msgstr "পা�থন"
+
+#: ../gtksourceview/language-specs/R.lang.h:1
+msgid "Assignment Operator"
+msgstr "�সা�নম�ন�� �পার��র"
+
+#: ../gtksourceview/language-specs/R.lang.h:2
+msgid "Delimiter"
+msgstr "ড�লিমি�ার"
+
+#: ../gtksourceview/language-specs/R.lang.h:5
+msgid "Integer Number"
+msgstr "প�র�ণ স���যা"
+
+#: ../gtksourceview/language-specs/R.lang.h:8
+msgid "Reserved Class"
+msgstr "রি�ার�ঠ�রা ��লাস"
+
+#: ../gtksourceview/language-specs/ruby.lang.h:1
+msgid "Attribute Definitions"
+msgstr "��যা��রিবি�� স����া"
+
+#: ../gtksourceview/language-specs/ruby.lang.h:3
+msgid "Class Variables"
+msgstr "à¦?à§?লাস à¦à§?যারিà§?à§?বল"
+
+#: ../gtksourceview/language-specs/ruby.lang.h:4
+msgid "Constants"
+msgstr "ধ�র�ব�"
+
+#: ../gtksourceview/language-specs/ruby.lang.h:5
+msgid "Definitions"
+msgstr "ড�ফিন�শন"
+
+#: ../gtksourceview/language-specs/ruby.lang.h:7
+msgid "Global Variables"
+msgstr "à¦?à§?লà§?বাল à¦à§?যারিà§?à§?বল"
+
+#: ../gtksourceview/language-specs/ruby.lang.h:8
+msgid "Instance Variables"
+msgstr "à¦?নà§?সà¦?à§?যানà§?স à¦à§?যারিà§?à§?বল"
+
+#: ../gtksourceview/language-specs/ruby.lang.h:11
+msgid "Module Handlers"
+msgstr "মডি�ল হ�যান�ডলার"
+
+#: ../gtksourceview/language-specs/ruby.lang.h:12
+msgid "Multiline Comment"
+msgstr "��াধি� লা�ন �ম�ন��"
+
+#: ../gtksourceview/language-specs/ruby.lang.h:13
+msgid "Pseudo Variables"
+msgstr "সà§?ডà§? à¦à§?যারিà§?à§?বল"
+
+#: ../gtksourceview/language-specs/ruby.lang.h:14
+msgid "RegExp Variables"
+msgstr "RegExp à¦à§?যারিà§?à§?বল"
+
+#: ../gtksourceview/language-specs/ruby.lang.h:15
+msgid "Ruby"
+msgstr "র�বি"
+
+#: ../gtksourceview/language-specs/ruby.lang.h:18
+#, fuzzy
+msgid "Symbols"
+msgstr "Keysymbols"
+
+#: ../gtksourceview/language-specs/scheme.lang.h:11
+msgid "Scheme"
+msgstr ""
+
+#: ../gtksourceview/language-specs/sh.lang.h:2
+#, fuzzy
+msgid "Built-in Command"
+msgstr "বিল���ন �মান�ড"
+
+#: ../gtksourceview/language-specs/sh.lang.h:3
+#, fuzzy
+msgid "Common Command"
+msgstr "বহ�ল ব�যবহ�ত �ম�যান�ড"
+
+#: ../gtksourceview/language-specs/sh.lang.h:8
+#, fuzzy
+msgid "Operator"
+msgstr "�পার��র"
+
+#: ../gtksourceview/language-specs/sh.lang.h:9
+#, fuzzy
+msgid "Punctuator"
+msgstr "বিরাম�িহ�ন"
+
+#: ../gtksourceview/language-specs/sh.lang.h:10
+#, fuzzy
+msgid "Redirection"
+msgstr "রিডির��শন"
+
+#: ../gtksourceview/language-specs/sh.lang.h:12
+msgid "Self"
+msgstr "স�ল�ফ"
+
+#: ../gtksourceview/language-specs/sh.lang.h:17
+msgid "sh"
+msgstr "sh"
+
+#: ../gtksourceview/language-specs/sql.lang.h:1
+msgid "ANSI Datatypes"
+msgstr "ANSI ডা�া�া�প"
+
+#. Reserved Words
+#: ../gtksourceview/language-specs/sql.lang.h:3
+msgid "ANSI Reserved Words"
+msgstr "ANSI রি�ার�ঠ�রা শব�দ"
+
+#. Aggregate Functions
+#: ../gtksourceview/language-specs/sql.lang.h:5
+msgid "Aggregate Functions"
+msgstr "��যা��রি��� ফা�শানসম�হ"
+
+#. Analytic Functions
+#: ../gtksourceview/language-specs/sql.lang.h:7
+msgid "Analytic Functions"
+msgstr "��যানালি�ি� ফা�শানসম�হ"
+
+#: ../gtksourceview/language-specs/sql.lang.h:10
+msgid "Character Functions Returning Character Values"
+msgstr "য� ��যার����ার ফা�শন ��যার����ার মান ফ�রত দ��"
+
+#: ../gtksourceview/language-specs/sql.lang.h:11
+msgid "Character Functions Returning Number Values"
+msgstr "য� ��যার����ার ফা�শন নম�বর মান ফ�রত দ��"
+
+#: ../gtksourceview/language-specs/sql.lang.h:12
+msgid "Collection Functions"
+msgstr "�াল��শন ফা�শন"
+
+#: ../gtksourceview/language-specs/sql.lang.h:13
+msgid "Conditions"
+msgstr "শর�তাবল�"
+
+#: ../gtksourceview/language-specs/sql.lang.h:14
+msgid "Conversion Functions"
+msgstr "à¦?নà§?à¦à¦¾à¦°à§?শন ফাà¦?শন"
+
+#: ../gtksourceview/language-specs/sql.lang.h:15
+msgid "Data Mining Functions"
+msgstr "ডা�া মা�নি� ফা�শন"
+
+#: ../gtksourceview/language-specs/sql.lang.h:16
+msgid "Datetime Functions"
+msgstr "Datetime ফা�শন"
+
+#: ../gtksourceview/language-specs/sql.lang.h:17
+msgid "Encoding and Decoding Functions"
+msgstr "�ন��ডি� �ব� ডি��ডি� ফা�শন"
+
+#: ../gtksourceview/language-specs/sql.lang.h:18
+msgid "Environment and Identifier Functions"
+msgstr "পরিব�শ �ব� ��ড�ন��িফা��ার ফা�শন"
+
+#: ../gtksourceview/language-specs/sql.lang.h:19
+msgid "General Comparison Functions"
+msgstr "সাধারন ত�লনা�ার� ফা�শন"
+
+#: ../gtksourceview/language-specs/sql.lang.h:20
+msgid "Hierarchical Function"
+msgstr "��রমবিন�যস�ত ফা�শান "
+
+#: ../gtksourceview/language-specs/sql.lang.h:21
+msgid "Integer Literals"
+msgstr "�ন��ি�ার লি�ার�ল"
+
+#: ../gtksourceview/language-specs/sql.lang.h:22
+msgid "Large Object Functions"
+msgstr "ব� �ব����� ফা�শন"
+
+#. Model Functions
+#: ../gtksourceview/language-specs/sql.lang.h:25
+msgid "Model Functions"
+msgstr "মড�ল ফা�শন"
+
+#: ../gtksourceview/language-specs/sql.lang.h:26
+msgid "NLS Character Functions"
+msgstr "NLS Character ফা�শন"
+
+#: ../gtksourceview/language-specs/sql.lang.h:27
+msgid "NULL-Related Functions"
+msgstr "NULL-Related ফা�শন"
+
+#: ../gtksourceview/language-specs/sql.lang.h:28
+msgid "Null"
+msgstr "Null"
+
+#: ../gtksourceview/language-specs/sql.lang.h:29
+msgid "Number Literals"
+msgstr "নম�বর লি��রালসম�হ"
+
+#. Single-Row Functions
+#: ../gtksourceview/language-specs/sql.lang.h:31
+msgid "Numeric Functions"
+msgstr "নম�বর সম�বন�ধ�� ফা�শন"
+
+#. Object Reference Functions
+#: ../gtksourceview/language-specs/sql.lang.h:33
+msgid "Object Reference Functions"
+msgstr "�ব����� র�ফার�ন�স ফা�শন"
+
+#. Datatypes
+#: ../gtksourceview/language-specs/sql.lang.h:36
+msgid "Oracle Built-in Datatypes"
+msgstr "à¦?রâ??à§?যাà¦?à§?ল বিলà§?à¦?à¦?ন ডাà¦?াà¦?াà¦?প"
+
+#: ../gtksourceview/language-specs/sql.lang.h:37
+msgid "Oracle Reserved Words"
+msgstr "à¦?রâ??à§?যাà¦?à§?ল রিà¦?ারà§?ঠà¦?রা à¦?à§?ারà§?ড"
+
+#: ../gtksourceview/language-specs/sql.lang.h:38
+msgid "Oracle-Supplied Types"
+msgstr "à¦?রâ??à§?যাà¦?à§?ল সরবরাহà¦?à§?ত à¦?াà¦?প"
+
+#: ../gtksourceview/language-specs/sql.lang.h:39
+msgid "SQL"
+msgstr "SQL"
+
+#: ../gtksourceview/language-specs/sql.lang.h:40
+msgid "SQL Statements"
+msgstr "SQL স����ম�ন��"
+
+#. SQL*Plus
+#: ../gtksourceview/language-specs/sql.lang.h:42
+msgid "SQL*Plus At Sign"
+msgstr "SQL*Plus ��যা� �িহ�ন"
+
+#: ../gtksourceview/language-specs/sql.lang.h:43
+msgid "SQL*Plus Commands"
+msgstr "SQL*Plus �ম�যান�ড সম�হ"
+
+#: ../gtksourceview/language-specs/sql.lang.h:44
+msgid "SQL*Plus Double At Sign"
+msgstr "SQL*Plus ডাবল ��যা� �িহ�ন"
+
+#: ../gtksourceview/language-specs/sql.lang.h:45
+msgid "SQL*Plus Slash"
+msgstr "SQL*Plus স�ল�যাশ"
+
+#: ../gtksourceview/language-specs/sql.lang.h:46
+msgid "SQL/DS and DB2 Datatypes"
+msgstr "SQL/DS �ব� DB2 ডা�া�া�প সম�হ"
+
+#: ../gtksourceview/language-specs/sql.lang.h:47
+msgid "Size Clause"
+msgstr "সা�� ��ল�"
+
+#. Literals
+#: ../gtksourceview/language-specs/sql.lang.h:50
+msgid "Text Literals"
+msgstr "����স� লি�ার�ল"
+
+#: ../gtksourceview/language-specs/sql.lang.h:51
+msgid "Unlimited"
+msgstr "�নলিমি��ড"
+
+#: ../gtksourceview/language-specs/sql.lang.h:52
+msgid "XML Functions"
+msgstr "XML ফা�শন"
+
+#: ../gtksourceview/language-specs/tcl.lang.h:6
+msgid "Tcl"
+msgstr "Tcl"
+
+#: ../gtksourceview/language-specs/texinfo.lang.h:2
+msgid "Characters"
+msgstr "���ষর"
+
+#: ../gtksourceview/language-specs/texinfo.lang.h:3
+msgid "File Attributes"
+msgstr "ফা�ল ��যা��রিবি��"
+
+#: ../gtksourceview/language-specs/texinfo.lang.h:4
+msgid "Formatting"
+msgstr "ফর�ম�যা�ি�"
+
+#: ../gtksourceview/language-specs/texinfo.lang.h:5
+msgid "Generated Content"
+msgstr "সাধারন বিষ�বস�ত�"
+
+#: ../gtksourceview/language-specs/texinfo.lang.h:7
+msgid "Indexing"
+msgstr "�ন�ড���সি�"
+
+#: ../gtksourceview/language-specs/texinfo.lang.h:10
+msgid "Macro Parameters"
+msgstr "ম�যা��র� প�যারামি�ার"
+
+#: ../gtksourceview/language-specs/texinfo.lang.h:11
+msgid "Macros"
+msgstr "ম�যা��র�"
+
+#: ../gtksourceview/language-specs/texinfo.lang.h:13
+msgid "Markup (block)"
+msgstr "মার���প (ব�ল�)"
+
+#: ../gtksourceview/language-specs/texinfo.lang.h:14
+msgid "Markup (inline)"
+msgstr "মার���প (�নলা�ন)"
+
+#: ../gtksourceview/language-specs/texinfo.lang.h:15
+msgid "Sectioning"
+msgstr "স��শনি�"
+
+#: ../gtksourceview/language-specs/texinfo.lang.h:16
+msgid "Texinfo"
+msgstr "Texinfo"
+
+#: ../gtksourceview/language-specs/vbnet.lang.h:7
+msgid "Old Style Comment"
+msgstr "প�র�ন� ধা���র �ম�ন��"
+
+#: ../gtksourceview/language-specs/vbnet.lang.h:12
+msgid "VB.NET"
+msgstr "VB.NET"
+
+#: ../gtksourceview/language-specs/verilog.lang.h:4
+msgid "Gates"
+msgstr "��� সম�হ"
+
+#: ../gtksourceview/language-specs/verilog.lang.h:11
+msgid "Verilog"
+msgstr "Verilog"
+
+#: ../gtksourceview/language-specs/vhdl.lang.h:7
+msgid "True and False"
+msgstr "সত�য � মিথ�যা"
+
+#: ../gtksourceview/language-specs/vhdl.lang.h:9
+msgid "VHDL"
+msgstr "VHDL"
+
+#: ../gtksourceview/language-specs/xml.lang.h:5
+msgid "Hexadecimal"
+msgstr "হ���সাড�সিমাল"
+
+#: ../gtksourceview/language-specs/xml.lang.h:9
+msgid "XML"
+msgstr "XML"
+
+#~ msgid "Tags"
+#~ msgstr "��যা� সম�হ"
+
+#~ msgid "Double Quote String"
+#~ msgstr "ডাবল ����ড স���রি�"
+
+#~ msgid "Single Quote String"
+#~ msgstr "সি���ল ����ড স���রি�"
+
+#~ msgid "Most Used Commands"
+#~ msgstr "বহ�ল ব�যবহ�ত �ম�যান�ড সম�হ"
+
+#~ msgid "Regular Expression"
+#~ msgstr "র���লার ���সপ�র�শন"
+
+#~ msgid "Regular Expression 2"
+#~ msgstr "র���লার ���সপ�র�শন ২"
+
+#~ msgid "Miscellaneous Single-Row Functions"
+#~ msgstr "�ন�যান�য ��� র� ফা�শন"
+
+#, fuzzy
+#~ msgid "Font description name to use for the document text"
+#~ msgstr "নথ�র ����স��র �ন�য য� ফন�� নাম ব�যবহ�ত হব�"
+
+#, fuzzy
+#~ msgid "Font description name to use for the header and footer"
+#~ msgstr "হ�ডার �ব� ফ��ার�র �ন�য য� ফন�� নাম ব�যবহ�ত হব�"
diff -pruN 1.6.1-3/po/cs.po 1.7.1-0ubuntu2/po/cs.po
--- 1.6.1-3/po/cs.po 2006-02-13 05:05:56.000000000 +0000
+++ 1.7.1-0ubuntu2/po/cs.po 2006-04-29 14:15:40.000000000 +0100
@@ -1,19 +1,23 @@
# Czech translation of gtksourceview.
# Copyright (C) 2003, 2004, 2005, 2006 gtksourceview's COPYRIGHT HOLDER
# Copyright (C) 2003, 2004, 2005, 2006 Miloslav Trmac <mitr volny cz>
+# Copyright (C) 2006 Lukas Novotny <lukasnov cvs gnome org>
# This file is distributed under the same license as the gtksourceview package.
# Miloslav Trmac <mitr volny cz>, 2003 - 2006.
+# Lukas Novotny <lukasnov cvs gnome org>, 2006.
+#
+#
msgid ""
msgstr ""
"Project-Id-Version: gtksourceview VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-10 00:19+0100\n"
-"PO-Revision-Date: 2006-02-13 05:14+0100\n"
-"Last-Translator: Miloslav Trmac <mitr volny cz>\n"
+"POT-Creation-Date: 2006-04-27 13:43+0200\n"
+"PO-Revision-Date: 2006-04-28 22:34+0200\n"
+"Last-Translator: Lukas Novotny <lukasnov cvs gnome org>\n"
"Language-Team: Czech <cs li org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: 8bit"
#: ../gtksourceview/gtksourcebuffer.c:278
msgid "Escape Character"
@@ -85,7 +89,7 @@ msgid "GtkSourceBuffer object to print"
msgstr "Objekt GtkSourceBuffer, který vytisknout"
#: ../gtksourceview/gtksourceprintjob.c:280
-#: ../gtksourceview/gtksourceview.c:235 ../gtksourceview/gtksourceview.c:236
+#: ../gtksourceview/gtksourceview.c:233 ../gtksourceview/gtksourceview.c:234
msgid "Tabs Width"
msgstr "Å ÃÅ?ka tabelátorů"
@@ -337,59 +341,59 @@ msgstr "Styl tagu"
msgid "The style associated with the source tag"
msgstr "Styl asociovaný se zdrojovým tagem"
-#: ../gtksourceview/gtksourceview.c:219
+#: ../gtksourceview/gtksourceview.c:217
msgid "Show Line Numbers"
msgstr "Zobrazovat Ä?Ãsla Å?ádků"
-#: ../gtksourceview/gtksourceview.c:220
+#: ../gtksourceview/gtksourceview.c:218
msgid "Whether to display line numbers"
msgstr "Jestli zobrazovat Ä?Ãsla Å?ádků"
-#: ../gtksourceview/gtksourceview.c:227
+#: ../gtksourceview/gtksourceview.c:225
msgid "Show Line Markers"
msgstr "Zobrazovat znaÄ?ky Å?ádků"
-#: ../gtksourceview/gtksourceview.c:228
+#: ../gtksourceview/gtksourceview.c:226
msgid "Whether to display line marker pixbufs"
msgstr "Jestli zobrazovat pixbufy znaÄ?ek Å?ádků"
-#: ../gtksourceview/gtksourceview.c:245
+#: ../gtksourceview/gtksourceview.c:243
msgid "Auto Indentation"
msgstr "Automatické odsazovánÃ"
-#: ../gtksourceview/gtksourceview.c:246
+#: ../gtksourceview/gtksourceview.c:244
msgid "Whether to enable auto indentation"
msgstr "Jestli povolit automatické odsazovánÃ"
-#: ../gtksourceview/gtksourceview.c:252
+#: ../gtksourceview/gtksourceview.c:250
msgid "Insert Spaces Instead of Tabs"
msgstr "Vkládat mezery mÃsto tabelátorů"
-#: ../gtksourceview/gtksourceview.c:253
+#: ../gtksourceview/gtksourceview.c:251
msgid "Whether to insert spaces instead of tabs"
msgstr "Jestli vkládat mezery mÃsto tabelátorů"
-#: ../gtksourceview/gtksourceview.c:260
+#: ../gtksourceview/gtksourceview.c:258
msgid "Show Right Margin"
msgstr "Zobrazovat pravý okraj"
-#: ../gtksourceview/gtksourceview.c:261
+#: ../gtksourceview/gtksourceview.c:259
msgid "Whether to display the right margin"
msgstr "Jestli zobrazovat pravý okraj"
-#: ../gtksourceview/gtksourceview.c:268
+#: ../gtksourceview/gtksourceview.c:266
msgid "Margin position"
msgstr "Pozice okraje"
-#: ../gtksourceview/gtksourceview.c:269
+#: ../gtksourceview/gtksourceview.c:267
msgid "Position of the right margin"
msgstr "Pozice pravého okraje"
-#: ../gtksourceview/gtksourceview.c:278
+#: ../gtksourceview/gtksourceview.c:276
msgid "Use smart home/end"
msgstr "PoužÃvat chytré home/end"
-#: ../gtksourceview/gtksourceview.c:279
+#: ../gtksourceview/gtksourceview.c:277
msgid ""
"HOME and END keys move to first/last non whitespace characters on line "
"before going to the start/end of the line"
@@ -397,54 +401,53 @@ msgstr ""
"Klávesy HOME a END jdou nejdÅ?Ãv na prvnÃ/poslednà neprázdný znak Å?ádku a až "
"potom na zaÄ?átek/konec Å?ádku"
-#: ../gtksourceview/gtksourceview.c:288
+#: ../gtksourceview/gtksourceview.c:286
msgid "Highlight current line"
msgstr "ZvýrazÅ?ovat aktuálnà Å?ádek"
-#: ../gtksourceview/gtksourceview.c:289
+#: ../gtksourceview/gtksourceview.c:287
msgid "Whether to highlight the current line"
msgstr "Jestli zvýrazÅ?ovat aktuálnà Å?ádek"
-#: ../gtksourceview/gtksourceview.c:305
+#: ../gtksourceview/gtksourceview.c:303
msgid "Margin Line Alpha"
msgstr "Alfa Ä?áry na okraji"
-#: ../gtksourceview/gtksourceview.c:306
+#: ../gtksourceview/gtksourceview.c:304
msgid "Transparency of the margin line"
msgstr "Průhlednost Ä?áry na okraji"
-#: ../gtksourceview/gtksourceview.c:323
+#: ../gtksourceview/gtksourceview.c:321
msgid "Margin Line Color"
msgstr "Barva Ä?áry na okraji"
-#: ../gtksourceview/gtksourceview.c:324
+#: ../gtksourceview/gtksourceview.c:322
msgid "Color to use for the right margin line"
msgstr "Barva, kterou použÃvat pro Ä?áru na pravém okraji"
-#: ../gtksourceview/gtksourceview.c:340
+#: ../gtksourceview/gtksourceview.c:338
msgid "Margin Overlay Toggle"
-msgstr ""
+msgstr "O kolik pÅ?ekrýt okraj"
-#: ../gtksourceview/gtksourceview.c:341
-#, fuzzy
+#: ../gtksourceview/gtksourceview.c:339
msgid "Whether to draw the right margin overlay"
-msgstr "Jestli zobrazovat pravý okraj"
+msgstr "Jestli vykreslovat pÅ?ekrytà pravého okraje"
-#: ../gtksourceview/gtksourceview.c:357
+#: ../gtksourceview/gtksourceview.c:355
msgid "Margin Overlay Alpha"
msgstr ""
-#: ../gtksourceview/gtksourceview.c:358
+#: ../gtksourceview/gtksourceview.c:356
msgid "Transparency of the margin overlay"
-msgstr ""
+msgstr "Průhledné pÅ?ekrytà okraje"
-#: ../gtksourceview/gtksourceview.c:375
+#: ../gtksourceview/gtksourceview.c:373
msgid "Margin Overlay Color"
-msgstr ""
+msgstr "Barva pÅ?ekrytà okraje"
-#: ../gtksourceview/gtksourceview.c:376
+#: ../gtksourceview/gtksourceview.c:374
msgid "Color to use for drawing the margin overlay"
-msgstr ""
+msgstr "Barva,·kterou·použÃvat·pro·vykreslenà pÅ?ekrytà okraje"
#: ../gtksourceview/language-specs/ada.lang.h:1
msgid "Ada"
diff -pruN 1.6.1-3/po/dz.po 1.7.1-0ubuntu2/po/dz.po
--- 1.6.1-3/po/dz.po 2006-03-25 07:39:54.000000000 +0000
+++ 1.7.1-0ubuntu2/po/dz.po 2006-04-20 17:49:52.000000000 +0100
@@ -1,15 +1,14 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL ADDRESS>, YEAR.
+# Dzongkha translation of gtksourceview
+# Copyright @ 2006 Free Software Foundation, Inc.
+# Mindu Dorji
#
msgid ""
msgstr ""
-"Project-Id-Version: gtksourceview.HEAD.dz\n"
+"Project-Id-Version: gtksourceview.gnome-2-14 dz\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-06 05:21+0100\n"
-"PO-Revision-Date: 2006-03-24 17:33-0500\n"
-"Last-Translator: \n"
+"POT-Creation-Date: 2006-04-04 22:38+0200\n"
+"PO-Revision-Date: 2006-04-14 15:25+0530\n"
+"Last-Translator: Mindu Dorji\n"
"Language-Team: DZONGKHA <pgeyleg dit gov bt>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
@@ -19,180 +18,180 @@ msgstr ""
"X-Poedit-Country: BHUTAN\n"
"X-Poedit-SourceCharset: utf-8\n"
-#: ../gtksourceview/gtksourcebuffer.c:279
+#: ../gtksourceview/gtksourcebuffer.c:278
msgid "Escape Character"
msgstr "ཡི��འ�ྲུ� �ྲོས��ར�འ���"
-#: ../gtksourceview/gtksourcebuffer.c:280
+#: ../gtksourceview/gtksourcebuffer.c:279
msgid "Escaping character for syntax patterns"
msgstr "�ི��སྦྱོར���ེ���ིའི��ོ��ལུ� ཡི��འ�ྲུ��ྲོས��ར�འ����ོ�"
-#: ../gtksourceview/gtksourcebuffer.c:288
+#: ../gtksourceview/gtksourcebuffer.c:287
msgid "Check Brackets"
msgstr "�ུ��ཤ���ུ� �ི����ྱ��འ���"
-#: ../gtksourceview/gtksourcebuffer.c:289
+#: ../gtksourceview/gtksourcebuffer.c:288
msgid "Whether to check and highlight matching brackets"
msgstr "��ུ��ས�ྲི���ི��ུ��ཤ���ུ� �ི����ྱ��འ����ེ� ��ོ���ི�ས�འ�����ོ��ཨི����"
-#: ../gtksourceview/gtksourcebuffer.c:297
-#: ../gtksourceview/gtksourceprintjob.c:295
+#: ../gtksourceview/gtksourcebuffer.c:296
+#: ../gtksourceview/gtksourceprintjob.c:296
msgid "Highlight"
msgstr "��ོ���ི�ས�"
-#: ../gtksourceview/gtksourcebuffer.c:298
+#: ../gtksourceview/gtksourcebuffer.c:297
msgid "Whether to highlight syntax in the buffer"
msgstr "�����ོ�ས�����ི� �ི��སྦྱོར�ལུ� ��ོ���ི�ས�འ�����ོ��ཨི����"
-#: ../gtksourceview/gtksourcebuffer.c:306
+#: ../gtksourceview/gtksourcebuffer.c:305
msgid "Maximum Undo Levels"
msgstr "འ����ཤོལ���ས�རི���ྱི������འ�"
-#: ../gtksourceview/gtksourcebuffer.c:307
+#: ../gtksourceview/gtksourcebuffer.c:306
msgid "Number of undo levels for the buffer"
msgstr "�����ོ�ས��ྱི��ོ��ལུ� འ����ཤོལ���ས�རི���ྱི��ྱ�ས���"
-#: ../gtksourceview/gtksourcebuffer.c:317
+#: ../gtksourceview/gtksourcebuffer.c:316
#: ../gtksourceview/language-specs/desktop.lang.h:6
#: ../gtksourceview/language-specs/ini.lang.h:7
msgid "Language"
msgstr "ས���ཡི�"
-#: ../gtksourceview/gtksourcebuffer.c:318
+#: ../gtksourceview/gtksourcebuffer.c:317
msgid "Language object to get highlighting patterns from"
msgstr "��ོ���ི�ས��ྱི���ེ���ི�ལེ��སའི� ས���ཡི����ོས��ོ�"
-#: ../gtksourceview/gtksourcelanguagesmanager.c:119
+#: ../gtksourceview/gtksourcelanguagesmanager.c:114
msgid "Language specification directories"
msgstr "ས���ཡི���སལ��ཤ���ྱི� ���ྱ���ོ��ེ��"
-#: ../gtksourceview/gtksourcelanguagesmanager.c:120
+#: ../gtksourceview/gtksourcelanguagesmanager.c:115
msgid "List of directories where the language specification files (.lang) are located"
msgstr "ས���ཡི���སལ��ཤ��ཡི��སྣོ��(.ས���ཡི��) �ུ�ཡོ��སའི� ���ྱ���ོ��ེ���ྱི��ོ�ཡི�"
-#: ../gtksourceview/gtksourceprintjob.c:264
+#: ../gtksourceview/gtksourceprintjob.c:265
msgid "Configuration"
msgstr "རི��ས�ྲི�"
-#: ../gtksourceview/gtksourceprintjob.c:265
+#: ../gtksourceview/gtksourceprintjob.c:266
msgid "Configuration options for the print job"
msgstr "��ར��ས�ྲུ��ལས��ཡོ���ོ��ལུ� རི��ས�ྲི���������ུ�"
-#: ../gtksourceview/gtksourceprintjob.c:272
+#: ../gtksourceview/gtksourceprintjob.c:273
msgid "Source Buffer"
msgstr "འ�ྱུ���ུ�ས������ོ�ས�"
-#: ../gtksourceview/gtksourceprintjob.c:273
+#: ../gtksourceview/gtksourceprintjob.c:274
msgid "GtkSourceBuffer object to print"
msgstr "��ར��ས�ྲུ��འ����ིའི� �ི��ི��ེ�འ�ྱུ���ུ�ས������ོ�ས���ོས��ོ�"
-#: ../gtksourceview/gtksourceprintjob.c:279
-#: ../gtksourceview/gtksourceview.c:221
-#: ../gtksourceview/gtksourceview.c:222
+#: ../gtksourceview/gtksourceprintjob.c:280
+#: ../gtksourceview/gtksourceview.c:235
+#: ../gtksourceview/gtksourceview.c:236
msgid "Tabs Width"
msgstr "��ོ��ལྡེའི�ར�ྱ����"
-#: ../gtksourceview/gtksourceprintjob.c:280
+#: ../gtksourceview/gtksourceprintjob.c:281
msgid "Width in equivalent space characters of tabs"
msgstr "��ོ��ལྡེ��ུ��ི� ཡི��འ�ྲུའི��ར�ས�ོ��འ�ྲ������ྱི�ར�ྱ����"
-#: ../gtksourceview/gtksourceprintjob.c:287
+#: ../gtksourceview/gtksourceprintjob.c:288
msgid "Wrap Mode"
msgstr "��ས�ལ��ལོ�����ས���ོ�"
-#: ../gtksourceview/gtksourceprintjob.c:288
+#: ../gtksourceview/gtksourceprintjob.c:289
msgid "Word wrapping mode"
msgstr "�ི���ི��ལོ�����ས���ས�ལ��"
-#: ../gtksourceview/gtksourceprintjob.c:296
+#: ../gtksourceview/gtksourceprintjob.c:297
msgid "Whether to print the document with highlighted syntax"
msgstr "ཡི�����ེ� ��ོ���ི�ས�འ����ི� �ི��སྦྱོར��ྱི��ོ��ལས� ��ར��ས�ྲུ��འ����ི�ཨི����"
-#: ../gtksourceview/gtksourceprintjob.c:304
+#: ../gtksourceview/gtksourceprintjob.c:305
msgid "Font"
msgstr "ཡི����ུ�ས�"
-#: ../gtksourceview/gtksourceprintjob.c:305
+#: ../gtksourceview/gtksourceprintjob.c:306
msgid "GnomeFont name to use for the document text (deprecated)"
msgstr "ཡི���འི��ི��ཡི���ི��ོ��ལུ� ལ��ལེ��འ����ིའི� �ི��ོ��ཡི����ུ�ས��ྱི��ི��� (�ོས�ལེ���ེ��)"
-#: ../gtksourceview/gtksourceprintjob.c:312
+#: ../gtksourceview/gtksourceprintjob.c:313
msgid "Font Description"
msgstr "ཡི����ུ�ས�འ�ྲེལ��ཤ��"
-#: ../gtksourceview/gtksourceprintjob.c:313
+#: ../gtksourceview/gtksourceprintjob.c:314
msgid "Font to use for the document text (e.g. \"Monospace 10\")"
msgstr "ཡི���འི��ི��ཡི���ོ��ལུ� ལ��ལེ��འ����ིའི�ཡི����ུ�ས� (��ེར��� \"Monospace 10\")"
-#: ../gtksourceview/gtksourceprintjob.c:320
-#: ../gtksourceview/gtksourceprintjob.c:328
+#: ../gtksourceview/gtksourceprintjob.c:321
+#: ../gtksourceview/gtksourceprintjob.c:329
msgid "Numbers Font"
msgstr "ཨ���ྲ�ས��ུ��ི�ཡི����ུ�ས�"
-#: ../gtksourceview/gtksourceprintjob.c:321
+#: ../gtksourceview/gtksourceprintjob.c:322
msgid "GnomeFont name to use for the line numbers (deprecated)"
msgstr "�ྱལ�རི��ཨ���ྲ�ས��ུ��ི��ོ��ལུ� ལ��ལེ��འ����ིའི� �ི��ོ��ཡི����ུ�ས��ི��� (�ོས�ལེ���ེ��)"
-#: ../gtksourceview/gtksourceprintjob.c:329
+#: ../gtksourceview/gtksourceprintjob.c:330
msgid "Font description to use for the line numbers"
msgstr "�ྱལ�རི��ཨ���ྲ�ས��ུ��ི��ོ��ལུ� ལ��ལེ��འ����ིའི� ཡི����ུ�ས�འ�ྲེལ��ཤ��"
-#: ../gtksourceview/gtksourceprintjob.c:336
+#: ../gtksourceview/gtksourceprintjob.c:337
msgid "Print Line Numbers"
msgstr "�ྱལ�རི��ཨ���ྲ�ས��ུ� ��ར��ས�ྲུ��འ���"
-#: ../gtksourceview/gtksourceprintjob.c:337
+#: ../gtksourceview/gtksourceprintjob.c:338
msgid "Interval of printed line numbers (0 means no numbers)"
msgstr "��ར��ས�ྲུ��འ����འི� �ྱལ�རི��ཨ���ྲ�ས��ུ��ི��ར����ས� (༠འ������ི��ཨ���ྲ�ས��ེ�)"
-#: ../gtksourceview/gtksourceprintjob.c:344
+#: ../gtksourceview/gtksourceprintjob.c:345
msgid "Print Header"
msgstr "��ོ�ཡི����ར��ས�ྲུ��འ���"
-#: ../gtksourceview/gtksourceprintjob.c:345
+#: ../gtksourceview/gtksourceprintjob.c:346
msgid "Whether to print a header in each page"
msgstr "ཤོ��ལེ��རེ�རེ���ི���ུ�ལུ� ��ོ�ཡི����ར��ས�ྲུ��འ�����ོ��ཨི����"
-#: ../gtksourceview/gtksourceprintjob.c:352
+#: ../gtksourceview/gtksourceprintjob.c:353
msgid "Print Footer"
msgstr "��ུ��ཡི����ར��ས�ྲུ��འ���"
-#: ../gtksourceview/gtksourceprintjob.c:353
+#: ../gtksourceview/gtksourceprintjob.c:354
msgid "Whether to print a footer in each page"
msgstr "ཤོ��ལེ��རེ�རེ���ི���ུ�ལུ� ��ུ��ཡི����ར��ས�ྲུ��འ�����ོ��ཨི����"
-#: ../gtksourceview/gtksourceprintjob.c:360
+#: ../gtksourceview/gtksourceprintjob.c:361
msgid "Header and Footer Font"
msgstr "��ོ�ཡི�������ུ��ཡི���ི� ཡི����ུ�ས�"
-#: ../gtksourceview/gtksourceprintjob.c:361
+#: ../gtksourceview/gtksourceprintjob.c:362
msgid "GnomeFont name to use for the header and footer (deprecated)"
msgstr "��ོ�ཡི����� ��ུ��ཡི���ི��ོ��ལུ� ལ��ལེ��འ����ིའི� �ི��ོ��ཡི����ུ�ས��ི��� (�ོས�ལེ���ེ��)"
-#: ../gtksourceview/gtksourceprintjob.c:368
+#: ../gtksourceview/gtksourceprintjob.c:369
msgid "Header and Footer Font Description"
msgstr "��ོ�ཡི�������ུ��ཡི���ི� ཡི����ུ�ས��ྱི�འ�ྲེལ��ཤ��"
-#: ../gtksourceview/gtksourceprintjob.c:369
+#: ../gtksourceview/gtksourceprintjob.c:370
msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
msgstr "��ོ�ཡི�������ུ��ཡི���ུ��ི��ོ��ལུ� ལ��ལེ��འ����ིའི�ཡི����ུ�ས� (��ེར���\"Monospace 10\")"
-#: ../gtksourceview/gtksourcestylescheme.c:262
+#: ../gtksourceview/gtksourcestylescheme.c:264
msgid "Base-N Integer"
msgstr "��ི�ར�ེ��ཨེ���ྱི� ཧྲིལ�ཨ���"
-#: ../gtksourceview/gtksourcestylescheme.c:267
+#: ../gtksourceview/gtksourcestylescheme.c:269
msgid "Character"
msgstr "ཡི��འ�ྲུ�"
-#: ../gtksourceview/gtksourcestylescheme.c:272
-#: ../gtksourceview/language-specs/latex.lang.h:1
+#: ../gtksourceview/gtksourcestylescheme.c:274
+#: ../gtksourceview/language-specs/latex.lang.h:2
#: ../gtksourceview/language-specs/po.lang.h:1
msgid "Comment"
msgstr "�ས����ོ��"
#. $this = (datatype)
-#: ../gtksourceview/gtksourcestylescheme.c:277
+#: ../gtksourceview/gtksourcestylescheme.c:279
#: ../gtksourceview/language-specs/php.lang.h:14
msgid "Data Type"
msgstr "����སྡུ����ྱེ���"
@@ -200,46 +199,63 @@ msgstr "à½?à½?à½?à¼?སྡུà½?à¼?à½?à½
#.
#. CSS functions, such as rgb(), clip(), or lang().
#.
-#: ../gtksourceview/gtksourcestylescheme.c:282
+#: ../gtksourceview/gtksourcestylescheme.c:284
#: ../gtksourceview/language-specs/ada.lang.h:3
#: ../gtksourceview/language-specs/css.lang.h:18
+#: ../gtksourceview/language-specs/octave.lang.h:4
+#: ../gtksourceview/language-specs/python.lang.h:5
+#: ../gtksourceview/language-specs/scheme.lang.h:2
+#: ../gtksourceview/language-specs/sh.lang.h:4
msgid "Function"
msgstr "�ྱ�ལས�"
-#: ../gtksourceview/gtksourcestylescheme.c:287
+#: ../gtksourceview/gtksourcestylescheme.c:289
#: ../gtksourceview/language-specs/c.lang.h:6
#: ../gtksourceview/language-specs/cpp.lang.h:6
#: ../gtksourceview/language-specs/fortran.lang.h:1
#: ../gtksourceview/language-specs/haskell.lang.h:3
#: ../gtksourceview/language-specs/nemerle.lang.h:6
+#: ../gtksourceview/language-specs/octave.lang.h:1
#: ../gtksourceview/language-specs/python.lang.h:2
msgid "Decimal"
msgstr "��ུ���"
-#: ../gtksourceview/gtksourcestylescheme.c:292
+#: ../gtksourceview/gtksourcestylescheme.c:294
msgid "Floating Point"
msgstr "ལྡི�����"
-#: ../gtksourceview/gtksourcestylescheme.c:297
+#. We cannot match \b at the end of a keyword automatically
+#. because it fails for let* etc. So we need to manually add it to the
+#. other keywords and match ([ \t]|$) for the one ending with a
+#. special character. Unfortnately this also means that if the highlight
+#. style for keywords sets the background color, for let* etc also the
+#. trailing space will be highlighted.
+#: ../gtksourceview/gtksourcestylescheme.c:299
+#: ../gtksourceview/language-specs/ada.lang.h:4
#: ../gtksourceview/language-specs/gtkrc.lang.h:6
-#: ../gtksourceview/language-specs/latex.lang.h:4
+#: ../gtksourceview/language-specs/haskell.lang.h:9
+#: ../gtksourceview/language-specs/latex.lang.h:5
+#: ../gtksourceview/language-specs/octave.lang.h:6
#: ../gtksourceview/language-specs/po.lang.h:3
+#: ../gtksourceview/language-specs/python.lang.h:7
#: ../gtksourceview/language-specs/R.lang.h:6
+#: ../gtksourceview/language-specs/scheme.lang.h:9
+#: ../gtksourceview/language-specs/tcl.lang.h:1
#: ../gtksourceview/language-specs/texinfo.lang.h:8
#: ../gtksourceview/language-specs/vhdl.lang.h:2
msgid "Keyword"
msgstr "��ོ��ི�"
-#: ../gtksourceview/gtksourcestylescheme.c:302
+#: ../gtksourceview/gtksourcestylescheme.c:304
msgid "Preprocessor"
msgstr "ས���ོ��ལས�སྦྱོར�འ�ྲུལ��ས�"
#.
-#. <pattern-item _name = "Operators" style = "Operators">
+#. <pattern-item _name = "Operator" style = "Operators">
#. <regex>[:!#$%&*+./>=<? \\^|~\-]+</regex>
#. </pattern-item>
#.
-#. <keyword-list _name="Keysymbols" style = "Keyword">
+#. <keyword-list _name="Keysymbol" style = "Keyword">
#. <keyword>::</keyword>
#. <keyword>-></keyword>
#. <keyword><-</keyword>
@@ -251,14 +267,14 @@ msgstr "སà¾?à¼?à½?ོà½?à¼?ལསà¼?à½
#. <keyword>~</keyword>
#. </keyword-list>
#.
-#: ../gtksourceview/gtksourcestylescheme.c:307
+#: ../gtksourceview/gtksourcestylescheme.c:309
#: ../gtksourceview/language-specs/ada.lang.h:9
#: ../gtksourceview/language-specs/c.lang.h:15
#: ../gtksourceview/language-specs/cpp.lang.h:15
#: ../gtksourceview/language-specs/csharp.lang.h:9
#: ../gtksourceview/language-specs/css.lang.h:58
#: ../gtksourceview/language-specs/html.lang.h:8
-#: ../gtksourceview/language-specs/fortran.lang.h:12
+#: ../gtksourceview/language-specs/fortran.lang.h:13
#: ../gtksourceview/language-specs/haskell.lang.h:31
#: ../gtksourceview/language-specs/idl.lang.h:9
#: ../gtksourceview/language-specs/java.lang.h:11
@@ -269,8 +285,7 @@ msgstr "སà¾?à¼?à½?ོà½?à¼?ལསà¼?à½
#: ../gtksourceview/language-specs/pascal.lang.h:18
#: ../gtksourceview/language-specs/perl.lang.h:8
#: ../gtksourceview/language-specs/po.lang.h:6
-#: ../gtksourceview/language-specs/python.lang.h:14
-#: ../gtksourceview/language-specs/ruby.lang.h:18
+#: ../gtksourceview/language-specs/scheme.lang.h:13
#: ../gtksourceview/language-specs/sh.lang.h:13
#: ../gtksourceview/language-specs/tcl.lang.h:4
#: ../gtksourceview/language-specs/vbnet.lang.h:11
@@ -279,11 +294,12 @@ msgstr "སà¾?à¼?à½?ོà½?à¼?ལསà¼?à½
msgid "String"
msgstr "ཡི��ར�ྱུ��"
-#: ../gtksourceview/gtksourcestylescheme.c:312
+#: ../gtksourceview/gtksourcestylescheme.c:314
msgid "Specials"
msgstr "��ི�ས��སལ��ུ�"
-#: ../gtksourceview/gtksourcestylescheme.c:319
+#: ../gtksourceview/gtksourcestylescheme.c:321
+#: ../gtksourceview/language-specs/changelog.lang.h:6
#: ../gtksourceview/language-specs/css.lang.h:36
#: ../gtksourceview/language-specs/desktop.lang.h:10
#: ../gtksourceview/language-specs/diff.lang.h:7
@@ -294,98 +310,138 @@ msgstr "à½?à½?ིà½?སà¼?à½?སལà¼?à½
msgid "Others"
msgstr "�����ུ�"
-#: ../gtksourceview/gtksourcestylescheme.c:324
+#: ../gtksourceview/gtksourcestylescheme.c:326
msgid "Others 2"
msgstr "�����ུ� ༢ ��"
-#: ../gtksourceview/gtksourcestylescheme.c:329
+#: ../gtksourceview/gtksourcestylescheme.c:331
msgid "Others 3"
msgstr "�����ུ� ༣ ��"
-#: ../gtksourceview/gtksourcestylescheme.c:366
+#: ../gtksourceview/gtksourcestylescheme.c:368
msgid "Default"
msgstr "ས�ོ��ས�ྲི�"
-#: ../gtksourceview/gtksourcetag.c:108
+#: ../gtksourceview/gtksourcetag.c:109
msgid "Tag ID"
msgstr "�ོ�ར��ས��ྱི�ཨའི��ི�"
-#: ../gtksourceview/gtksourcetag.c:109
+#: ../gtksourceview/gtksourcetag.c:110
msgid "ID used to refer to the source tag"
msgstr "འ�ྱུ���ུ�ས��ོ�ར��ས�ལུ� ��ི��ས�ུ��འ����ི�ལུ� ལ��ལེ��འ����ིའི�ཨའི��ི�"
-#: ../gtksourceview/gtksourcetag.c:116
+#: ../gtksourceview/gtksourcetag.c:117
msgid "Tag style"
msgstr "�ོ�ར��ས��ྱི���ོ�རྣ��"
-#: ../gtksourceview/gtksourcetag.c:117
+#: ../gtksourceview/gtksourcetag.c:118
msgid "The style associated with the source tag"
msgstr "འ�ྱུ���ུ�ས��ོ�ར��ས���� ����འ�ྲེལ�ཡོ���འི���ོ�རྣ���"
-#: ../gtksourceview/gtksourceview.c:205
+#: ../gtksourceview/gtksourceview.c:219
msgid "Show Line Numbers"
msgstr "�ྱལ�རི��ཨ���ྲ�ས�ས�ོ��"
-#: ../gtksourceview/gtksourceview.c:206
+#: ../gtksourceview/gtksourceview.c:220
msgid "Whether to display line numbers"
msgstr "�ྱལ�རི��ཨ���ྲ�ས��ུ� ��ྲ��ས�ོ��འ�����ོ��ཨི����"
-#: ../gtksourceview/gtksourceview.c:213
+#: ../gtksourceview/gtksourceview.c:227
msgid "Show Line Markers"
msgstr "�ྱལ�རི��ལུ� ར��ས���ོ���ས�ོ��"
-#: ../gtksourceview/gtksourceview.c:214
+#: ../gtksourceview/gtksourceview.c:228
msgid "Whether to display line marker pixbufs"
msgstr "�ྱལ�རི��ར��ས���ོ���འི��ར��ོ�ས� ��ྲ��ས�ོ��འ����ི�ཨི��"
-#: ../gtksourceview/gtksourceview.c:231
+#: ../gtksourceview/gtksourceview.c:245
msgid "Auto Indentation"
msgstr "ར����ི��འ�ོ������ལ���"
-#: ../gtksourceview/gtksourceview.c:232
+#: ../gtksourceview/gtksourceview.c:246
msgid "Whether to enable auto indentation"
msgstr "རི���ི��འ�ོ������ལ��ི� ལ�ོ�ས������ོ���ོ��ཨི����"
-#: ../gtksourceview/gtksourceview.c:238
+#: ../gtksourceview/gtksourceview.c:252
msgid "Insert Spaces Instead of Tabs"
msgstr "��ོ��ལྡེ��ུ��ི����ལུ� �ར�ས�ོ���ུ���ུ�ས�"
-#: ../gtksourceview/gtksourceview.c:239
+#: ../gtksourceview/gtksourceview.c:253
msgid "Whether to insert spaces instead of tabs"
msgstr "��ོ��ལྡེ��ུ��ི����ལུ� �ར�ས�ོ���ུ���ུ�ས���ོ��ཨི����"
-#: ../gtksourceview/gtksourceview.c:246
+#: ../gtksourceview/gtksourceview.c:260
msgid "Show Right Margin"
msgstr "�ཡས��ྱི�ས�ས�ོ��ས�ོ��"
-#: ../gtksourceview/gtksourceview.c:247
+#: ../gtksourceview/gtksourceview.c:261
msgid "Whether to display the right margin"
msgstr "�ཡས��ྱི�ས�ས�ོ��ས�ོ����ོ��ཨི����"
-#: ../gtksourceview/gtksourceview.c:254
+#: ../gtksourceview/gtksourceview.c:268
msgid "Margin position"
msgstr "ས�ས�ོ����ས�ས�"
-#: ../gtksourceview/gtksourceview.c:255
+#: ../gtksourceview/gtksourceview.c:269
msgid "Position of the right margin"
msgstr "�ཡས��ྱི�ས�ས�ོ����ས�ས�"
-#: ../gtksourceview/gtksourceview.c:264
+#: ../gtksourceview/gtksourceview.c:278
msgid "Use smart home/end"
msgstr "སྤུར��ས�ྱིར��ྲ�ས��ྱི��ྱི��ལ��ལེ��འ��/��ུ���སྡུ�"
-#: ../gtksourceview/gtksourceview.c:265
+#: ../gtksourceview/gtksourceview.c:279
msgid "HOME and END keys move to first/last non whitespace characters on line before going to the start/end of the line"
msgstr "�ྱི�������ུ���ི�ལྡེ��ི���ུ��ིས� �ྱལ�རི���ི�འ�ོ������ུ��ལུ� ��འ�ྱོ��འི�ཧེ��ར� �ྱལ�རི������ི� �ར�ས�ོ����ར�ོ��ི���འི�ཡི��འ�ྲུ�ལུ�འ�ྱོ��ཨི��"
-#: ../gtksourceview/gtksourceview.c:274
+#: ../gtksourceview/gtksourceview.c:288
msgid "Highlight current line"
msgstr "��ལ�ོའི��ྱལ�རི�� ��ོ���ི�ས�འ���"
-#: ../gtksourceview/gtksourceview.c:275
+#: ../gtksourceview/gtksourceview.c:289
msgid "Whether to highlight the current line"
msgstr "��ལ�ོའི��ྱལ�རི�� ��ོ���ི�ས�འ�����ོ��ཨི����"
+#: ../gtksourceview/gtksourceview.c:305
+msgid "Margin Line Alpha"
+msgstr "ཨཱལ����ྱལ�རི����འ�ས�ོ�������ུ�ས�"
+
+#: ../gtksourceview/gtksourceview.c:306
+msgid "Transparency of the margin line"
+msgstr "à½?à½?འà¼?སà¾?ོà½?à¼?à½?ིà½?à¼?à½?ིà¼?à½?à¾à½?སà¼?à½?སལà¼?"
+
+#: ../gtksourceview/gtksourceview.c:323
+msgid "Margin Line Color"
+msgstr "�ི���ི��ོས���ི���འ�ས�ོ�������ུ�ས�"
+
+#: ../gtksourceview/gtksourceview.c:324
+msgid "Color to use for the right margin line"
+msgstr "�ཡས��ྱི���འ�ས�ོ���ི���ི��ོ��ལུ�ལ��ལེ��འ����ིའི��ོས���ི�"
+
+#: ../gtksourceview/gtksourceview.c:340
+msgid "Margin Overlay Toggle"
+msgstr "སྤུར��ེ�ས�སོར�ས�ོ����འ�ས�ོ�������ུ�ས�"
+
+#: ../gtksourceview/gtksourceview.c:341
+msgid "Whether to draw the right margin overlay"
+msgstr "�ཡས��ྱི���འ�ས�ོ��སྤུར��ེ�ས�འ�ྲི���ོ��ཨི����"
+
+#: ../gtksourceview/gtksourceview.c:357
+msgid "Margin Overlay Alpha"
+msgstr "སྤུར��ེ�ས�ཨཱལ�����འ�ས�ོ�������ུ�ས�"
+
+#: ../gtksourceview/gtksourceview.c:358
+msgid "Transparency of the margin overlay"
+msgstr "à½?à½?འà¼?སà¾?ོà½?à¼?སྤུརà¼?à½?ེà½?སà¼?à½?ྱིà¼?à½?à¾à½?སà¼?à½?སལà¼?"
+
+#: ../gtksourceview/gtksourceview.c:375
+msgid "Margin Overlay Color"
+msgstr "སྤུར��ེ�ས��ོས���ི���འ�ས�ོ�������ུ�ས�"
+
+#: ../gtksourceview/gtksourceview.c:376
+msgid "Color to use for drawing the margin overlay"
+msgstr "��འ�ས�ོ��སྤུར��ེ�ས�འ�ྲི��ིའི��ོ��ལུ�ལ��ལ�ེ�འ����ིའི��ོས���ི�"
+
#: ../gtksourceview/language-specs/ada.lang.h:1
msgid "Ada"
msgstr "ཨ���"
@@ -399,24 +455,7 @@ msgstr "ཨ���"
msgid "Character Constant"
msgstr "ཡི��འ�ྲུ�����ེ��"
-#: ../gtksourceview/language-specs/ada.lang.h:4
-#: ../gtksourceview/language-specs/c.lang.h:10
-#: ../gtksourceview/language-specs/cpp.lang.h:10
-#: ../gtksourceview/language-specs/csharp.lang.h:3
-#: ../gtksourceview/language-specs/fortran.lang.h:7
-#: ../gtksourceview/language-specs/haskell.lang.h:9
-#: ../gtksourceview/language-specs/idl.lang.h:4
-#: ../gtksourceview/language-specs/javascript.lang.h:12
-#: ../gtksourceview/language-specs/lua.lang.h:3
-#: ../gtksourceview/language-specs/perl.lang.h:2
-#: ../gtksourceview/language-specs/python.lang.h:6
-#: ../gtksourceview/language-specs/ruby.lang.h:8
-#: ../gtksourceview/language-specs/tcl.lang.h:1
-#: ../gtksourceview/language-specs/vbnet.lang.h:1
-#: ../gtksourceview/language-specs/verilog.lang.h:6
-msgid "Keywords"
-msgstr "��ོ��ི���ུ�"
-
+#. Note: contains an hack to avoid considering ^COMMON a comment
#. <string _name = "String 2" style = "String" end-at-line-end = "TRUE">
#. <start-regex>'</start-regex>
#. <end-regex>'</end-regex>
@@ -428,7 +467,7 @@ msgstr "à½?à½?ོà¼?à½?ིà½?à¼?à½?ུà¼
#: ../gtksourceview/language-specs/css.lang.h:29
#: ../gtksourceview/language-specs/desktop.lang.h:7
#: ../gtksourceview/language-specs/diff.lang.h:5
-#: ../gtksourceview/language-specs/fortran.lang.h:8
+#: ../gtksourceview/language-specs/fortran.lang.h:9
#: ../gtksourceview/language-specs/gtkrc.lang.h:7
#: ../gtksourceview/language-specs/haskell.lang.h:10
#: ../gtksourceview/language-specs/idl.lang.h:5
@@ -438,11 +477,13 @@ msgstr "à½?à½?ོà¼?à½?ིà½?à¼?à½?ུà¼
#: ../gtksourceview/language-specs/lua.lang.h:4
#: ../gtksourceview/language-specs/makefile.lang.h:4
#: ../gtksourceview/language-specs/nemerle.lang.h:10
+#: ../gtksourceview/language-specs/octave.lang.h:7
#: ../gtksourceview/language-specs/pascal.lang.h:11
#: ../gtksourceview/language-specs/perl.lang.h:3
-#: ../gtksourceview/language-specs/python.lang.h:7
+#: ../gtksourceview/language-specs/python.lang.h:8
#: ../gtksourceview/language-specs/R.lang.h:7
-#: ../gtksourceview/language-specs/ruby.lang.h:9
+#: ../gtksourceview/language-specs/ruby.lang.h:10
+#: ../gtksourceview/language-specs/scheme.lang.h:10
#: ../gtksourceview/language-specs/sh.lang.h:5
#: ../gtksourceview/language-specs/sql.lang.h:23
#: ../gtksourceview/language-specs/tcl.lang.h:2
@@ -468,21 +509,21 @@ msgid "Number"
msgstr "ཨ���ྲ�ས�"
#: ../gtksourceview/language-specs/ada.lang.h:7
-msgid "Preprocessor Keywords"
-msgstr "ས���ོ��ལས�སྦྱོར�འ�ྲུལ��ས��ྱི���ོ��ི���ུ�"
+msgid "Preprocessor Keyword"
+msgstr "ས���ོ��ལས�སྦྱོར�འ�ྲུལ��ས��ྱི���ོ��ི�"
#: ../gtksourceview/language-specs/ada.lang.h:8
#: ../gtksourceview/language-specs/c.lang.h:14
#: ../gtksourceview/language-specs/cpp.lang.h:14
#: ../gtksourceview/language-specs/csharp.lang.h:8
-#: ../gtksourceview/language-specs/fortran.lang.h:11
+#: ../gtksourceview/language-specs/fortran.lang.h:12
#: ../gtksourceview/language-specs/haskell.lang.h:13
#: ../gtksourceview/language-specs/idl.lang.h:8
#: ../gtksourceview/language-specs/java.lang.h:10
#: ../gtksourceview/language-specs/makefile.lang.h:6
#: ../gtksourceview/language-specs/nemerle.lang.h:14
#: ../gtksourceview/language-specs/pascal.lang.h:17
-#: ../gtksourceview/language-specs/php.lang.h:24
+#: ../gtksourceview/language-specs/scheme.lang.h:12
#: ../gtksourceview/language-specs/sql.lang.h:48
#: ../gtksourceview/language-specs/vbnet.lang.h:10
#: ../gtksourceview/language-specs/verilog.lang.h:9
@@ -495,13 +536,9 @@ msgid "True And False"
msgstr "��ེ�������རྫུ����"
#: ../gtksourceview/language-specs/ada.lang.h:11
-#: ../gtksourceview/language-specs/c.lang.h:16
-#: ../gtksourceview/language-specs/cpp.lang.h:16
-#: ../gtksourceview/language-specs/fortran.lang.h:14
-#: ../gtksourceview/language-specs/idl.lang.h:10
-#: ../gtksourceview/language-specs/verilog.lang.h:10
-msgid "Types"
-msgstr "��ྱེ����ུ�"
+#: ../gtksourceview/language-specs/vhdl.lang.h:8
+msgid "Type"
+msgstr "��ྱེ���"
#: ../gtksourceview/language-specs/c.lang.h:1
#: ../gtksourceview/language-specs/cpp.lang.h:1
@@ -541,7 +578,8 @@ msgstr "à½?à½?ུà½?à¼?à½?ོà½?à¼?à½?à½
#: ../gtksourceview/language-specs/fortran.lang.h:2
#: ../gtksourceview/language-specs/haskell.lang.h:4
#: ../gtksourceview/language-specs/nemerle.lang.h:7
-#: ../gtksourceview/language-specs/python.lang.h:3
+#: ../gtksourceview/language-specs/octave.lang.h:3
+#: ../gtksourceview/language-specs/python.lang.h:4
#: ../gtksourceview/language-specs/R.lang.h:4
msgid "Floating Point Number"
msgstr "ལྡི�����ཨ���ྲ�ས�"
@@ -552,8 +590,9 @@ msgstr "ལྡིà½?à¼?à½?à½?à¼?ཨà½?à¼
#: ../gtksourceview/language-specs/fortran.lang.h:4
#: ../gtksourceview/language-specs/haskell.lang.h:6
#: ../gtksourceview/language-specs/nemerle.lang.h:8
+#: ../gtksourceview/language-specs/octave.lang.h:5
#: ../gtksourceview/language-specs/pascal.lang.h:10
-#: ../gtksourceview/language-specs/python.lang.h:5
+#: ../gtksourceview/language-specs/python.lang.h:6
msgid "Hex Number"
msgstr "ཧེ�སི�ཨ���ྲ�ས�"
@@ -564,12 +603,27 @@ msgstr "ཧེà½?སིà¼?ཨà½?à¼?à½?à¾
msgid "Include/Pragma"
msgstr "�ྲ�ས�སུ���ུ�ས�/�ེརེ����"
+#: ../gtksourceview/language-specs/c.lang.h:10
+#: ../gtksourceview/language-specs/cpp.lang.h:10
+#: ../gtksourceview/language-specs/csharp.lang.h:3
+#: ../gtksourceview/language-specs/fortran.lang.h:7
+#: ../gtksourceview/language-specs/idl.lang.h:4
+#: ../gtksourceview/language-specs/javascript.lang.h:12
+#: ../gtksourceview/language-specs/lua.lang.h:3
+#: ../gtksourceview/language-specs/perl.lang.h:2
+#: ../gtksourceview/language-specs/ruby.lang.h:9
+#: ../gtksourceview/language-specs/vbnet.lang.h:1
+#: ../gtksourceview/language-specs/verilog.lang.h:6
+msgid "Keywords"
+msgstr "��ོ��ི���ུ�"
+
#: ../gtksourceview/language-specs/c.lang.h:12
#: ../gtksourceview/language-specs/cpp.lang.h:12
-#: ../gtksourceview/language-specs/fortran.lang.h:9
+#: ../gtksourceview/language-specs/fortran.lang.h:10
#: ../gtksourceview/language-specs/haskell.lang.h:11
#: ../gtksourceview/language-specs/nemerle.lang.h:12
-#: ../gtksourceview/language-specs/python.lang.h:11
+#: ../gtksourceview/language-specs/octave.lang.h:10
+#: ../gtksourceview/language-specs/python.lang.h:12
#: ../gtksourceview/language-specs/verilog.lang.h:8
msgid "Octal Number"
msgstr "�ར�ྱ��ར�ེ��ཨ���ྲ�ས�"
@@ -577,12 +631,39 @@ msgstr "à½?རà¾?ྱà½?à¼?རà¾?ེà½?à¼
#: ../gtksourceview/language-specs/c.lang.h:13
#: ../gtksourceview/language-specs/cpp.lang.h:13
#: ../gtksourceview/language-specs/csharp.lang.h:6
-#: ../gtksourceview/language-specs/haskell.lang.h:12
#: ../gtksourceview/language-specs/idl.lang.h:6
#: ../gtksourceview/language-specs/vbnet.lang.h:8
msgid "Preprocessor Definitions"
msgstr "ས���ོ��ལས�སྦྱོར�འ�ྲུལ��ས��ྱི��ེས��ི���ུ�"
+#: ../gtksourceview/language-specs/c.lang.h:16
+#: ../gtksourceview/language-specs/cpp.lang.h:16
+#: ../gtksourceview/language-specs/fortran.lang.h:15
+#: ../gtksourceview/language-specs/idl.lang.h:10
+#: ../gtksourceview/language-specs/verilog.lang.h:10
+msgid "Types"
+msgstr "��ྱེ����ུ�"
+
+#: ../gtksourceview/language-specs/changelog.lang.h:1
+msgid "ChangeLog"
+msgstr "�ས�ྱུར���ོས��ྲ���ེ��"
+
+#: ../gtksourceview/language-specs/changelog.lang.h:2
+msgid "Date"
+msgstr "�ེས��ྲ�ས�"
+
+#: ../gtksourceview/language-specs/changelog.lang.h:3
+msgid "Email"
+msgstr "�ློ��འ�ྲི��"
+
+#: ../gtksourceview/language-specs/changelog.lang.h:4
+msgid "File"
+msgstr "ཡི��སྣོ��"
+
+#: ../gtksourceview/language-specs/changelog.lang.h:5
+msgid "Marker"
+msgstr "ར��ས���ོ���"
+
#: ../gtksourceview/language-specs/cpp.lang.h:3
msgid "C++"
msgstr "སི�++�"
@@ -593,7 +674,6 @@ msgstr "སི�#�"
#: ../gtksourceview/language-specs/csharp.lang.h:5
#: ../gtksourceview/language-specs/lua.lang.h:7
-#: ../gtksourceview/language-specs/python.lang.h:9
#: ../gtksourceview/language-specs/sh.lang.h:6
msgid "Multiline String"
msgstr "སྣ�����ྱལ�རི��ཡི��ར�ྱུ��"
@@ -607,13 +687,11 @@ msgstr "à½?ིརིà¼?à½?ིà¼?à½?ིà½
#: ../gtksourceview/language-specs/csharp.lang.h:10
#: ../gtksourceview/language-specs/css.lang.h:59
-#: ../gtksourceview/language-specs/fortran.lang.h:13
+#: ../gtksourceview/language-specs/fortran.lang.h:14
#: ../gtksourceview/language-specs/java.lang.h:12
#: ../gtksourceview/language-specs/javascript.lang.h:24
#: ../gtksourceview/language-specs/lua.lang.h:11
#: ../gtksourceview/language-specs/makefile.lang.h:9
-#: ../gtksourceview/language-specs/python.lang.h:15
-#: ../gtksourceview/language-specs/ruby.lang.h:19
#: ../gtksourceview/language-specs/sh.lang.h:14
msgid "String 2"
msgstr "ཡི��ར�ྱུ�� ༢ ��"
@@ -665,7 +743,6 @@ msgstr "ཤེསà¼?à½?འིà¼?རà¾?à¾
#: ../gtksourceview/language-specs/css.lang.h:35
#: ../gtksourceview/language-specs/javascript.lang.h:20
#: ../gtksourceview/language-specs/php.lang.h:20
-#: ../gtksourceview/language-specs/sh.lang.h:8
#: ../gtksourceview/language-specs/sql.lang.h:34
msgid "Operators"
msgstr "��ོལ�སྤྱོ���"
@@ -679,7 +756,6 @@ msgstr "རà¾?ྱུà¼?à½?à½?ོསà¼?à½
#.
#: ../gtksourceview/language-specs/css.lang.h:41
#: ../gtksourceview/language-specs/javascript.lang.h:21
-#: ../gtksourceview/language-specs/sh.lang.h:9
msgid "Punctuators"
msgstr "ཡི��ར��ས���ལ��ི�"
@@ -730,6 +806,7 @@ msgstr ".�ེ�སི��ོ��"
#: ../gtksourceview/language-specs/desktop.lang.h:2
#: ../gtksourceview/language-specs/gtkrc.lang.h:1
#: ../gtksourceview/language-specs/ini.lang.h:2
+#: ../gtksourceview/language-specs/scheme.lang.h:1
msgid "Boolean Value"
msgstr "�ུ�ལི�� �ེ�ལུ�"
@@ -786,8 +863,8 @@ msgstr "à½?à½?ིà½?སà¼?à½?སལà¼?à½
#: ../gtksourceview/language-specs/html.lang.h:1
#: ../gtksourceview/language-specs/xml.lang.h:1
-msgid "Attributes"
-msgstr "�ྱ���ོས��ུ�"
+msgid "Attribute"
+msgstr "�ྱ���ོས�"
#: ../gtksourceview/language-specs/html.lang.h:3
#: ../gtksourceview/language-specs/xml.lang.h:3
@@ -808,15 +885,16 @@ msgid "HTML"
msgstr "ཨེ���ི�ཨེ��ཨེལ�"
#: ../gtksourceview/language-specs/html.lang.h:7
-#: ../gtksourceview/language-specs/latex.lang.h:6
+#: ../gtksourceview/language-specs/latex.lang.h:7
#: ../gtksourceview/language-specs/texinfo.lang.h:12
#: ../gtksourceview/language-specs/xml.lang.h:6
msgid "Markup"
msgstr "ར��ས���ོ��"
#: ../gtksourceview/language-specs/html.lang.h:9
-msgid "Tags"
-msgstr "�ོ�ར��ས��ུ�"
+#: ../gtksourceview/language-specs/xml.lang.h:8
+msgid "Tag"
+msgstr "�ོ�ར��ས�"
#: ../gtksourceview/language-specs/fortran.lang.h:3
msgid "Fortran 95"
@@ -830,15 +908,20 @@ msgstr "ཨིà½?à¼?à½?ུà½?ིà¼?/ཨà
msgid "Intrinsics"
msgstr "ར���ཤིས�"
-#: ../gtksourceview/language-specs/fortran.lang.h:10
+#: ../gtksourceview/language-specs/fortran.lang.h:11
msgid "Read/Write"
msgstr "ལྷ�/འ�ྲི�"
+#. "duble-quoted strings"
#: ../gtksourceview/language-specs/gtkrc.lang.h:2
#: ../gtksourceview/language-specs/ini.lang.h:4
+#: ../gtksourceview/language-specs/octave.lang.h:2
+#: ../gtksourceview/language-specs/php.lang.h:16
+#: ../gtksourceview/language-specs/python.lang.h:3
#: ../gtksourceview/language-specs/R.lang.h:3
-msgid "Double Quote String"
-msgstr "འ�ྲེ��ར��ས���ིས�ལྡ��ཡི��ར�ྱུ��"
+#: ../gtksourceview/language-specs/ruby.lang.h:6
+msgid "Double Quoted String"
+msgstr "འ�ྲེ��ར��ས���ིས�ལྡ���ྱི�ཡི��ར�ྱུ��"
#: ../gtksourceview/language-specs/gtkrc.lang.h:3
msgid "GtkRC"
@@ -849,14 +932,20 @@ msgid "Include Directive"
msgstr "ལ��ས�ོ���ྲ�ས�སུ���ུ�ས�"
#: ../gtksourceview/language-specs/gtkrc.lang.h:5
+#: ../gtksourceview/language-specs/haskell.lang.h:8
msgid "Keysymbol"
msgstr "ལྡེ��ི���རྡ���ོ��"
+#. 'single-quoted strings'
#: ../gtksourceview/language-specs/gtkrc.lang.h:10
#: ../gtksourceview/language-specs/ini.lang.h:11
+#: ../gtksourceview/language-specs/octave.lang.h:14
+#: ../gtksourceview/language-specs/php.lang.h:24
+#: ../gtksourceview/language-specs/python.lang.h:15
#: ../gtksourceview/language-specs/R.lang.h:11
-msgid "Single Quote String"
-msgstr "འ�ྲེ��ར��ས���ི��ལྡ��ཡི��ར�ྱུ��"
+#: ../gtksourceview/language-specs/ruby.lang.h:17
+msgid "Single Quoted String"
+msgstr "འ�ྲེ��ར��ས�ར�ྱ���ོའི�ཡི��ར�ྱུ��"
#: ../gtksourceview/language-specs/gtkrc.lang.h:11
msgid "State"
@@ -866,6 +955,7 @@ msgstr "��ས�ལུ�ས�"
#: ../gtksourceview/language-specs/gtkrc.lang.h:12
#: ../gtksourceview/language-specs/ini.lang.h:12
#: ../gtksourceview/language-specs/php.lang.h:26
+#: ../gtksourceview/language-specs/tcl.lang.h:7
msgid "Variable"
msgstr "འ�ྱུར����"
@@ -873,9 +963,9 @@ msgstr "འ�ྱུར����"
msgid "Haskell"
msgstr "ཧེསི��ེལ�"
-#: ../gtksourceview/language-specs/haskell.lang.h:8
-msgid "Keysymbols"
-msgstr "ལྡེ��ི���རྡ���ོ��"
+#: ../gtksourceview/language-specs/haskell.lang.h:12
+msgid "Preprocessor Definition"
+msgstr "ས���ོ��ལས�སྦྱོར�འ�ྲུལ��ས��ྱི��ེས��ི�"
#: ../gtksourceview/language-specs/haskell.lang.h:32
msgid "Type or Constructor"
@@ -990,10 +1080,12 @@ msgstr "à½?à½?ོསà¼?à½?ོà¼?à½?ུà¼
#: ../gtksourceview/language-specs/javascript.lang.h:22
#: ../gtksourceview/language-specs/lua.lang.h:9
+#: ../gtksourceview/language-specs/octave.lang.h:13
#: ../gtksourceview/language-specs/perl.lang.h:7
-#: ../gtksourceview/language-specs/python.lang.h:13
+#: ../gtksourceview/language-specs/php.lang.h:22
+#: ../gtksourceview/language-specs/python.lang.h:14
#: ../gtksourceview/language-specs/R.lang.h:10
-#: ../gtksourceview/language-specs/ruby.lang.h:17
+#: ../gtksourceview/language-specs/ruby.lang.h:16
#: ../gtksourceview/language-specs/sh.lang.h:11
#: ../gtksourceview/language-specs/tcl.lang.h:3
msgid "Scripts"
@@ -1007,31 +1099,29 @@ msgstr "ཡུà¼?à½?ིà¼?à½?ོà½?ིà¼
msgid "Word Operators"
msgstr "�ི���ི����ོལ�སྤྱོ�����ུ�"
-#: ../gtksourceview/language-specs/latex.lang.h:2
+#: ../gtksourceview/language-specs/latex.lang.h:1
+msgid "Command"
+msgstr "�རྡ���ོ��"
+
+#: ../gtksourceview/language-specs/latex.lang.h:3
msgid "Comment Environment"
msgstr "�ས����ོ����འ�འ�ོར�"
-#: ../gtksourceview/language-specs/latex.lang.h:3
+#: ../gtksourceview/language-specs/latex.lang.h:4
#: ../gtksourceview/language-specs/texinfo.lang.h:6
msgid "Include"
msgstr "�ྲ�ས�སུ���ུ�ས�"
-#: ../gtksourceview/language-specs/latex.lang.h:5
+#: ../gtksourceview/language-specs/latex.lang.h:6
msgid "LaTeX"
msgstr "ལ��ེ�སི�"
-#: ../gtksourceview/language-specs/latex.lang.h:7
+#: ../gtksourceview/language-specs/latex.lang.h:8
msgid "Math"
msgstr "ཨ��རྩིས�"
-#: ../gtksourceview/language-specs/latex.lang.h:8
-msgid "Most Used Commands"
-msgstr "���ཤོས�ལ��ལེ��འ����ི��རྡ���ོ���ུ�"
-
#: ../gtksourceview/language-specs/lua.lang.h:2
#: ../gtksourceview/language-specs/makefile.lang.h:3
-#: ../gtksourceview/language-specs/python.lang.h:4
-#: ../gtksourceview/language-specs/sh.lang.h:4
msgid "Functions"
msgstr "�ྱ�ལས�"
@@ -1044,7 +1134,6 @@ msgid "Lua"
msgstr "ལུ�འ�"
#: ../gtksourceview/language-specs/lua.lang.h:8
-#: ../gtksourceview/language-specs/python.lang.h:10
#: ../gtksourceview/language-specs/sh.lang.h:7
msgid "Multiline String 2"
msgstr "སྣ�����ྱལ�རི��ཡི��ར�ྱུ��༢�"
@@ -1107,6 +1196,25 @@ msgstr "à½?ེà½?à¼?རོསིà¼?à½?à½
msgid "Nemerle"
msgstr "�ི��ར�ལི"
+#: ../gtksourceview/language-specs/octave.lang.h:8
+#: ../gtksourceview/language-specs/python.lang.h:10
+msgid "Multiline Double Quoted String"
+msgstr "སྣ�����ི��འ�ྲེ��ར��ས���ིས������ུ�ས��འི�ཡི��ར�ྱུ��"
+
+#: ../gtksourceview/language-specs/octave.lang.h:9
+#: ../gtksourceview/language-specs/python.lang.h:11
+msgid "Multiline Single Quoted String"
+msgstr "སྣ�����ི��འ�ྲེ��ར��ས�ར�ྱ���ོའི������ུ�ས��འི�ཡི��ར�ྱུ��"
+
+#: ../gtksourceview/language-specs/octave.lang.h:11
+msgid "Octave"
+msgstr "�ར�ྱ��ལྡ��"
+
+#: ../gtksourceview/language-specs/octave.lang.h:12
+#: ../gtksourceview/language-specs/R.lang.h:9
+msgid "Reserved Constant"
+msgstr "�ུར��ས�ས�འ����འི� ����ེ� �"
+
#: ../gtksourceview/language-specs/pascal.lang.h:1
msgid "Block Comment 1"
msgstr "སྡེ������ས����ོ�� ༡ ��"
@@ -1185,7 +1293,6 @@ msgid "String3"
msgstr "ཡི��ར�ྱུ�� ༣ ��"
#: ../gtksourceview/language-specs/perl.lang.h:11
-#: ../gtksourceview/language-specs/tcl.lang.h:7
msgid "Variables"
msgstr "འ�ྱུར�����ུ�"
@@ -1213,11 +1320,6 @@ msgstr "à½?à½?à½?à¼?à½?ོà½?à¼?à½?ྲà½
msgid "Case Sensitive Keyword"
msgstr "�����ོ���ྲ���ོར�����ྱི���ོ��ི�"
-#. "duble-quoted strings"
-#: ../gtksourceview/language-specs/php.lang.h:16
-msgid "Double Quoted String"
-msgstr "འ�ྲེ��ར��ས���ིས�ལྡ���ྱི�ཡི��ར�ྱུ��"
-
#. <? ?> <HTML> inside PHP <?
#: ../gtksourceview/language-specs/php.lang.h:18
msgid "First Open PHP Tag"
@@ -1231,11 +1333,6 @@ msgstr "ཨེà½?à¼?à½?ིà¼?ཨེà½?à¼
msgid "PHP"
msgstr "�ི�ཨེ���ི�"
-#. 'single-quoted strings'
-#: ../gtksourceview/language-specs/php.lang.h:23
-msgid "Single Quoted String"
-msgstr "འ�ྲེ��ར��ས�ར�ྱ���ོའི�ཡི��ར�ྱུ��"
-
#: ../gtksourceview/language-specs/po.lang.h:2
msgid "Format"
msgstr "རྩ�ས�ྲི�"
@@ -1249,11 +1346,11 @@ msgstr "à½?ིà½?à¼?ཡིà½?à¼?ལེà½
msgid "Builtins"
msgstr "���སྦྲ�ས�"
-#: ../gtksourceview/language-specs/python.lang.h:8
+#: ../gtksourceview/language-specs/python.lang.h:9
msgid "Module Handler"
msgstr "�����ི�ལེ�ས�ས�ྱོ����"
-#: ../gtksourceview/language-specs/python.lang.h:12
+#: ../gtksourceview/language-specs/python.lang.h:13
msgid "Python"
msgstr "སྦུལ�ོ��ེ�"
@@ -1273,10 +1370,6 @@ msgstr "ཧྲིལà¼?ཨà½?à¼?à½?ིà¼
msgid "Reserved Class"
msgstr "�ུར��ས�ས�འ����འི� ��ྱེ���"
-#: ../gtksourceview/language-specs/R.lang.h:9
-msgid "Reserved Constant"
-msgstr "�ུར��ས�ས�འ����འི� ����ེ� �"
-
#: ../gtksourceview/language-specs/ruby.lang.h:1
msgid "Attribute Definitions"
msgstr "�ྱ���ོས��ྱི��ེས��ི�"
@@ -1293,52 +1386,60 @@ msgstr "����ེ��"
msgid "Definitions"
msgstr "�ེས��ི�"
-#: ../gtksourceview/language-specs/ruby.lang.h:6
+#: ../gtksourceview/language-specs/ruby.lang.h:7
msgid "Global Variables"
msgstr "སྤྱི��ྱ���ྱི�འ�ྱུར���"
-#: ../gtksourceview/language-specs/ruby.lang.h:7
+#: ../gtksourceview/language-specs/ruby.lang.h:8
msgid "Instance Variables"
msgstr "��ེ���ོ���ྱི�འ�ྱུར���"
-#: ../gtksourceview/language-specs/ruby.lang.h:10
+#: ../gtksourceview/language-specs/ruby.lang.h:11
msgid "Module Handlers"
msgstr "�����ི�ལེ�ས�ས�ྱོ����"
-#: ../gtksourceview/language-specs/ruby.lang.h:11
+#: ../gtksourceview/language-specs/ruby.lang.h:12
msgid "Multiline Comment"
msgstr "སྣ�����ྱལ�རི���ས����ོ��"
-#: ../gtksourceview/language-specs/ruby.lang.h:12
+#: ../gtksourceview/language-specs/ruby.lang.h:13
msgid "Pseudo Variables"
msgstr "སིའུ��ོ� འ�ྱུར����"
-#: ../gtksourceview/language-specs/ruby.lang.h:13
+#: ../gtksourceview/language-specs/ruby.lang.h:14
msgid "RegExp Variables"
msgstr "�ུས�ར�ྱུ���ྱི� �སལ��ར�ོ��འ�ྱུར���"
-#: ../gtksourceview/language-specs/ruby.lang.h:14
-msgid "Regular Expression"
-msgstr "�ུས�ར�ྱུ���སལ��ར�ོ��"
-
#: ../gtksourceview/language-specs/ruby.lang.h:15
-msgid "Regular Expression 2"
-msgstr "�ུས�ར�ྱུ���ྱི��སལ��ར�ོ�� ༢ ��"
-
-#: ../gtksourceview/language-specs/ruby.lang.h:16
msgid "Ruby"
msgstr "ར��ི�"
+#: ../gtksourceview/language-specs/ruby.lang.h:18
+msgid "Symbols"
+msgstr "�རྡ���ོ���ུ�"
+
+#: ../gtksourceview/language-specs/scheme.lang.h:11
+msgid "Scheme"
+msgstr "འ�ར�ལས�"
+
#: ../gtksourceview/language-specs/sh.lang.h:2
-msgid "Built-in Commands"
+msgid "Built-in Command"
msgstr "���སྦྲ�ས��རྡ���ོ��"
#: ../gtksourceview/language-specs/sh.lang.h:3
-msgid "Common Commands"
-msgstr "��ུ���ོ���ི��རྡ���ོ���ུ�"
+msgid "Common Command"
+msgstr "��ུ���ོ���ི��རྡ���ོ��"
+
+#: ../gtksourceview/language-specs/sh.lang.h:8
+msgid "Operator"
+msgstr "��ོལ�སྤྱོ���"
+
+#: ../gtksourceview/language-specs/sh.lang.h:9
+msgid "Punctuator"
+msgstr "ཡི��ར��ས���ལ��ི�"
#: ../gtksourceview/language-specs/sh.lang.h:10
-msgid "Redirections"
+msgid "Redirection"
msgstr "སླར�ལོ��������"
#: ../gtksourceview/language-specs/sh.lang.h:12
@@ -1578,10 +1679,6 @@ msgstr "�ེ�རི�ལོ�"
msgid "True and False"
msgstr "��ེ�������རྫུ����"
-#: ../gtksourceview/language-specs/vhdl.lang.h:8
-msgid "Type"
-msgstr "��ྱེ���"
-
#: ../gtksourceview/language-specs/vhdl.lang.h:9
msgid "VHDL"
msgstr "�ི�ཨེ���ི�ཨེལ�"
@@ -1590,14 +1687,22 @@ msgstr "à½?ིà¼?ཨེà½?à¼?à½?ིà¼?à½
msgid "Hexadecimal"
msgstr "�ྲུ��ལྡ����ུ���"
-#: ../gtksourceview/language-specs/xml.lang.h:8
-msgid "Tag"
-msgstr "�ོ�ར��ས�"
-
#: ../gtksourceview/language-specs/xml.lang.h:9
msgid "XML"
msgstr "ཨེ�སི�ཨེ��ཨེལ�"
+#~ msgid "Tags"
+#~ msgstr "�ོ�ར��ས��ུ�"
+#~ msgid "Double Quote String"
+#~ msgstr "འ�ྲེ��ར��ས���ིས�ལྡ��ཡི��ར�ྱུ��"
+#~ msgid "Single Quote String"
+#~ msgstr "འ�ྲེ��ར��ས���ི��ལྡ��ཡི��ར�ྱུ��"
+#~ msgid "Most Used Commands"
+#~ msgstr "���ཤོས�ལ��ལེ��འ����ི��རྡ���ོ���ུ�"
+#~ msgid "Regular Expression"
+#~ msgstr "�ུས�ར�ྱུ���སལ��ར�ོ��"
+#~ msgid "Regular Expression 2"
+#~ msgstr "�ུས�ར�ྱུ���ྱི��སལ��ར�ོ�� ༢ ��"
#~ msgid "Miscellaneous Single-Row Functions"
#~ msgstr "སྣ��ོ�ས��ྱལ�རི��ར�ྱ���ོའི��ྱ�ལས�"
diff -pruN 1.6.1-3/po/fr.po 1.7.1-0ubuntu2/po/fr.po
--- 1.6.1-3/po/fr.po 2005-09-03 19:33:53.000000000 +0100
+++ 1.7.1-0ubuntu2/po/fr.po 2006-05-29 18:27:03.000000000 +0100
@@ -1,203 +1,205 @@
# French translation of gtksourceview.
-# Copyright (C) 2003-2005 Free Software Foundation, Inc.
+# Copyright (C) 2003-2006 Free Software Foundation, Inc.
# This file is distributed under the same license as the gtksourceview package.
-#
+#
# Cédric Delfosse <cdelfosse free fr>, 2003.
# Christophe Merlet (RedFox) <redfox redfoxcenter org>, 2003-2005.
# Baptiste Mille-Mathias <bmm80 free fr>, 2004.
# Benoît Dejean <TazForEver dlfp org>, 2005.
-#
+# Jonathan Ernst <jonathan ernstfamily ch>, 2006.
+#
msgid ""
msgstr ""
-"Project-Id-Version: gtksourceview 1.3.93\n"
+"Project-Id-Version: gtksourceview 1.6.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-03 20:32+0200\n"
-"PO-Revision-Date: 2005-09-02 12:23+0200\n"
-"Last-Translator: Christophe Merlet (RedFox) <redfox redfoxcenter org>\n"
+"POT-Creation-Date: 2006-05-22 19:04+0200\n"
+"PO-Revision-Date: 2006-05-15 17:44+0100\n"
+"Last-Translator: Jonathan Ernst <jonathan ernstfamily ch>\n"
"Language-Team: GNOME French Team <gnomefr traduc org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: French\n"
-#: ../gtksourceview/gtksourcebuffer.c:279
+#: ../gtksourceview/gtksourcebuffer.c:278
msgid "Escape Character"
msgstr "Caractère d'échappement"
-#: ../gtksourceview/gtksourcebuffer.c:280
+#: ../gtksourceview/gtksourcebuffer.c:279
msgid "Escaping character for syntax patterns"
-msgstr "Caractère d'échappement dans la syntaxe des motifs"
+msgstr "Caractère d'échappement pour les motifs de syntaxe"
-#: ../gtksourceview/gtksourcebuffer.c:288
+#: ../gtksourceview/gtksourcebuffer.c:287
msgid "Check Brackets"
msgstr "Vérifier les parenthèses"
-#: ../gtksourceview/gtksourcebuffer.c:289
+#: ../gtksourceview/gtksourcebuffer.c:288
msgid "Whether to check and highlight matching brackets"
msgstr "Vérifier et indiquer les couples de parenthèses"
-#: ../gtksourceview/gtksourcebuffer.c:297
-#: ../gtksourceview/gtksourceprintjob.c:295
+#: ../gtksourceview/gtksourcebuffer.c:296
+#: ../gtksourceview/gtksourceprintjob.c:296
msgid "Highlight"
msgstr "Coloration syntaxique"
-#: ../gtksourceview/gtksourcebuffer.c:298
+#: ../gtksourceview/gtksourcebuffer.c:297
msgid "Whether to highlight syntax in the buffer"
msgstr "Utiliser la coloration syntaxique pour le fichier"
-#: ../gtksourceview/gtksourcebuffer.c:306
+#: ../gtksourceview/gtksourcebuffer.c:305
msgid "Maximum Undo Levels"
msgstr "Nombre d'annulation possible"
-#: ../gtksourceview/gtksourcebuffer.c:307
+#: ../gtksourceview/gtksourcebuffer.c:306
msgid "Number of undo levels for the buffer"
msgstr "Nombre d'annulation possible pour le fichier"
-#: ../gtksourceview/gtksourcebuffer.c:317
+#: ../gtksourceview/gtksourcebuffer.c:316
#: ../gtksourceview/language-specs/desktop.lang.h:6
#: ../gtksourceview/language-specs/ini.lang.h:7
msgid "Language"
msgstr "Langage"
-#: ../gtksourceview/gtksourcebuffer.c:318
+#: ../gtksourceview/gtksourcebuffer.c:317
msgid "Language object to get highlighting patterns from"
msgstr "Objet de langage pour les motifs de coloration syntaxique"
-#: ../gtksourceview/gtksourcelanguagesmanager.c:119
+#: ../gtksourceview/gtksourcelanguagesmanager.c:114
msgid "Language specification directories"
msgstr "Répertoires contenant les caractéristiques des langages"
-#: ../gtksourceview/gtksourcelanguagesmanager.c:120
+#: ../gtksourceview/gtksourcelanguagesmanager.c:115
msgid ""
"List of directories where the language specification files (.lang) are "
"located"
msgstr ""
"Liste des répertoires contenant les fichiers de caractéristiques des langages"
-#: ../gtksourceview/gtksourceprintjob.c:264
+#: ../gtksourceview/gtksourceprintjob.c:265
msgid "Configuration"
msgstr "Configuration"
-#: ../gtksourceview/gtksourceprintjob.c:265
+#: ../gtksourceview/gtksourceprintjob.c:266
msgid "Configuration options for the print job"
msgstr "Options de configuration de l'impression"
-#: ../gtksourceview/gtksourceprintjob.c:272
+#: ../gtksourceview/gtksourceprintjob.c:273
msgid "Source Buffer"
msgstr "Fichier source"
-#: ../gtksourceview/gtksourceprintjob.c:273
+#: ../gtksourceview/gtksourceprintjob.c:274
msgid "GtkSourceBuffer object to print"
msgstr "Objet GtkSourceBuffer à imprimer"
-#: ../gtksourceview/gtksourceprintjob.c:279
-#: ../gtksourceview/gtksourceview.c:221 ../gtksourceview/gtksourceview.c:222
+#: ../gtksourceview/gtksourceprintjob.c:280
+#: ../gtksourceview/gtksourceview.c:233 ../gtksourceview/gtksourceview.c:234
msgid "Tabs Width"
msgstr "Taille des tabulations"
-#: ../gtksourceview/gtksourceprintjob.c:280
+#: ../gtksourceview/gtksourceprintjob.c:281
msgid "Width in equivalent space characters of tabs"
msgstr "Taille en caractères d'espacement des tabulations"
-#: ../gtksourceview/gtksourceprintjob.c:287
+#: ../gtksourceview/gtksourceprintjob.c:288
msgid "Wrap Mode"
msgstr "Mode de coupure"
-#: ../gtksourceview/gtksourceprintjob.c:288
+#: ../gtksourceview/gtksourceprintjob.c:289
msgid "Word wrapping mode"
msgstr "Mode de coupure des mots"
-#: ../gtksourceview/gtksourceprintjob.c:296
+#: ../gtksourceview/gtksourceprintjob.c:297
msgid "Whether to print the document with highlighted syntax"
msgstr "Imprimer le document avec la coloration syntaxique"
-#: ../gtksourceview/gtksourceprintjob.c:304
+#: ../gtksourceview/gtksourceprintjob.c:305
msgid "Font"
msgstr "Police"
-#: ../gtksourceview/gtksourceprintjob.c:305
+#: ../gtksourceview/gtksourceprintjob.c:306
msgid "GnomeFont name to use for the document text (deprecated)"
msgstr "Nom de la police à utiliser pour le texte du document (obsolète)"
-#: ../gtksourceview/gtksourceprintjob.c:312
+#: ../gtksourceview/gtksourceprintjob.c:313
msgid "Font Description"
msgstr "Description de la police"
-#: ../gtksourceview/gtksourceprintjob.c:313
+#: ../gtksourceview/gtksourceprintjob.c:314
msgid "Font to use for the document text (e.g. \"Monospace 10\")"
msgstr ""
"Nom de la police à utiliser pour le texte du document (ex : « Monospace 10 »)"
-#: ../gtksourceview/gtksourceprintjob.c:320
-#: ../gtksourceview/gtksourceprintjob.c:328
+#: ../gtksourceview/gtksourceprintjob.c:321
+#: ../gtksourceview/gtksourceprintjob.c:329
msgid "Numbers Font"
msgstr "Police des numéros"
-#: ../gtksourceview/gtksourceprintjob.c:321
+#: ../gtksourceview/gtksourceprintjob.c:322
msgid "GnomeFont name to use for the line numbers (deprecated)"
msgstr "Nom de la police à utiliser pour les numéros de ligne (obsolète)"
-#: ../gtksourceview/gtksourceprintjob.c:329
+#: ../gtksourceview/gtksourceprintjob.c:330
msgid "Font description to use for the line numbers"
msgstr "Description de la police à utiliser pour les numéros de ligne"
-#: ../gtksourceview/gtksourceprintjob.c:336
+#: ../gtksourceview/gtksourceprintjob.c:337
msgid "Print Line Numbers"
msgstr "Imprimer les numéros de ligne"
-#: ../gtksourceview/gtksourceprintjob.c:337
+#: ../gtksourceview/gtksourceprintjob.c:338
msgid "Interval of printed line numbers (0 means no numbers)"
msgstr "Intervalle entre les numéros de lignes imprimés (0 pour aucun numéro)"
-#: ../gtksourceview/gtksourceprintjob.c:344
+#: ../gtksourceview/gtksourceprintjob.c:345
msgid "Print Header"
msgstr "Imprimer l'en-tête"
-#: ../gtksourceview/gtksourceprintjob.c:345
+#: ../gtksourceview/gtksourceprintjob.c:346
msgid "Whether to print a header in each page"
msgstr "Imprimer un en-tête à chaque page"
-#: ../gtksourceview/gtksourceprintjob.c:352
+#: ../gtksourceview/gtksourceprintjob.c:353
msgid "Print Footer"
msgstr "Imprimer le pied de page"
-#: ../gtksourceview/gtksourceprintjob.c:353
+#: ../gtksourceview/gtksourceprintjob.c:354
msgid "Whether to print a footer in each page"
msgstr "Imprimer un pied de page à chaque page"
-#: ../gtksourceview/gtksourceprintjob.c:360
+#: ../gtksourceview/gtksourceprintjob.c:361
msgid "Header and Footer Font"
msgstr "Police des en-têtes et pieds de page"
-#: ../gtksourceview/gtksourceprintjob.c:361
+#: ../gtksourceview/gtksourceprintjob.c:362
msgid "GnomeFont name to use for the header and footer (deprecated)"
msgstr "Nom de police à utiliser pour les en-têtes et pieds de page (obsolète)"
-#: ../gtksourceview/gtksourceprintjob.c:368
+#: ../gtksourceview/gtksourceprintjob.c:369
msgid "Header and Footer Font Description"
msgstr "Description de la police des en-têtes et pieds de page"
-#: ../gtksourceview/gtksourceprintjob.c:369
+#: ../gtksourceview/gtksourceprintjob.c:370
msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
msgstr ""
"Nom de police à utiliser pour les en-têtes et pieds de page (ex : "
"« Monospace 10 »)"
-#: ../gtksourceview/gtksourcestylescheme.c:262
+#: ../gtksourceview/gtksourcestylescheme.c:264
msgid "Base-N Integer"
msgstr "Entier en base N"
-#: ../gtksourceview/gtksourcestylescheme.c:267
+#: ../gtksourceview/gtksourcestylescheme.c:269
msgid "Character"
msgstr "Caractère"
-#: ../gtksourceview/gtksourcestylescheme.c:272
-#: ../gtksourceview/language-specs/latex.lang.h:1
+#: ../gtksourceview/gtksourcestylescheme.c:274
+#: ../gtksourceview/language-specs/latex.lang.h:2
#: ../gtksourceview/language-specs/po.lang.h:1
msgid "Comment"
msgstr "Commentaire"
#. $this = (datatype)
-#: ../gtksourceview/gtksourcestylescheme.c:277
+#: ../gtksourceview/gtksourcestylescheme.c:279
#: ../gtksourceview/language-specs/php.lang.h:14
msgid "Data Type"
msgstr "Type de donnée"
@@ -205,46 +207,63 @@ msgstr "Type de donnée"
#.
#. CSS functions, such as rgb(), clip(), or lang().
#.
-#: ../gtksourceview/gtksourcestylescheme.c:282
+#: ../gtksourceview/gtksourcestylescheme.c:284
#: ../gtksourceview/language-specs/ada.lang.h:3
#: ../gtksourceview/language-specs/css.lang.h:18
+#: ../gtksourceview/language-specs/octave.lang.h:4
+#: ../gtksourceview/language-specs/python.lang.h:5
+#: ../gtksourceview/language-specs/scheme.lang.h:2
+#: ../gtksourceview/language-specs/sh.lang.h:4
msgid "Function"
msgstr "Fonction"
-#: ../gtksourceview/gtksourcestylescheme.c:287
+#: ../gtksourceview/gtksourcestylescheme.c:289
#: ../gtksourceview/language-specs/c.lang.h:6
#: ../gtksourceview/language-specs/cpp.lang.h:6
#: ../gtksourceview/language-specs/fortran.lang.h:1
#: ../gtksourceview/language-specs/haskell.lang.h:3
#: ../gtksourceview/language-specs/nemerle.lang.h:6
+#: ../gtksourceview/language-specs/octave.lang.h:1
#: ../gtksourceview/language-specs/python.lang.h:2
msgid "Decimal"
msgstr "Décimal"
-#: ../gtksourceview/gtksourcestylescheme.c:292
+#: ../gtksourceview/gtksourcestylescheme.c:294
msgid "Floating Point"
msgstr "Virgule flottante"
-#: ../gtksourceview/gtksourcestylescheme.c:297
+#. We cannot match \b at the end of a keyword automatically
+#. because it fails for let* etc. So we need to manually add it to the
+#. other keywords and match ([ \t]|$) for the one ending with a
+#. special character. Unfortnately this also means that if the highlight
+#. style for keywords sets the background color, for let* etc also the
+#. trailing space will be highlighted.
+#: ../gtksourceview/gtksourcestylescheme.c:299
+#: ../gtksourceview/language-specs/ada.lang.h:4
#: ../gtksourceview/language-specs/gtkrc.lang.h:6
-#: ../gtksourceview/language-specs/latex.lang.h:4
+#: ../gtksourceview/language-specs/haskell.lang.h:9
+#: ../gtksourceview/language-specs/latex.lang.h:5
+#: ../gtksourceview/language-specs/octave.lang.h:6
#: ../gtksourceview/language-specs/po.lang.h:3
+#: ../gtksourceview/language-specs/python.lang.h:7
#: ../gtksourceview/language-specs/R.lang.h:6
+#: ../gtksourceview/language-specs/scheme.lang.h:9
+#: ../gtksourceview/language-specs/tcl.lang.h:1
#: ../gtksourceview/language-specs/texinfo.lang.h:8
#: ../gtksourceview/language-specs/vhdl.lang.h:2
msgid "Keyword"
msgstr "Mot-clé"
-#: ../gtksourceview/gtksourcestylescheme.c:302
+#: ../gtksourceview/gtksourcestylescheme.c:304
msgid "Preprocessor"
msgstr "Préprocesseur"
#.
-#. <pattern-item _name = "Operators" style = "Operators">
+#. <pattern-item _name = "Operator" style = "Operators">
#. <regex>[:!#$%&*+./>=<? \\^|~\-]+</regex>
#. </pattern-item>
#.
-#. <keyword-list _name="Keysymbols" style = "Keyword">
+#. <keyword-list _name="Keysymbol" style = "Keyword">
#. <keyword>::</keyword>
#. <keyword>-></keyword>
#. <keyword><-</keyword>
@@ -256,14 +275,14 @@ msgstr "Préprocesseur"
#. <keyword>~</keyword>
#. </keyword-list>
#.
-#: ../gtksourceview/gtksourcestylescheme.c:307
+#: ../gtksourceview/gtksourcestylescheme.c:309
#: ../gtksourceview/language-specs/ada.lang.h:9
#: ../gtksourceview/language-specs/c.lang.h:15
#: ../gtksourceview/language-specs/cpp.lang.h:15
#: ../gtksourceview/language-specs/csharp.lang.h:9
#: ../gtksourceview/language-specs/css.lang.h:58
#: ../gtksourceview/language-specs/html.lang.h:8
-#: ../gtksourceview/language-specs/fortran.lang.h:12
+#: ../gtksourceview/language-specs/fortran.lang.h:13
#: ../gtksourceview/language-specs/haskell.lang.h:31
#: ../gtksourceview/language-specs/idl.lang.h:9
#: ../gtksourceview/language-specs/java.lang.h:11
@@ -274,8 +293,7 @@ msgstr "Préprocesseur"
#: ../gtksourceview/language-specs/pascal.lang.h:18
#: ../gtksourceview/language-specs/perl.lang.h:8
#: ../gtksourceview/language-specs/po.lang.h:6
-#: ../gtksourceview/language-specs/python.lang.h:14
-#: ../gtksourceview/language-specs/ruby.lang.h:18
+#: ../gtksourceview/language-specs/scheme.lang.h:13
#: ../gtksourceview/language-specs/sh.lang.h:13
#: ../gtksourceview/language-specs/tcl.lang.h:4
#: ../gtksourceview/language-specs/vbnet.lang.h:11
@@ -284,11 +302,12 @@ msgstr "Préprocesseur"
msgid "String"
msgstr "Chaîne"
-#: ../gtksourceview/gtksourcestylescheme.c:312
+#: ../gtksourceview/gtksourcestylescheme.c:314
msgid "Specials"
msgstr "Spéciales"
-#: ../gtksourceview/gtksourcestylescheme.c:319
+#: ../gtksourceview/gtksourcestylescheme.c:321
+#: ../gtksourceview/language-specs/changelog.lang.h:6
#: ../gtksourceview/language-specs/css.lang.h:36
#: ../gtksourceview/language-specs/desktop.lang.h:10
#: ../gtksourceview/language-specs/diff.lang.h:7
@@ -299,87 +318,87 @@ msgstr "Spéciales"
msgid "Others"
msgstr "Autres"
-#: ../gtksourceview/gtksourcestylescheme.c:324
+#: ../gtksourceview/gtksourcestylescheme.c:326
msgid "Others 2"
msgstr "Autres 2"
-#: ../gtksourceview/gtksourcestylescheme.c:329
+#: ../gtksourceview/gtksourcestylescheme.c:331
msgid "Others 3"
msgstr "Autres 3"
-#: ../gtksourceview/gtksourcestylescheme.c:366
+#: ../gtksourceview/gtksourcestylescheme.c:368
msgid "Default"
msgstr "Par défaut"
-#: ../gtksourceview/gtksourcetag.c:108
+#: ../gtksourceview/gtksourcetag.c:109
msgid "Tag ID"
msgstr "ID de la balise"
-#: ../gtksourceview/gtksourcetag.c:109
+#: ../gtksourceview/gtksourcetag.c:110
msgid "ID used to refer to the source tag"
msgstr "ID utilisé pour se référer à la balise de source"
-#: ../gtksourceview/gtksourcetag.c:116
+#: ../gtksourceview/gtksourcetag.c:117
msgid "Tag style"
msgstr "Style de la balise"
-#: ../gtksourceview/gtksourcetag.c:117
+#: ../gtksourceview/gtksourcetag.c:118
msgid "The style associated with the source tag"
msgstr "Le style associé à la balise de source"
-#: ../gtksourceview/gtksourceview.c:205
+#: ../gtksourceview/gtksourceview.c:217
msgid "Show Line Numbers"
msgstr "Afficher les numéros de ligne"
-#: ../gtksourceview/gtksourceview.c:206
+#: ../gtksourceview/gtksourceview.c:218
msgid "Whether to display line numbers"
msgstr "Afficher/Cacher les numéros de lignes"
-#: ../gtksourceview/gtksourceview.c:213
+#: ../gtksourceview/gtksourceview.c:225
msgid "Show Line Markers"
msgstr "Afficher les repères de fin de ligne"
-#: ../gtksourceview/gtksourceview.c:214
+#: ../gtksourceview/gtksourceview.c:226
msgid "Whether to display line marker pixbufs"
msgstr "Afficher/cacher les répères de fin de ligne"
-#: ../gtksourceview/gtksourceview.c:231
+#: ../gtksourceview/gtksourceview.c:243
msgid "Auto Indentation"
msgstr "Indentation automatique"
-#: ../gtksourceview/gtksourceview.c:232
+#: ../gtksourceview/gtksourceview.c:244
msgid "Whether to enable auto indentation"
msgstr "Activer/Désactiver l'indentation automatique"
-#: ../gtksourceview/gtksourceview.c:238
+#: ../gtksourceview/gtksourceview.c:250
msgid "Insert Spaces Instead of Tabs"
msgstr "Remplacer les tabulations par des espaces"
-#: ../gtksourceview/gtksourceview.c:239
+#: ../gtksourceview/gtksourceview.c:251
msgid "Whether to insert spaces instead of tabs"
msgstr "Remplacer les tabulations par des espaces"
-#: ../gtksourceview/gtksourceview.c:246
+#: ../gtksourceview/gtksourceview.c:258
msgid "Show Right Margin"
msgstr "Afficher la marge à droite"
-#: ../gtksourceview/gtksourceview.c:247
+#: ../gtksourceview/gtksourceview.c:259
msgid "Whether to display the right margin"
msgstr "Afficher/cacher la marge à droite"
-#: ../gtksourceview/gtksourceview.c:254
+#: ../gtksourceview/gtksourceview.c:266
msgid "Margin position"
msgstr "Position de la marge"
-#: ../gtksourceview/gtksourceview.c:255
+#: ../gtksourceview/gtksourceview.c:267
msgid "Position of the right margin"
msgstr "Position de la marge à droite"
-#: ../gtksourceview/gtksourceview.c:264
+#: ../gtksourceview/gtksourceview.c:276
msgid "Use smart home/end"
msgstr "Utiliser un mode spéciale pour les touches début/fin"
-#: ../gtksourceview/gtksourceview.c:265
+#: ../gtksourceview/gtksourceview.c:277
msgid ""
"HOME and END keys move to first/last non whitespace characters on line "
"before going to the start/end of the line"
@@ -387,14 +406,54 @@ msgstr ""
"Les touches HOME et END déplace le curseur au premier/dernier caractère non "
"blanc avant d'aller en début/fin de ligne"
-#: ../gtksourceview/gtksourceview.c:274
+#: ../gtksourceview/gtksourceview.c:286
msgid "Highlight current line"
msgstr "Mettre en surbrillance la ligne actuelle"
-#: ../gtksourceview/gtksourceview.c:275
+#: ../gtksourceview/gtksourceview.c:287
msgid "Whether to highlight the current line"
msgstr "Mettre en surbrillance la ligne actuelle"
+#: ../gtksourceview/gtksourceview.c:303
+msgid "Margin Line Alpha"
+msgstr "Canal alpha de la ligne de marge"
+
+#: ../gtksourceview/gtksourceview.c:304
+msgid "Transparency of the margin line"
+msgstr "Transparence de la ligne de marge"
+
+#: ../gtksourceview/gtksourceview.c:321
+msgid "Margin Line Color"
+msgstr "Couleur de la ligne de marge"
+
+#: ../gtksourceview/gtksourceview.c:322
+msgid "Color to use for the right margin line"
+msgstr "Couleur à utiliser pour la ligne de marge de droite"
+
+#: ../gtksourceview/gtksourceview.c:338
+msgid "Margin Overlay Toggle"
+msgstr "Bascule du cache avec marge"
+
+#: ../gtksourceview/gtksourceview.c:339
+msgid "Whether to draw the right margin overlay"
+msgstr "Indique s'il faut afficher le cache de la marge de droite"
+
+#: ../gtksourceview/gtksourceview.c:355
+msgid "Margin Overlay Alpha"
+msgstr "Canal alpha du cache avec marge"
+
+#: ../gtksourceview/gtksourceview.c:356
+msgid "Transparency of the margin overlay"
+msgstr "Transparence du cache avec marge"
+
+#: ../gtksourceview/gtksourceview.c:373
+msgid "Margin Overlay Color"
+msgstr "Couleur du cache avec marge"
+
+#: ../gtksourceview/gtksourceview.c:374
+msgid "Color to use for drawing the margin overlay"
+msgstr "Couleur à utiliser pour dessiner le cache avec marge"
+
#: ../gtksourceview/language-specs/ada.lang.h:1
msgid "Ada"
msgstr "Ada"
@@ -408,24 +467,7 @@ msgstr "Ada"
msgid "Character Constant"
msgstr "Constante de type caractère"
-#: ../gtksourceview/language-specs/ada.lang.h:4
-#: ../gtksourceview/language-specs/c.lang.h:10
-#: ../gtksourceview/language-specs/cpp.lang.h:10
-#: ../gtksourceview/language-specs/csharp.lang.h:3
-#: ../gtksourceview/language-specs/fortran.lang.h:7
-#: ../gtksourceview/language-specs/haskell.lang.h:9
-#: ../gtksourceview/language-specs/idl.lang.h:4
-#: ../gtksourceview/language-specs/javascript.lang.h:12
-#: ../gtksourceview/language-specs/lua.lang.h:3
-#: ../gtksourceview/language-specs/perl.lang.h:2
-#: ../gtksourceview/language-specs/python.lang.h:6
-#: ../gtksourceview/language-specs/ruby.lang.h:8
-#: ../gtksourceview/language-specs/tcl.lang.h:1
-#: ../gtksourceview/language-specs/vbnet.lang.h:1
-#: ../gtksourceview/language-specs/verilog.lang.h:6
-msgid "Keywords"
-msgstr "Mots-clés"
-
+#. Note: contains an hack to avoid considering ^COMMON a comment
#. <string _name = "String 2" style = "String" end-at-line-end = "TRUE">
#. <start-regex>'</start-regex>
#. <end-regex>'</end-regex>
@@ -437,7 +479,7 @@ msgstr "Mots-clés"
#: ../gtksourceview/language-specs/css.lang.h:29
#: ../gtksourceview/language-specs/desktop.lang.h:7
#: ../gtksourceview/language-specs/diff.lang.h:5
-#: ../gtksourceview/language-specs/fortran.lang.h:8
+#: ../gtksourceview/language-specs/fortran.lang.h:9
#: ../gtksourceview/language-specs/gtkrc.lang.h:7
#: ../gtksourceview/language-specs/haskell.lang.h:10
#: ../gtksourceview/language-specs/idl.lang.h:5
@@ -447,11 +489,13 @@ msgstr "Mots-clés"
#: ../gtksourceview/language-specs/lua.lang.h:4
#: ../gtksourceview/language-specs/makefile.lang.h:4
#: ../gtksourceview/language-specs/nemerle.lang.h:10
+#: ../gtksourceview/language-specs/octave.lang.h:7
#: ../gtksourceview/language-specs/pascal.lang.h:11
#: ../gtksourceview/language-specs/perl.lang.h:3
-#: ../gtksourceview/language-specs/python.lang.h:7
+#: ../gtksourceview/language-specs/python.lang.h:8
#: ../gtksourceview/language-specs/R.lang.h:7
-#: ../gtksourceview/language-specs/ruby.lang.h:9
+#: ../gtksourceview/language-specs/ruby.lang.h:10
+#: ../gtksourceview/language-specs/scheme.lang.h:10
#: ../gtksourceview/language-specs/sh.lang.h:5
#: ../gtksourceview/language-specs/sql.lang.h:23
#: ../gtksourceview/language-specs/tcl.lang.h:2
@@ -477,21 +521,21 @@ msgid "Number"
msgstr "Nombre"
#: ../gtksourceview/language-specs/ada.lang.h:7
-msgid "Preprocessor Keywords"
-msgstr "Mots-clés du préprocesseur"
+msgid "Preprocessor Keyword"
+msgstr "Mot-clé du pré-processeur"
#: ../gtksourceview/language-specs/ada.lang.h:8
#: ../gtksourceview/language-specs/c.lang.h:14
#: ../gtksourceview/language-specs/cpp.lang.h:14
#: ../gtksourceview/language-specs/csharp.lang.h:8
-#: ../gtksourceview/language-specs/fortran.lang.h:11
+#: ../gtksourceview/language-specs/fortran.lang.h:12
#: ../gtksourceview/language-specs/haskell.lang.h:13
#: ../gtksourceview/language-specs/idl.lang.h:8
#: ../gtksourceview/language-specs/java.lang.h:10
#: ../gtksourceview/language-specs/makefile.lang.h:6
#: ../gtksourceview/language-specs/nemerle.lang.h:14
#: ../gtksourceview/language-specs/pascal.lang.h:17
-#: ../gtksourceview/language-specs/php.lang.h:24
+#: ../gtksourceview/language-specs/scheme.lang.h:12
#: ../gtksourceview/language-specs/sql.lang.h:48
#: ../gtksourceview/language-specs/vbnet.lang.h:10
#: ../gtksourceview/language-specs/verilog.lang.h:9
@@ -504,18 +548,14 @@ msgid "True And False"
msgstr "Vrai et faux"
#: ../gtksourceview/language-specs/ada.lang.h:11
-#: ../gtksourceview/language-specs/c.lang.h:16
-#: ../gtksourceview/language-specs/cpp.lang.h:16
-#: ../gtksourceview/language-specs/fortran.lang.h:14
-#: ../gtksourceview/language-specs/idl.lang.h:10
-#: ../gtksourceview/language-specs/verilog.lang.h:10
-msgid "Types"
-msgstr "Types"
+#: ../gtksourceview/language-specs/vhdl.lang.h:8
+msgid "Type"
+msgstr "Type"
#: ../gtksourceview/language-specs/c.lang.h:1
#: ../gtksourceview/language-specs/cpp.lang.h:1
msgid "'#if 0' Comment"
-msgstr "Commentaire '#if 0'"
+msgstr "Commentaire « #if 0 »"
#. Comments
#: ../gtksourceview/language-specs/c.lang.h:2
@@ -550,7 +590,8 @@ msgstr "Macro usuelle"
#: ../gtksourceview/language-specs/fortran.lang.h:2
#: ../gtksourceview/language-specs/haskell.lang.h:4
#: ../gtksourceview/language-specs/nemerle.lang.h:7
-#: ../gtksourceview/language-specs/python.lang.h:3
+#: ../gtksourceview/language-specs/octave.lang.h:3
+#: ../gtksourceview/language-specs/python.lang.h:4
#: ../gtksourceview/language-specs/R.lang.h:4
msgid "Floating Point Number"
msgstr "Nombre à virgule flottante"
@@ -561,8 +602,9 @@ msgstr "Nombre à virgule flottante"
#: ../gtksourceview/language-specs/fortran.lang.h:4
#: ../gtksourceview/language-specs/haskell.lang.h:6
#: ../gtksourceview/language-specs/nemerle.lang.h:8
+#: ../gtksourceview/language-specs/octave.lang.h:5
#: ../gtksourceview/language-specs/pascal.lang.h:10
-#: ../gtksourceview/language-specs/python.lang.h:5
+#: ../gtksourceview/language-specs/python.lang.h:6
msgid "Hex Number"
msgstr "Nombre hexadécimal"
@@ -573,12 +615,27 @@ msgstr "Nombre hexadécimal"
msgid "Include/Pragma"
msgstr "Include/Pragma"
+#: ../gtksourceview/language-specs/c.lang.h:10
+#: ../gtksourceview/language-specs/cpp.lang.h:10
+#: ../gtksourceview/language-specs/csharp.lang.h:3
+#: ../gtksourceview/language-specs/fortran.lang.h:7
+#: ../gtksourceview/language-specs/idl.lang.h:4
+#: ../gtksourceview/language-specs/javascript.lang.h:12
+#: ../gtksourceview/language-specs/lua.lang.h:3
+#: ../gtksourceview/language-specs/perl.lang.h:2
+#: ../gtksourceview/language-specs/ruby.lang.h:9
+#: ../gtksourceview/language-specs/vbnet.lang.h:1
+#: ../gtksourceview/language-specs/verilog.lang.h:6
+msgid "Keywords"
+msgstr "Mots-clés"
+
#: ../gtksourceview/language-specs/c.lang.h:12
#: ../gtksourceview/language-specs/cpp.lang.h:12
-#: ../gtksourceview/language-specs/fortran.lang.h:9
+#: ../gtksourceview/language-specs/fortran.lang.h:10
#: ../gtksourceview/language-specs/haskell.lang.h:11
#: ../gtksourceview/language-specs/nemerle.lang.h:12
-#: ../gtksourceview/language-specs/python.lang.h:11
+#: ../gtksourceview/language-specs/octave.lang.h:10
+#: ../gtksourceview/language-specs/python.lang.h:12
#: ../gtksourceview/language-specs/verilog.lang.h:8
msgid "Octal Number"
msgstr "Nombre octal"
@@ -586,12 +643,39 @@ msgstr "Nombre octal"
#: ../gtksourceview/language-specs/c.lang.h:13
#: ../gtksourceview/language-specs/cpp.lang.h:13
#: ../gtksourceview/language-specs/csharp.lang.h:6
-#: ../gtksourceview/language-specs/haskell.lang.h:12
#: ../gtksourceview/language-specs/idl.lang.h:6
#: ../gtksourceview/language-specs/vbnet.lang.h:8
msgid "Preprocessor Definitions"
msgstr "Définitions du préprocesseur"
+#: ../gtksourceview/language-specs/c.lang.h:16
+#: ../gtksourceview/language-specs/cpp.lang.h:16
+#: ../gtksourceview/language-specs/fortran.lang.h:15
+#: ../gtksourceview/language-specs/idl.lang.h:10
+#: ../gtksourceview/language-specs/verilog.lang.h:10
+msgid "Types"
+msgstr "Types"
+
+#: ../gtksourceview/language-specs/changelog.lang.h:1
+msgid "ChangeLog"
+msgstr "Nouveautés"
+
+#: ../gtksourceview/language-specs/changelog.lang.h:2
+msgid "Date"
+msgstr "Date"
+
+#: ../gtksourceview/language-specs/changelog.lang.h:3
+msgid "Email"
+msgstr "Courrier électronique"
+
+#: ../gtksourceview/language-specs/changelog.lang.h:4
+msgid "File"
+msgstr "Fichier"
+
+#: ../gtksourceview/language-specs/changelog.lang.h:5
+msgid "Marker"
+msgstr "Marqueur"
+
#: ../gtksourceview/language-specs/cpp.lang.h:3
msgid "C++"
msgstr "C++"
@@ -602,7 +686,6 @@ msgstr "C#"
#: ../gtksourceview/language-specs/csharp.lang.h:5
#: ../gtksourceview/language-specs/lua.lang.h:7
-#: ../gtksourceview/language-specs/python.lang.h:9
#: ../gtksourceview/language-specs/sh.lang.h:6
msgid "Multiline String"
msgstr "Chaîne sur plusieurs lignes"
@@ -616,13 +699,11 @@ msgstr "Primitives"
#: ../gtksourceview/language-specs/csharp.lang.h:10
#: ../gtksourceview/language-specs/css.lang.h:59
-#: ../gtksourceview/language-specs/fortran.lang.h:13
+#: ../gtksourceview/language-specs/fortran.lang.h:14
#: ../gtksourceview/language-specs/java.lang.h:12
#: ../gtksourceview/language-specs/javascript.lang.h:24
#: ../gtksourceview/language-specs/lua.lang.h:11
#: ../gtksourceview/language-specs/makefile.lang.h:9
-#: ../gtksourceview/language-specs/python.lang.h:15
-#: ../gtksourceview/language-specs/ruby.lang.h:19
#: ../gtksourceview/language-specs/sh.lang.h:14
msgid "String 2"
msgstr "Chaîne 2"
@@ -674,7 +755,6 @@ msgstr "Valeurs de propriété connues"
#: ../gtksourceview/language-specs/css.lang.h:35
#: ../gtksourceview/language-specs/javascript.lang.h:20
#: ../gtksourceview/language-specs/php.lang.h:20
-#: ../gtksourceview/language-specs/sh.lang.h:8
#: ../gtksourceview/language-specs/sql.lang.h:34
msgid "Operators"
msgstr "Opérateurs"
@@ -688,7 +768,6 @@ msgstr "Noms de propriété"
#.
#: ../gtksourceview/language-specs/css.lang.h:41
#: ../gtksourceview/language-specs/javascript.lang.h:21
-#: ../gtksourceview/language-specs/sh.lang.h:9
msgid "Punctuators"
msgstr "Ponctuations"
@@ -739,16 +818,17 @@ msgstr ".desktop"
#: ../gtksourceview/language-specs/desktop.lang.h:2
#: ../gtksourceview/language-specs/gtkrc.lang.h:1
#: ../gtksourceview/language-specs/ini.lang.h:2
+#: ../gtksourceview/language-specs/scheme.lang.h:1
msgid "Boolean Value"
msgstr "Valeur booléenne"
#: ../gtksourceview/language-specs/desktop.lang.h:3
msgid "Encoding"
-msgstr "Encodage"
+msgstr "Codage"
#: ../gtksourceview/language-specs/desktop.lang.h:4
msgid "Exec Parameter"
-msgstr "Paramètre de l'exécutable"
+msgstr "Paramètre d'exécution"
#: ../gtksourceview/language-specs/desktop.lang.h:5
#: ../gtksourceview/language-specs/ini.lang.h:5
@@ -795,8 +875,8 @@ msgstr "Cas spécial"
#: ../gtksourceview/language-specs/html.lang.h:1
#: ../gtksourceview/language-specs/xml.lang.h:1
-msgid "Attributes"
-msgstr "Attributs"
+msgid "Attribute"
+msgstr "Attribut"
#: ../gtksourceview/language-specs/html.lang.h:3
#: ../gtksourceview/language-specs/xml.lang.h:3
@@ -817,15 +897,16 @@ msgid "HTML"
msgstr "HTML"
#: ../gtksourceview/language-specs/html.lang.h:7
-#: ../gtksourceview/language-specs/latex.lang.h:6
+#: ../gtksourceview/language-specs/latex.lang.h:7
#: ../gtksourceview/language-specs/texinfo.lang.h:12
#: ../gtksourceview/language-specs/xml.lang.h:6
msgid "Markup"
msgstr "Balisage"
#: ../gtksourceview/language-specs/html.lang.h:9
-msgid "Tags"
-msgstr "Balises"
+#: ../gtksourceview/language-specs/xml.lang.h:8
+msgid "Tag"
+msgstr "Balise"
#: ../gtksourceview/language-specs/fortran.lang.h:3
msgid "Fortran 95"
@@ -839,15 +920,20 @@ msgstr "Entrée/Sortie"
msgid "Intrinsics"
msgstr "Intrinsèques"
-#: ../gtksourceview/language-specs/fortran.lang.h:10
+#: ../gtksourceview/language-specs/fortran.lang.h:11
msgid "Read/Write"
msgstr "Lecture/Ã?criture"
+#. "duble-quoted strings"
#: ../gtksourceview/language-specs/gtkrc.lang.h:2
#: ../gtksourceview/language-specs/ini.lang.h:4
+#: ../gtksourceview/language-specs/octave.lang.h:2
+#: ../gtksourceview/language-specs/php.lang.h:16
+#: ../gtksourceview/language-specs/python.lang.h:3
#: ../gtksourceview/language-specs/R.lang.h:3
-msgid "Double Quote String"
-msgstr "Chaîne doublement citée"
+#: ../gtksourceview/language-specs/ruby.lang.h:6
+msgid "Double Quoted String"
+msgstr "Chaîne mise entre guillemets (\")"
#: ../gtksourceview/language-specs/gtkrc.lang.h:3
msgid "GtkRC"
@@ -858,14 +944,20 @@ msgid "Include Directive"
msgstr "Directive d'inclusion"
#: ../gtksourceview/language-specs/gtkrc.lang.h:5
+#: ../gtksourceview/language-specs/haskell.lang.h:8
msgid "Keysymbol"
msgstr "Symbole clé"
+#. 'single-quoted strings'
#: ../gtksourceview/language-specs/gtkrc.lang.h:10
#: ../gtksourceview/language-specs/ini.lang.h:11
+#: ../gtksourceview/language-specs/octave.lang.h:14
+#: ../gtksourceview/language-specs/php.lang.h:24
+#: ../gtksourceview/language-specs/python.lang.h:15
#: ../gtksourceview/language-specs/R.lang.h:11
-msgid "Single Quote String"
-msgstr "Chaîne simplement citée"
+#: ../gtksourceview/language-specs/ruby.lang.h:17
+msgid "Single Quoted String"
+msgstr "Chaîne mise entre guillemets simples (')"
#: ../gtksourceview/language-specs/gtkrc.lang.h:11
msgid "State"
@@ -875,6 +967,7 @@ msgstr "Ã?tat"
#: ../gtksourceview/language-specs/gtkrc.lang.h:12
#: ../gtksourceview/language-specs/ini.lang.h:12
#: ../gtksourceview/language-specs/php.lang.h:26
+#: ../gtksourceview/language-specs/tcl.lang.h:7
msgid "Variable"
msgstr "Variable"
@@ -882,9 +975,9 @@ msgstr "Variable"
msgid "Haskell"
msgstr "Haskell"
-#: ../gtksourceview/language-specs/haskell.lang.h:8
-msgid "Keysymbols"
-msgstr "Symboles clés"
+#: ../gtksourceview/language-specs/haskell.lang.h:12
+msgid "Preprocessor Definition"
+msgstr "Définition du pré-processeur"
#: ../gtksourceview/language-specs/haskell.lang.h:32
msgid "Type or Constructor"
@@ -999,10 +1092,12 @@ msgstr "Objets"
#: ../gtksourceview/language-specs/javascript.lang.h:22
#: ../gtksourceview/language-specs/lua.lang.h:9
+#: ../gtksourceview/language-specs/octave.lang.h:13
#: ../gtksourceview/language-specs/perl.lang.h:7
-#: ../gtksourceview/language-specs/python.lang.h:13
+#: ../gtksourceview/language-specs/php.lang.h:22
+#: ../gtksourceview/language-specs/python.lang.h:14
#: ../gtksourceview/language-specs/R.lang.h:10
-#: ../gtksourceview/language-specs/ruby.lang.h:17
+#: ../gtksourceview/language-specs/ruby.lang.h:16
#: ../gtksourceview/language-specs/sh.lang.h:11
#: ../gtksourceview/language-specs/tcl.lang.h:3
msgid "Scripts"
@@ -1016,31 +1111,29 @@ msgstr "Séquence d'échappement Unicode
msgid "Word Operators"
msgstr "Opérateurs de mots"
-#: ../gtksourceview/language-specs/latex.lang.h:2
+#: ../gtksourceview/language-specs/latex.lang.h:1
+msgid "Command"
+msgstr "Commande"
+
+#: ../gtksourceview/language-specs/latex.lang.h:3
msgid "Comment Environment"
msgstr "Environnement de commentaires"
-#: ../gtksourceview/language-specs/latex.lang.h:3
+#: ../gtksourceview/language-specs/latex.lang.h:4
#: ../gtksourceview/language-specs/texinfo.lang.h:6
msgid "Include"
msgstr "Inclusion"
-#: ../gtksourceview/language-specs/latex.lang.h:5
+#: ../gtksourceview/language-specs/latex.lang.h:6
msgid "LaTeX"
msgstr "LaTeX"
-#: ../gtksourceview/language-specs/latex.lang.h:7
+#: ../gtksourceview/language-specs/latex.lang.h:8
msgid "Math"
msgstr "Mathématiques"
-#: ../gtksourceview/language-specs/latex.lang.h:8
-msgid "Most Used Commands"
-msgstr "Commandes les plus utilisées"
-
#: ../gtksourceview/language-specs/lua.lang.h:2
#: ../gtksourceview/language-specs/makefile.lang.h:3
-#: ../gtksourceview/language-specs/python.lang.h:4
-#: ../gtksourceview/language-specs/sh.lang.h:4
msgid "Functions"
msgstr "Fonctions"
@@ -1053,7 +1146,6 @@ msgid "Lua"
msgstr "Lua"
#: ../gtksourceview/language-specs/lua.lang.h:8
-#: ../gtksourceview/language-specs/python.lang.h:10
#: ../gtksourceview/language-specs/sh.lang.h:7
msgid "Multiline String 2"
msgstr "Chaîne sur plusieurs lignes 2"
@@ -1063,7 +1155,7 @@ msgstr "Chaîne sur plusieurs lignes 2"
#: ../gtksourceview/language-specs/php.lang.h:3
#: ../gtksourceview/language-specs/sh.lang.h:1
msgid "Backtick String"
-msgstr "Chaîne backtick"
+msgstr "Chaîne entourée d'apostrophes inverse"
#: ../gtksourceview/language-specs/makefile.lang.h:2
msgid "Directives"
@@ -1116,6 +1208,25 @@ msgstr "Mots-clés définis par des macr
msgid "Nemerle"
msgstr "Nemerle"
+#: ../gtksourceview/language-specs/octave.lang.h:8
+#: ../gtksourceview/language-specs/python.lang.h:10
+msgid "Multiline Double Quoted String"
+msgstr "Chaîne mise entre guillemets (\") sur plusieurs lignes"
+
+#: ../gtksourceview/language-specs/octave.lang.h:9
+#: ../gtksourceview/language-specs/python.lang.h:11
+msgid "Multiline Single Quoted String"
+msgstr "Chaîne mise entre guillemets simples (') sur plusieurs lignes"
+
+#: ../gtksourceview/language-specs/octave.lang.h:11
+msgid "Octave"
+msgstr "Octave"
+
+#: ../gtksourceview/language-specs/octave.lang.h:12
+#: ../gtksourceview/language-specs/R.lang.h:9
+msgid "Reserved Constant"
+msgstr "Constante réservée"
+
#: ../gtksourceview/language-specs/pascal.lang.h:1
msgid "Block Comment 1"
msgstr "Commentaire sur un bloc 1"
@@ -1194,7 +1305,6 @@ msgid "String3"
msgstr "Chaîne3"
#: ../gtksourceview/language-specs/perl.lang.h:11
-#: ../gtksourceview/language-specs/tcl.lang.h:7
msgid "Variables"
msgstr "Variables"
@@ -1222,11 +1332,6 @@ msgstr "Mot-clé insensible à la casse"
msgid "Case Sensitive Keyword"
msgstr "Mot-clé sensible à la casse"
-#. "duble-quoted strings"
-#: ../gtksourceview/language-specs/php.lang.h:16
-msgid "Double Quoted String"
-msgstr "Chaîne doublement citée"
-
#. <? ?> <HTML> inside PHP <?
#: ../gtksourceview/language-specs/php.lang.h:18
msgid "First Open PHP Tag"
@@ -1240,11 +1345,6 @@ msgstr "Bloc HTML"
msgid "PHP"
msgstr "PHP"
-#. 'single-quoted strings'
-#: ../gtksourceview/language-specs/php.lang.h:23
-msgid "Single Quoted String"
-msgstr "Chaîne simplement citée"
-
#: ../gtksourceview/language-specs/po.lang.h:2
msgid "Format"
msgstr "Format"
@@ -1258,11 +1358,11 @@ msgstr "Traduction via gettext"
msgid "Builtins"
msgstr "Commande intégrées"
-#: ../gtksourceview/language-specs/python.lang.h:8
+#: ../gtksourceview/language-specs/python.lang.h:9
msgid "Module Handler"
msgstr "Handler de module"
-#: ../gtksourceview/language-specs/python.lang.h:12
+#: ../gtksourceview/language-specs/python.lang.h:13
msgid "Python"
msgstr "Python"
@@ -1282,13 +1382,9 @@ msgstr "Nombre entier"
msgid "Reserved Class"
msgstr "Classe réservée"
-#: ../gtksourceview/language-specs/R.lang.h:9
-msgid "Reserved Constant"
-msgstr "Constante réservée"
-
#: ../gtksourceview/language-specs/ruby.lang.h:1
msgid "Attribute Definitions"
-msgstr "Définition d'attribut"
+msgstr "Définitions d'attribut"
#: ../gtksourceview/language-specs/ruby.lang.h:3
msgid "Class Variables"
@@ -1302,53 +1398,61 @@ msgstr "Constantes"
msgid "Definitions"
msgstr "Définitions"
-#: ../gtksourceview/language-specs/ruby.lang.h:6
+#: ../gtksourceview/language-specs/ruby.lang.h:7
msgid "Global Variables"
msgstr "Variables globales"
-#: ../gtksourceview/language-specs/ruby.lang.h:7
+#: ../gtksourceview/language-specs/ruby.lang.h:8
msgid "Instance Variables"
msgstr "Variables d'instance"
-#: ../gtksourceview/language-specs/ruby.lang.h:10
+#: ../gtksourceview/language-specs/ruby.lang.h:11
msgid "Module Handlers"
msgstr "Gestionnaire de module"
-#: ../gtksourceview/language-specs/ruby.lang.h:11
+#: ../gtksourceview/language-specs/ruby.lang.h:12
msgid "Multiline Comment"
msgstr "Commentaire sur plusieurs lignes"
-#: ../gtksourceview/language-specs/ruby.lang.h:12
+#: ../gtksourceview/language-specs/ruby.lang.h:13
msgid "Pseudo Variables"
msgstr "Pseudo variables"
-#: ../gtksourceview/language-specs/ruby.lang.h:13
+#: ../gtksourceview/language-specs/ruby.lang.h:14
msgid "RegExp Variables"
msgstr "Variables d'expression rationnelle"
-#: ../gtksourceview/language-specs/ruby.lang.h:14
-msgid "Regular Expression"
-msgstr "Expression rationnelle"
-
#: ../gtksourceview/language-specs/ruby.lang.h:15
-msgid "Regular Expression 2"
-msgstr "Expression rationnelle 2"
-
-#: ../gtksourceview/language-specs/ruby.lang.h:16
msgid "Ruby"
msgstr "Ruby"
+#: ../gtksourceview/language-specs/ruby.lang.h:18
+msgid "Symbols"
+msgstr "Symboles"
+
+#: ../gtksourceview/language-specs/scheme.lang.h:11
+msgid "Scheme"
+msgstr "Schéma"
+
#: ../gtksourceview/language-specs/sh.lang.h:2
-msgid "Built-in Commands"
-msgstr "Fonctions intégrées"
+msgid "Built-in Command"
+msgstr "Commande intégrée"
#: ../gtksourceview/language-specs/sh.lang.h:3
-msgid "Common Commands"
-msgstr "Commandes les plus utilisées"
+msgid "Common Command"
+msgstr "Commande commune"
+
+#: ../gtksourceview/language-specs/sh.lang.h:8
+msgid "Operator"
+msgstr "Opérateur"
+
+#: ../gtksourceview/language-specs/sh.lang.h:9
+msgid "Punctuator"
+msgstr "Ponctuation"
#: ../gtksourceview/language-specs/sh.lang.h:10
-msgid "Redirections"
-msgstr "Redirections"
+msgid "Redirection"
+msgstr "Redirection"
#: ../gtksourceview/language-specs/sh.lang.h:12
msgid "Self"
@@ -1440,7 +1544,7 @@ msgstr "Fonctions de caractères NLS"
#: ../gtksourceview/language-specs/sql.lang.h:27
msgid "NULL-Related Functions"
-msgstr "Fonctions lié à NULL"
+msgstr "Fonctions liées à NULL"
#: ../gtksourceview/language-specs/sql.lang.h:28
msgid "Null"
@@ -1479,12 +1583,12 @@ msgstr "SQL"
#: ../gtksourceview/language-specs/sql.lang.h:40
msgid "SQL Statements"
-msgstr "Blocs SQL"
+msgstr "Instructions SQL"
#. SQL*Plus
#: ../gtksourceview/language-specs/sql.lang.h:42
msgid "SQL*Plus At Sign"
-msgstr "SQL*Plus At Sign"
+msgstr "Arobase SQL*Plus"
#: ../gtksourceview/language-specs/sql.lang.h:43
msgid "SQL*Plus Commands"
@@ -1492,11 +1596,11 @@ msgstr "Commandes SQL*Plus"
#: ../gtksourceview/language-specs/sql.lang.h:44
msgid "SQL*Plus Double At Sign"
-msgstr "SQL*Plus Double At Sign"
+msgstr "Double arobase SQL*Plus"
#: ../gtksourceview/language-specs/sql.lang.h:45
msgid "SQL*Plus Slash"
-msgstr "SQL*Plus Slash"
+msgstr "Slash SQL*Plus"
#: ../gtksourceview/language-specs/sql.lang.h:46
msgid "SQL/DS and DB2 Datatypes"
@@ -1504,12 +1608,12 @@ msgstr "SQL/DS et types de données DB2"
#: ../gtksourceview/language-specs/sql.lang.h:47
msgid "Size Clause"
-msgstr "Size Clause"
+msgstr "Clause de taille"
#. Literals
#: ../gtksourceview/language-specs/sql.lang.h:50
msgid "Text Literals"
-msgstr "Texte littéral"
+msgstr "Constantes de texte"
#: ../gtksourceview/language-specs/sql.lang.h:51
msgid "Unlimited"
@@ -1587,10 +1691,6 @@ msgstr "Verilog"
msgid "True and False"
msgstr "Vrai et faux"
-#: ../gtksourceview/language-specs/vhdl.lang.h:8
-msgid "Type"
-msgstr "Type"
-
#: ../gtksourceview/language-specs/vhdl.lang.h:9
msgid "VHDL"
msgstr "VHDL"
@@ -1599,10 +1699,6 @@ msgstr "VHDL"
msgid "Hexadecimal"
msgstr "Hexadécimal"
-#: ../gtksourceview/language-specs/xml.lang.h:8
-msgid "Tag"
-msgstr "Balise"
-
#: ../gtksourceview/language-specs/xml.lang.h:9
msgid "XML"
msgstr "XML"
diff -pruN 1.6.1-3/po/hu.po 1.7.1-0ubuntu2/po/hu.po
--- 1.6.1-3/po/hu.po 2006-02-26 19:09:56.000000000 +0000
+++ 1.7.1-0ubuntu2/po/hu.po 2006-07-24 16:08:59.000000000 +0100
@@ -1,22 +1,22 @@
# Hungarian translation of gtksourceview.
-# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This file is distributed under the same license as the gtksourceview package.
+#
# Andras Timar <timar gnome hu>, 2003.
# Laszlo Dvornik <dvornik gnome hu>, 2004.
-# Gabor Kelemen <kelemeng gnome hu>, 2005.
-#
+# Gabor Kelemen <kelemeng gnome hu>, 2005, 2006.
msgid ""
msgstr ""
"Project-Id-Version: gtksourceview.HEAD.hu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-26 10:15+0100\n"
-"PO-Revision-Date: 2005-09-03 16:33+0200\n"
+"POT-Creation-Date: 2006-07-10 08:00+0200\n"
+"PO-Revision-Date: 2006-07-21 19:46+0200\n"
"Last-Translator: Gabor Kelemen <kelemeng gnome hu>\n"
"Language-Team: Hungarian <gnome gnome hu>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.10.2\n"
+"X-Generator: KBabel 1.11.2\n"
"Plural-Forms: nplurals=1; plural=0;\n"
#: ../gtksourceview/gtksourcebuffer.c:278
@@ -89,7 +89,7 @@ msgid "GtkSourceBuffer object to print"
msgstr "A nyomtatandó GtkSourceBuffer objektum"
#: ../gtksourceview/gtksourceprintjob.c:280
-#: ../gtksourceview/gtksourceview.c:235 ../gtksourceview/gtksourceview.c:236
+#: ../gtksourceview/gtksourceview.c:233 ../gtksourceview/gtksourceview.c:234
msgid "Tabs Width"
msgstr "Tabulátorok szélessége"
@@ -340,59 +340,59 @@ msgstr "Tag stÃlusa"
msgid "The style associated with the source tag"
msgstr "A forrás cÃmkéhez rendelt stÃlus"
-#: ../gtksourceview/gtksourceview.c:219
+#: ../gtksourceview/gtksourceview.c:217
msgid "Show Line Numbers"
msgstr "Sorszámozás megjelenÃtése"
-#: ../gtksourceview/gtksourceview.c:220
+#: ../gtksourceview/gtksourceview.c:218
msgid "Whether to display line numbers"
msgstr "MegjelenÃtse-e a sorok számát"
-#: ../gtksourceview/gtksourceview.c:227
+#: ../gtksourceview/gtksourceview.c:225
msgid "Show Line Markers"
msgstr "Sorjelek megjelenÃtése"
-#: ../gtksourceview/gtksourceview.c:228
+#: ../gtksourceview/gtksourceview.c:226
msgid "Whether to display line marker pixbufs"
msgstr "Megjelenjenek-e a sorjelzÅ? pixbuf-ok"
-#: ../gtksourceview/gtksourceview.c:245
+#: ../gtksourceview/gtksourceview.c:243
msgid "Auto Indentation"
msgstr "Automatikus behúzás"
-#: ../gtksourceview/gtksourceview.c:246
+#: ../gtksourceview/gtksourceview.c:244
msgid "Whether to enable auto indentation"
msgstr "Engedélyezve legyen-e az automatikus behúzás"
-#: ../gtksourceview/gtksourceview.c:252
+#: ../gtksourceview/gtksourceview.c:250
msgid "Insert Spaces Instead of Tabs"
msgstr "Szóközök beillesztése tabulátorok helyett"
-#: ../gtksourceview/gtksourceview.c:253
+#: ../gtksourceview/gtksourceview.c:251
msgid "Whether to insert spaces instead of tabs"
msgstr "Tabulátorok helyett szóközöket illesszen-e be"
-#: ../gtksourceview/gtksourceview.c:260
+#: ../gtksourceview/gtksourceview.c:258
msgid "Show Right Margin"
msgstr "Jobb oldali margó megjelenÃtése"
-#: ../gtksourceview/gtksourceview.c:261
+#: ../gtksourceview/gtksourceview.c:259
msgid "Whether to display the right margin"
msgstr "MegjelenÃtse-e a jobb oldali margót"
-#: ../gtksourceview/gtksourceview.c:268
+#: ../gtksourceview/gtksourceview.c:266
msgid "Margin position"
msgstr "Margó pozÃciója"
-#: ../gtksourceview/gtksourceview.c:269
+#: ../gtksourceview/gtksourceview.c:267
msgid "Position of the right margin"
msgstr "Jobb oldali margó pozÃciója"
-#: ../gtksourceview/gtksourceview.c:278
+#: ../gtksourceview/gtksourceview.c:276
msgid "Use smart home/end"
msgstr "Okos home/end használata"
-#: ../gtksourceview/gtksourceview.c:279
+#: ../gtksourceview/gtksourceview.c:277
msgid ""
"HOME and END keys move to first/last non whitespace characters on line "
"before going to the start/end of the line"
@@ -400,51 +400,51 @@ msgstr ""
"A HOME és END billentyűk a sor elsÅ?/utolsó nem üreshely karakterére ugranak, "
"mielÅ?tt a sor elejére/végére állnának"
-#: ../gtksourceview/gtksourceview.c:288
+#: ../gtksourceview/gtksourceview.c:286
msgid "Highlight current line"
msgstr "A jelenlegi sor kiemelése"
-#: ../gtksourceview/gtksourceview.c:289
+#: ../gtksourceview/gtksourceview.c:287
msgid "Whether to highlight the current line"
msgstr "Kiemelje-e a jelenlegi sort?"
-#: ../gtksourceview/gtksourceview.c:305
+#: ../gtksourceview/gtksourceview.c:303
msgid "Margin Line Alpha"
msgstr "Margóvonal alfája"
-#: ../gtksourceview/gtksourceview.c:306
+#: ../gtksourceview/gtksourceview.c:304
msgid "Transparency of the margin line"
msgstr "A margóvonal átlátszósága"
-#: ../gtksourceview/gtksourceview.c:323
+#: ../gtksourceview/gtksourceview.c:321
msgid "Margin Line Color"
msgstr "Margóvonal szÃne"
-#: ../gtksourceview/gtksourceview.c:324
+#: ../gtksourceview/gtksourceview.c:322
msgid "Color to use for the right margin line"
msgstr "A jobb margóvonalhoz használandó szÃn "
-#: ../gtksourceview/gtksourceview.c:340
+#: ../gtksourceview/gtksourceview.c:338
msgid "Margin Overlay Toggle"
msgstr "Margó átfedés átváltása"
-#: ../gtksourceview/gtksourceview.c:341
+#: ../gtksourceview/gtksourceview.c:339
msgid "Whether to draw the right margin overlay"
msgstr "MegjelenÃtse-e a jobb oldali margó átfedését"
-#: ../gtksourceview/gtksourceview.c:357
+#: ../gtksourceview/gtksourceview.c:355
msgid "Margin Overlay Alpha"
msgstr "Margóátfedés alfája"
-#: ../gtksourceview/gtksourceview.c:358
+#: ../gtksourceview/gtksourceview.c:356
msgid "Transparency of the margin overlay"
msgstr "A margóátfedés áttetszÅ?sége"
-#: ../gtksourceview/gtksourceview.c:375
+#: ../gtksourceview/gtksourceview.c:373
msgid "Margin Overlay Color"
msgstr "A margóátfedés szÃne"
-#: ../gtksourceview/gtksourceview.c:376
+#: ../gtksourceview/gtksourceview.c:374
msgid "Color to use for drawing the margin overlay"
msgstr "A margóátfedés rajzolásakor használandó szÃn"
@@ -535,7 +535,7 @@ msgstr "ElÅ?feldolgozó kulcsszava"
#: ../gtksourceview/language-specs/verilog.lang.h:9
#: ../gtksourceview/language-specs/vhdl.lang.h:5
msgid "Sources"
-msgstr "Források"
+msgstr "Forráskód"
#: ../gtksourceview/language-specs/ada.lang.h:10
msgid "True And False"
@@ -895,7 +895,7 @@ msgstr "HTML"
#: ../gtksourceview/language-specs/texinfo.lang.h:12
#: ../gtksourceview/language-specs/xml.lang.h:6
msgid "Markup"
-msgstr "Jelölés"
+msgstr "LeÃrónyelv"
#: ../gtksourceview/language-specs/html.lang.h:9
#: ../gtksourceview/language-specs/xml.lang.h:8
@@ -1651,11 +1651,11 @@ msgstr "Makrók"
#: ../gtksourceview/language-specs/texinfo.lang.h:13
msgid "Markup (block)"
-msgstr "Jelölés (blokk)"
+msgstr "LeÃrónyelv (blokk)"
#: ../gtksourceview/language-specs/texinfo.lang.h:14
msgid "Markup (inline)"
-msgstr "Jelölés (beágyazott)"
+msgstr "LeÃrónyelv (beágyazott)"
#: ../gtksourceview/language-specs/texinfo.lang.h:15
msgid "Sectioning"
diff -pruN 1.6.1-3/po/id.po 1.7.1-0ubuntu2/po/id.po
--- 1.6.1-3/po/id.po 2005-07-29 10:22:20.000000000 +0100
+++ 1.7.1-0ubuntu2/po/id.po 2006-06-20 22:12:48.000000000 +0100
@@ -1,6 +1,6 @@
# Indonesia translation of gtksourceview.
-# Copyright (C) 2004 THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# Copyright (C) 2004 THE gtksourceview'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the gtksourceview package.
# Ahmad Riza H Nst <ari 160c afraid org>, 2004.
#
#
@@ -8,437 +8,493 @@ msgid ""
msgstr ""
"Project-Id-Version: gtksourceview HEAD\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-29 16:02+0700\n"
-"PO-Revision-Date: 2005-07-27 15:01+0700\n"
+"POT-Creation-Date: 2006-06-15 05:40+0200\n"
+"PO-Revision-Date: 2006-06-15 13:25+0700\n"
"Last-Translator: Imam Musthaqim <musthaqim telkom net>\n"
-"Language-Team: Indonesia <sukarelawan gnome linux or id>\n"
+"Language-Team: Indonesia <kontak id gnome org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: 8bit"
-#: gtksourceview/gtksourcebuffer.c:279
+#: ../gtksourceview/gtksourcebuffer.c:278
msgid "Escape Character"
msgstr "Karakter Escape"
-#: gtksourceview/gtksourcebuffer.c:280
+#: ../gtksourceview/gtksourcebuffer.c:279
msgid "Escaping character for syntax patterns"
msgstr "Karakter Escape untuk pola sintaks"
-#: gtksourceview/gtksourcebuffer.c:288
+#: ../gtksourceview/gtksourcebuffer.c:287
msgid "Check Brackets"
msgstr "Kurung Cek"
-#: gtksourceview/gtksourcebuffer.c:289
+#: ../gtksourceview/gtksourcebuffer.c:288
msgid "Whether to check and highlight matching brackets"
msgstr "Apakah mengecek dan menandai kurung yang cocok"
-#: gtksourceview/gtksourcebuffer.c:297 gtksourceview/gtksourceprintjob.c:295
+#: ../gtksourceview/gtksourcebuffer.c:296
+#: ../gtksourceview/gtksourceprintjob.c:296
msgid "Highlight"
msgstr "Sorot"
-#: gtksourceview/gtksourcebuffer.c:298
+#: ../gtksourceview/gtksourcebuffer.c:297
msgid "Whether to highlight syntax in the buffer"
msgstr "Apakah menandai sintaks dalam buffer"
-#: gtksourceview/gtksourcebuffer.c:306
+#: ../gtksourceview/gtksourcebuffer.c:305
msgid "Maximum Undo Levels"
msgstr "Tingkatan Undo Maksimum"
-#: gtksourceview/gtksourcebuffer.c:307
+#: ../gtksourceview/gtksourcebuffer.c:306
msgid "Number of undo levels for the buffer"
msgstr "Jumlah tingkatan undo untuk buffer"
-#: gtksourceview/gtksourcebuffer.c:317
-#: gtksourceview/language-specs/desktop.lang.h:6
-#: gtksourceview/language-specs/ini.lang.h:7
+#: ../gtksourceview/gtksourcebuffer.c:316
+#: ../gtksourceview/language-specs/desktop.lang.h:6
+#: ../gtksourceview/language-specs/ini.lang.h:7
msgid "Language"
msgstr "Bahasa"
-#: gtksourceview/gtksourcebuffer.c:318
+#: ../gtksourceview/gtksourcebuffer.c:317
msgid "Language object to get highlighting patterns from"
msgstr "Bahasa obyek untuk mengambil pola penandaan"
-#: gtksourceview/gtksourcelanguagesmanager.c:119
+#: ../gtksourceview/gtksourcelanguagesmanager.c:114
msgid "Language specification directories"
msgstr "Direktori spesifikasi bahasa"
-#: gtksourceview/gtksourcelanguagesmanager.c:120
+#: ../gtksourceview/gtksourcelanguagesmanager.c:115
msgid ""
"List of directories where the language specification files (.lang) are "
"located"
msgstr "Daftar direktori tempat lokasi file spesifikasi bahasa (.lang)"
-#: gtksourceview/gtksourceprintjob.c:264
+#: ../gtksourceview/gtksourceprintjob.c:265
msgid "Configuration"
msgstr "Konfigurasi"
-#: gtksourceview/gtksourceprintjob.c:265
+#: ../gtksourceview/gtksourceprintjob.c:266
msgid "Configuration options for the print job"
msgstr "Pilihan konfigurasi untuk tugas cetak"
-#: gtksourceview/gtksourceprintjob.c:272
+#: ../gtksourceview/gtksourceprintjob.c:273
msgid "Source Buffer"
msgstr "Buffer Sumber"
-#: gtksourceview/gtksourceprintjob.c:273
+#: ../gtksourceview/gtksourceprintjob.c:274
msgid "GtkSourceBuffer object to print"
msgstr "Obyek GtkSourceBuffer untuk di cetak"
-#: gtksourceview/gtksourceprintjob.c:279 gtksourceview/gtksourceview.c:221
-#: gtksourceview/gtksourceview.c:222
+#: ../gtksourceview/gtksourceprintjob.c:280
+#: ../gtksourceview/gtksourceview.c:233 ../gtksourceview/gtksourceview.c:234
msgid "Tabs Width"
msgstr "Lebar tab"
-#: gtksourceview/gtksourceprintjob.c:280
+#: ../gtksourceview/gtksourceprintjob.c:281
msgid "Width in equivalent space characters of tabs"
msgstr "Lebar tab dalam ruang karakter yang sama"
-#: gtksourceview/gtksourceprintjob.c:287
+#: ../gtksourceview/gtksourceprintjob.c:288
msgid "Wrap Mode"
msgstr "Mode Gulung"
-#: gtksourceview/gtksourceprintjob.c:288
+#: ../gtksourceview/gtksourceprintjob.c:289
msgid "Word wrapping mode"
msgstr "Moda penggulungan kata"
-#: gtksourceview/gtksourceprintjob.c:296
+#: ../gtksourceview/gtksourceprintjob.c:297
msgid "Whether to print the document with highlighted syntax"
msgstr "Apakah mencetak dokumen dengan sintaks yang ditandai"
-#: gtksourceview/gtksourceprintjob.c:304
+#: ../gtksourceview/gtksourceprintjob.c:305
msgid "Font"
msgstr "Huruf"
-#: gtksourceview/gtksourceprintjob.c:305
+#: ../gtksourceview/gtksourceprintjob.c:306
msgid "GnomeFont name to use for the document text (deprecated)"
msgstr "Nama GnomeFont yang digunakan untuk teks dokumen"
-#: gtksourceview/gtksourceprintjob.c:312
+#: ../gtksourceview/gtksourceprintjob.c:313
msgid "Font Description"
msgstr "Keterangan Font"
-#: gtksourceview/gtksourceprintjob.c:313
+#: ../gtksourceview/gtksourceprintjob.c:314
msgid "Font to use for the document text (e.g. \"Monospace 10\")"
msgstr "Huruf yang digunakan untuk teks dokumen (misalnya, \"Monospace 10\")"
-#: gtksourceview/gtksourceprintjob.c:320 gtksourceview/gtksourceprintjob.c:328
+#: ../gtksourceview/gtksourceprintjob.c:321
+#: ../gtksourceview/gtksourceprintjob.c:329
msgid "Numbers Font"
msgstr "Jumlah Huruf"
-#: gtksourceview/gtksourceprintjob.c:321
+#: ../gtksourceview/gtksourceprintjob.c:322
msgid "GnomeFont name to use for the line numbers (deprecated)"
msgstr "Nama GnomeFont yang digunakan untuk nomor baris"
-#: gtksourceview/gtksourceprintjob.c:329
+#: ../gtksourceview/gtksourceprintjob.c:330
msgid "Font description to use for the line numbers"
msgstr "Keterangan huruf yang digunakan untuk nomor baris"
-#: gtksourceview/gtksourceprintjob.c:336
+#: ../gtksourceview/gtksourceprintjob.c:337
msgid "Print Line Numbers"
msgstr "Cetak Nomor Baris"
-#: gtksourceview/gtksourceprintjob.c:337
+#: ../gtksourceview/gtksourceprintjob.c:338
msgid "Interval of printed line numbers (0 means no numbers)"
msgstr "Jarak nomor baris yang dicetak (0 berarti tidak bernomor)"
-#: gtksourceview/gtksourceprintjob.c:344
+#: ../gtksourceview/gtksourceprintjob.c:345
msgid "Print Header"
msgstr "Cetak Header"
-#: gtksourceview/gtksourceprintjob.c:345
+#: ../gtksourceview/gtksourceprintjob.c:346
msgid "Whether to print a header in each page"
msgstr "Apakah mencetak header di setiap halaman"
-#: gtksourceview/gtksourceprintjob.c:352
+#: ../gtksourceview/gtksourceprintjob.c:353
msgid "Print Footer"
msgstr "Cetak Footer"
-#: gtksourceview/gtksourceprintjob.c:353
+#: ../gtksourceview/gtksourceprintjob.c:354
msgid "Whether to print a footer in each page"
msgstr "Apakah mencetak footer pada setiap halaman"
-#: gtksourceview/gtksourceprintjob.c:360
+#: ../gtksourceview/gtksourceprintjob.c:361
msgid "Header and Footer Font"
msgstr "Huruf Header dan Footer"
-#: gtksourceview/gtksourceprintjob.c:361
+#: ../gtksourceview/gtksourceprintjob.c:362
msgid "GnomeFont name to use for the header and footer (deprecated)"
msgstr "Nama GnomeFont yang digunakan untuk header dan footer"
-#: gtksourceview/gtksourceprintjob.c:368
+#: ../gtksourceview/gtksourceprintjob.c:369
msgid "Header and Footer Font Description"
msgstr "Keterangan Huruf Header dan Footer"
-#: gtksourceview/gtksourceprintjob.c:369
+#: ../gtksourceview/gtksourceprintjob.c:370
msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
msgstr ""
"Huruf yang digunakan untuk header dan footer (misalnya, \"Monospace 10\")"
-#: gtksourceview/gtksourcestylescheme.c:262
+#: ../gtksourceview/gtksourcestylescheme.c:264
msgid "Base-N Integer"
msgstr "Integer berbasis-N"
-#: gtksourceview/gtksourcestylescheme.c:267
+#: ../gtksourceview/gtksourcestylescheme.c:269
msgid "Character"
msgstr "Karakter"
-#: gtksourceview/gtksourcestylescheme.c:272
-#: gtksourceview/language-specs/latex.lang.h:1
-#: gtksourceview/language-specs/po.lang.h:1
+#: ../gtksourceview/gtksourcestylescheme.c:274
+#: ../gtksourceview/language-specs/latex.lang.h:2
+#: ../gtksourceview/language-specs/po.lang.h:1
msgid "Comment"
msgstr "Komentar"
#. $this = (datatype)
-#: gtksourceview/gtksourcestylescheme.c:277
-#: gtksourceview/language-specs/php.lang.h:14
+#: ../gtksourceview/gtksourcestylescheme.c:279
+#: ../gtksourceview/language-specs/php.lang.h:14
msgid "Data Type"
msgstr "Tipe Data"
#.
#. CSS functions, such as rgb(), clip(), or lang().
#.
-#: gtksourceview/gtksourcestylescheme.c:282
-#: gtksourceview/language-specs/ada.lang.h:3
-#: gtksourceview/language-specs/css.lang.h:17
+#: ../gtksourceview/gtksourcestylescheme.c:284
+#: ../gtksourceview/language-specs/ada.lang.h:3
+#: ../gtksourceview/language-specs/css.lang.h:18
+#: ../gtksourceview/language-specs/octave.lang.h:4
+#: ../gtksourceview/language-specs/python.lang.h:5
+#: ../gtksourceview/language-specs/scheme.lang.h:2
+#: ../gtksourceview/language-specs/sh.lang.h:4
msgid "Function"
msgstr "Fungsi"
-#: gtksourceview/gtksourcestylescheme.c:287
-#: gtksourceview/language-specs/c.lang.h:6
-#: gtksourceview/language-specs/cpp.lang.h:6
-#: gtksourceview/language-specs/fortran.lang.h:1
-#: gtksourceview/language-specs/python.lang.h:2
-#: gtksourceview/language-specs/haskell.lang.h:3
-#: gtksourceview/language-specs/nemerle.lang.h:6
+#: ../gtksourceview/gtksourcestylescheme.c:289
+#: ../gtksourceview/language-specs/c.lang.h:6
+#: ../gtksourceview/language-specs/cpp.lang.h:6
+#: ../gtksourceview/language-specs/fortran.lang.h:1
+#: ../gtksourceview/language-specs/haskell.lang.h:3
+#: ../gtksourceview/language-specs/nemerle.lang.h:6
+#: ../gtksourceview/language-specs/octave.lang.h:1
+#: ../gtksourceview/language-specs/python.lang.h:2
msgid "Decimal"
msgstr "Desimal"
-#: gtksourceview/gtksourcestylescheme.c:292
+#: ../gtksourceview/gtksourcestylescheme.c:294
msgid "Floating Point"
msgstr "Titik Ambang"
-#: gtksourceview/gtksourcestylescheme.c:297
-#: gtksourceview/language-specs/latex.lang.h:3
-#: gtksourceview/language-specs/po.lang.h:3
-#: gtksourceview/language-specs/texinfo.lang.h:8
-#: gtksourceview/language-specs/vhdl.lang.h:2
-#: gtksourceview/language-specs/R.lang.h:6
-#: gtksourceview/language-specs/gtkrc.lang.h:6
+#. We cannot match \b at the end of a keyword automatically
+#. because it fails for let* etc. So we need to manually add it to the
+#. other keywords and match ([ \t]|$) for the one ending with a
+#. special character. Unfortnately this also means that if the highlight
+#. style for keywords sets the background color, for let* etc also the
+#. trailing space will be highlighted.
+#: ../gtksourceview/gtksourcestylescheme.c:299
+#: ../gtksourceview/language-specs/ada.lang.h:4
+#: ../gtksourceview/language-specs/gtkrc.lang.h:6
+#: ../gtksourceview/language-specs/haskell.lang.h:9
+#: ../gtksourceview/language-specs/latex.lang.h:5
+#: ../gtksourceview/language-specs/octave.lang.h:6
+#: ../gtksourceview/language-specs/po.lang.h:3
+#: ../gtksourceview/language-specs/python.lang.h:7
+#: ../gtksourceview/language-specs/R.lang.h:6
+#: ../gtksourceview/language-specs/scheme.lang.h:9
+#: ../gtksourceview/language-specs/tcl.lang.h:1
+#: ../gtksourceview/language-specs/texinfo.lang.h:8
+#: ../gtksourceview/language-specs/vhdl.lang.h:2
msgid "Keyword"
msgstr "Kata-kunci"
-#: gtksourceview/gtksourcestylescheme.c:302
+#: ../gtksourceview/gtksourcestylescheme.c:304
msgid "Preprocessor"
msgstr "Preprosesor"
-#: gtksourceview/gtksourcestylescheme.c:307
-#: gtksourceview/language-specs/ada.lang.h:9
-#: gtksourceview/language-specs/c.lang.h:15
-#: gtksourceview/language-specs/cpp.lang.h:15
-#: gtksourceview/language-specs/csharp.lang.h:8
-#: gtksourceview/language-specs/css.lang.h:63
-#: gtksourceview/language-specs/html.lang.h:8
-#: gtksourceview/language-specs/fortran.lang.h:12
-#: gtksourceview/language-specs/idl.lang.h:9
-#: gtksourceview/language-specs/java.lang.h:11
-#: gtksourceview/language-specs/javascript.lang.h:33
-#: gtksourceview/language-specs/lua.lang.h:10
-#: gtksourceview/language-specs/pascal.lang.h:18
-#: gtksourceview/language-specs/perl.lang.h:8
-#: gtksourceview/language-specs/po.lang.h:6
-#: gtksourceview/language-specs/python.lang.h:14
-#: gtksourceview/language-specs/ruby.lang.h:18
-#: gtksourceview/language-specs/sh.lang.h:13
-#: gtksourceview/language-specs/xml.lang.h:7
-#: gtksourceview/language-specs/haskell.lang.h:15
-#: gtksourceview/language-specs/vbnet.lang.h:7
-#: gtksourceview/language-specs/nemerle.lang.h:15
-#: gtksourceview/language-specs/tcl.lang.h:4
-#: gtksourceview/language-specs/vhdl.lang.h:6
+#.
+#. <pattern-item _name = "Operator" style = "Operators">
+#. <regex>[:!#$%&*+./>=<? \\^|~\-]+</regex>
+#. </pattern-item>
+#.
+#. <keyword-list _name="Keysymbol" style = "Keyword">
+#. <keyword>::</keyword>
+#. <keyword>-></keyword>
+#. <keyword><-</keyword>
+#. <keyword>=></keyword>
+#. <keyword>=</keyword>
+#. <keyword>|</keyword>`
+#. <keyword>\</keyword>
+#. <keyword>@</keyword>
+#. <keyword>~</keyword>
+#. </keyword-list>
+#.
+#: ../gtksourceview/gtksourcestylescheme.c:309
+#: ../gtksourceview/language-specs/ada.lang.h:9
+#: ../gtksourceview/language-specs/c.lang.h:15
+#: ../gtksourceview/language-specs/cpp.lang.h:15
+#: ../gtksourceview/language-specs/csharp.lang.h:9
+#: ../gtksourceview/language-specs/css.lang.h:58
+#: ../gtksourceview/language-specs/html.lang.h:8
+#: ../gtksourceview/language-specs/fortran.lang.h:13
+#: ../gtksourceview/language-specs/haskell.lang.h:31
+#: ../gtksourceview/language-specs/idl.lang.h:9
+#: ../gtksourceview/language-specs/java.lang.h:11
+#: ../gtksourceview/language-specs/javascript.lang.h:23
+#: ../gtksourceview/language-specs/lua.lang.h:10
+#: ../gtksourceview/language-specs/makefile.lang.h:8
+#: ../gtksourceview/language-specs/nemerle.lang.h:15
+#: ../gtksourceview/language-specs/pascal.lang.h:18
+#: ../gtksourceview/language-specs/perl.lang.h:8
+#: ../gtksourceview/language-specs/po.lang.h:6
+#: ../gtksourceview/language-specs/scheme.lang.h:13
+#: ../gtksourceview/language-specs/sh.lang.h:13
+#: ../gtksourceview/language-specs/tcl.lang.h:4
+#: ../gtksourceview/language-specs/vbnet.lang.h:11
+#: ../gtksourceview/language-specs/vhdl.lang.h:6
+#: ../gtksourceview/language-specs/xml.lang.h:7
msgid "String"
msgstr "String"
-#: gtksourceview/gtksourcestylescheme.c:312
+#: ../gtksourceview/gtksourcestylescheme.c:314
msgid "Specials"
msgstr "Spesial"
-#.
-#. Proposed language specification for CSS (Cascading Style Sheet) files.
-#.
-#. Reference used:
-#. http://www.w3.org/TR/CSS2/
-#.
-#. Tested with:
-#. http://www.simplebits.com/css/simple.css
-#.
-#. Submitted by Scott Martin (scott coffeeblack org)
-#.
-#: gtksourceview/gtksourcestylescheme.c:319
-#: gtksourceview/language-specs/css.lang.h:46
-#: gtksourceview/language-specs/desktop.lang.h:10
-#: gtksourceview/language-specs/diff.lang.h:7
-#: gtksourceview/language-specs/ini.lang.h:10
-#: gtksourceview/language-specs/msil.lang.h:2
-#: gtksourceview/language-specs/po.lang.h:5
-#: gtksourceview/language-specs/gtkrc.lang.h:9
+#: ../gtksourceview/gtksourcestylescheme.c:321
+#: ../gtksourceview/language-specs/changelog.lang.h:6
+#: ../gtksourceview/language-specs/css.lang.h:36
+#: ../gtksourceview/language-specs/desktop.lang.h:10
+#: ../gtksourceview/language-specs/diff.lang.h:7
+#: ../gtksourceview/language-specs/gtkrc.lang.h:9
+#: ../gtksourceview/language-specs/ini.lang.h:10
+#: ../gtksourceview/language-specs/msil.lang.h:2
+#: ../gtksourceview/language-specs/po.lang.h:5
msgid "Others"
msgstr "Lainnya"
-#: gtksourceview/gtksourcestylescheme.c:324
+#: ../gtksourceview/gtksourcestylescheme.c:326
msgid "Others 2"
msgstr "Lainnya 2"
-#: gtksourceview/gtksourcestylescheme.c:329
+#: ../gtksourceview/gtksourcestylescheme.c:331
msgid "Others 3"
msgstr "Lainnya 3"
-#: gtksourceview/gtksourcestylescheme.c:366
+#: ../gtksourceview/gtksourcestylescheme.c:368
msgid "Default"
msgstr "Default"
-#: gtksourceview/gtksourcetag.c:108
+#: ../gtksourceview/gtksourcetag.c:109
msgid "Tag ID"
msgstr "Tag ID"
-#: gtksourceview/gtksourcetag.c:109
+#: ../gtksourceview/gtksourcetag.c:110
msgid "ID used to refer to the source tag"
msgstr "ID yang digunakan untuk mengacu ke tag sumber"
-#: gtksourceview/gtksourcetag.c:116
+#: ../gtksourceview/gtksourcetag.c:117
msgid "Tag style"
msgstr "Gaya tag"
-#: gtksourceview/gtksourcetag.c:117
-msgid "The style associated to the source tag"
+#: ../gtksourceview/gtksourcetag.c:118
+msgid "The style associated with the source tag"
msgstr "Gaya yang dihubungkan ke tag sumber"
-#: gtksourceview/gtksourceview.c:205
+#: ../gtksourceview/gtksourceview.c:217
msgid "Show Line Numbers"
msgstr "Tampilkan Nomor Baris"
-#: gtksourceview/gtksourceview.c:206
+#: ../gtksourceview/gtksourceview.c:218
msgid "Whether to display line numbers"
msgstr "Apakah menunjukkan nomor baris"
-#: gtksourceview/gtksourceview.c:213
+#: ../gtksourceview/gtksourceview.c:225
msgid "Show Line Markers"
msgstr "Tampilkan Tanda Baris"
-#: gtksourceview/gtksourceview.c:214
+#: ../gtksourceview/gtksourceview.c:226
msgid "Whether to display line marker pixbufs"
msgstr "Apakah menampilkan tanda baris pixbufs"
-#: gtksourceview/gtksourceview.c:231
+#: ../gtksourceview/gtksourceview.c:243
msgid "Auto Indentation"
msgstr "Indentasi otomatis"
-#: gtksourceview/gtksourceview.c:232
+#: ../gtksourceview/gtksourceview.c:244
msgid "Whether to enable auto indentation"
msgstr "Apakah mengaktifkan indentasi otomatis"
-#: gtksourceview/gtksourceview.c:238
+#: ../gtksourceview/gtksourceview.c:250
msgid "Insert Spaces Instead of Tabs"
msgstr "Sisipkan Spasi Sebagai Ganti Tab"
-#: gtksourceview/gtksourceview.c:239
+#: ../gtksourceview/gtksourceview.c:251
msgid "Whether to insert spaces instead of tabs"
msgstr "Apakah menyisipkan spasi sebagai ganti tab"
-#: gtksourceview/gtksourceview.c:246
+#: ../gtksourceview/gtksourceview.c:258
msgid "Show Right Margin"
msgstr "Tampilkan Batas Kanan"
-#: gtksourceview/gtksourceview.c:247
+#: ../gtksourceview/gtksourceview.c:259
msgid "Whether to display the right margin"
msgstr "Apakah menampilkan batas kanan"
-#: gtksourceview/gtksourceview.c:254
+#: ../gtksourceview/gtksourceview.c:266
msgid "Margin position"
msgstr "Posisi batas"
-#: gtksourceview/gtksourceview.c:255
+#: ../gtksourceview/gtksourceview.c:267
msgid "Position of the right margin"
msgstr "Posisi batas kanan"
-#: gtksourceview/gtksourceview.c:264
+#: ../gtksourceview/gtksourceview.c:276
msgid "Use smart home/end"
msgstr "Gunakan home/end cerdas"
-#: gtksourceview/gtksourceview.c:265
+#: ../gtksourceview/gtksourceview.c:277
msgid ""
-"HOME and END keys move to first/last characters on line first before going "
-"to the start/end of the line"
+"HOME and END keys move to first/last non whitespace characters on line "
+"before going to the start/end of the line"
msgstr ""
-"Tombol HOME dan END memindahkan ke karakter pertama/terakhir pada baris "
-"pertama sebelum menuju ke awal/akhir baris"
+"Tombol HOME dan END memindahkan karakter bukan spasi pertama/akhir pada "
+"garis sebelum pergi ke baris awal/akhir."
-#: gtksourceview/gtksourceview.c:274
+#: ../gtksourceview/gtksourceview.c:286
msgid "Highlight current line"
msgstr "Sorot baris yang ada"
-#: gtksourceview/gtksourceview.c:275
+#: ../gtksourceview/gtksourceview.c:287
msgid "Whether to highlight the current line"
msgstr "Apakah menandai baris yang ada"
-#: gtksourceview/language-specs/ada.lang.h:1
+#: ../gtksourceview/gtksourceview.c:303
+msgid "Margin Line Alpha"
+msgstr "Batas Garos Alpha"
+
+#: ../gtksourceview/gtksourceview.c:304
+msgid "Transparency of the margin line"
+msgstr "Transparansi garis batas"
+
+#: ../gtksourceview/gtksourceview.c:321
+msgid "Margin Line Color"
+msgstr "Warna Garis Batas"
+
+#: ../gtksourceview/gtksourceview.c:322
+msgid "Color to use for the right margin line"
+msgstr "Warna garis batas kanan"
+
+#: ../gtksourceview/gtksourceview.c:338
+msgid "Margin Overlay Toggle"
+msgstr "Ganti Lapisan Batas"
+
+#: ../gtksourceview/gtksourceview.c:339
+msgid "Whether to draw the right margin overlay"
+msgstr "Apakah menampilkan lapisan batas kanan"
+
+#: ../gtksourceview/gtksourceview.c:355
+msgid "Margin Overlay Alpha"
+msgstr "Batas Lapisan Alpha"
+
+#: ../gtksourceview/gtksourceview.c:356
+msgid "Transparency of the margin overlay"
+msgstr "Transparansi lapisan batas"
+
+#: ../gtksourceview/gtksourceview.c:373
+msgid "Margin Overlay Color"
+msgstr "Warna Lapisan Batas"
+
+#: ../gtksourceview/gtksourceview.c:374
+msgid "Color to use for drawing the margin overlay"
+msgstr "Warna yang digunakan untuk menggambar lapisan batas"
+
+#: ../gtksourceview/language-specs/ada.lang.h:1
msgid "Ada"
msgstr "Ada"
-#: gtksourceview/language-specs/ada.lang.h:2
-#: gtksourceview/language-specs/c.lang.h:4
-#: gtksourceview/language-specs/cpp.lang.h:4
-#: gtksourceview/language-specs/haskell.lang.h:2
-#: gtksourceview/language-specs/nemerle.lang.h:3
-#: gtksourceview/language-specs/vhdl.lang.h:1
+#: ../gtksourceview/language-specs/ada.lang.h:2
+#: ../gtksourceview/language-specs/c.lang.h:4
+#: ../gtksourceview/language-specs/cpp.lang.h:4
+#: ../gtksourceview/language-specs/haskell.lang.h:2
+#: ../gtksourceview/language-specs/nemerle.lang.h:3
+#: ../gtksourceview/language-specs/vhdl.lang.h:1
msgid "Character Constant"
msgstr "Konstanta Karakter"
-#: gtksourceview/language-specs/ada.lang.h:4
-#: gtksourceview/language-specs/c.lang.h:10
-#: gtksourceview/language-specs/cpp.lang.h:10
-#: gtksourceview/language-specs/csharp.lang.h:3
-#: gtksourceview/language-specs/fortran.lang.h:7
-#: gtksourceview/language-specs/idl.lang.h:4
-#: gtksourceview/language-specs/javascript.lang.h:11
-#: gtksourceview/language-specs/lua.lang.h:3
-#: gtksourceview/language-specs/perl.lang.h:2
-#: gtksourceview/language-specs/python.lang.h:6
-#: gtksourceview/language-specs/ruby.lang.h:8
-#: gtksourceview/language-specs/verilog.lang.h:6
-#: gtksourceview/language-specs/haskell.lang.h:9
-#: gtksourceview/language-specs/vbnet.lang.h:1
-#: gtksourceview/language-specs/tcl.lang.h:1
-msgid "Keywords"
-msgstr "Kata-kunci"
-
-#: gtksourceview/language-specs/ada.lang.h:5
-#: gtksourceview/language-specs/c.lang.h:11
-#: gtksourceview/language-specs/cpp.lang.h:11
-#: gtksourceview/language-specs/csharp.lang.h:4
-#: gtksourceview/language-specs/css.lang.h:28
-#: gtksourceview/language-specs/desktop.lang.h:7
-#: gtksourceview/language-specs/diff.lang.h:5
-#: gtksourceview/language-specs/fortran.lang.h:8
-#: gtksourceview/language-specs/idl.lang.h:5
-#: gtksourceview/language-specs/ini.lang.h:8
-#: gtksourceview/language-specs/java.lang.h:5
-#: gtksourceview/language-specs/javascript.lang.h:12
-#: gtksourceview/language-specs/lua.lang.h:4
-#: gtksourceview/language-specs/pascal.lang.h:11
-#: gtksourceview/language-specs/perl.lang.h:3
-#: gtksourceview/language-specs/python.lang.h:7
-#: gtksourceview/language-specs/ruby.lang.h:9
-#: gtksourceview/language-specs/sh.lang.h:5
-#: gtksourceview/language-specs/sql.lang.h:11
-#: gtksourceview/language-specs/verilog.lang.h:7
-#: gtksourceview/language-specs/haskell.lang.h:10
-#: gtksourceview/language-specs/texinfo.lang.h:9
-#: gtksourceview/language-specs/vbnet.lang.h:2
-#: gtksourceview/language-specs/nemerle.lang.h:10
-#: gtksourceview/language-specs/tcl.lang.h:2
-#: gtksourceview/language-specs/vhdl.lang.h:3
-#: gtksourceview/language-specs/R.lang.h:7
-#: gtksourceview/language-specs/gtkrc.lang.h:7
+#. Note: contains an hack to avoid considering ^COMMON a comment
+#. <string _name = "String 2" style = "String" end-at-line-end = "TRUE">
+#. <start-regex>'</start-regex>
+#. <end-regex>'</end-regex>
+#. </string>
+#: ../gtksourceview/language-specs/ada.lang.h:5
+#: ../gtksourceview/language-specs/c.lang.h:11
+#: ../gtksourceview/language-specs/cpp.lang.h:11
+#: ../gtksourceview/language-specs/csharp.lang.h:4
+#: ../gtksourceview/language-specs/css.lang.h:29
+#: ../gtksourceview/language-specs/desktop.lang.h:7
+#: ../gtksourceview/language-specs/diff.lang.h:5
+#: ../gtksourceview/language-specs/fortran.lang.h:9
+#: ../gtksourceview/language-specs/gtkrc.lang.h:7
+#: ../gtksourceview/language-specs/haskell.lang.h:10
+#: ../gtksourceview/language-specs/idl.lang.h:5
+#: ../gtksourceview/language-specs/ini.lang.h:8
+#: ../gtksourceview/language-specs/java.lang.h:5
+#: ../gtksourceview/language-specs/javascript.lang.h:13
+#: ../gtksourceview/language-specs/lua.lang.h:4
+#: ../gtksourceview/language-specs/makefile.lang.h:4
+#: ../gtksourceview/language-specs/nemerle.lang.h:10
+#: ../gtksourceview/language-specs/octave.lang.h:7
+#: ../gtksourceview/language-specs/pascal.lang.h:11
+#: ../gtksourceview/language-specs/perl.lang.h:3
+#: ../gtksourceview/language-specs/python.lang.h:8
+#: ../gtksourceview/language-specs/R.lang.h:7
+#: ../gtksourceview/language-specs/ruby.lang.h:10
+#: ../gtksourceview/language-specs/scheme.lang.h:10
+#: ../gtksourceview/language-specs/sh.lang.h:5
+#: ../gtksourceview/language-specs/sql.lang.h:23
+#: ../gtksourceview/language-specs/tcl.lang.h:2
+#: ../gtksourceview/language-specs/texinfo.lang.h:9
+#: ../gtksourceview/language-specs/vbnet.lang.h:6
+#: ../gtksourceview/language-specs/verilog.lang.h:7
+#: ../gtksourceview/language-specs/vhdl.lang.h:3
msgid "Line Comment"
msgstr "Komentar Baris"
@@ -446,176 +502,226 @@ msgstr "Komentar Baris"
#. For values like: z-index: 2;
#. +/- before 0 is not allowed.
#.
-#: gtksourceview/language-specs/ada.lang.h:6
-#: gtksourceview/language-specs/css.lang.h:33
-#: gtksourceview/language-specs/desktop.lang.h:9
-#: gtksourceview/language-specs/javascript.lang.h:15
-#: gtksourceview/language-specs/pascal.lang.h:14
-#: gtksourceview/language-specs/vhdl.lang.h:4
-#: gtksourceview/language-specs/gtkrc.lang.h:8
+#: ../gtksourceview/language-specs/ada.lang.h:6
+#: ../gtksourceview/language-specs/css.lang.h:34
+#: ../gtksourceview/language-specs/desktop.lang.h:9
+#: ../gtksourceview/language-specs/gtkrc.lang.h:8
+#: ../gtksourceview/language-specs/javascript.lang.h:16
+#: ../gtksourceview/language-specs/pascal.lang.h:14
+#: ../gtksourceview/language-specs/vhdl.lang.h:4
msgid "Number"
msgstr "Nomor"
-#: gtksourceview/language-specs/ada.lang.h:7
-msgid "Preprocessor Keywords"
-msgstr "Kata-kunci preprosesor"
-
-#: gtksourceview/language-specs/ada.lang.h:8
-#: gtksourceview/language-specs/c.lang.h:14
-#: gtksourceview/language-specs/cpp.lang.h:14
-#: gtksourceview/language-specs/csharp.lang.h:7
-#: gtksourceview/language-specs/fortran.lang.h:11
-#: gtksourceview/language-specs/idl.lang.h:8
-#: gtksourceview/language-specs/java.lang.h:10
-#: gtksourceview/language-specs/pascal.lang.h:17
-#: gtksourceview/language-specs/php.lang.h:23
-#: gtksourceview/language-specs/sql.lang.h:26
-#: gtksourceview/language-specs/verilog.lang.h:9
-#: gtksourceview/language-specs/haskell.lang.h:14
-#: gtksourceview/language-specs/vbnet.lang.h:6
-#: gtksourceview/language-specs/nemerle.lang.h:14
-#: gtksourceview/language-specs/vhdl.lang.h:5
+#: ../gtksourceview/language-specs/ada.lang.h:7
+msgid "Preprocessor Keyword"
+msgstr "Kata kunci Preprosesor"
+
+#: ../gtksourceview/language-specs/ada.lang.h:8
+#: ../gtksourceview/language-specs/c.lang.h:14
+#: ../gtksourceview/language-specs/cpp.lang.h:14
+#: ../gtksourceview/language-specs/csharp.lang.h:8
+#: ../gtksourceview/language-specs/fortran.lang.h:12
+#: ../gtksourceview/language-specs/haskell.lang.h:13
+#: ../gtksourceview/language-specs/idl.lang.h:8
+#: ../gtksourceview/language-specs/java.lang.h:10
+#: ../gtksourceview/language-specs/makefile.lang.h:6
+#: ../gtksourceview/language-specs/nemerle.lang.h:14
+#: ../gtksourceview/language-specs/pascal.lang.h:17
+#: ../gtksourceview/language-specs/scheme.lang.h:12
+#: ../gtksourceview/language-specs/sql.lang.h:48
+#: ../gtksourceview/language-specs/vbnet.lang.h:10
+#: ../gtksourceview/language-specs/verilog.lang.h:9
+#: ../gtksourceview/language-specs/vhdl.lang.h:5
msgid "Sources"
msgstr "Sumber"
-#: gtksourceview/language-specs/ada.lang.h:10
+#: ../gtksourceview/language-specs/ada.lang.h:10
msgid "True And False"
msgstr "Benar dan Salah"
-#: gtksourceview/language-specs/ada.lang.h:11
-#: gtksourceview/language-specs/c.lang.h:16
-#: gtksourceview/language-specs/cpp.lang.h:16
-#: gtksourceview/language-specs/fortran.lang.h:14
-#: gtksourceview/language-specs/idl.lang.h:10
-#: gtksourceview/language-specs/verilog.lang.h:10
-msgid "Types"
+#: ../gtksourceview/language-specs/ada.lang.h:11
+#: ../gtksourceview/language-specs/vhdl.lang.h:8
+msgid "Type"
msgstr "Tipe"
-#: gtksourceview/language-specs/c.lang.h:1
-#: gtksourceview/language-specs/cpp.lang.h:1
+#: ../gtksourceview/language-specs/c.lang.h:1
+#: ../gtksourceview/language-specs/cpp.lang.h:1
msgid "'#if 0' Comment"
msgstr "'#if 0' Komentar"
-#: gtksourceview/language-specs/c.lang.h:2
-#: gtksourceview/language-specs/cpp.lang.h:2
-#: gtksourceview/language-specs/csharp.lang.h:1
-#: gtksourceview/language-specs/css.lang.h:9
-#: gtksourceview/language-specs/html.lang.h:2
-#: gtksourceview/language-specs/idl.lang.h:1
-#: gtksourceview/language-specs/java.lang.h:1
-#: gtksourceview/language-specs/javascript.lang.h:2
-#: gtksourceview/language-specs/lua.lang.h:1
-#: gtksourceview/language-specs/sql.lang.h:5
-#: gtksourceview/language-specs/verilog.lang.h:2
-#: gtksourceview/language-specs/xml.lang.h:2
-#: gtksourceview/language-specs/haskell.lang.h:1
-#: gtksourceview/language-specs/texinfo.lang.h:1
-#: gtksourceview/language-specs/nemerle.lang.h:2
+#. Comments
+#: ../gtksourceview/language-specs/c.lang.h:2
+#: ../gtksourceview/language-specs/cpp.lang.h:2
+#: ../gtksourceview/language-specs/csharp.lang.h:1
+#: ../gtksourceview/language-specs/css.lang.h:9
+#: ../gtksourceview/language-specs/html.lang.h:2
+#: ../gtksourceview/language-specs/haskell.lang.h:1
+#: ../gtksourceview/language-specs/idl.lang.h:1
+#: ../gtksourceview/language-specs/java.lang.h:1
+#: ../gtksourceview/language-specs/javascript.lang.h:2
+#: ../gtksourceview/language-specs/lua.lang.h:1
+#: ../gtksourceview/language-specs/nemerle.lang.h:2
+#: ../gtksourceview/language-specs/sql.lang.h:9
+#: ../gtksourceview/language-specs/texinfo.lang.h:1
+#: ../gtksourceview/language-specs/verilog.lang.h:2
+#: ../gtksourceview/language-specs/xml.lang.h:2
msgid "Block Comment"
msgstr "Komentar Blok"
-#: gtksourceview/language-specs/c.lang.h:3
+#: ../gtksourceview/language-specs/c.lang.h:3
msgid "C"
msgstr "C"
-#: gtksourceview/language-specs/c.lang.h:5
-#: gtksourceview/language-specs/cpp.lang.h:5
+#: ../gtksourceview/language-specs/c.lang.h:5
+#: ../gtksourceview/language-specs/cpp.lang.h:5
msgid "Common Macro"
msgstr "Macro Umum"
-#: gtksourceview/language-specs/c.lang.h:7
-#: gtksourceview/language-specs/cpp.lang.h:7
-#: gtksourceview/language-specs/fortran.lang.h:2
-#: gtksourceview/language-specs/python.lang.h:3
-#: gtksourceview/language-specs/haskell.lang.h:4
-#: gtksourceview/language-specs/nemerle.lang.h:7
-#: gtksourceview/language-specs/R.lang.h:4
+#: ../gtksourceview/language-specs/c.lang.h:7
+#: ../gtksourceview/language-specs/cpp.lang.h:7
+#: ../gtksourceview/language-specs/fortran.lang.h:2
+#: ../gtksourceview/language-specs/haskell.lang.h:4
+#: ../gtksourceview/language-specs/nemerle.lang.h:7
+#: ../gtksourceview/language-specs/octave.lang.h:3
+#: ../gtksourceview/language-specs/python.lang.h:4
+#: ../gtksourceview/language-specs/R.lang.h:4
msgid "Floating Point Number"
msgstr "Angka Titik Ambang"
#. FIXME WHY DOESN'T THIS WORK?
-#: gtksourceview/language-specs/c.lang.h:8
-#: gtksourceview/language-specs/cpp.lang.h:8
-#: gtksourceview/language-specs/fortran.lang.h:4
-#: gtksourceview/language-specs/pascal.lang.h:10
-#: gtksourceview/language-specs/python.lang.h:5
-#: gtksourceview/language-specs/haskell.lang.h:6
-#: gtksourceview/language-specs/nemerle.lang.h:8
+#: ../gtksourceview/language-specs/c.lang.h:8
+#: ../gtksourceview/language-specs/cpp.lang.h:8
+#: ../gtksourceview/language-specs/fortran.lang.h:4
+#: ../gtksourceview/language-specs/haskell.lang.h:6
+#: ../gtksourceview/language-specs/nemerle.lang.h:8
+#: ../gtksourceview/language-specs/octave.lang.h:5
+#: ../gtksourceview/language-specs/pascal.lang.h:10
+#: ../gtksourceview/language-specs/python.lang.h:6
msgid "Hex Number"
msgstr "Nomor Hexa"
-#: gtksourceview/language-specs/c.lang.h:9
-#: gtksourceview/language-specs/cpp.lang.h:9
-#: gtksourceview/language-specs/idl.lang.h:3
-#: gtksourceview/language-specs/haskell.lang.h:7
+#: ../gtksourceview/language-specs/c.lang.h:9
+#: ../gtksourceview/language-specs/cpp.lang.h:9
+#: ../gtksourceview/language-specs/haskell.lang.h:7
+#: ../gtksourceview/language-specs/idl.lang.h:3
msgid "Include/Pragma"
msgstr "Include/Pragma"
-#: gtksourceview/language-specs/c.lang.h:12
-#: gtksourceview/language-specs/cpp.lang.h:12
-#: gtksourceview/language-specs/fortran.lang.h:9
-#: gtksourceview/language-specs/python.lang.h:11
-#: gtksourceview/language-specs/verilog.lang.h:8
-#: gtksourceview/language-specs/haskell.lang.h:11
-#: gtksourceview/language-specs/nemerle.lang.h:12
+#: ../gtksourceview/language-specs/c.lang.h:10
+#: ../gtksourceview/language-specs/cpp.lang.h:10
+#: ../gtksourceview/language-specs/csharp.lang.h:3
+#: ../gtksourceview/language-specs/fortran.lang.h:7
+#: ../gtksourceview/language-specs/idl.lang.h:4
+#: ../gtksourceview/language-specs/javascript.lang.h:12
+#: ../gtksourceview/language-specs/lua.lang.h:3
+#: ../gtksourceview/language-specs/perl.lang.h:2
+#: ../gtksourceview/language-specs/ruby.lang.h:9
+#: ../gtksourceview/language-specs/vbnet.lang.h:1
+#: ../gtksourceview/language-specs/verilog.lang.h:6
+msgid "Keywords"
+msgstr "Kata-kunci"
+
+#: ../gtksourceview/language-specs/c.lang.h:12
+#: ../gtksourceview/language-specs/cpp.lang.h:12
+#: ../gtksourceview/language-specs/fortran.lang.h:10
+#: ../gtksourceview/language-specs/haskell.lang.h:11
+#: ../gtksourceview/language-specs/nemerle.lang.h:12
+#: ../gtksourceview/language-specs/octave.lang.h:10
+#: ../gtksourceview/language-specs/python.lang.h:12
+#: ../gtksourceview/language-specs/verilog.lang.h:8
msgid "Octal Number"
msgstr "Angka Oktal"
-#: gtksourceview/language-specs/c.lang.h:13
-#: gtksourceview/language-specs/cpp.lang.h:13
-#: gtksourceview/language-specs/csharp.lang.h:5
-#: gtksourceview/language-specs/idl.lang.h:6
-#: gtksourceview/language-specs/haskell.lang.h:13
-#: gtksourceview/language-specs/vbnet.lang.h:4
+#: ../gtksourceview/language-specs/c.lang.h:13
+#: ../gtksourceview/language-specs/cpp.lang.h:13
+#: ../gtksourceview/language-specs/csharp.lang.h:6
+#: ../gtksourceview/language-specs/idl.lang.h:6
+#: ../gtksourceview/language-specs/vbnet.lang.h:8
msgid "Preprocessor Definitions"
msgstr "Definisi preprosesor"
-#: gtksourceview/language-specs/cpp.lang.h:3
+#: ../gtksourceview/language-specs/c.lang.h:16
+#: ../gtksourceview/language-specs/cpp.lang.h:16
+#: ../gtksourceview/language-specs/fortran.lang.h:15
+#: ../gtksourceview/language-specs/idl.lang.h:10
+#: ../gtksourceview/language-specs/verilog.lang.h:10
+msgid "Types"
+msgstr "Tipe"
+
+#: ../gtksourceview/language-specs/changelog.lang.h:1
+msgid "ChangeLog"
+msgstr "ChangeLog"
+
+#: ../gtksourceview/language-specs/changelog.lang.h:2
+msgid "Date"
+msgstr "Tanggal"
+
+#: ../gtksourceview/language-specs/changelog.lang.h:3
+msgid "Email"
+msgstr "Email"
+
+#: ../gtksourceview/language-specs/changelog.lang.h:4
+msgid "File"
+msgstr "Berkas"
+
+#: ../gtksourceview/language-specs/changelog.lang.h:5
+msgid "Marker"
+msgstr "Penanda"
+
+#: ../gtksourceview/language-specs/cpp.lang.h:3
msgid "C++"
msgstr "C++"
-#: gtksourceview/language-specs/csharp.lang.h:2
+#: ../gtksourceview/language-specs/csharp.lang.h:2
msgid "C#"
msgstr "C#"
-#: gtksourceview/language-specs/csharp.lang.h:6
-#: gtksourceview/language-specs/java.lang.h:9
-#: gtksourceview/language-specs/vbnet.lang.h:5
-#: gtksourceview/language-specs/nemerle.lang.h:13
+#: ../gtksourceview/language-specs/csharp.lang.h:5
+#: ../gtksourceview/language-specs/lua.lang.h:7
+#: ../gtksourceview/language-specs/sh.lang.h:6
+msgid "Multiline String"
+msgstr "String Multi-baris"
+
+#: ../gtksourceview/language-specs/csharp.lang.h:7
+#: ../gtksourceview/language-specs/java.lang.h:9
+#: ../gtksourceview/language-specs/nemerle.lang.h:13
+#: ../gtksourceview/language-specs/vbnet.lang.h:9
msgid "Primitives"
msgstr "Primitif"
-#: gtksourceview/language-specs/csharp.lang.h:9
-#: gtksourceview/language-specs/css.lang.h:64
-#: gtksourceview/language-specs/fortran.lang.h:13
-#: gtksourceview/language-specs/java.lang.h:12
-#: gtksourceview/language-specs/javascript.lang.h:34
-#: gtksourceview/language-specs/lua.lang.h:11
-#: gtksourceview/language-specs/python.lang.h:15
-#: gtksourceview/language-specs/ruby.lang.h:19
-#: gtksourceview/language-specs/sh.lang.h:14
-#: gtksourceview/language-specs/vbnet.lang.h:8
+#: ../gtksourceview/language-specs/csharp.lang.h:10
+#: ../gtksourceview/language-specs/css.lang.h:59
+#: ../gtksourceview/language-specs/fortran.lang.h:14
+#: ../gtksourceview/language-specs/java.lang.h:12
+#: ../gtksourceview/language-specs/javascript.lang.h:24
+#: ../gtksourceview/language-specs/lua.lang.h:11
+#: ../gtksourceview/language-specs/makefile.lang.h:9
+#: ../gtksourceview/language-specs/sh.lang.h:14
msgid "String 2"
msgstr "String 2"
#.
#. At rules must occur at the start of a line.
#.
-#: gtksourceview/language-specs/css.lang.h:4
+#: ../gtksourceview/language-specs/css.lang.h:4
msgid "At Rules"
msgstr "Pada Aturan"
#.
#. For CSS 2-style selectors: tag[attr="value"].
#.
-#: gtksourceview/language-specs/css.lang.h:8
+#: ../gtksourceview/language-specs/css.lang.h:8
msgid "Attribute Value Delimiters"
msgstr "Pembatas Nilai Atribut"
+#: ../gtksourceview/language-specs/css.lang.h:10
+msgid "CSS"
+msgstr "CSS"
+
#.
#. Value length specifier. Unless it is 0, must always be like: -1.2em.
#.
-#: gtksourceview/language-specs/css.lang.h:13
+#: ../gtksourceview/language-specs/css.lang.h:14
msgid "Dimension"
msgstr "Dimensi"
@@ -623,43 +729,46 @@ msgstr "Dimensi"
#. Hexadecimal method of specifying colors. Can either be 3 or 6 in
#. length: #ffcc00 = #fc0.
#.
-#: gtksourceview/language-specs/css.lang.h:22
+#: ../gtksourceview/language-specs/css.lang.h:23
msgid "Hexadecimal Color"
msgstr "Warna Heksadesimal"
#.
#. Upgrades a rule set's importance when several rule sets conflict.
#.
-#: gtksourceview/language-specs/css.lang.h:26
+#: ../gtksourceview/language-specs/css.lang.h:27
msgid "Importance Modifier"
msgstr "Modifier Penting"
-#: gtksourceview/language-specs/css.lang.h:27
+#: ../gtksourceview/language-specs/css.lang.h:28
msgid "Known Property Values"
msgstr "Nilai Properti Yang Dikenal"
-#: gtksourceview/language-specs/css.lang.h:34
-#: gtksourceview/language-specs/javascript.lang.h:19
-#: gtksourceview/language-specs/php.lang.h:19
-#: gtksourceview/language-specs/sh.lang.h:8
-#: gtksourceview/language-specs/haskell.lang.h:12
+#: ../gtksourceview/language-specs/css.lang.h:35
+#: ../gtksourceview/language-specs/javascript.lang.h:20
+#: ../gtksourceview/language-specs/php.lang.h:20
+#: ../gtksourceview/language-specs/sql.lang.h:34
msgid "Operators"
msgstr "Operator"
-#: gtksourceview/language-specs/css.lang.h:47
+#: ../gtksourceview/language-specs/css.lang.h:37
msgid "Property Names"
msgstr "Nama Properti"
#.
#. Brackets define a declaration block, parentheses define functions.
#.
-#: gtksourceview/language-specs/css.lang.h:51
-#: gtksourceview/language-specs/javascript.lang.h:20
-#: gtksourceview/language-specs/sh.lang.h:9
+#: ../gtksourceview/language-specs/css.lang.h:41
+#: ../gtksourceview/language-specs/javascript.lang.h:21
msgid "Punctuators"
msgstr "Pemberi tanda-baca"
-#: gtksourceview/language-specs/css.lang.h:52
+#.
+#. Used to combine selectors. Example syntax:
+#.
+#. body * div#ID.className > p + ul li:first-child
+#.
+#: ../gtksourceview/language-specs/css.lang.h:47
msgid "Selector Grammar"
msgstr "Tatabahasa Pemilih"
@@ -667,7 +776,7 @@ msgstr "Tatabahasa Pemilih"
#. Pseudo-class rules. Good to have syntax highlighting for these
#. for mistypings.
#.
-#: gtksourceview/language-specs/css.lang.h:57
+#: ../gtksourceview/language-specs/css.lang.h:52
msgid "Selector Pseudo Classes"
msgstr "Kelas Semu Selektor"
@@ -675,7 +784,7 @@ msgstr "Kelas Semu Selektor"
#. Pseudo-element rules. Good to have syntax highlighting for these
#. for mistypings.
#.
-#: gtksourceview/language-specs/css.lang.h:62
+#: ../gtksourceview/language-specs/css.lang.h:57
msgid "Selector Pseudo Elements"
msgstr "Elemen Semu Selektor"
@@ -683,814 +792,926 @@ msgstr "Elemen Semu Selektor"
#. Escaped unicode characters can contain either 6 hexadecimal characters
#. or 1-5 hex characters followed by one whitespace character.
#.
-#: gtksourceview/language-specs/css.lang.h:69
+#: ../gtksourceview/language-specs/css.lang.h:64
msgid "Unicode Character Reference"
msgstr "Referensi Karakter Unicode"
#.
#. Unicode range values.
#.
-#: gtksourceview/language-specs/css.lang.h:73
+#: ../gtksourceview/language-specs/css.lang.h:68
msgid "Unicode Range"
msgstr "Kisaran Unicode"
-#: gtksourceview/language-specs/desktop.lang.h:1
+#: ../gtksourceview/language-specs/desktop.lang.h:1
msgid ".desktop"
msgstr ".desktop"
-#: gtksourceview/language-specs/desktop.lang.h:2
-#: gtksourceview/language-specs/ini.lang.h:2
-#: gtksourceview/language-specs/gtkrc.lang.h:1
+#: ../gtksourceview/language-specs/desktop.lang.h:2
+#: ../gtksourceview/language-specs/gtkrc.lang.h:1
+#: ../gtksourceview/language-specs/ini.lang.h:2
+#: ../gtksourceview/language-specs/scheme.lang.h:1
msgid "Boolean Value"
msgstr "Nilai Boolean"
-#: gtksourceview/language-specs/desktop.lang.h:3
+#: ../gtksourceview/language-specs/desktop.lang.h:3
msgid "Encoding"
msgstr "Pengkodean"
-#: gtksourceview/language-specs/desktop.lang.h:4
+#: ../gtksourceview/language-specs/desktop.lang.h:4
msgid "Exec Parameter"
msgstr "Parameter Exec"
-#: gtksourceview/language-specs/desktop.lang.h:5
-#: gtksourceview/language-specs/ini.lang.h:5
+#: ../gtksourceview/language-specs/desktop.lang.h:5
+#: ../gtksourceview/language-specs/ini.lang.h:5
msgid "Group"
msgstr "Grup"
-#: gtksourceview/language-specs/desktop.lang.h:8
-#: gtksourceview/language-specs/ini.lang.h:9
+#: ../gtksourceview/language-specs/desktop.lang.h:8
+#: ../gtksourceview/language-specs/ini.lang.h:9
msgid "Non Standard Key"
msgstr "Kunci Non-Standard"
-#: gtksourceview/language-specs/desktop.lang.h:11
+#: ../gtksourceview/language-specs/desktop.lang.h:11
msgid "Standard Key"
msgstr "Kunci Standard"
-#: gtksourceview/language-specs/diff.lang.h:1
+#: ../gtksourceview/language-specs/diff.lang.h:1
msgid "Added line"
msgstr "Baris yang ditambahkan"
-#: gtksourceview/language-specs/diff.lang.h:2
+#: ../gtksourceview/language-specs/diff.lang.h:2
msgid "Changed line"
msgstr "Baris yang diubah"
-#: gtksourceview/language-specs/diff.lang.h:3
+#: ../gtksourceview/language-specs/diff.lang.h:3
msgid "Diff"
msgstr "Diff"
-#: gtksourceview/language-specs/diff.lang.h:4
+#: ../gtksourceview/language-specs/diff.lang.h:4
msgid "Diff file"
msgstr "File diff"
-#: gtksourceview/language-specs/diff.lang.h:6
-#: gtksourceview/language-specs/po.lang.h:4
+#: ../gtksourceview/language-specs/diff.lang.h:6
+#: ../gtksourceview/language-specs/po.lang.h:4
msgid "Location"
msgstr "Lokasi"
-#: gtksourceview/language-specs/diff.lang.h:8
+#: ../gtksourceview/language-specs/diff.lang.h:8
msgid "Removed line"
msgstr "Baris yang dibuang"
-#: gtksourceview/language-specs/diff.lang.h:9
+#: ../gtksourceview/language-specs/diff.lang.h:9
msgid "Special case"
msgstr "Kasus khusus"
-#: gtksourceview/language-specs/html.lang.h:1
-#: gtksourceview/language-specs/xml.lang.h:1
-msgid "Attributes"
+#: ../gtksourceview/language-specs/html.lang.h:1
+#: ../gtksourceview/language-specs/xml.lang.h:1
+msgid "Attribute"
msgstr "Atribut"
-#: gtksourceview/language-specs/html.lang.h:3
-#: gtksourceview/language-specs/xml.lang.h:3
+#: ../gtksourceview/language-specs/html.lang.h:3
+#: ../gtksourceview/language-specs/xml.lang.h:3
msgid "Closing Bracket"
msgstr "Kurung Tutup"
-#: gtksourceview/language-specs/html.lang.h:4
+#: ../gtksourceview/language-specs/html.lang.h:4
msgid "DTD"
msgstr "DTD"
-#: gtksourceview/language-specs/html.lang.h:5
-#: gtksourceview/language-specs/xml.lang.h:4
+#: ../gtksourceview/language-specs/html.lang.h:5
+#: ../gtksourceview/language-specs/xml.lang.h:4
msgid "Entity"
msgstr "Entiti"
-#: gtksourceview/language-specs/html.lang.h:6
+#: ../gtksourceview/language-specs/html.lang.h:6
msgid "HTML"
msgstr "HTML"
-#: gtksourceview/language-specs/html.lang.h:7
-#: gtksourceview/language-specs/latex.lang.h:5
-#: gtksourceview/language-specs/xml.lang.h:6
-#: gtksourceview/language-specs/texinfo.lang.h:12
+#: ../gtksourceview/language-specs/html.lang.h:7
+#: ../gtksourceview/language-specs/latex.lang.h:7
+#: ../gtksourceview/language-specs/texinfo.lang.h:12
+#: ../gtksourceview/language-specs/xml.lang.h:6
msgid "Markup"
msgstr "Markup"
-#: gtksourceview/language-specs/html.lang.h:9
-msgid "Tags"
-msgstr "Tags"
+#: ../gtksourceview/language-specs/html.lang.h:9
+#: ../gtksourceview/language-specs/xml.lang.h:8
+msgid "Tag"
+msgstr "Tag"
-#: gtksourceview/language-specs/fortran.lang.h:3
+#: ../gtksourceview/language-specs/fortran.lang.h:3
msgid "Fortran 95"
msgstr "Fortran 95"
-#: gtksourceview/language-specs/fortran.lang.h:5
+#: ../gtksourceview/language-specs/fortran.lang.h:5
msgid "Input/Output"
msgstr "Input/Output"
-#: gtksourceview/language-specs/fortran.lang.h:6
+#: ../gtksourceview/language-specs/fortran.lang.h:6
msgid "Intrinsics"
msgstr "Intrinsik"
-#: gtksourceview/language-specs/fortran.lang.h:10
+#: ../gtksourceview/language-specs/fortran.lang.h:11
msgid "Read/Write"
msgstr "Read/Write"
-#: gtksourceview/language-specs/idl.lang.h:2
+#. "duble-quoted strings"
+#: ../gtksourceview/language-specs/gtkrc.lang.h:2
+#: ../gtksourceview/language-specs/ini.lang.h:4
+#: ../gtksourceview/language-specs/octave.lang.h:2
+#: ../gtksourceview/language-specs/php.lang.h:16
+#: ../gtksourceview/language-specs/python.lang.h:3
+#: ../gtksourceview/language-specs/R.lang.h:3
+#: ../gtksourceview/language-specs/ruby.lang.h:6
+msgid "Double Quoted String"
+msgstr "String Tanda-petik Ganda"
+
+#: ../gtksourceview/language-specs/gtkrc.lang.h:3
+msgid "GtkRC"
+msgstr "GtkRC"
+
+#: ../gtksourceview/language-specs/gtkrc.lang.h:4
+msgid "Include Directive"
+msgstr "Masukkan Direktif"
+
+#: ../gtksourceview/language-specs/gtkrc.lang.h:5
+#: ../gtksourceview/language-specs/haskell.lang.h:8
+msgid "Keysymbol"
+msgstr "Simbol-kunci"
+
+#. 'single-quoted strings'
+#: ../gtksourceview/language-specs/gtkrc.lang.h:10
+#: ../gtksourceview/language-specs/ini.lang.h:11
+#: ../gtksourceview/language-specs/octave.lang.h:14
+#: ../gtksourceview/language-specs/php.lang.h:24
+#: ../gtksourceview/language-specs/python.lang.h:15
+#: ../gtksourceview/language-specs/R.lang.h:11
+#: ../gtksourceview/language-specs/ruby.lang.h:17
+msgid "Single Quoted String"
+msgstr "String Tanda-petik Tunggal"
+
+#: ../gtksourceview/language-specs/gtkrc.lang.h:11
+msgid "State"
+msgstr "Status"
+
+#. $variable, $$dynamic-variable and even $$$more
+#: ../gtksourceview/language-specs/gtkrc.lang.h:12
+#: ../gtksourceview/language-specs/ini.lang.h:12
+#: ../gtksourceview/language-specs/php.lang.h:26
+#: ../gtksourceview/language-specs/tcl.lang.h:7
+msgid "Variable"
+msgstr "Variabel"
+
+#: ../gtksourceview/language-specs/haskell.lang.h:5
+msgid "Haskell"
+msgstr "Haskell"
+
+#: ../gtksourceview/language-specs/haskell.lang.h:12
+msgid "Preprocessor Definition"
+msgstr "Definisi Preprosesor"
+
+#: ../gtksourceview/language-specs/haskell.lang.h:32
+msgid "Type or Constructor"
+msgstr "Tipe atau Konstruktor"
+
+#: ../gtksourceview/language-specs/idl.lang.h:2
msgid "IDL"
msgstr "IDL"
-#: gtksourceview/language-specs/idl.lang.h:7
+#: ../gtksourceview/language-specs/idl.lang.h:7
msgid "Sectional"
msgstr "Seksional"
-#: gtksourceview/language-specs/ini.lang.h:1
+#: ../gtksourceview/language-specs/ini.lang.h:1
msgid ".ini"
msgstr ".ini"
-#: gtksourceview/language-specs/ini.lang.h:3
-#: gtksourceview/language-specs/verilog.lang.h:3
+#: ../gtksourceview/language-specs/ini.lang.h:3
+#: ../gtksourceview/language-specs/verilog.lang.h:3
msgid "Decimal Number"
msgstr "Angka Desimal"
-#: gtksourceview/language-specs/ini.lang.h:4
-#: gtksourceview/language-specs/R.lang.h:3
-#: gtksourceview/language-specs/gtkrc.lang.h:2
-msgid "Double Quote String"
-msgstr "String Tanda-petik Ganda"
-
-#: gtksourceview/language-specs/ini.lang.h:6
+#: ../gtksourceview/language-specs/ini.lang.h:6
msgid "Integer"
msgstr "Integer"
-#: gtksourceview/language-specs/ini.lang.h:11
-#: gtksourceview/language-specs/R.lang.h:11
-#: gtksourceview/language-specs/gtkrc.lang.h:10
-msgid "Single Quote String"
-msgstr "String Tanda-petik Tunggal"
-
-#. $variable, $$dynamic-variable and even $$$more
-#: gtksourceview/language-specs/ini.lang.h:12
-#: gtksourceview/language-specs/php.lang.h:25
-#: gtksourceview/language-specs/gtkrc.lang.h:12
-msgid "Variable"
-msgstr "Variabel"
-
-#: gtksourceview/language-specs/java.lang.h:2
+#: ../gtksourceview/language-specs/java.lang.h:2
msgid "Declarations"
msgstr "Deklarasi"
-#: gtksourceview/language-specs/java.lang.h:3
+#: ../gtksourceview/language-specs/java.lang.h:3
msgid "Flow"
msgstr "Aliran"
-#: gtksourceview/language-specs/java.lang.h:4
+#: ../gtksourceview/language-specs/java.lang.h:4
msgid "Java"
msgstr "Java"
-#: gtksourceview/language-specs/java.lang.h:6
+#: ../gtksourceview/language-specs/java.lang.h:6
msgid "Memory"
msgstr "Memori"
-#: gtksourceview/language-specs/java.lang.h:7
+#: ../gtksourceview/language-specs/java.lang.h:7
msgid "Modifiers"
msgstr "Pemodifikasi"
-#: gtksourceview/language-specs/java.lang.h:8
+#: ../gtksourceview/language-specs/java.lang.h:8
msgid "Numeric"
msgstr "Numerik"
-#: gtksourceview/language-specs/javascript.lang.h:1
-#: gtksourceview/language-specs/php.lang.h:1
+#: ../gtksourceview/language-specs/javascript.lang.h:1
+#: ../gtksourceview/language-specs/php.lang.h:1
msgid "Array Operators"
msgstr "Operator Array"
-#: gtksourceview/language-specs/javascript.lang.h:3
+#: ../gtksourceview/language-specs/javascript.lang.h:3
msgid "Constructors"
msgstr "Konstruktor"
-#: gtksourceview/language-specs/javascript.lang.h:4
+#: ../gtksourceview/language-specs/javascript.lang.h:4
msgid "Error Handling"
msgstr "Penanganan Kesalahan"
-#: gtksourceview/language-specs/javascript.lang.h:5
+#: ../gtksourceview/language-specs/javascript.lang.h:5
msgid "Floating-Point Number"
msgstr "Angka Titik Ambang"
-#: gtksourceview/language-specs/javascript.lang.h:6
+#: ../gtksourceview/language-specs/javascript.lang.h:6
msgid "Flow Keywords"
msgstr "Kata-kunci Alur"
-#: gtksourceview/language-specs/javascript.lang.h:7
+#: ../gtksourceview/language-specs/javascript.lang.h:7
msgid "Future Reserved Words"
msgstr "Kata-kata Yang Telah Dicadangkan"
-#: gtksourceview/language-specs/javascript.lang.h:8
+#: ../gtksourceview/language-specs/javascript.lang.h:8
msgid "Global Functions"
msgstr "Fungsi Global"
-#: gtksourceview/language-specs/javascript.lang.h:9
+#: ../gtksourceview/language-specs/javascript.lang.h:9
msgid "Global Properties"
msgstr "Properti Global"
-#: gtksourceview/language-specs/javascript.lang.h:10
-#: gtksourceview/language-specs/verilog.lang.h:5
+#: ../gtksourceview/language-specs/javascript.lang.h:10
+#: ../gtksourceview/language-specs/verilog.lang.h:5
msgid "Hexadecimal Number"
msgstr "Nomor Heksadesimal"
-#: gtksourceview/language-specs/javascript.lang.h:13
+#: ../gtksourceview/language-specs/javascript.lang.h:11
+msgid "JavaScript"
+msgstr "JavaScript"
+
+#: ../gtksourceview/language-specs/javascript.lang.h:14
msgid "Literals"
msgstr "Literal"
-#: gtksourceview/language-specs/javascript.lang.h:14
+#: ../gtksourceview/language-specs/javascript.lang.h:15
msgid "Math Value Properties"
msgstr "Properti Nilai Matematis"
-#: gtksourceview/language-specs/javascript.lang.h:16
+#: ../gtksourceview/language-specs/javascript.lang.h:17
msgid "Object Functions"
msgstr "Fungsi Objek"
-#: gtksourceview/language-specs/javascript.lang.h:17
+#: ../gtksourceview/language-specs/javascript.lang.h:18
msgid "Object Properties"
msgstr "Properti Obyek"
-#: gtksourceview/language-specs/javascript.lang.h:18
+#: ../gtksourceview/language-specs/javascript.lang.h:19
msgid "Objects"
msgstr "Obyek"
-#.
-#. Proposed language specification for JavaScript files.
-#.
-#. Reference used:
-#. http://www.ecma-international.org/publications/files/ecma-st/ECMA-262.pdf
-#.
-#. Tested with:
-#. http://www.coffeeblack.org/scripts/map.js
-#.
-#. Submitted by Scott Martin (scott coffeeblack org)
-#.
-#: gtksourceview/language-specs/javascript.lang.h:32
-#: gtksourceview/language-specs/lua.lang.h:9
-#: gtksourceview/language-specs/perl.lang.h:7
-#: gtksourceview/language-specs/python.lang.h:13
-#: gtksourceview/language-specs/ruby.lang.h:17
-#: gtksourceview/language-specs/sh.lang.h:11
-#: gtksourceview/language-specs/tcl.lang.h:3
-#: gtksourceview/language-specs/R.lang.h:10
+#: ../gtksourceview/language-specs/javascript.lang.h:22
+#: ../gtksourceview/language-specs/lua.lang.h:9
+#: ../gtksourceview/language-specs/octave.lang.h:13
+#: ../gtksourceview/language-specs/perl.lang.h:7
+#: ../gtksourceview/language-specs/php.lang.h:22
+#: ../gtksourceview/language-specs/python.lang.h:14
+#: ../gtksourceview/language-specs/R.lang.h:10
+#: ../gtksourceview/language-specs/ruby.lang.h:16
+#: ../gtksourceview/language-specs/sh.lang.h:11
+#: ../gtksourceview/language-specs/tcl.lang.h:3
msgid "Scripts"
msgstr "Script"
-#: gtksourceview/language-specs/javascript.lang.h:35
+#: ../gtksourceview/language-specs/javascript.lang.h:25
msgid "Unicode Escape Sequence"
msgstr "Sekuen Escape Unicode"
-#: gtksourceview/language-specs/javascript.lang.h:36
+#: ../gtksourceview/language-specs/javascript.lang.h:26
msgid "Word Operators"
msgstr "Operator Kata"
-#: gtksourceview/language-specs/latex.lang.h:2
-#: gtksourceview/language-specs/texinfo.lang.h:6
+#: ../gtksourceview/language-specs/latex.lang.h:1
+msgid "Command"
+msgstr "Perintah"
+
+#: ../gtksourceview/language-specs/latex.lang.h:3
+msgid "Comment Environment"
+msgstr "Lingkungan Komentar"
+
+#: ../gtksourceview/language-specs/latex.lang.h:4
+#: ../gtksourceview/language-specs/texinfo.lang.h:6
msgid "Include"
msgstr "Termasuk"
-#: gtksourceview/language-specs/latex.lang.h:4
+#: ../gtksourceview/language-specs/latex.lang.h:6
msgid "LaTeX"
msgstr "LaTeX"
-#: gtksourceview/language-specs/latex.lang.h:6
+#: ../gtksourceview/language-specs/latex.lang.h:8
msgid "Math"
msgstr "Matematika"
-#: gtksourceview/language-specs/latex.lang.h:7
-msgid "Most Used Commands"
-msgstr "Perintah yg Paling Sering Digunakan"
-
-#: gtksourceview/language-specs/lua.lang.h:2
-#: gtksourceview/language-specs/python.lang.h:4
-#: gtksourceview/language-specs/sh.lang.h:4
+#: ../gtksourceview/language-specs/lua.lang.h:2
+#: ../gtksourceview/language-specs/makefile.lang.h:3
msgid "Functions"
msgstr "Fungsi"
-#: gtksourceview/language-specs/lua.lang.h:5
+#: ../gtksourceview/language-specs/lua.lang.h:5
msgid "Line Comment 2"
msgstr "Komentar Baris 2"
-#: gtksourceview/language-specs/lua.lang.h:6
+#: ../gtksourceview/language-specs/lua.lang.h:6
msgid "Lua"
msgstr "Lua"
-#: gtksourceview/language-specs/lua.lang.h:7
-#: gtksourceview/language-specs/python.lang.h:9
-#: gtksourceview/language-specs/sh.lang.h:6
-msgid "Multiline String"
-msgstr "String Multi-baris"
-
-#: gtksourceview/language-specs/lua.lang.h:8
-#: gtksourceview/language-specs/python.lang.h:10
-#: gtksourceview/language-specs/sh.lang.h:7
+#: ../gtksourceview/language-specs/lua.lang.h:8
+#: ../gtksourceview/language-specs/sh.lang.h:7
msgid "Multiline String 2"
msgstr "String Multi-baris 2"
-#: gtksourceview/language-specs/pascal.lang.h:1
+#. `backticks-quoted strings`
+#: ../gtksourceview/language-specs/makefile.lang.h:1
+#: ../gtksourceview/language-specs/php.lang.h:3
+#: ../gtksourceview/language-specs/sh.lang.h:1
+msgid "Backtick String"
+msgstr "String Backtick"
+
+#: ../gtksourceview/language-specs/makefile.lang.h:2
+msgid "Directives"
+msgstr "Direktif"
+
+#: ../gtksourceview/language-specs/makefile.lang.h:5
+msgid "Makefile"
+msgstr "Makefile"
+
+#: ../gtksourceview/language-specs/makefile.lang.h:7
+msgid "Special Targets"
+msgstr "Target Khusus"
+
+#: ../gtksourceview/language-specs/makefile.lang.h:10
+msgid "Targets"
+msgstr "Target"
+
+#: ../gtksourceview/language-specs/makefile.lang.h:11
+#: ../gtksourceview/language-specs/sh.lang.h:15
+msgid "Variable1"
+msgstr "Variabel1"
+
+#: ../gtksourceview/language-specs/makefile.lang.h:12
+#: ../gtksourceview/language-specs/sh.lang.h:16
+msgid "Variable2"
+msgstr "Variabel2"
+
+#: ../gtksourceview/language-specs/msil.lang.h:1
+msgid "MSIL"
+msgstr "MSIL"
+
+#: ../gtksourceview/language-specs/nemerle.lang.h:1
+#: ../gtksourceview/language-specs/verilog.lang.h:1
+msgid "Binary Number"
+msgstr "Angka Biner"
+
+#: ../gtksourceview/language-specs/nemerle.lang.h:4
+msgid "Core Keywords"
+msgstr "Kata-kunci Inti"
+
+#: ../gtksourceview/language-specs/nemerle.lang.h:5
+msgid "Core Types"
+msgstr "Tipe Inti"
+
+#: ../gtksourceview/language-specs/nemerle.lang.h:9
+msgid "Keywords Defined by Macros"
+msgstr "Kata-kunci yang didefinisikan oleh Makro"
+
+#: ../gtksourceview/language-specs/nemerle.lang.h:11
+msgid "Nemerle"
+msgstr "Nemerle"
+
+#: ../gtksourceview/language-specs/octave.lang.h:8
+#: ../gtksourceview/language-specs/python.lang.h:10
+msgid "Multiline Double Quoted String"
+msgstr "String Tanda-petik Ganda Berbaris"
+
+#: ../gtksourceview/language-specs/octave.lang.h:9
+#: ../gtksourceview/language-specs/python.lang.h:11
+msgid "Multiline Single Quoted String"
+msgstr "String Tanda-petik Tunggal Berbaris"
+
+#: ../gtksourceview/language-specs/octave.lang.h:11
+msgid "Octave"
+msgstr "Oktaf"
+
+#: ../gtksourceview/language-specs/octave.lang.h:12
+#: ../gtksourceview/language-specs/R.lang.h:9
+msgid "Reserved Constant"
+msgstr "Konstanta Yang Telah Dicadangkan"
+
+#: ../gtksourceview/language-specs/pascal.lang.h:1
msgid "Block Comment 1"
msgstr "Komentar Blok 1"
-#: gtksourceview/language-specs/pascal.lang.h:2
+#: ../gtksourceview/language-specs/pascal.lang.h:2
msgid "Block Comment 2"
msgstr "Komentar Blok 2"
-#: gtksourceview/language-specs/pascal.lang.h:3
+#: ../gtksourceview/language-specs/pascal.lang.h:3
msgid "Boolean Bitwise Operators"
msgstr "Operator Bitwise Boolean"
-#: gtksourceview/language-specs/pascal.lang.h:4
+#: ../gtksourceview/language-specs/pascal.lang.h:4
msgid "Builtin Functions"
msgstr "Fungsi Bawaan"
-#: gtksourceview/language-specs/pascal.lang.h:5
+#: ../gtksourceview/language-specs/pascal.lang.h:5
msgid "Builtin Types"
msgstr "Tipe Bawaan"
-#: gtksourceview/language-specs/pascal.lang.h:6
+#: ../gtksourceview/language-specs/pascal.lang.h:6
msgid "Builtin Values"
msgstr "Nilai Bawaan"
-#: gtksourceview/language-specs/pascal.lang.h:7
+#: ../gtksourceview/language-specs/pascal.lang.h:7
msgid "Functions and Function Modifiers"
msgstr "Fungsi dan Modifier Fungsi"
-#: gtksourceview/language-specs/pascal.lang.h:8
+#: ../gtksourceview/language-specs/pascal.lang.h:8
msgid "General Format"
msgstr "Format Umum"
-#: gtksourceview/language-specs/pascal.lang.h:12
+#: ../gtksourceview/language-specs/pascal.lang.h:12
msgid "Loop, Flow, and Exceptions Keywords"
msgstr "Kata-kunci Eksepsi, Loop, dan Flow"
-#: gtksourceview/language-specs/pascal.lang.h:13
+#: ../gtksourceview/language-specs/pascal.lang.h:13
msgid "Math Operators"
msgstr "Operator Matematis"
-#: gtksourceview/language-specs/pascal.lang.h:15
+#: ../gtksourceview/language-specs/pascal.lang.h:15
msgid "Pascal"
msgstr "Pascal"
-#: gtksourceview/language-specs/pascal.lang.h:16
+#: ../gtksourceview/language-specs/pascal.lang.h:16
msgid "Preprocessor Defines"
msgstr "Definisi Preprosesor"
-#: gtksourceview/language-specs/pascal.lang.h:19
+#: ../gtksourceview/language-specs/pascal.lang.h:19
msgid "Type, Class and Object Keywords"
msgstr "Kata-kunci Obyek, Kelas, dan Tipe"
-#: gtksourceview/language-specs/perl.lang.h:1
+#: ../gtksourceview/language-specs/perl.lang.h:1
msgid "Function Call"
msgstr "Fungsi Call"
-#: gtksourceview/language-specs/perl.lang.h:4
+#: ../gtksourceview/language-specs/perl.lang.h:4
msgid "Method Call"
msgstr "Panggilan Metode"
-#: gtksourceview/language-specs/perl.lang.h:5
+#: ../gtksourceview/language-specs/perl.lang.h:5
msgid "POD"
msgstr "POD"
-#: gtksourceview/language-specs/perl.lang.h:6
+#: ../gtksourceview/language-specs/perl.lang.h:6
msgid "Perl"
msgstr "Perl"
-#: gtksourceview/language-specs/perl.lang.h:9
-#: gtksourceview/language-specs/tcl.lang.h:5
+#: ../gtksourceview/language-specs/perl.lang.h:9
+#: ../gtksourceview/language-specs/tcl.lang.h:5
msgid "String2"
msgstr "String2"
-#: gtksourceview/language-specs/perl.lang.h:10
+#: ../gtksourceview/language-specs/perl.lang.h:10
msgid "String3"
msgstr "String3"
-#: gtksourceview/language-specs/perl.lang.h:11
-#: gtksourceview/language-specs/tcl.lang.h:7
+#: ../gtksourceview/language-specs/perl.lang.h:11
msgid "Variables"
msgstr "Variabel"
-#. `backticks-quoted strings`
-#: gtksourceview/language-specs/php.lang.h:3
-#: gtksourceview/language-specs/sh.lang.h:1
-msgid "Backtick String"
-msgstr "String Backtick"
-
#. # Bourne Shell Line Comment
-#: gtksourceview/language-specs/php.lang.h:5
+#: ../gtksourceview/language-specs/php.lang.h:5
msgid "Bash Line Comment"
msgstr "Komentar Baris Bash"
#. /* C Block Comment
-#: gtksourceview/language-specs/php.lang.h:7
+#: ../gtksourceview/language-specs/php.lang.h:7
msgid "C Block Comment"
msgstr "Komentar Blok C"
#. // C++ Line Comment
-#: gtksourceview/language-specs/php.lang.h:9
+#: ../gtksourceview/language-specs/php.lang.h:9
msgid "C++ Line Comment"
msgstr "Komentar baris C++"
-#: gtksourceview/language-specs/php.lang.h:10
+#: ../gtksourceview/language-specs/php.lang.h:10
msgid "Case Insensitive Keyword"
msgstr "Kata-kunci yang Tidak case-sensitive"
#. This are keywords, the are recognised by php
-#: gtksourceview/language-specs/php.lang.h:12
+#: ../gtksourceview/language-specs/php.lang.h:12
msgid "Case Sensitive Keyword"
msgstr "Kata-kunci yang Case Sensitive"
-#. "duble-quoted strings"
-#: gtksourceview/language-specs/php.lang.h:16
-msgid "Double Quoted String"
-msgstr "String Tanda-petik Ganda"
-
-#: gtksourceview/language-specs/php.lang.h:17
+#. <? ?> <HTML> inside PHP <?
+#: ../gtksourceview/language-specs/php.lang.h:18
msgid "First Open PHP Tag"
msgstr "Tag PHP yang dibuka pertama"
-#: gtksourceview/language-specs/php.lang.h:18
+#: ../gtksourceview/language-specs/php.lang.h:19
msgid "HTML Block"
msgstr "Blok HTML"
-#: gtksourceview/language-specs/php.lang.h:20
+#: ../gtksourceview/language-specs/php.lang.h:21
msgid "PHP"
msgstr "PHP"
-#. 'single-quoted strings'
-#: gtksourceview/language-specs/php.lang.h:22
-msgid "Single Quoted String"
-msgstr "String Tanda-petik Tunggal"
-
-#: gtksourceview/language-specs/po.lang.h:2
+#: ../gtksourceview/language-specs/po.lang.h:2
msgid "Format"
msgstr "Format"
-#: gtksourceview/language-specs/po.lang.h:7
+#: ../gtksourceview/language-specs/po.lang.h:7
msgid "gettext translation"
msgstr "Terjemahan gettext"
-#: gtksourceview/language-specs/python.lang.h:1
-#: gtksourceview/language-specs/ruby.lang.h:2
+#: ../gtksourceview/language-specs/python.lang.h:1
+#: ../gtksourceview/language-specs/ruby.lang.h:2
msgid "Builtins"
msgstr "Bawaan"
-#: gtksourceview/language-specs/python.lang.h:8
+#: ../gtksourceview/language-specs/python.lang.h:9
msgid "Module Handler"
msgstr "Handler Modul"
-#: gtksourceview/language-specs/python.lang.h:12
+#: ../gtksourceview/language-specs/python.lang.h:13
msgid "Python"
msgstr "Python"
-#: gtksourceview/language-specs/ruby.lang.h:1
+#: ../gtksourceview/language-specs/R.lang.h:1
+msgid "Assignment Operator"
+msgstr "Operator Penugasan"
+
+#: ../gtksourceview/language-specs/R.lang.h:2
+msgid "Delimiter"
+msgstr "Pembatas"
+
+#: ../gtksourceview/language-specs/R.lang.h:5
+msgid "Integer Number"
+msgstr "Angka Integer"
+
+#: ../gtksourceview/language-specs/R.lang.h:8
+msgid "Reserved Class"
+msgstr "Kelas yang Telah Dicadangkan"
+
+#: ../gtksourceview/language-specs/ruby.lang.h:1
msgid "Attribute Definitions"
msgstr "Definisi Atribut"
-#: gtksourceview/language-specs/ruby.lang.h:3
+#: ../gtksourceview/language-specs/ruby.lang.h:3
msgid "Class Variables"
msgstr "Variabel Kelas"
-#: gtksourceview/language-specs/ruby.lang.h:4
+#: ../gtksourceview/language-specs/ruby.lang.h:4
msgid "Constants"
msgstr "Konstanta"
-#: gtksourceview/language-specs/ruby.lang.h:5
+#: ../gtksourceview/language-specs/ruby.lang.h:5
msgid "Definitions"
msgstr "Definisi"
-#: gtksourceview/language-specs/ruby.lang.h:6
+#: ../gtksourceview/language-specs/ruby.lang.h:7
msgid "Global Variables"
msgstr "Variabel Global"
-#: gtksourceview/language-specs/ruby.lang.h:7
+#: ../gtksourceview/language-specs/ruby.lang.h:8
msgid "Instance Variables"
msgstr "Variabel Instan"
-#: gtksourceview/language-specs/ruby.lang.h:10
+#: ../gtksourceview/language-specs/ruby.lang.h:11
msgid "Module Handlers"
msgstr "Handler Modul"
-#: gtksourceview/language-specs/ruby.lang.h:11
+#: ../gtksourceview/language-specs/ruby.lang.h:12
msgid "Multiline Comment"
msgstr "Komentar Multi-baris"
-#: gtksourceview/language-specs/ruby.lang.h:12
+#: ../gtksourceview/language-specs/ruby.lang.h:13
msgid "Pseudo Variables"
msgstr "Variabel Semu"
-#: gtksourceview/language-specs/ruby.lang.h:13
+#: ../gtksourceview/language-specs/ruby.lang.h:14
msgid "RegExp Variables"
msgstr "Variabel RegExp"
-#: gtksourceview/language-specs/ruby.lang.h:14
-msgid "Regular Expression"
-msgstr "Ekspresi Reguler"
-
-#: gtksourceview/language-specs/ruby.lang.h:15
-msgid "Regular Expression 2"
-msgstr "Ekspresi Reguler 2"
-
-#: gtksourceview/language-specs/ruby.lang.h:16
+#: ../gtksourceview/language-specs/ruby.lang.h:15
msgid "Ruby"
msgstr "Ruby"
-#: gtksourceview/language-specs/sh.lang.h:2
-msgid "Built-in Commands"
+#: ../gtksourceview/language-specs/ruby.lang.h:18
+msgid "Symbols"
+msgstr "Simbol"
+
+#: ../gtksourceview/language-specs/scheme.lang.h:11
+msgid "Scheme"
+msgstr "Skema"
+
+#: ../gtksourceview/language-specs/sh.lang.h:2
+msgid "Built-in Command"
msgstr "Perintah Bawaan"
-#: gtksourceview/language-specs/sh.lang.h:3
-msgid "Common Commands"
+#: ../gtksourceview/language-specs/sh.lang.h:3
+msgid "Common Command"
msgstr "Perintah Umum"
-#: gtksourceview/language-specs/sh.lang.h:10
-msgid "Redirections"
+#: ../gtksourceview/language-specs/sh.lang.h:8
+msgid "Operator"
+msgstr "Operator"
+
+#: ../gtksourceview/language-specs/sh.lang.h:9
+msgid "Punctuator"
+msgstr "Pemberi tanda-baca"
+
+#: ../gtksourceview/language-specs/sh.lang.h:10
+msgid "Redirection"
msgstr "Pengalihan-arah"
-#: gtksourceview/language-specs/sh.lang.h:12
+#: ../gtksourceview/language-specs/sh.lang.h:12
msgid "Self"
msgstr "Sendiri"
-#: gtksourceview/language-specs/sh.lang.h:15
-msgid "Variable1"
-msgstr "Variabel1"
-
-#: gtksourceview/language-specs/sh.lang.h:16
-msgid "Variable2"
-msgstr "Variabel2"
-
-#: gtksourceview/language-specs/sh.lang.h:17
+#: ../gtksourceview/language-specs/sh.lang.h:17
msgid "sh"
msgstr "sh"
-#: gtksourceview/language-specs/sql.lang.h:1
+#: ../gtksourceview/language-specs/sql.lang.h:1
msgid "ANSI Datatypes"
msgstr "Tipe data ANSI"
-#: gtksourceview/language-specs/sql.lang.h:2
+#. Reserved Words
+#: ../gtksourceview/language-specs/sql.lang.h:3
msgid "ANSI Reserved Words"
msgstr "Kata ANSI yg telah dipesan"
-#: gtksourceview/language-specs/sql.lang.h:3
+#. Aggregate Functions
+#: ../gtksourceview/language-specs/sql.lang.h:5
msgid "Aggregate Functions"
msgstr "Fungsi agregat"
-#: gtksourceview/language-specs/sql.lang.h:4
+#. Analytic Functions
+#: ../gtksourceview/language-specs/sql.lang.h:7
msgid "Analytic Functions"
msgstr "Fungsi Analitik"
-#: gtksourceview/language-specs/sql.lang.h:6
+#: ../gtksourceview/language-specs/sql.lang.h:10
msgid "Character Functions Returning Character Values"
msgstr "Fungsi Karakter Yang Menghasilkan Nilai Karakter"
-#: gtksourceview/language-specs/sql.lang.h:7
+#: ../gtksourceview/language-specs/sql.lang.h:11
msgid "Character Functions Returning Number Values"
msgstr "Fungsi Karakter Yang Menghasilkan Nilai Angka"
-#: gtksourceview/language-specs/sql.lang.h:8
+#: ../gtksourceview/language-specs/sql.lang.h:12
+msgid "Collection Functions"
+msgstr "Fungsi Koleksi"
+
+#: ../gtksourceview/language-specs/sql.lang.h:13
+msgid "Conditions"
+msgstr "Kondisi"
+
+#: ../gtksourceview/language-specs/sql.lang.h:14
msgid "Conversion Functions"
msgstr "Fungsi Konversi"
-#: gtksourceview/language-specs/sql.lang.h:9
+#: ../gtksourceview/language-specs/sql.lang.h:15
+msgid "Data Mining Functions"
+msgstr "Fungsi Penggalian Data"
+
+#: ../gtksourceview/language-specs/sql.lang.h:16
msgid "Datetime Functions"
msgstr "Fungsi Tanggal-waktu"
-#: gtksourceview/language-specs/sql.lang.h:10
+#: ../gtksourceview/language-specs/sql.lang.h:17
+msgid "Encoding and Decoding Functions"
+msgstr "Enkode dan Dekode Fungsi"
+
+#: ../gtksourceview/language-specs/sql.lang.h:18
+msgid "Environment and Identifier Functions"
+msgstr "Lingkungan dan Pengenal Fungsi"
+
+#: ../gtksourceview/language-specs/sql.lang.h:19
+msgid "General Comparison Functions"
+msgstr "Fungsi Perbandingan Umum"
+
+#: ../gtksourceview/language-specs/sql.lang.h:20
+msgid "Hierarchical Function"
+msgstr "Fungsi Hirarki"
+
+#: ../gtksourceview/language-specs/sql.lang.h:21
msgid "Integer Literals"
msgstr "Literal Integer"
-#: gtksourceview/language-specs/sql.lang.h:12
-msgid "Miscellaneous Single-Row Functions"
-msgstr "Aneka Fungsi Baris-Tunggal"
+#: ../gtksourceview/language-specs/sql.lang.h:22
+msgid "Large Object Functions"
+msgstr "Fungsi Objek Besar"
+
+#. Model Functions
+#: ../gtksourceview/language-specs/sql.lang.h:25
+msgid "Model Functions"
+msgstr "Fungsi Model"
+
+#: ../gtksourceview/language-specs/sql.lang.h:26
+msgid "NLS Character Functions"
+msgstr "Fungsi Karakter NLS"
+
+#: ../gtksourceview/language-specs/sql.lang.h:27
+msgid "NULL-Related Functions"
+msgstr "Fungsi Berhubungan NULL"
-#: gtksourceview/language-specs/sql.lang.h:13
+#: ../gtksourceview/language-specs/sql.lang.h:28
msgid "Null"
msgstr "Null"
-#: gtksourceview/language-specs/sql.lang.h:14
-msgid "Number Functions"
-msgstr "Fungsi Angka"
-
-#: gtksourceview/language-specs/sql.lang.h:15
+#: ../gtksourceview/language-specs/sql.lang.h:29
msgid "Number Literals"
msgstr "Literal Angka"
-#: gtksourceview/language-specs/sql.lang.h:16
+#. Single-Row Functions
+#: ../gtksourceview/language-specs/sql.lang.h:31
+msgid "Numeric Functions"
+msgstr "Fungsi Angka"
+
+#. Object Reference Functions
+#: ../gtksourceview/language-specs/sql.lang.h:33
msgid "Object Reference Functions"
msgstr "Fungsi Referensi Obyek"
-#: gtksourceview/language-specs/sql.lang.h:17
+#. Datatypes
+#: ../gtksourceview/language-specs/sql.lang.h:36
msgid "Oracle Built-in Datatypes"
msgstr "Tipe data Bawaan Oracle"
-#: gtksourceview/language-specs/sql.lang.h:18
+#: ../gtksourceview/language-specs/sql.lang.h:37
msgid "Oracle Reserved Words"
msgstr "Kata-kata Oracle yang telah Dicadangkan"
-#: gtksourceview/language-specs/sql.lang.h:19
+#: ../gtksourceview/language-specs/sql.lang.h:38
+msgid "Oracle-Supplied Types"
+msgstr "Jenis Diberikan Oracle"
+
+#: ../gtksourceview/language-specs/sql.lang.h:39
msgid "SQL"
msgstr "SQL"
-#: gtksourceview/language-specs/sql.lang.h:20
+#: ../gtksourceview/language-specs/sql.lang.h:40
+msgid "SQL Statements"
+msgstr "Pernyataan SQL"
+
+#. SQL*Plus
+#: ../gtksourceview/language-specs/sql.lang.h:42
msgid "SQL*Plus At Sign"
msgstr "SQL*Plus At Sign"
-#: gtksourceview/language-specs/sql.lang.h:21
+#: ../gtksourceview/language-specs/sql.lang.h:43
msgid "SQL*Plus Commands"
msgstr "SQL*Plus Commands"
-#: gtksourceview/language-specs/sql.lang.h:22
+#: ../gtksourceview/language-specs/sql.lang.h:44
msgid "SQL*Plus Double At Sign"
msgstr "SQL*Plus Double At Sign"
-#: gtksourceview/language-specs/sql.lang.h:23
+#: ../gtksourceview/language-specs/sql.lang.h:45
msgid "SQL*Plus Slash"
msgstr "SQL*Plus Slash"
-#: gtksourceview/language-specs/sql.lang.h:24
+#: ../gtksourceview/language-specs/sql.lang.h:46
msgid "SQL/DS and DB2 Datatypes"
msgstr "Tipe data SQL/DS dan DB2"
-#: gtksourceview/language-specs/sql.lang.h:25
+#: ../gtksourceview/language-specs/sql.lang.h:47
msgid "Size Clause"
msgstr "Klausa Ukuran"
-#: gtksourceview/language-specs/sql.lang.h:27
+#. Literals
+#: ../gtksourceview/language-specs/sql.lang.h:50
msgid "Text Literals"
msgstr "Teks Literal"
-#: gtksourceview/language-specs/sql.lang.h:28
+#: ../gtksourceview/language-specs/sql.lang.h:51
msgid "Unlimited"
msgstr "Tidak terbatas"
-#: gtksourceview/language-specs/verilog.lang.h:1
-#: gtksourceview/language-specs/nemerle.lang.h:1
-msgid "Binary Number"
-msgstr "Angka Biner"
-
-#: gtksourceview/language-specs/verilog.lang.h:4
-msgid "Gates"
-msgstr "Gerbang"
-
-#: gtksourceview/language-specs/verilog.lang.h:11
-msgid "Verilog"
-msgstr "Verilog"
-
-#: gtksourceview/language-specs/xml.lang.h:5
-msgid "Hexadecimal"
-msgstr "Heksadesimal"
+#: ../gtksourceview/language-specs/sql.lang.h:52
+msgid "XML Functions"
+msgstr "Fungsi XML"
-#: gtksourceview/language-specs/xml.lang.h:8
-msgid "Tag"
-msgstr "Tag"
-
-#: gtksourceview/language-specs/xml.lang.h:9
-msgid "XML"
-msgstr "XML"
-
-#: gtksourceview/language-specs/haskell.lang.h:5
-msgid "Haskell"
-msgstr "Haskell"
-
-#: gtksourceview/language-specs/haskell.lang.h:8
-msgid "Keysymbols"
-msgstr "Simbol-kunci"
-
-#: gtksourceview/language-specs/haskell.lang.h:16
-msgid "Type or Constructor"
-msgstr "Tipe atau Konstruktor"
+#: ../gtksourceview/language-specs/tcl.lang.h:6
+msgid "Tcl"
+msgstr "Tcl"
-#: gtksourceview/language-specs/texinfo.lang.h:2
+#: ../gtksourceview/language-specs/texinfo.lang.h:2
msgid "Characters"
msgstr "Karakter"
-#: gtksourceview/language-specs/texinfo.lang.h:3
+#: ../gtksourceview/language-specs/texinfo.lang.h:3
msgid "File Attributes"
msgstr "Atribut File"
-#: gtksourceview/language-specs/texinfo.lang.h:4
+#: ../gtksourceview/language-specs/texinfo.lang.h:4
msgid "Formatting"
msgstr "Memformat"
-#: gtksourceview/language-specs/texinfo.lang.h:5
+#: ../gtksourceview/language-specs/texinfo.lang.h:5
msgid "Generated Content"
msgstr "Konten Yang Dihasilkan"
-#: gtksourceview/language-specs/texinfo.lang.h:7
+#: ../gtksourceview/language-specs/texinfo.lang.h:7
msgid "Indexing"
msgstr "Indeks"
-#: gtksourceview/language-specs/texinfo.lang.h:10
+#: ../gtksourceview/language-specs/texinfo.lang.h:10
msgid "Macro Parameters"
msgstr "Parameter Makro"
-#: gtksourceview/language-specs/texinfo.lang.h:11
+#: ../gtksourceview/language-specs/texinfo.lang.h:11
msgid "Macros"
msgstr "Makro"
-#: gtksourceview/language-specs/texinfo.lang.h:13
+#: ../gtksourceview/language-specs/texinfo.lang.h:13
msgid "Markup (block)"
msgstr "Markup (blok)"
-#: gtksourceview/language-specs/texinfo.lang.h:14
+#: ../gtksourceview/language-specs/texinfo.lang.h:14
msgid "Markup (inline)"
msgstr "Markup (sebaris)"
-#: gtksourceview/language-specs/texinfo.lang.h:15
+#: ../gtksourceview/language-specs/texinfo.lang.h:15
msgid "Sectioning"
msgstr "Seksi"
-#: gtksourceview/language-specs/texinfo.lang.h:16
+#: ../gtksourceview/language-specs/texinfo.lang.h:16
msgid "Texinfo"
msgstr "Texinfo"
-#: gtksourceview/language-specs/vbnet.lang.h:3
+#: ../gtksourceview/language-specs/vbnet.lang.h:7
msgid "Old Style Comment"
msgstr "Komentar Gaya Lama"
-#: gtksourceview/language-specs/vbnet.lang.h:9
+#: ../gtksourceview/language-specs/vbnet.lang.h:12
msgid "VB.NET"
msgstr "VB.NET"
-#: gtksourceview/language-specs/nemerle.lang.h:4
-msgid "Core Keywords"
-msgstr "Kata-kunci Inti"
-
-#: gtksourceview/language-specs/nemerle.lang.h:5
-msgid "Core Types"
-msgstr "Tipe Inti"
-
-#: gtksourceview/language-specs/nemerle.lang.h:9
-msgid "Keywords Defined by Macros"
-msgstr "Kata-kunci yang didefinisikan oleh Makro"
-
-#: gtksourceview/language-specs/nemerle.lang.h:11
-msgid "Nemerle"
-msgstr "Nemerle"
+#: ../gtksourceview/language-specs/verilog.lang.h:4
+msgid "Gates"
+msgstr "Gerbang"
-#: gtksourceview/language-specs/tcl.lang.h:6
-msgid "Tcl"
-msgstr "Tcl"
+#: ../gtksourceview/language-specs/verilog.lang.h:11
+msgid "Verilog"
+msgstr "Verilog"
-#: gtksourceview/language-specs/vhdl.lang.h:7
+#: ../gtksourceview/language-specs/vhdl.lang.h:7
msgid "True and False"
msgstr "Benar dan Salah"
-#: gtksourceview/language-specs/vhdl.lang.h:8
-msgid "Type"
-msgstr "Tipe"
-
-#: gtksourceview/language-specs/vhdl.lang.h:9
+#: ../gtksourceview/language-specs/vhdl.lang.h:9
msgid "VHDL"
msgstr "VHDL"
-#: gtksourceview/language-specs/R.lang.h:1
-msgid "Assignment Operator"
-msgstr "Operator Penugasan"
+#: ../gtksourceview/language-specs/xml.lang.h:5
+msgid "Hexadecimal"
+msgstr "Heksadesimal"
-#: gtksourceview/language-specs/R.lang.h:2
-msgid "Delimiter"
-msgstr "Pembatas"
+#: ../gtksourceview/language-specs/xml.lang.h:9
+msgid "XML"
+msgstr "XML"
-#: gtksourceview/language-specs/R.lang.h:5
-msgid "Integer Number"
-msgstr "Angka Integer"
+#~ msgid "Double Quote String"
+#~ msgstr "String Tanda-petik Ganda"
-#: gtksourceview/language-specs/R.lang.h:8
-msgid "Reserved Class"
-msgstr "Kelas yang Telah Dicadangkan"
+#~ msgid "Single Quote String"
+#~ msgstr "String Tanda-petik Tunggal"
-#: gtksourceview/language-specs/R.lang.h:9
-msgid "Reserved Constant"
-msgstr "Konstanta Yang Telah Dicadangkan"
+#~ msgid "Most Used Commands"
+#~ msgstr "Perintah yg Paling Sering Digunakan"
-#: gtksourceview/language-specs/gtkrc.lang.h:3
-msgid "GtkRC"
-msgstr "GtkRC"
+#~ msgid "Regular Expression"
+#~ msgstr "Ekspresi Reguler"
-#: gtksourceview/language-specs/gtkrc.lang.h:4
-msgid "Include Directive"
-msgstr "Masukkan Direktif"
+#~ msgid "Regular Expression 2"
+#~ msgstr "Ekspresi Reguler 2"
-#: gtksourceview/language-specs/gtkrc.lang.h:5
-msgid "Keysymbol"
-msgstr "Simbol-kunci"
-
-#: gtksourceview/language-specs/gtkrc.lang.h:11
-msgid "State"
-msgstr "Status"
+#~ msgid "Miscellaneous Single-Row Functions"
+#~ msgstr "Aneka Fungsi Baris-Tunggal"
#, fuzzy
#~ msgid "Font description name to use for the document text"
@@ -1499,6 +1720,3 @@ msgstr "Status"
#, fuzzy
#~ msgid "Font description name to use for the header and footer"
#~ msgstr "Nama huruf yang digunakan untuk header dan footer"
-
-#~ msgid "MSIL"
-#~ msgstr "MSIL"
diff -pruN 1.6.1-3/po/ko.po 1.7.1-0ubuntu2/po/ko.po
--- 1.6.1-3/po/ko.po 2005-03-08 10:47:59.000000000 +0000
+++ 1.7.1-0ubuntu2/po/ko.po 2006-07-20 09:09:56.000000000 +0100
@@ -1,441 +1,494 @@
# gtksourceview
-# Changwoo Ryu <cwryu debian org>, 2003-2004.
+# Changwoo Ryu <cwryu debian org>, 2003-2006.
#
msgid ""
msgstr ""
"Project-Id-Version: gtksourceview\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-08 11:38+0100\n"
-"PO-Revision-Date: 2005-02-04 05:56+0900\n"
+"POT-Creation-Date: 2006-07-09 03:03+0900\n"
+"PO-Revision-Date: 2006-07-09 03:12+0900\n"
"Last-Translator: Changwoo Ryu <cwryu debian org>\n"
"Language-Team: GNOME Korean <gnome-kr-hackers lists kldp net>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: gtksourceview/gtksourcebuffer.c:279
+#: ../gtksourceview/gtksourcebuffer.c:278
msgid "Escape Character"
msgstr "ì?´ì?¤ì¼?ì?´í?? 문ì??"
-#: gtksourceview/gtksourcebuffer.c:280
+#: ../gtksourceview/gtksourcebuffer.c:279
msgid "Escaping character for syntax patterns"
msgstr "구문 í?¨í?´ì??ì?? ì?´ì?¤ì¼?ì?´í?? 문ì??"
-#: gtksourceview/gtksourcebuffer.c:288
+#: ../gtksourceview/gtksourcebuffer.c:287
msgid "Check Brackets"
msgstr "ê´?í?¸ ê²?ì?¬"
-#: gtksourceview/gtksourcebuffer.c:289
+#: ../gtksourceview/gtksourcebuffer.c:288
msgid "Whether to check and highlight matching brackets"
msgstr "ê´?í?¸ê°? ë§?ë?? ì§? ê²?ì?¬í??ê³ ê°?ì¡°í? ì§? ì?¬ë¶?"
-#: gtksourceview/gtksourcebuffer.c:297 gtksourceview/gtksourceprintjob.c:295
+#: ../gtksourceview/gtksourcebuffer.c:296
+#: ../gtksourceview/gtksourceprintjob.c:296
msgid "Highlight"
msgstr "ê°?ì¡°"
-#: gtksourceview/gtksourcebuffer.c:298
+#: ../gtksourceview/gtksourcebuffer.c:297
msgid "Whether to highlight syntax in the buffer"
msgstr "ë²?í?¼ì??ì?? 구문 ê°?ì¡°í? ì§? ì?¬ë¶?"
-#: gtksourceview/gtksourcebuffer.c:306
+#: ../gtksourceview/gtksourcebuffer.c:305
msgid "Maximum Undo Levels"
msgstr "ìµ?ë?? ì?¤í?? ì·¨ì?? ê°?ì??"
-#: gtksourceview/gtksourcebuffer.c:307
+#: ../gtksourceview/gtksourcebuffer.c:306
msgid "Number of undo levels for the buffer"
msgstr "ë²?í?¼ì??ì?? ê°?ë?¥í?? ì?¤í?? ì·¨ì?? ê°?ì??"
-#: gtksourceview/gtksourcebuffer.c:317
-#: gtksourceview/language-specs/desktop.lang.h:6
-#: gtksourceview/language-specs/ini.lang.h:7
+#: ../gtksourceview/gtksourcebuffer.c:316
+#: ../gtksourceview/language-specs/desktop.lang.h:6
+#: ../gtksourceview/language-specs/ini.lang.h:7
msgid "Language"
msgstr "��"
-#: gtksourceview/gtksourcebuffer.c:318
+#: ../gtksourceview/gtksourcebuffer.c:317
msgid "Language object to get highlighting patterns from"
msgstr "ê°?ì¡° í?¨í?´ì?? ì?»ì?´ì?¬ ì?¸ì?´ ì?¤ë¸?ì ?í?¸"
-#: gtksourceview/gtksourcelanguagesmanager.c:119
+#: ../gtksourceview/gtksourcelanguagesmanager.c:114
msgid "Language specification directories"
msgstr "ì?¸ì?´ ëª?ì?¸ ë??ë ?í? 리"
-#: gtksourceview/gtksourcelanguagesmanager.c:120
+#: ../gtksourceview/gtksourcelanguagesmanager.c:115
msgid ""
"List of directories where the language specification files (.lang) are "
"located"
msgstr "ì?¸ì?´ ëª?ì?¸ í??ì?¼(.lang)ì?´ ë?¤ì?´ ì??ë?? ë??ë ?í? 리ì?? 목ë¡?"
-#: gtksourceview/gtksourceprintjob.c:264
+#: ../gtksourceview/gtksourceprintjob.c:265
msgid "Configuration"
msgstr "ì?¤ì ?"
-#: gtksourceview/gtksourceprintjob.c:265
+#: ../gtksourceview/gtksourceprintjob.c:266
msgid "Configuration options for the print job"
msgstr "ì?¸ì??ì?? ë??í?? ì?¤ì ? ì?µì??"
-#: gtksourceview/gtksourceprintjob.c:272
+#: ../gtksourceview/gtksourceprintjob.c:273
msgid "Source Buffer"
msgstr "ì??ì?¤ ë²?í?¼"
-#: gtksourceview/gtksourceprintjob.c:273
+#: ../gtksourceview/gtksourceprintjob.c:274
msgid "GtkSourceBuffer object to print"
msgstr "ì?¸ì??í? GtkSourceBuffer ì?¤ë¸?ì ?í?¸"
-#: gtksourceview/gtksourceprintjob.c:279 gtksourceview/gtksourceview.c:222
-#: gtksourceview/gtksourceview.c:223
+#: ../gtksourceview/gtksourceprintjob.c:280
+#: ../gtksourceview/gtksourceview.c:233 ../gtksourceview/gtksourceview.c:234
msgid "Tabs Width"
msgstr "í? ë??ë¹?"
-#: gtksourceview/gtksourceprintjob.c:280
+#: ../gtksourceview/gtksourceprintjob.c:281
msgid "Width in equivalent space characters of tabs"
msgstr "í? ë??ë¹?ì?? í?´ë?¹í??ë?? ì?¤í??ì?´ì?¤ ê°?ì??"
-#: gtksourceview/gtksourceprintjob.c:287
+#: ../gtksourceview/gtksourceprintjob.c:288
msgid "Wrap Mode"
msgstr "ì¤? ë°?꾸기 모ë??"
-#: gtksourceview/gtksourceprintjob.c:288
+#: ../gtksourceview/gtksourceprintjob.c:289
msgid "Word wrapping mode"
msgstr "ë?¨ì?´ ì¤?ë°?ê¿? 모ë??"
-#: gtksourceview/gtksourceprintjob.c:296
+#: ../gtksourceview/gtksourceprintjob.c:297
msgid "Whether to print the document with highlighted syntax"
msgstr "구문 ê°?ì¡°ë?? 문ì??를 ì?¸ì??í? ì§? ì?¬ë¶?"
-#: gtksourceview/gtksourceprintjob.c:304
+#: ../gtksourceview/gtksourceprintjob.c:305
msgid "Font"
msgstr "�꼴"
-#: gtksourceview/gtksourceprintjob.c:305
+#: ../gtksourceview/gtksourceprintjob.c:306
msgid "GnomeFont name to use for the document text (deprecated)"
msgstr "문ì?? í??ì?¤í?¸ì?? ì?¬ì?©í? GnomeFont ì?´ë¦? (ì??ì?´ì§? ì??ì ?)"
-#: gtksourceview/gtksourceprintjob.c:312
+#: ../gtksourceview/gtksourceprintjob.c:313
msgid "Font Description"
msgstr "�꼴 ��"
-#: gtksourceview/gtksourceprintjob.c:313
+#: ../gtksourceview/gtksourceprintjob.c:314
msgid "Font to use for the document text (e.g. \"Monospace 10\")"
msgstr "문ì?? í??ì?¤í?¸ì?? ì?¬ì?©í? ê¸?ê¼´ (ì??를 ë?¤ì?´ \"Monospace 10\")"
-#: gtksourceview/gtksourceprintjob.c:320 gtksourceview/gtksourceprintjob.c:328
+#: ../gtksourceview/gtksourceprintjob.c:321
+#: ../gtksourceview/gtksourceprintjob.c:329
msgid "Numbers Font"
msgstr "�� �꼴"
-#: gtksourceview/gtksourceprintjob.c:321
+#: ../gtksourceview/gtksourceprintjob.c:322
msgid "GnomeFont name to use for the line numbers (deprecated)"
msgstr "ì¤? ë²?í?¸ì?? ì?¬ì?©í? GnomeFont ì?´ë¦? (ì??ì?´ì§? ì??ì ?)"
-#: gtksourceview/gtksourceprintjob.c:329
+#: ../gtksourceview/gtksourceprintjob.c:330
msgid "Font description to use for the line numbers"
msgstr "ì¤? ë²?í?¸ì?? ì?¬ì?©í? ê¸?ê¼´ ì?¤ëª?"
-#: gtksourceview/gtksourceprintjob.c:336
+#: ../gtksourceview/gtksourceprintjob.c:337
msgid "Print Line Numbers"
msgstr "ì¤? ë²?í?¸ ì?¸ì??"
-#: gtksourceview/gtksourceprintjob.c:337
+#: ../gtksourceview/gtksourceprintjob.c:338
msgid "Interval of printed line numbers (0 means no numbers)"
msgstr "ì¤?ë²?í?¸ ì?¸ì?? ê°?격 (0ë?? ë²?í?¸ ì??ì??)"
-#: gtksourceview/gtksourceprintjob.c:344
+#: ../gtksourceview/gtksourceprintjob.c:345
msgid "Print Header"
msgstr "ê¸?머리 ì?¸ì??"
-#: gtksourceview/gtksourceprintjob.c:345
+#: ../gtksourceview/gtksourceprintjob.c:346
msgid "Whether to print a header in each page"
msgstr "ê°? í??ì?´ì§?ì?? ê¸?머리를 ì?¸ì??í? ì§? ì?¬ë¶?"
-#: gtksourceview/gtksourceprintjob.c:352
+#: ../gtksourceview/gtksourceprintjob.c:353
msgid "Print Footer"
msgstr "ê¸?꼬리 ì?¸ì??"
-#: gtksourceview/gtksourceprintjob.c:353
+#: ../gtksourceview/gtksourceprintjob.c:354
msgid "Whether to print a footer in each page"
msgstr "ê°? í??ì?´ì§?ì?? ê¸?꼬리를 ì?¸ì??í? ì§? ì?¬ë¶?"
-#: gtksourceview/gtksourceprintjob.c:360
+#: ../gtksourceview/gtksourceprintjob.c:361
msgid "Header and Footer Font"
msgstr "�머리 � 꼬리 �꼴"
-#: gtksourceview/gtksourceprintjob.c:361
+#: ../gtksourceview/gtksourceprintjob.c:362
msgid "GnomeFont name to use for the header and footer (deprecated)"
msgstr "ê¸?머리ì?? 꼬리ì?? ì?¬ì?©í? GnomeFont ì?´ë¦? (ì??ì?´ì§? ì??ì ?)"
-#: gtksourceview/gtksourceprintjob.c:368
+#: ../gtksourceview/gtksourceprintjob.c:369
msgid "Header and Footer Font Description"
msgstr "�머리 � 꼬리 �꼴 ��"
-#: gtksourceview/gtksourceprintjob.c:369
+#: ../gtksourceview/gtksourceprintjob.c:370
msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
msgstr "ê¸?머리ì?? 꼬리ì?? ì?¬ì?©í? ê¸?ê¼´ (ì??를 ë?¤ì?´ \"Monospace 10\")"
-#: gtksourceview/gtksourcestylescheme.c:262
+#: ../gtksourceview/gtksourcestylescheme.c:264
msgid "Base-N Integer"
msgstr "Nì§?ì?? ì ?ì??"
-#: gtksourceview/gtksourcestylescheme.c:267
+#: ../gtksourceview/gtksourcestylescheme.c:269
msgid "Character"
msgstr "문ì??"
-#: gtksourceview/gtksourcestylescheme.c:272
-#: gtksourceview/language-specs/latex.lang.h:1
-#: gtksourceview/language-specs/po.lang.h:1
+#: ../gtksourceview/gtksourcestylescheme.c:274
+#: ../gtksourceview/language-specs/latex.lang.h:2
+#: ../gtksourceview/language-specs/po.lang.h:1
msgid "Comment"
msgstr "주ì??"
#. $this = (datatype)
-#: gtksourceview/gtksourcestylescheme.c:277
-#: gtksourceview/language-specs/php.lang.h:14
+#: ../gtksourceview/gtksourcestylescheme.c:279
+#: ../gtksourceview/language-specs/php.lang.h:14
msgid "Data Type"
msgstr "ë?°ì?´í?? í??ì??"
#.
#. CSS functions, such as rgb(), clip(), or lang().
#.
-#: gtksourceview/gtksourcestylescheme.c:282
-#: gtksourceview/language-specs/ada.lang.h:3
-#: gtksourceview/language-specs/css.lang.h:17
+#: ../gtksourceview/gtksourcestylescheme.c:284
+#: ../gtksourceview/language-specs/ada.lang.h:3
+#: ../gtksourceview/language-specs/css.lang.h:18
+#: ../gtksourceview/language-specs/octave.lang.h:4
+#: ../gtksourceview/language-specs/python.lang.h:5
+#: ../gtksourceview/language-specs/scheme.lang.h:2
+#: ../gtksourceview/language-specs/sh.lang.h:4
msgid "Function"
msgstr "í?¨ì??"
-#: gtksourceview/gtksourcestylescheme.c:287
-#: gtksourceview/language-specs/c.lang.h:6
-#: gtksourceview/language-specs/cpp.lang.h:6
-#: gtksourceview/language-specs/fortran.lang.h:1
-#: gtksourceview/language-specs/python.lang.h:2
-#: gtksourceview/language-specs/haskell.lang.h:3
-#: gtksourceview/language-specs/nemerle.lang.h:6
+#: ../gtksourceview/gtksourcestylescheme.c:289
+#: ../gtksourceview/language-specs/c.lang.h:6
+#: ../gtksourceview/language-specs/cpp.lang.h:6
+#: ../gtksourceview/language-specs/fortran.lang.h:1
+#: ../gtksourceview/language-specs/haskell.lang.h:3
+#: ../gtksourceview/language-specs/nemerle.lang.h:6
+#: ../gtksourceview/language-specs/octave.lang.h:1
+#: ../gtksourceview/language-specs/python.lang.h:2
msgid "Decimal"
msgstr "ì?ì§?ì??"
-#: gtksourceview/gtksourcestylescheme.c:292
+#: ../gtksourceview/gtksourcestylescheme.c:294
msgid "Floating Point"
msgstr "ë¶?ë??ì??ì??ì ?"
-#: gtksourceview/gtksourcestylescheme.c:297
-#: gtksourceview/language-specs/latex.lang.h:3
-#: gtksourceview/language-specs/po.lang.h:3
-#: gtksourceview/language-specs/texinfo.lang.h:8
-#: gtksourceview/language-specs/vhdl.lang.h:2
-#: gtksourceview/language-specs/R.lang.h:6
-#: gtksourceview/language-specs/gtkrc.lang.h:6
+#. We cannot match \b at the end of a keyword automatically
+#. because it fails for let* etc. So we need to manually add it to the
+#. other keywords and match ([ \t]|$) for the one ending with a
+#. special character. Unfortnately this also means that if the highlight
+#. style for keywords sets the background color, for let* etc also the
+#. trailing space will be highlighted.
+#: ../gtksourceview/gtksourcestylescheme.c:299
+#: ../gtksourceview/language-specs/ada.lang.h:4
+#: ../gtksourceview/language-specs/gtkrc.lang.h:6
+#: ../gtksourceview/language-specs/haskell.lang.h:9
+#: ../gtksourceview/language-specs/latex.lang.h:5
+#: ../gtksourceview/language-specs/octave.lang.h:6
+#: ../gtksourceview/language-specs/po.lang.h:3
+#: ../gtksourceview/language-specs/python.lang.h:7
+#: ../gtksourceview/language-specs/R.lang.h:6
+#: ../gtksourceview/language-specs/scheme.lang.h:9
+#: ../gtksourceview/language-specs/tcl.lang.h:1
+#: ../gtksourceview/language-specs/texinfo.lang.h:8
+#: ../gtksourceview/language-specs/vhdl.lang.h:2
msgid "Keyword"
msgstr "í?¤ì??ë??"
-#: gtksourceview/gtksourcestylescheme.c:302
+#: ../gtksourceview/gtksourcestylescheme.c:304
msgid "Preprocessor"
msgstr "ì ?ì²?리기"
-#: gtksourceview/gtksourcestylescheme.c:307
-#: gtksourceview/language-specs/ada.lang.h:9
-#: gtksourceview/language-specs/c.lang.h:15
-#: gtksourceview/language-specs/cpp.lang.h:15
-#: gtksourceview/language-specs/csharp.lang.h:8
-#: gtksourceview/language-specs/css.lang.h:63
-#: gtksourceview/language-specs/html.lang.h:8
-#: gtksourceview/language-specs/fortran.lang.h:12
-#: gtksourceview/language-specs/idl.lang.h:9
-#: gtksourceview/language-specs/java.lang.h:11
-#: gtksourceview/language-specs/javascript.lang.h:33
-#: gtksourceview/language-specs/lua.lang.h:10
-#: gtksourceview/language-specs/pascal.lang.h:18
-#: gtksourceview/language-specs/perl.lang.h:8
-#: gtksourceview/language-specs/po.lang.h:6
-#: gtksourceview/language-specs/python.lang.h:14
-#: gtksourceview/language-specs/ruby.lang.h:18
-#: gtksourceview/language-specs/sh.lang.h:13
-#: gtksourceview/language-specs/xml.lang.h:7
-#: gtksourceview/language-specs/haskell.lang.h:15
-#: gtksourceview/language-specs/vbnet.lang.h:7
-#: gtksourceview/language-specs/nemerle.lang.h:15
-#: gtksourceview/language-specs/tcl.lang.h:4
-#: gtksourceview/language-specs/vhdl.lang.h:6
+#.
+#. <pattern-item _name = "Operator" style = "Operators">
+#. <regex>[:!#$%&*+./>=<? \\^|~\-]+</regex>
+#. </pattern-item>
+#.
+#. <keyword-list _name="Keysymbol" style = "Keyword">
+#. <keyword>::</keyword>
+#. <keyword>-></keyword>
+#. <keyword><-</keyword>
+#. <keyword>=></keyword>
+#. <keyword>=</keyword>
+#. <keyword>|</keyword>`
+#. <keyword>\</keyword>
+#. <keyword>@</keyword>
+#. <keyword>~</keyword>
+#. </keyword-list>
+#.
+#: ../gtksourceview/gtksourcestylescheme.c:309
+#: ../gtksourceview/language-specs/ada.lang.h:9
+#: ../gtksourceview/language-specs/c.lang.h:15
+#: ../gtksourceview/language-specs/cpp.lang.h:15
+#: ../gtksourceview/language-specs/csharp.lang.h:9
+#: ../gtksourceview/language-specs/css.lang.h:58
+#: ../gtksourceview/language-specs/html.lang.h:8
+#: ../gtksourceview/language-specs/fortran.lang.h:13
+#: ../gtksourceview/language-specs/haskell.lang.h:31
+#: ../gtksourceview/language-specs/idl.lang.h:9
+#: ../gtksourceview/language-specs/java.lang.h:11
+#: ../gtksourceview/language-specs/javascript.lang.h:23
+#: ../gtksourceview/language-specs/lua.lang.h:10
+#: ../gtksourceview/language-specs/makefile.lang.h:8
+#: ../gtksourceview/language-specs/nemerle.lang.h:15
+#: ../gtksourceview/language-specs/pascal.lang.h:18
+#: ../gtksourceview/language-specs/perl.lang.h:8
+#: ../gtksourceview/language-specs/po.lang.h:6
+#: ../gtksourceview/language-specs/scheme.lang.h:13
+#: ../gtksourceview/language-specs/sh.lang.h:13
+#: ../gtksourceview/language-specs/tcl.lang.h:4
+#: ../gtksourceview/language-specs/vbnet.lang.h:11
+#: ../gtksourceview/language-specs/vhdl.lang.h:6
+#: ../gtksourceview/language-specs/xml.lang.h:7
msgid "String"
msgstr "문ì??ì?´"
-#: gtksourceview/gtksourcestylescheme.c:312
+#: ../gtksourceview/gtksourcestylescheme.c:314
msgid "Specials"
msgstr "í?¹ì??"
-#.
-#. Proposed language specification for CSS (Cascading Style Sheet) files.
-#.
-#. Reference used:
-#. http://www.w3.org/TR/CSS2/
-#.
-#. Tested with:
-#. http://www.simplebits.com/css/simple.css
-#.
-#. Submitted by Scott Martin (scott coffeeblack org)
-#.
-#. FIXME: find the correct mimetype
-#: gtksourceview/gtksourcestylescheme.c:319
-#: gtksourceview/language-specs/css.lang.h:46
-#: gtksourceview/language-specs/desktop.lang.h:10
-#: gtksourceview/language-specs/diff.lang.h:7
-#: gtksourceview/language-specs/ini.lang.h:10
-#: gtksourceview/language-specs/msil.lang.h:2
-#: gtksourceview/language-specs/po.lang.h:5
-#: gtksourceview/language-specs/gtkrc.lang.h:9
+#: ../gtksourceview/gtksourcestylescheme.c:321
+#: ../gtksourceview/language-specs/changelog.lang.h:6
+#: ../gtksourceview/language-specs/css.lang.h:36
+#: ../gtksourceview/language-specs/desktop.lang.h:10
+#: ../gtksourceview/language-specs/diff.lang.h:7
+#: ../gtksourceview/language-specs/gtkrc.lang.h:9
+#: ../gtksourceview/language-specs/ini.lang.h:10
+#: ../gtksourceview/language-specs/msil.lang.h:2
+#: ../gtksourceview/language-specs/po.lang.h:5
msgid "Others"
msgstr "ê·¸ ì?¸"
-#: gtksourceview/gtksourcestylescheme.c:324
+#: ../gtksourceview/gtksourcestylescheme.c:326
msgid "Others 2"
msgstr "ê·¸ ì?¸ 2"
-#: gtksourceview/gtksourcestylescheme.c:329
+#: ../gtksourceview/gtksourcestylescheme.c:331
msgid "Others 3"
msgstr "ê·¸ ì?¸ 3"
-#: gtksourceview/gtksourcestylescheme.c:366
+#: ../gtksourceview/gtksourcestylescheme.c:368
msgid "Default"
msgstr "기본"
-#: gtksourceview/gtksourcetag.c:108
+#: ../gtksourceview/gtksourcetag.c:109
msgid "Tag ID"
msgstr "í??ê·¸ ID"
-#: gtksourceview/gtksourcetag.c:109
+#: ../gtksourceview/gtksourcetag.c:110
msgid "ID used to refer to the source tag"
msgstr "ì??ì?¤ í??그를 참조í??ë?? ë?° ì?°ë?? ID"
-#: gtksourceview/gtksourcetag.c:116
+#: ../gtksourceview/gtksourcetag.c:117
msgid "Tag style"
msgstr "í??ê·¸ ì?¤í??ì?¼"
-#: gtksourceview/gtksourcetag.c:117
-msgid "The style associated to the source tag"
+#: ../gtksourceview/gtksourcetag.c:118
+msgid "The style associated with the source tag"
msgstr "ì??ì?¤ í??ê·¸ì?? ì?°ê²°ë?? ì?¤í??ì?¼"
-#: gtksourceview/gtksourceview.c:206
+#: ../gtksourceview/gtksourceview.c:217
msgid "Show Line Numbers"
msgstr "� �� 보�기"
-#: gtksourceview/gtksourceview.c:207
+#: ../gtksourceview/gtksourceview.c:218
msgid "Whether to display line numbers"
msgstr "� ��를 보�� � ��"
-#: gtksourceview/gtksourceview.c:214
+#: ../gtksourceview/gtksourceview.c:225
msgid "Show Line Markers"
msgstr "ì¤? í??ì?? ë³´ì?´ê¸°"
-#: gtksourceview/gtksourceview.c:215
+#: ../gtksourceview/gtksourceview.c:226
msgid "Whether to display line marker pixbufs"
msgstr "ì¤? í??ì?? í?½ì?¤ë§µì?? ë³´ì?¬ì¤? ì§? ì?¬ë¶?"
-#: gtksourceview/gtksourceview.c:232
+#: ../gtksourceview/gtksourceview.c:243
msgid "Auto Indentation"
msgstr "ì??ë?? ë?¤ì?¬ì?°ê¸°"
-#: gtksourceview/gtksourceview.c:233
+#: ../gtksourceview/gtksourceview.c:244
msgid "Whether to enable auto indentation"
msgstr "ì??ë?? ë?¤ì?¬ ì?°ê¸°ë¥¼ ì?¬ì?©í? ì§? ì?¬ë¶?"
-#: gtksourceview/gtksourceview.c:239
+#: ../gtksourceview/gtksourceview.c:250
msgid "Insert Spaces Instead of Tabs"
msgstr "í? ë??ì? ì?? ì?¤í??ì?´ì?¤ ë?£ê¸°"
-#: gtksourceview/gtksourceview.c:240
+#: ../gtksourceview/gtksourceview.c:251
msgid "Whether to insert spaces instead of tabs"
msgstr "í? ë??ì? ì?? ì?¤í??ì?´ì?¤ë¥¼ ë?£ì?? ì§? ì?¬ë¶?"
-#: gtksourceview/gtksourceview.c:247
+#: ../gtksourceview/gtksourceview.c:258
msgid "Show Right Margin"
msgstr "�른쪽 �백 보�기"
-#: gtksourceview/gtksourceview.c:248
+#: ../gtksourceview/gtksourceview.c:259
msgid "Whether to display the right margin"
msgstr "ì?¤ë¥¸ìª½ ì?¬ë°±ì?? ë³´ì?¬ì¤? ì§? ì?¬ë¶?"
-#: gtksourceview/gtksourceview.c:255
+#: ../gtksourceview/gtksourceview.c:266
msgid "Margin position"
msgstr "ì?¬ë°± ì??ì¹?"
-#: gtksourceview/gtksourceview.c:256
+#: ../gtksourceview/gtksourceview.c:267
msgid "Position of the right margin"
msgstr "ì?¤ë¥¸ìª½ ì?¬ë°±ì?? ì??ì¹?"
-#: gtksourceview/gtksourceview.c:265
+#: ../gtksourceview/gtksourceview.c:276
msgid "Use smart home/end"
msgstr "ë??ë??í?? <Home>/<End> ì?¬ì?©"
-#: gtksourceview/gtksourceview.c:266
+#: ../gtksourceview/gtksourceview.c:277
msgid ""
-"HOME and END keys move to first/last characters on line first before going "
-"to the start/end of the line"
-msgstr ""
-"<Home>/<End> í?¤ë¥¼ ë??르면 ê·¸ ì¤?ì?? 맨 첫ë²?째/ë§?ì§?ë§? ê¸?ì??ë¡? ì?´ë??í?©ë??ë?¤. í?? ë²? "
-"ë?? ë??ë?¬ì?¼ ì¤?ì?? ì²?ì??/ë??ì?¼ë¡? ì?´ë??í?©ë??ë?¤."
+"HOME and END keys move to first/last non whitespace characters on line "
+"before going to the start/end of the line"
+msgstr "<Home>/<End> í?¤ë¥¼ ë??르면 ê·¸ ì¤?ì?? 공백문ì??ê°? ì??ë?? 맨 첫ë²?째/ë§?ì§?ë§? ê¸?ì??ë¡? ì?´ë??í?©ë??ë?¤. í?? ë²? ë?? ë??ë?¬ì?¼ ì¤?ì?? ì²?ì??/ë??ì?¼ë¡? ì?´ë??í?©ë??ë?¤."
-#: gtksourceview/gtksourceview.c:275
+#: ../gtksourceview/gtksourceview.c:286
msgid "Highlight current line"
msgstr "í??ì?¬ ì¤? ê°?ì¡°"
-#: gtksourceview/gtksourceview.c:276
+#: ../gtksourceview/gtksourceview.c:287
msgid "Whether to highlight the current line"
msgstr "í??ì?¬ ì¤?ì?? ê°?ì¡°í? ì§? ì?¬ë¶?"
-#: gtksourceview/language-specs/ada.lang.h:1
+#: ../gtksourceview/gtksourceview.c:303
+msgid "Margin Line Alpha"
+msgstr "ì?¬ë°± ì¤? ì??í??ê°?"
+
+#: ../gtksourceview/gtksourceview.c:304
+msgid "Transparency of the margin line"
+msgstr "ì?¬ë°± ì¤?ì?? í?¬ëª?ë??"
+
+#: ../gtksourceview/gtksourceview.c:321
+msgid "Margin Line Color"
+msgstr "ì?¬ë°± ì¤? ì??"
+
+#: ../gtksourceview/gtksourceview.c:322
+msgid "Color to use for the right margin line"
+msgstr "ì?¤ë¥¸ìª½ ì?¬ë°± ì¤?ì?? ì?¬ì?©í? ì??"
+
+#: ../gtksourceview/gtksourceview.c:338
+msgid "Margin Overlay Toggle"
+msgstr "ì?¬ë°± ì?¤ë²?ë ?ì?´ í? ê¸?"
+
+#: ../gtksourceview/gtksourceview.c:339
+msgid "Whether to draw the right margin overlay"
+msgstr "ì?¤ë¥¸ 쪽 ì?¬ë°± ì?¤ë²?ë ?ì?´ë¥¼ 그릴 ì§? ì?¬ë¶?"
+
+#: ../gtksourceview/gtksourceview.c:355
+msgid "Margin Overlay Alpha"
+msgstr "ì?¬ë°± ì?¤ë²?ë ?ì?´ ì??í??"
+
+#: ../gtksourceview/gtksourceview.c:356
+msgid "Transparency of the margin overlay"
+msgstr "ì?¬ë°± ì?¤ë²?ë ?ì?´ì?? í?¬ëª?ë??"
+
+#: ../gtksourceview/gtksourceview.c:373
+msgid "Margin Overlay Color"
+msgstr "ì?¬ë°± ì?¤ë²?ë ?ì?´ ì??"
+
+#: ../gtksourceview/gtksourceview.c:374
+msgid "Color to use for drawing the margin overlay"
+msgstr "ì?¬ë°± ì?¤ë²?ë ?ì?´ë¥¼ 그릴 ë?? ì?¬ì?©í? ì??"
+
+#: ../gtksourceview/language-specs/ada.lang.h:1
msgid "Ada"
msgstr "Ada"
-#: gtksourceview/language-specs/ada.lang.h:2
-#: gtksourceview/language-specs/c.lang.h:4
-#: gtksourceview/language-specs/cpp.lang.h:4
-#: gtksourceview/language-specs/haskell.lang.h:2
-#: gtksourceview/language-specs/nemerle.lang.h:3
-#: gtksourceview/language-specs/vhdl.lang.h:1
+#: ../gtksourceview/language-specs/ada.lang.h:2
+#: ../gtksourceview/language-specs/c.lang.h:4
+#: ../gtksourceview/language-specs/cpp.lang.h:4
+#: ../gtksourceview/language-specs/haskell.lang.h:2
+#: ../gtksourceview/language-specs/nemerle.lang.h:3
+#: ../gtksourceview/language-specs/vhdl.lang.h:1
msgid "Character Constant"
msgstr "문ì?? ì??ì??"
-#: gtksourceview/language-specs/ada.lang.h:4
-#: gtksourceview/language-specs/c.lang.h:10
-#: gtksourceview/language-specs/cpp.lang.h:10
-#: gtksourceview/language-specs/csharp.lang.h:3
-#: gtksourceview/language-specs/fortran.lang.h:7
-#: gtksourceview/language-specs/idl.lang.h:4
-#: gtksourceview/language-specs/javascript.lang.h:11
-#: gtksourceview/language-specs/lua.lang.h:3
-#: gtksourceview/language-specs/perl.lang.h:2
-#: gtksourceview/language-specs/python.lang.h:6
-#: gtksourceview/language-specs/ruby.lang.h:8
-#: gtksourceview/language-specs/verilog.lang.h:6
-#: gtksourceview/language-specs/haskell.lang.h:9
-#: gtksourceview/language-specs/vbnet.lang.h:1
-#: gtksourceview/language-specs/tcl.lang.h:1
-msgid "Keywords"
-msgstr "í?¤ì??ë??"
-
-#: gtksourceview/language-specs/ada.lang.h:5
-#: gtksourceview/language-specs/c.lang.h:11
-#: gtksourceview/language-specs/cpp.lang.h:11
-#: gtksourceview/language-specs/csharp.lang.h:4
-#: gtksourceview/language-specs/css.lang.h:28
-#: gtksourceview/language-specs/desktop.lang.h:7
-#: gtksourceview/language-specs/diff.lang.h:5
-#: gtksourceview/language-specs/fortran.lang.h:8
-#: gtksourceview/language-specs/idl.lang.h:5
-#: gtksourceview/language-specs/ini.lang.h:8
-#: gtksourceview/language-specs/java.lang.h:5
-#: gtksourceview/language-specs/javascript.lang.h:12
-#: gtksourceview/language-specs/lua.lang.h:4
-#: gtksourceview/language-specs/pascal.lang.h:11
-#: gtksourceview/language-specs/perl.lang.h:3
-#: gtksourceview/language-specs/python.lang.h:7
-#: gtksourceview/language-specs/ruby.lang.h:9
-#: gtksourceview/language-specs/sh.lang.h:5
-#: gtksourceview/language-specs/sql.lang.h:11
-#: gtksourceview/language-specs/verilog.lang.h:7
-#: gtksourceview/language-specs/haskell.lang.h:10
-#: gtksourceview/language-specs/texinfo.lang.h:9
-#: gtksourceview/language-specs/vbnet.lang.h:2
-#: gtksourceview/language-specs/nemerle.lang.h:10
-#: gtksourceview/language-specs/tcl.lang.h:2
-#: gtksourceview/language-specs/vhdl.lang.h:3
-#: gtksourceview/language-specs/R.lang.h:7
-#: gtksourceview/language-specs/gtkrc.lang.h:7
+#. Note: contains an hack to avoid considering ^COMMON a comment
+#. <string _name = "String 2" style = "String" end-at-line-end = "TRUE">
+#. <start-regex>'</start-regex>
+#. <end-regex>'</end-regex>
+#. </string>
+#: ../gtksourceview/language-specs/ada.lang.h:5
+#: ../gtksourceview/language-specs/c.lang.h:11
+#: ../gtksourceview/language-specs/cpp.lang.h:11
+#: ../gtksourceview/language-specs/csharp.lang.h:4
+#: ../gtksourceview/language-specs/css.lang.h:29
+#: ../gtksourceview/language-specs/desktop.lang.h:7
+#: ../gtksourceview/language-specs/diff.lang.h:5
+#: ../gtksourceview/language-specs/fortran.lang.h:9
+#: ../gtksourceview/language-specs/gtkrc.lang.h:7
+#: ../gtksourceview/language-specs/haskell.lang.h:10
+#: ../gtksourceview/language-specs/idl.lang.h:5
+#: ../gtksourceview/language-specs/ini.lang.h:8
+#: ../gtksourceview/language-specs/java.lang.h:5
+#: ../gtksourceview/language-specs/javascript.lang.h:13
+#: ../gtksourceview/language-specs/lua.lang.h:4
+#: ../gtksourceview/language-specs/makefile.lang.h:4
+#: ../gtksourceview/language-specs/nemerle.lang.h:10
+#: ../gtksourceview/language-specs/octave.lang.h:7
+#: ../gtksourceview/language-specs/pascal.lang.h:11
+#: ../gtksourceview/language-specs/perl.lang.h:3
+#: ../gtksourceview/language-specs/python.lang.h:8
+#: ../gtksourceview/language-specs/R.lang.h:7
+#: ../gtksourceview/language-specs/ruby.lang.h:10
+#: ../gtksourceview/language-specs/scheme.lang.h:10
+#: ../gtksourceview/language-specs/sh.lang.h:5
+#: ../gtksourceview/language-specs/sql.lang.h:23
+#: ../gtksourceview/language-specs/tcl.lang.h:2
+#: ../gtksourceview/language-specs/texinfo.lang.h:9
+#: ../gtksourceview/language-specs/vbnet.lang.h:6
+#: ../gtksourceview/language-specs/verilog.lang.h:7
+#: ../gtksourceview/language-specs/vhdl.lang.h:3
msgid "Line Comment"
msgstr "ë?¼ì?¸ 주ì??"
@@ -443,176 +496,226 @@ msgstr "ë?¼ì?¸ 주ì??"
#. For values like: z-index: 2;
#. +/- before 0 is not allowed.
#.
-#: gtksourceview/language-specs/ada.lang.h:6
-#: gtksourceview/language-specs/css.lang.h:33
-#: gtksourceview/language-specs/desktop.lang.h:9
-#: gtksourceview/language-specs/javascript.lang.h:15
-#: gtksourceview/language-specs/pascal.lang.h:14
-#: gtksourceview/language-specs/vhdl.lang.h:4
-#: gtksourceview/language-specs/gtkrc.lang.h:8
+#: ../gtksourceview/language-specs/ada.lang.h:6
+#: ../gtksourceview/language-specs/css.lang.h:34
+#: ../gtksourceview/language-specs/desktop.lang.h:9
+#: ../gtksourceview/language-specs/gtkrc.lang.h:8
+#: ../gtksourceview/language-specs/javascript.lang.h:16
+#: ../gtksourceview/language-specs/pascal.lang.h:14
+#: ../gtksourceview/language-specs/vhdl.lang.h:4
msgid "Number"
msgstr "ì?«ì??"
-#: gtksourceview/language-specs/ada.lang.h:7
-msgid "Preprocessor Keywords"
+#: ../gtksourceview/language-specs/ada.lang.h:7
+msgid "Preprocessor Keyword"
msgstr "ì ?ì²?리기 í?¤ì??ë??"
-#: gtksourceview/language-specs/ada.lang.h:8
-#: gtksourceview/language-specs/c.lang.h:14
-#: gtksourceview/language-specs/cpp.lang.h:14
-#: gtksourceview/language-specs/csharp.lang.h:7
-#: gtksourceview/language-specs/fortran.lang.h:11
-#: gtksourceview/language-specs/idl.lang.h:8
-#: gtksourceview/language-specs/java.lang.h:10
-#: gtksourceview/language-specs/pascal.lang.h:17
-#: gtksourceview/language-specs/php.lang.h:23
-#: gtksourceview/language-specs/sql.lang.h:26
-#: gtksourceview/language-specs/verilog.lang.h:9
-#: gtksourceview/language-specs/haskell.lang.h:14
-#: gtksourceview/language-specs/vbnet.lang.h:6
-#: gtksourceview/language-specs/nemerle.lang.h:14
-#: gtksourceview/language-specs/vhdl.lang.h:5
+#: ../gtksourceview/language-specs/ada.lang.h:8
+#: ../gtksourceview/language-specs/c.lang.h:14
+#: ../gtksourceview/language-specs/cpp.lang.h:14
+#: ../gtksourceview/language-specs/csharp.lang.h:8
+#: ../gtksourceview/language-specs/fortran.lang.h:12
+#: ../gtksourceview/language-specs/haskell.lang.h:13
+#: ../gtksourceview/language-specs/idl.lang.h:8
+#: ../gtksourceview/language-specs/java.lang.h:10
+#: ../gtksourceview/language-specs/makefile.lang.h:6
+#: ../gtksourceview/language-specs/nemerle.lang.h:14
+#: ../gtksourceview/language-specs/pascal.lang.h:17
+#: ../gtksourceview/language-specs/scheme.lang.h:12
+#: ../gtksourceview/language-specs/sql.lang.h:48
+#: ../gtksourceview/language-specs/vbnet.lang.h:10
+#: ../gtksourceview/language-specs/verilog.lang.h:9
+#: ../gtksourceview/language-specs/vhdl.lang.h:5
msgid "Sources"
msgstr "ì??ì?¤"
-#: gtksourceview/language-specs/ada.lang.h:10
+#: ../gtksourceview/language-specs/ada.lang.h:10
msgid "True And False"
msgstr "참 거�"
-#: gtksourceview/language-specs/ada.lang.h:11
-#: gtksourceview/language-specs/c.lang.h:16
-#: gtksourceview/language-specs/cpp.lang.h:16
-#: gtksourceview/language-specs/fortran.lang.h:14
-#: gtksourceview/language-specs/idl.lang.h:10
-#: gtksourceview/language-specs/verilog.lang.h:10
-msgid "Types"
+#: ../gtksourceview/language-specs/ada.lang.h:11
+#: ../gtksourceview/language-specs/vhdl.lang.h:8
+msgid "Type"
msgstr "í??ì??"
-#: gtksourceview/language-specs/c.lang.h:1
-#: gtksourceview/language-specs/cpp.lang.h:1
+#: ../gtksourceview/language-specs/c.lang.h:1
+#: ../gtksourceview/language-specs/cpp.lang.h:1
msgid "'#if 0' Comment"
msgstr "'#if 0' 주ì??"
-#: gtksourceview/language-specs/c.lang.h:2
-#: gtksourceview/language-specs/cpp.lang.h:2
-#: gtksourceview/language-specs/csharp.lang.h:1
-#: gtksourceview/language-specs/css.lang.h:9
-#: gtksourceview/language-specs/html.lang.h:2
-#: gtksourceview/language-specs/idl.lang.h:1
-#: gtksourceview/language-specs/java.lang.h:1
-#: gtksourceview/language-specs/javascript.lang.h:2
-#: gtksourceview/language-specs/lua.lang.h:1
-#: gtksourceview/language-specs/sql.lang.h:5
-#: gtksourceview/language-specs/verilog.lang.h:2
-#: gtksourceview/language-specs/xml.lang.h:2
-#: gtksourceview/language-specs/haskell.lang.h:1
-#: gtksourceview/language-specs/texinfo.lang.h:1
-#: gtksourceview/language-specs/nemerle.lang.h:2
+#. Comments
+#: ../gtksourceview/language-specs/c.lang.h:2
+#: ../gtksourceview/language-specs/cpp.lang.h:2
+#: ../gtksourceview/language-specs/csharp.lang.h:1
+#: ../gtksourceview/language-specs/css.lang.h:9
+#: ../gtksourceview/language-specs/html.lang.h:2
+#: ../gtksourceview/language-specs/haskell.lang.h:1
+#: ../gtksourceview/language-specs/idl.lang.h:1
+#: ../gtksourceview/language-specs/java.lang.h:1
+#: ../gtksourceview/language-specs/javascript.lang.h:2
+#: ../gtksourceview/language-specs/lua.lang.h:1
+#: ../gtksourceview/language-specs/nemerle.lang.h:2
+#: ../gtksourceview/language-specs/sql.lang.h:9
+#: ../gtksourceview/language-specs/texinfo.lang.h:1
+#: ../gtksourceview/language-specs/verilog.lang.h:2
+#: ../gtksourceview/language-specs/xml.lang.h:2
msgid "Block Comment"
msgstr "ë¸?ë? 주ì??"
-#: gtksourceview/language-specs/c.lang.h:3
+#: ../gtksourceview/language-specs/c.lang.h:3
msgid "C"
msgstr "C"
-#: gtksourceview/language-specs/c.lang.h:5
-#: gtksourceview/language-specs/cpp.lang.h:5
+#: ../gtksourceview/language-specs/c.lang.h:5
+#: ../gtksourceview/language-specs/cpp.lang.h:5
msgid "Common Macro"
msgstr "공� 매��"
-#: gtksourceview/language-specs/c.lang.h:7
-#: gtksourceview/language-specs/cpp.lang.h:7
-#: gtksourceview/language-specs/fortran.lang.h:2
-#: gtksourceview/language-specs/python.lang.h:3
-#: gtksourceview/language-specs/haskell.lang.h:4
-#: gtksourceview/language-specs/nemerle.lang.h:7
-#: gtksourceview/language-specs/R.lang.h:4
+#: ../gtksourceview/language-specs/c.lang.h:7
+#: ../gtksourceview/language-specs/cpp.lang.h:7
+#: ../gtksourceview/language-specs/fortran.lang.h:2
+#: ../gtksourceview/language-specs/haskell.lang.h:4
+#: ../gtksourceview/language-specs/nemerle.lang.h:7
+#: ../gtksourceview/language-specs/octave.lang.h:3
+#: ../gtksourceview/language-specs/python.lang.h:4
+#: ../gtksourceview/language-specs/R.lang.h:4
msgid "Floating Point Number"
msgstr "ë¶?ë??ì??ì??ì ? ì??"
#. FIXME WHY DOESN'T THIS WORK?
-#: gtksourceview/language-specs/c.lang.h:8
-#: gtksourceview/language-specs/cpp.lang.h:8
-#: gtksourceview/language-specs/fortran.lang.h:4
-#: gtksourceview/language-specs/pascal.lang.h:10
-#: gtksourceview/language-specs/python.lang.h:5
-#: gtksourceview/language-specs/haskell.lang.h:6
-#: gtksourceview/language-specs/nemerle.lang.h:8
+#: ../gtksourceview/language-specs/c.lang.h:8
+#: ../gtksourceview/language-specs/cpp.lang.h:8
+#: ../gtksourceview/language-specs/fortran.lang.h:4
+#: ../gtksourceview/language-specs/haskell.lang.h:6
+#: ../gtksourceview/language-specs/nemerle.lang.h:8
+#: ../gtksourceview/language-specs/octave.lang.h:5
+#: ../gtksourceview/language-specs/pascal.lang.h:10
+#: ../gtksourceview/language-specs/python.lang.h:6
msgid "Hex Number"
msgstr "16ì§?ì??"
-#: gtksourceview/language-specs/c.lang.h:9
-#: gtksourceview/language-specs/cpp.lang.h:9
-#: gtksourceview/language-specs/idl.lang.h:3
-#: gtksourceview/language-specs/haskell.lang.h:7
+#: ../gtksourceview/language-specs/c.lang.h:9
+#: ../gtksourceview/language-specs/cpp.lang.h:9
+#: ../gtksourceview/language-specs/haskell.lang.h:7
+#: ../gtksourceview/language-specs/idl.lang.h:3
msgid "Include/Pragma"
msgstr "include/pragma"
-#: gtksourceview/language-specs/c.lang.h:12
-#: gtksourceview/language-specs/cpp.lang.h:12
-#: gtksourceview/language-specs/fortran.lang.h:9
-#: gtksourceview/language-specs/python.lang.h:11
-#: gtksourceview/language-specs/verilog.lang.h:8
-#: gtksourceview/language-specs/haskell.lang.h:11
-#: gtksourceview/language-specs/nemerle.lang.h:12
+#: ../gtksourceview/language-specs/c.lang.h:10
+#: ../gtksourceview/language-specs/cpp.lang.h:10
+#: ../gtksourceview/language-specs/csharp.lang.h:3
+#: ../gtksourceview/language-specs/fortran.lang.h:7
+#: ../gtksourceview/language-specs/idl.lang.h:4
+#: ../gtksourceview/language-specs/javascript.lang.h:12
+#: ../gtksourceview/language-specs/lua.lang.h:3
+#: ../gtksourceview/language-specs/perl.lang.h:2
+#: ../gtksourceview/language-specs/ruby.lang.h:9
+#: ../gtksourceview/language-specs/vbnet.lang.h:1
+#: ../gtksourceview/language-specs/verilog.lang.h:6
+msgid "Keywords"
+msgstr "í?¤ì??ë??"
+
+#: ../gtksourceview/language-specs/c.lang.h:12
+#: ../gtksourceview/language-specs/cpp.lang.h:12
+#: ../gtksourceview/language-specs/fortran.lang.h:10
+#: ../gtksourceview/language-specs/haskell.lang.h:11
+#: ../gtksourceview/language-specs/nemerle.lang.h:12
+#: ../gtksourceview/language-specs/octave.lang.h:10
+#: ../gtksourceview/language-specs/python.lang.h:12
+#: ../gtksourceview/language-specs/verilog.lang.h:8
msgid "Octal Number"
msgstr "8ì§?ì??"
-#: gtksourceview/language-specs/c.lang.h:13
-#: gtksourceview/language-specs/cpp.lang.h:13
-#: gtksourceview/language-specs/csharp.lang.h:5
-#: gtksourceview/language-specs/idl.lang.h:6
-#: gtksourceview/language-specs/haskell.lang.h:13
-#: gtksourceview/language-specs/vbnet.lang.h:4
+#: ../gtksourceview/language-specs/c.lang.h:13
+#: ../gtksourceview/language-specs/cpp.lang.h:13
+#: ../gtksourceview/language-specs/csharp.lang.h:6
+#: ../gtksourceview/language-specs/idl.lang.h:6
+#: ../gtksourceview/language-specs/vbnet.lang.h:8
msgid "Preprocessor Definitions"
msgstr "ì ?ì²?리기 ì ?ì??"
-#: gtksourceview/language-specs/cpp.lang.h:3
+#: ../gtksourceview/language-specs/c.lang.h:16
+#: ../gtksourceview/language-specs/cpp.lang.h:16
+#: ../gtksourceview/language-specs/fortran.lang.h:15
+#: ../gtksourceview/language-specs/idl.lang.h:10
+#: ../gtksourceview/language-specs/verilog.lang.h:10
+msgid "Types"
+msgstr "í??ì??"
+
+#: ../gtksourceview/language-specs/changelog.lang.h:1
+msgid "ChangeLog"
+msgstr "�꾼 기�"
+
+#: ../gtksourceview/language-specs/changelog.lang.h:2
+msgid "Date"
+msgstr "ë? ì§?"
+
+#: ../gtksourceview/language-specs/changelog.lang.h:3
+msgid "Email"
+msgstr "ì ?ì??ë©?ì?¼"
+
+#: ../gtksourceview/language-specs/changelog.lang.h:4
+msgid "File"
+msgstr "í??ì?¼"
+
+#: ../gtksourceview/language-specs/changelog.lang.h:5
+msgid "Marker"
+msgstr "�커"
+
+#: ../gtksourceview/language-specs/cpp.lang.h:3
msgid "C++"
msgstr "C++"
-#: gtksourceview/language-specs/csharp.lang.h:2
+#: ../gtksourceview/language-specs/csharp.lang.h:2
msgid "C#"
msgstr "C#"
-#: gtksourceview/language-specs/csharp.lang.h:6
-#: gtksourceview/language-specs/java.lang.h:9
-#: gtksourceview/language-specs/vbnet.lang.h:5
-#: gtksourceview/language-specs/nemerle.lang.h:13
+#: ../gtksourceview/language-specs/csharp.lang.h:5
+#: ../gtksourceview/language-specs/lua.lang.h:7
+#: ../gtksourceview/language-specs/sh.lang.h:6
+msgid "Multiline String"
+msgstr "ì?¬ë?¬ ì¤?ë¡? ë?? 문ì??ì?´"
+
+#: ../gtksourceview/language-specs/csharp.lang.h:7
+#: ../gtksourceview/language-specs/java.lang.h:9
+#: ../gtksourceview/language-specs/nemerle.lang.h:13
+#: ../gtksourceview/language-specs/vbnet.lang.h:9
msgid "Primitives"
msgstr "기본"
-#: gtksourceview/language-specs/csharp.lang.h:9
-#: gtksourceview/language-specs/css.lang.h:64
-#: gtksourceview/language-specs/fortran.lang.h:13
-#: gtksourceview/language-specs/java.lang.h:12
-#: gtksourceview/language-specs/javascript.lang.h:34
-#: gtksourceview/language-specs/lua.lang.h:11
-#: gtksourceview/language-specs/python.lang.h:15
-#: gtksourceview/language-specs/ruby.lang.h:19
-#: gtksourceview/language-specs/sh.lang.h:14
-#: gtksourceview/language-specs/vbnet.lang.h:8
+#: ../gtksourceview/language-specs/csharp.lang.h:10
+#: ../gtksourceview/language-specs/css.lang.h:59
+#: ../gtksourceview/language-specs/fortran.lang.h:14
+#: ../gtksourceview/language-specs/java.lang.h:12
+#: ../gtksourceview/language-specs/javascript.lang.h:24
+#: ../gtksourceview/language-specs/lua.lang.h:11
+#: ../gtksourceview/language-specs/makefile.lang.h:9
+#: ../gtksourceview/language-specs/sh.lang.h:14
msgid "String 2"
msgstr "문ì??ì?´ 2"
#.
#. At rules must occur at the start of a line.
#.
-#: gtksourceview/language-specs/css.lang.h:4
+#: ../gtksourceview/language-specs/css.lang.h:4
msgid "At Rules"
msgstr "AT ê·?ì¹?"
#.
#. For CSS 2-style selectors: tag[attr="value"].
#.
-#: gtksourceview/language-specs/css.lang.h:8
+#: ../gtksourceview/language-specs/css.lang.h:8
msgid "Attribute Value Delimiters"
msgstr "ì??ì?± ê°? 구ë¶?"
+#: ../gtksourceview/language-specs/css.lang.h:10
+msgid "CSS"
+msgstr "CSS"
+
#.
#. Value length specifier. Unless it is 0, must always be like: -1.2em.
#.
-#: gtksourceview/language-specs/css.lang.h:13
+#: ../gtksourceview/language-specs/css.lang.h:14
msgid "Dimension"
msgstr "�기"
@@ -620,43 +723,46 @@ msgstr "�기"
#. Hexadecimal method of specifying colors. Can either be 3 or 6 in
#. length: #ffcc00 = #fc0.
#.
-#: gtksourceview/language-specs/css.lang.h:22
+#: ../gtksourceview/language-specs/css.lang.h:23
msgid "Hexadecimal Color"
msgstr "16ì§?ì?? ì??"
#.
#. Upgrades a rule set's importance when several rule sets conflict.
#.
-#: gtksourceview/language-specs/css.lang.h:26
+#: ../gtksourceview/language-specs/css.lang.h:27
msgid "Importance Modifier"
msgstr "ì¤?ì?? ì??ì??ì?´êµ¬"
-#: gtksourceview/language-specs/css.lang.h:27
+#: ../gtksourceview/language-specs/css.lang.h:28
msgid "Known Property Values"
msgstr "ì??ë ¤ì§? ì??ì?± ê°?"
-#: gtksourceview/language-specs/css.lang.h:34
-#: gtksourceview/language-specs/javascript.lang.h:19
-#: gtksourceview/language-specs/php.lang.h:19
-#: gtksourceview/language-specs/sh.lang.h:8
-#: gtksourceview/language-specs/haskell.lang.h:12
+#: ../gtksourceview/language-specs/css.lang.h:35
+#: ../gtksourceview/language-specs/javascript.lang.h:20
+#: ../gtksourceview/language-specs/php.lang.h:20
+#: ../gtksourceview/language-specs/sql.lang.h:34
msgid "Operators"
msgstr "ì?°ì?°ì??"
-#: gtksourceview/language-specs/css.lang.h:47
+#: ../gtksourceview/language-specs/css.lang.h:37
msgid "Property Names"
msgstr "ì??ì?± ì?´ë¦?"
#.
#. Brackets define a declaration block, parentheses define functions.
#.
-#: gtksourceview/language-specs/css.lang.h:51
-#: gtksourceview/language-specs/javascript.lang.h:20
-#: gtksourceview/language-specs/sh.lang.h:9
+#: ../gtksourceview/language-specs/css.lang.h:41
+#: ../gtksourceview/language-specs/javascript.lang.h:21
msgid "Punctuators"
msgstr "구ë??ì ?"
-#: gtksourceview/language-specs/css.lang.h:52
+#.
+#. Used to combine selectors. Example syntax:
+#.
+#. body * div#ID.className > p + ul li:first-child
+#.
+#: ../gtksourceview/language-specs/css.lang.h:47
msgid "Selector Grammar"
msgstr "ì??ë ?í?° 문ë²?"
@@ -664,7 +770,7 @@ msgstr "ì??ë ?í?° 문ë²?"
#. Pseudo-class rules. Good to have syntax highlighting for these
#. for mistypings.
#.
-#: gtksourceview/language-specs/css.lang.h:57
+#: ../gtksourceview/language-specs/css.lang.h:52
msgid "Selector Pseudo Classes"
msgstr "ì??ë ?í?° ê°?ì§? í?´ë??ì?¤"
@@ -672,7 +778,7 @@ msgstr "ì??ë ?í?° ê°?ì§? í?´ë??ì?¤"
#. Pseudo-element rules. Good to have syntax highlighting for these
#. for mistypings.
#.
-#: gtksourceview/language-specs/css.lang.h:62
+#: ../gtksourceview/language-specs/css.lang.h:57
msgid "Selector Pseudo Elements"
msgstr "ì??ë ?í?° ê°?ì§? ì??리먼í?¸"
@@ -680,812 +786,924 @@ msgstr "ì??ë ?í?° ê°?ì§? ì??리먼í?¸"
#. Escaped unicode characters can contain either 6 hexadecimal characters
#. or 1-5 hex characters followed by one whitespace character.
#.
-#: gtksourceview/language-specs/css.lang.h:69
+#: ../gtksourceview/language-specs/css.lang.h:64
msgid "Unicode Character Reference"
msgstr "ì? ë??ì½?ë?? 문ì?? 참조"
#.
#. Unicode range values.
#.
-#: gtksourceview/language-specs/css.lang.h:73
+#: ../gtksourceview/language-specs/css.lang.h:68
msgid "Unicode Range"
msgstr "ì? ë??ì½?ë?? ë²?ì??"
-#: gtksourceview/language-specs/desktop.lang.h:1
+#: ../gtksourceview/language-specs/desktop.lang.h:1
msgid ".desktop"
msgstr ".desktop"
-#: gtksourceview/language-specs/desktop.lang.h:2
-#: gtksourceview/language-specs/ini.lang.h:2
-#: gtksourceview/language-specs/gtkrc.lang.h:1
+#: ../gtksourceview/language-specs/desktop.lang.h:2
+#: ../gtksourceview/language-specs/gtkrc.lang.h:1
+#: ../gtksourceview/language-specs/ini.lang.h:2
+#: ../gtksourceview/language-specs/scheme.lang.h:1
msgid "Boolean Value"
msgstr "�리� �"
-#: gtksourceview/language-specs/desktop.lang.h:3
+#: ../gtksourceview/language-specs/desktop.lang.h:3
msgid "Encoding"
msgstr "���"
-#: gtksourceview/language-specs/desktop.lang.h:4
+#: ../gtksourceview/language-specs/desktop.lang.h:4
msgid "Exec Parameter"
msgstr "ì?¤í?? ì?¸ì??"
-#: gtksourceview/language-specs/desktop.lang.h:5
-#: gtksourceview/language-specs/ini.lang.h:5
+#: ../gtksourceview/language-specs/desktop.lang.h:5
+#: ../gtksourceview/language-specs/ini.lang.h:5
msgid "Group"
msgstr "그룹"
-#: gtksourceview/language-specs/desktop.lang.h:8
-#: gtksourceview/language-specs/ini.lang.h:9
+#: ../gtksourceview/language-specs/desktop.lang.h:8
+#: ../gtksourceview/language-specs/ini.lang.h:9
msgid "Non Standard Key"
msgstr "í??ì¤?ì?´ ì??ë?? í?¤"
-#: gtksourceview/language-specs/desktop.lang.h:11
+#: ../gtksourceview/language-specs/desktop.lang.h:11
msgid "Standard Key"
msgstr "í??ì¤? í?¤"
-#: gtksourceview/language-specs/diff.lang.h:1
+#: ../gtksourceview/language-specs/diff.lang.h:1
msgid "Added line"
msgstr "ë??í?? ì¤?"
-#: gtksourceview/language-specs/diff.lang.h:2
+#: ../gtksourceview/language-specs/diff.lang.h:2
msgid "Changed line"
msgstr "ë°?ë?? ì¤?"
-#: gtksourceview/language-specs/diff.lang.h:3
+#: ../gtksourceview/language-specs/diff.lang.h:3
msgid "Diff"
msgstr "diff"
-#: gtksourceview/language-specs/diff.lang.h:4
+#: ../gtksourceview/language-specs/diff.lang.h:4
msgid "Diff file"
msgstr "diff í??ì?¼"
-#: gtksourceview/language-specs/diff.lang.h:6
-#: gtksourceview/language-specs/po.lang.h:4
+#: ../gtksourceview/language-specs/diff.lang.h:6
+#: ../gtksourceview/language-specs/po.lang.h:4
msgid "Location"
msgstr "ì??ì¹?"
-#: gtksourceview/language-specs/diff.lang.h:8
+#: ../gtksourceview/language-specs/diff.lang.h:8
msgid "Removed line"
msgstr "ì§?ì??ì§? ì¤?"
-#: gtksourceview/language-specs/diff.lang.h:9
+#: ../gtksourceview/language-specs/diff.lang.h:9
msgid "Special case"
msgstr "í?¹ì??í?? ê²½ì?°"
-#: gtksourceview/language-specs/html.lang.h:1
-#: gtksourceview/language-specs/xml.lang.h:1
-msgid "Attributes"
+#: ../gtksourceview/language-specs/html.lang.h:1
+#: ../gtksourceview/language-specs/xml.lang.h:1
+msgid "Attribute"
msgstr "ì??ì?±"
-#: gtksourceview/language-specs/html.lang.h:3
-#: gtksourceview/language-specs/xml.lang.h:3
+#: ../gtksourceview/language-specs/html.lang.h:3
+#: ../gtksourceview/language-specs/xml.lang.h:3
msgid "Closing Bracket"
msgstr "ë?«ë?? ê´?í?¸"
-#: gtksourceview/language-specs/html.lang.h:4
+#: ../gtksourceview/language-specs/html.lang.h:4
msgid "DTD"
msgstr "DTD"
-#: gtksourceview/language-specs/html.lang.h:5
-#: gtksourceview/language-specs/xml.lang.h:4
+#: ../gtksourceview/language-specs/html.lang.h:5
+#: ../gtksourceview/language-specs/xml.lang.h:4
msgid "Entity"
msgstr "ì??í?°í?°"
-#: gtksourceview/language-specs/html.lang.h:6
+#: ../gtksourceview/language-specs/html.lang.h:6
msgid "HTML"
msgstr "HTML"
-#: gtksourceview/language-specs/html.lang.h:7
-#: gtksourceview/language-specs/latex.lang.h:5
-#: gtksourceview/language-specs/xml.lang.h:6
-#: gtksourceview/language-specs/texinfo.lang.h:12
+#: ../gtksourceview/language-specs/html.lang.h:7
+#: ../gtksourceview/language-specs/latex.lang.h:7
+#: ../gtksourceview/language-specs/texinfo.lang.h:12
+#: ../gtksourceview/language-specs/xml.lang.h:6
msgid "Markup"
msgstr "ë§?í?¬ì??"
-#: gtksourceview/language-specs/html.lang.h:9
-msgid "Tags"
+#: ../gtksourceview/language-specs/html.lang.h:9
+#: ../gtksourceview/language-specs/xml.lang.h:8
+msgid "Tag"
msgstr "í??ê·¸"
-#: gtksourceview/language-specs/fortran.lang.h:3
+#: ../gtksourceview/language-specs/fortran.lang.h:3
msgid "Fortran 95"
msgstr "Fortran 95"
-#: gtksourceview/language-specs/fortran.lang.h:5
+#: ../gtksourceview/language-specs/fortran.lang.h:5
msgid "Input/Output"
msgstr "ì??/ì¶?ë ¥"
-#: gtksourceview/language-specs/fortran.lang.h:6
+#: ../gtksourceview/language-specs/fortran.lang.h:6
msgid "Intrinsics"
msgstr "ê³ ì? "
-#: gtksourceview/language-specs/fortran.lang.h:10
+#: ../gtksourceview/language-specs/fortran.lang.h:11
msgid "Read/Write"
msgstr "�기/�기"
-#: gtksourceview/language-specs/idl.lang.h:2
+#. "duble-quoted strings"
+#: ../gtksourceview/language-specs/gtkrc.lang.h:2
+#: ../gtksourceview/language-specs/ini.lang.h:4
+#: ../gtksourceview/language-specs/octave.lang.h:2
+#: ../gtksourceview/language-specs/php.lang.h:16
+#: ../gtksourceview/language-specs/python.lang.h:3
+#: ../gtksourceview/language-specs/R.lang.h:3
+#: ../gtksourceview/language-specs/ruby.lang.h:6
+msgid "Double Quoted String"
+msgstr "ì??ë?°ì?´í?? 문ì??ì?´"
+
+#: ../gtksourceview/language-specs/gtkrc.lang.h:3
+msgid "GtkRC"
+msgstr "GtkRC"
+
+#: ../gtksourceview/language-specs/gtkrc.lang.h:4
+msgid "Include Directive"
+msgstr "include ì§?ì??ì?´"
+
+#: ../gtksourceview/language-specs/gtkrc.lang.h:5
+#: ../gtksourceview/language-specs/haskell.lang.h:8
+msgid "Keysymbol"
+msgstr "��볼"
+
+#. 'single-quoted strings'
+#: ../gtksourceview/language-specs/gtkrc.lang.h:10
+#: ../gtksourceview/language-specs/ini.lang.h:11
+#: ../gtksourceview/language-specs/octave.lang.h:14
+#: ../gtksourceview/language-specs/php.lang.h:24
+#: ../gtksourceview/language-specs/python.lang.h:15
+#: ../gtksourceview/language-specs/R.lang.h:11
+#: ../gtksourceview/language-specs/ruby.lang.h:17
+msgid "Single Quoted String"
+msgstr "í??ë?°ì?´í?? 문ì??ì?´"
+
+#: ../gtksourceview/language-specs/gtkrc.lang.h:11
+msgid "State"
+msgstr "ì??í??"
+
+#. $variable, $$dynamic-variable and even $$$more
+#: ../gtksourceview/language-specs/gtkrc.lang.h:12
+#: ../gtksourceview/language-specs/ini.lang.h:12
+#: ../gtksourceview/language-specs/php.lang.h:26
+#: ../gtksourceview/language-specs/tcl.lang.h:7
+msgid "Variable"
+msgstr "ë³?ì??"
+
+#: ../gtksourceview/language-specs/haskell.lang.h:5
+msgid "Haskell"
+msgstr "���"
+
+#: ../gtksourceview/language-specs/haskell.lang.h:12
+msgid "Preprocessor Definition"
+msgstr "ì ?ì²?리기 ì ?ì??"
+
+#: ../gtksourceview/language-specs/haskell.lang.h:32
+msgid "Type or Constructor"
+msgstr "í??ì?? ë°? ì??ì?±ì??"
+
+#: ../gtksourceview/language-specs/idl.lang.h:2
msgid "IDL"
msgstr "IDL"
-#: gtksourceview/language-specs/idl.lang.h:7
+#: ../gtksourceview/language-specs/idl.lang.h:7
msgid "Sectional"
msgstr "ì?¹ì?? 구ë¶?"
-#: gtksourceview/language-specs/ini.lang.h:1
+#: ../gtksourceview/language-specs/ini.lang.h:1
msgid ".ini"
msgstr ".ini"
-#: gtksourceview/language-specs/ini.lang.h:3
-#: gtksourceview/language-specs/verilog.lang.h:3
+#: ../gtksourceview/language-specs/ini.lang.h:3
+#: ../gtksourceview/language-specs/verilog.lang.h:3
msgid "Decimal Number"
msgstr "ì?ì§?ì??"
-#: gtksourceview/language-specs/ini.lang.h:4
-#: gtksourceview/language-specs/R.lang.h:3
-#: gtksourceview/language-specs/gtkrc.lang.h:2
-msgid "Double Quote String"
-msgstr "ì??ë?°ì?´í?? 문ì??ì?´"
-
-#: gtksourceview/language-specs/ini.lang.h:6
+#: ../gtksourceview/language-specs/ini.lang.h:6
msgid "Integer"
msgstr "ì ?ì??"
-#: gtksourceview/language-specs/ini.lang.h:11
-#: gtksourceview/language-specs/R.lang.h:11
-#: gtksourceview/language-specs/gtkrc.lang.h:10
-msgid "Single Quote String"
-msgstr "í??ë?°ì?´í?? 문ì??ì?´"
-
-#. $variable, $$dynamic-variable and even $$$more
-#: gtksourceview/language-specs/ini.lang.h:12
-#: gtksourceview/language-specs/php.lang.h:25
-#: gtksourceview/language-specs/gtkrc.lang.h:12
-msgid "Variable"
-msgstr "ë³?ì??"
-
-#: gtksourceview/language-specs/java.lang.h:2
+#: ../gtksourceview/language-specs/java.lang.h:2
msgid "Declarations"
msgstr "ì? ì?¸"
-#: gtksourceview/language-specs/java.lang.h:3
+#: ../gtksourceview/language-specs/java.lang.h:3
msgid "Flow"
msgstr "í??ë¦?"
-#: gtksourceview/language-specs/java.lang.h:4
+#: ../gtksourceview/language-specs/java.lang.h:4
msgid "Java"
msgstr "ì??ë°?"
-#: gtksourceview/language-specs/java.lang.h:6
+#: ../gtksourceview/language-specs/java.lang.h:6
msgid "Memory"
msgstr "�모리"
-#: gtksourceview/language-specs/java.lang.h:7
+#: ../gtksourceview/language-specs/java.lang.h:7
msgid "Modifiers"
msgstr "ì??ì??ì?´"
-#: gtksourceview/language-specs/java.lang.h:8
+#: ../gtksourceview/language-specs/java.lang.h:8
msgid "Numeric"
msgstr "ì?«ì??"
-#: gtksourceview/language-specs/javascript.lang.h:1
-#: gtksourceview/language-specs/php.lang.h:1
+#: ../gtksourceview/language-specs/javascript.lang.h:1
+#: ../gtksourceview/language-specs/php.lang.h:1
msgid "Array Operators"
msgstr "ë°°ì?´ ì?°ì?°ì??"
-#: gtksourceview/language-specs/javascript.lang.h:3
+#: ../gtksourceview/language-specs/javascript.lang.h:3
msgid "Constructors"
msgstr "ì??ì?±ì??"
-#: gtksourceview/language-specs/javascript.lang.h:4
+#: ../gtksourceview/language-specs/javascript.lang.h:4
msgid "Error Handling"
msgstr "�� �리"
-#: gtksourceview/language-specs/javascript.lang.h:5
+#: ../gtksourceview/language-specs/javascript.lang.h:5
msgid "Floating-Point Number"
msgstr "ë¶?ë??ì??ì??ì ? ì??"
-#: gtksourceview/language-specs/javascript.lang.h:6
+#: ../gtksourceview/language-specs/javascript.lang.h:6
msgid "Flow Keywords"
msgstr "í??ë¡?ì?° í?¤ì??ë??"
-#: gtksourceview/language-specs/javascript.lang.h:7
+#: ../gtksourceview/language-specs/javascript.lang.h:7
msgid "Future Reserved Words"
msgstr "í?¥í?? ì??ì?½ì?´"
-#: gtksourceview/language-specs/javascript.lang.h:8
+#: ../gtksourceview/language-specs/javascript.lang.h:8
msgid "Global Functions"
msgstr "ê¸?ë¡?ë²? í?¨ì??"
-#: gtksourceview/language-specs/javascript.lang.h:9
+#: ../gtksourceview/language-specs/javascript.lang.h:9
msgid "Global Properties"
msgstr "ê¸?ë¡?ë²? ì??ì?±"
-#: gtksourceview/language-specs/javascript.lang.h:10
-#: gtksourceview/language-specs/verilog.lang.h:5
+#: ../gtksourceview/language-specs/javascript.lang.h:10
+#: ../gtksourceview/language-specs/verilog.lang.h:5
msgid "Hexadecimal Number"
msgstr "ì?ì?¡ì§?ì??"
-#: gtksourceview/language-specs/javascript.lang.h:13
+#: ../gtksourceview/language-specs/javascript.lang.h:11
+msgid "JavaScript"
+msgstr "ì??ë°?ì?¤í?¬ë¦½í?¸"
+
+#: ../gtksourceview/language-specs/javascript.lang.h:14
msgid "Literals"
msgstr "ê¸?ì??"
-#: gtksourceview/language-specs/javascript.lang.h:14
+#: ../gtksourceview/language-specs/javascript.lang.h:15
msgid "Math Value Properties"
msgstr "ì??í?? ê°? ì??ì?±"
-#: gtksourceview/language-specs/javascript.lang.h:16
+#: ../gtksourceview/language-specs/javascript.lang.h:17
msgid "Object Functions"
msgstr "ì?¤ë¸?ì ?í?¸ í?¨ì??"
-#: gtksourceview/language-specs/javascript.lang.h:17
+#: ../gtksourceview/language-specs/javascript.lang.h:18
msgid "Object Properties"
msgstr "ì?¤ë¸?ì ?í?¸ ì??ì?±"
-#: gtksourceview/language-specs/javascript.lang.h:18
+#: ../gtksourceview/language-specs/javascript.lang.h:19
msgid "Objects"
msgstr "ì?¤ë¸?ì ?í?¸"
-#.
-#. Proposed language specification for JavaScript files.
-#.
-#. Reference used:
-#. http://www.ecma-international.org/publications/files/ecma-st/ECMA-262.pdf
-#.
-#. Tested with:
-#. http://www.coffeeblack.org/scripts/map.js
-#.
-#. Submitted by Scott Martin (scott coffeeblack org)
-#.
-#: gtksourceview/language-specs/javascript.lang.h:32
-#: gtksourceview/language-specs/lua.lang.h:9
-#: gtksourceview/language-specs/perl.lang.h:7
-#: gtksourceview/language-specs/python.lang.h:13
-#: gtksourceview/language-specs/ruby.lang.h:17
-#: gtksourceview/language-specs/sh.lang.h:11
-#: gtksourceview/language-specs/tcl.lang.h:3
-#: gtksourceview/language-specs/R.lang.h:10
+#: ../gtksourceview/language-specs/javascript.lang.h:22
+#: ../gtksourceview/language-specs/lua.lang.h:9
+#: ../gtksourceview/language-specs/octave.lang.h:13
+#: ../gtksourceview/language-specs/perl.lang.h:7
+#: ../gtksourceview/language-specs/php.lang.h:22
+#: ../gtksourceview/language-specs/python.lang.h:14
+#: ../gtksourceview/language-specs/R.lang.h:10
+#: ../gtksourceview/language-specs/ruby.lang.h:16
+#: ../gtksourceview/language-specs/sh.lang.h:11
+#: ../gtksourceview/language-specs/tcl.lang.h:3
msgid "Scripts"
msgstr "��립�"
-#: gtksourceview/language-specs/javascript.lang.h:35
+#: ../gtksourceview/language-specs/javascript.lang.h:25
msgid "Unicode Escape Sequence"
msgstr "ì? ë??ì½?ë?? ì?´ì?¤ì¼?ì?´í?? ì??í??ì?¤"
-#: gtksourceview/language-specs/javascript.lang.h:36
+#: ../gtksourceview/language-specs/javascript.lang.h:26
msgid "Word Operators"
msgstr "ì?°ì?°ì?? ë?¨ì?´"
-#: gtksourceview/language-specs/latex.lang.h:2
-#: gtksourceview/language-specs/texinfo.lang.h:6
+#: ../gtksourceview/language-specs/latex.lang.h:1
+msgid "Command"
+msgstr "ëª?ë ¹ì?´"
+
+#: ../gtksourceview/language-specs/latex.lang.h:3
+msgid "Comment Environment"
+msgstr "주ì?? í??ê²½"
+
+#: ../gtksourceview/language-specs/latex.lang.h:4
+#: ../gtksourceview/language-specs/texinfo.lang.h:6
msgid "Include"
msgstr "include"
-#: gtksourceview/language-specs/latex.lang.h:4
+#: ../gtksourceview/language-specs/latex.lang.h:6
msgid "LaTeX"
msgstr "LaTeX"
-#: gtksourceview/language-specs/latex.lang.h:6
+#: ../gtksourceview/language-specs/latex.lang.h:8
msgid "Math"
msgstr "ì??í??"
-#: gtksourceview/language-specs/latex.lang.h:7
-msgid "Most Used Commands"
-msgstr "ë§?ì?´ ì?¬ì?©ë??ë?? ëª?ë ¹"
-
-#: gtksourceview/language-specs/lua.lang.h:2
-#: gtksourceview/language-specs/python.lang.h:4
-#: gtksourceview/language-specs/sh.lang.h:4
+#: ../gtksourceview/language-specs/lua.lang.h:2
+#: ../gtksourceview/language-specs/makefile.lang.h:3
msgid "Functions"
msgstr "í?¨ì??"
-#: gtksourceview/language-specs/lua.lang.h:5
+#: ../gtksourceview/language-specs/lua.lang.h:5
msgid "Line Comment 2"
msgstr "ë?¼ì?¸ 주ì?? 2"
-#: gtksourceview/language-specs/lua.lang.h:6
+#: ../gtksourceview/language-specs/lua.lang.h:6
msgid "Lua"
-msgstr "Lua"
-
-#: gtksourceview/language-specs/lua.lang.h:7
-#: gtksourceview/language-specs/python.lang.h:9
-#: gtksourceview/language-specs/sh.lang.h:6
-msgid "Multiline String"
-msgstr "ì?¬ë?¬ ì¤?ë¡? ë?? 문ì??ì?´"
+msgstr "lua"
-#: gtksourceview/language-specs/lua.lang.h:8
-#: gtksourceview/language-specs/python.lang.h:10
-#: gtksourceview/language-specs/sh.lang.h:7
+#: ../gtksourceview/language-specs/lua.lang.h:8
+#: ../gtksourceview/language-specs/sh.lang.h:7
msgid "Multiline String 2"
msgstr "ì?¬ë?¬ ì¤?ë¡? ë?? 문ì??ì?´ 2"
-#: gtksourceview/language-specs/pascal.lang.h:1
+# FIXME - backtick
+#. `backticks-quoted strings`
+#: ../gtksourceview/language-specs/makefile.lang.h:1
+#: ../gtksourceview/language-specs/php.lang.h:3
+#: ../gtksourceview/language-specs/sh.lang.h:1
+msgid "Backtick String"
+msgstr "ë°?ë?? ë°©í?¥ ë?°ì?´í?? 문ì??ì?´"
+
+#: ../gtksourceview/language-specs/makefile.lang.h:2
+msgid "Directives"
+msgstr "ì§?ì??ì?´"
+
+#: ../gtksourceview/language-specs/makefile.lang.h:5
+msgid "Makefile"
+msgstr "ë©?ì?´í?¬í??ì?¼"
+
+#: ../gtksourceview/language-specs/makefile.lang.h:7
+msgid "Special Targets"
+msgstr "í?¹ì?? í??ê²?"
+
+#: ../gtksourceview/language-specs/makefile.lang.h:10
+msgid "Targets"
+msgstr "í??ê²?"
+
+#: ../gtksourceview/language-specs/makefile.lang.h:11
+#: ../gtksourceview/language-specs/sh.lang.h:15
+msgid "Variable1"
+msgstr "ë³?ì??1"
+
+#: ../gtksourceview/language-specs/makefile.lang.h:12
+#: ../gtksourceview/language-specs/sh.lang.h:16
+msgid "Variable2"
+msgstr "ë³?ì??2"
+
+#: ../gtksourceview/language-specs/msil.lang.h:1
+msgid "MSIL"
+msgstr "MSIL"
+
+#: ../gtksourceview/language-specs/nemerle.lang.h:1
+#: ../gtksourceview/language-specs/verilog.lang.h:1
+msgid "Binary Number"
+msgstr "ì?´ì§?ì??"
+
+#: ../gtksourceview/language-specs/nemerle.lang.h:4
+msgid "Core Keywords"
+msgstr "ì½?ì?´ í?¤ì??ë??"
+
+#: ../gtksourceview/language-specs/nemerle.lang.h:5
+msgid "Core Types"
+msgstr "ì½?ì?´ í??ì??"
+
+#: ../gtksourceview/language-specs/nemerle.lang.h:9
+msgid "Keywords Defined by Macros"
+msgstr "매í?¬ë¡?ë¡? ì ?ì??í?? í?¤ì??ë??"
+
+#: ../gtksourceview/language-specs/nemerle.lang.h:11
+msgid "Nemerle"
+msgstr "Nemerle"
+
+#: ../gtksourceview/language-specs/octave.lang.h:8
+#: ../gtksourceview/language-specs/python.lang.h:10
+msgid "Multiline Double Quoted String"
+msgstr "ì?¬ë?¬ ì¤?ì?? ì??ë?°ì?´í?? 문ì??ì?´"
+
+#: ../gtksourceview/language-specs/octave.lang.h:9
+#: ../gtksourceview/language-specs/python.lang.h:11
+msgid "Multiline Single Quoted String"
+msgstr "ì?¬ë?¬ ì¤?ì?? í??ë?°ì?´í?? 문ì??ì?´"
+
+#: ../gtksourceview/language-specs/octave.lang.h:11
+msgid "Octave"
+msgstr "ì?¥í??ë¸?"
+
+#: ../gtksourceview/language-specs/octave.lang.h:12
+#: ../gtksourceview/language-specs/R.lang.h:9
+msgid "Reserved Constant"
+msgstr "ì??ì?½ ì??ì??"
+
+#: ../gtksourceview/language-specs/pascal.lang.h:1
msgid "Block Comment 1"
msgstr "ë¸?ë? 주ì?? 1"
-#: gtksourceview/language-specs/pascal.lang.h:2
+#: ../gtksourceview/language-specs/pascal.lang.h:2
msgid "Block Comment 2"
msgstr "ë¸?ë? 주ì?? 2"
-#: gtksourceview/language-specs/pascal.lang.h:3
+#: ../gtksourceview/language-specs/pascal.lang.h:3
msgid "Boolean Bitwise Operators"
msgstr "ë¶?리ì?¸ ë¹?í?¸ ì?°ì?°ì??"
-#: gtksourceview/language-specs/pascal.lang.h:4
+#: ../gtksourceview/language-specs/pascal.lang.h:4
msgid "Builtin Functions"
msgstr "ë?´ì?¥ í?¨ì??"
-#: gtksourceview/language-specs/pascal.lang.h:5
+#: ../gtksourceview/language-specs/pascal.lang.h:5
msgid "Builtin Types"
msgstr "ë?´ì?¥ í??ì??"
-#: gtksourceview/language-specs/pascal.lang.h:6
+#: ../gtksourceview/language-specs/pascal.lang.h:6
msgid "Builtin Values"
msgstr "ë?´ì?¥ ê°?"
-#: gtksourceview/language-specs/pascal.lang.h:7
+#: ../gtksourceview/language-specs/pascal.lang.h:7
msgid "Functions and Function Modifiers"
msgstr "í?¨ì?? ë°? í?¨ì?? ì??ì??ì?´"
-#: gtksourceview/language-specs/pascal.lang.h:8
+#: ../gtksourceview/language-specs/pascal.lang.h:8
msgid "General Format"
msgstr "ì?¼ë°? í??ì??"
-#: gtksourceview/language-specs/pascal.lang.h:12
+#: ../gtksourceview/language-specs/pascal.lang.h:12
msgid "Loop, Flow, and Exceptions Keywords"
msgstr "루í??, í??ë¡?ì?°, ì??ì?¸ í?¤ì??ë??"
-#: gtksourceview/language-specs/pascal.lang.h:13
+#: ../gtksourceview/language-specs/pascal.lang.h:13
msgid "Math Operators"
msgstr "ì??í?? ì?°ì?°ì??"
-#: gtksourceview/language-specs/pascal.lang.h:15
+#: ../gtksourceview/language-specs/pascal.lang.h:15
msgid "Pascal"
msgstr "Pascal"
-#: gtksourceview/language-specs/pascal.lang.h:16
+#: ../gtksourceview/language-specs/pascal.lang.h:16
msgid "Preprocessor Defines"
msgstr "ì ?ì²?리기 ì ?ì??"
-#: gtksourceview/language-specs/pascal.lang.h:19
+#: ../gtksourceview/language-specs/pascal.lang.h:19
msgid "Type, Class and Object Keywords"
msgstr "í??ì??, í?´ë??ì?¤ ë°? ì?¤ë¸?ì ?í?¸ í?¤ì??ë??"
-#: gtksourceview/language-specs/perl.lang.h:1
+#: ../gtksourceview/language-specs/perl.lang.h:1
msgid "Function Call"
msgstr "í?¨ì?? í?¸ì¶?"
-#: gtksourceview/language-specs/perl.lang.h:4
+#: ../gtksourceview/language-specs/perl.lang.h:4
msgid "Method Call"
msgstr "ë©?ì??ë?? í?¸ì¶?"
-#: gtksourceview/language-specs/perl.lang.h:5
+#: ../gtksourceview/language-specs/perl.lang.h:5
msgid "POD"
msgstr "POD"
-#: gtksourceview/language-specs/perl.lang.h:6
+#: ../gtksourceview/language-specs/perl.lang.h:6
msgid "Perl"
msgstr "Perl"
-#: gtksourceview/language-specs/perl.lang.h:9
-#: gtksourceview/language-specs/tcl.lang.h:5
+#: ../gtksourceview/language-specs/perl.lang.h:9
+#: ../gtksourceview/language-specs/tcl.lang.h:5
msgid "String2"
msgstr "문ì??ì?´2"
-#: gtksourceview/language-specs/perl.lang.h:10
+#: ../gtksourceview/language-specs/perl.lang.h:10
msgid "String3"
msgstr "문ì??ì?´3"
-#: gtksourceview/language-specs/perl.lang.h:11
-#: gtksourceview/language-specs/tcl.lang.h:7
+#: ../gtksourceview/language-specs/perl.lang.h:11
msgid "Variables"
msgstr "ë³?ì??"
-# FIXME - backtick
-#. `backticks-quoted strings`
-#: gtksourceview/language-specs/php.lang.h:3
-#: gtksourceview/language-specs/sh.lang.h:1
-msgid "Backtick String"
-msgstr "ë°?ë?? ë°©í?¥ ë?°ì?´í?? 문ì??ì?´"
-
#. # Bourne Shell Line Comment
-#: gtksourceview/language-specs/php.lang.h:5
+#: ../gtksourceview/language-specs/php.lang.h:5
msgid "Bash Line Comment"
msgstr "Bash ë?¼ì?¸ 주ì??"
#. /* C Block Comment
-#: gtksourceview/language-specs/php.lang.h:7
+#: ../gtksourceview/language-specs/php.lang.h:7
msgid "C Block Comment"
msgstr "C ë¸?ë? 주ì??"
#. // C++ Line Comment
-#: gtksourceview/language-specs/php.lang.h:9
+#: ../gtksourceview/language-specs/php.lang.h:9
msgid "C++ Line Comment"
msgstr "C++ ë?¼ì?¸ 주ì??"
-#: gtksourceview/language-specs/php.lang.h:10
+#: ../gtksourceview/language-specs/php.lang.h:10
msgid "Case Insensitive Keyword"
msgstr "ë??ì??문ì?? 구ë¶? ì?? í??ë?? í?¤ì??ë??"
#. This are keywords, the are recognised by php
-#: gtksourceview/language-specs/php.lang.h:12
+#: ../gtksourceview/language-specs/php.lang.h:12
msgid "Case Sensitive Keyword"
msgstr "ë??ì??문ì?? 구ë¶?í??ë?? í?¤ì??ë??"
-#. "duble-quoted strings"
-#: gtksourceview/language-specs/php.lang.h:16
-msgid "Double Quoted String"
-msgstr "ì??ë?°ì?´í?? 문ì??ì?´"
-
-#: gtksourceview/language-specs/php.lang.h:17
+#. <? ?> <HTML> inside PHP <?
+#: ../gtksourceview/language-specs/php.lang.h:18
msgid "First Open PHP Tag"
msgstr "ì²?ì?? ì?´ë¦° PHP í??ê·¸"
-#: gtksourceview/language-specs/php.lang.h:18
+#: ../gtksourceview/language-specs/php.lang.h:19
msgid "HTML Block"
msgstr "HTML ë¸?ë?"
-#: gtksourceview/language-specs/php.lang.h:20
+#: ../gtksourceview/language-specs/php.lang.h:21
msgid "PHP"
msgstr "PHP"
-#. 'single-quoted strings'
-#: gtksourceview/language-specs/php.lang.h:22
-msgid "Single Quoted String"
-msgstr "í??ë?°ì?´í?? 문ì??ì?´"
-
-#: gtksourceview/language-specs/po.lang.h:2
+#: ../gtksourceview/language-specs/po.lang.h:2
msgid "Format"
msgstr "í??ì??"
-#: gtksourceview/language-specs/po.lang.h:7
+#: ../gtksourceview/language-specs/po.lang.h:7
msgid "gettext translation"
msgstr "gettext ë²?ì?"
-#: gtksourceview/language-specs/python.lang.h:1
-#: gtksourceview/language-specs/ruby.lang.h:2
+#: ../gtksourceview/language-specs/python.lang.h:1
+#: ../gtksourceview/language-specs/ruby.lang.h:2
msgid "Builtins"
msgstr "��"
-#: gtksourceview/language-specs/python.lang.h:8
+#: ../gtksourceview/language-specs/python.lang.h:9
msgid "Module Handler"
msgstr "모ë?? ì²?리"
-#: gtksourceview/language-specs/python.lang.h:12
+#: ../gtksourceview/language-specs/python.lang.h:13
msgid "Python"
msgstr "í??ì?´ì?¬"
-#: gtksourceview/language-specs/ruby.lang.h:1
+#: ../gtksourceview/language-specs/R.lang.h:1
+msgid "Assignment Operator"
+msgstr "ë??ì?? ì?°ì?°ì??"
+
+#: ../gtksourceview/language-specs/R.lang.h:2
+msgid "Delimiter"
+msgstr "구�"
+
+#: ../gtksourceview/language-specs/R.lang.h:5
+msgid "Integer Number"
+msgstr "ì ?ì??"
+
+#: ../gtksourceview/language-specs/R.lang.h:8
+msgid "Reserved Class"
+msgstr "ì??ì?½ í?´ë??ì?¤"
+
+#: ../gtksourceview/language-specs/ruby.lang.h:1
msgid "Attribute Definitions"
msgstr "ì??ì?± ì ?ì??"
-#: gtksourceview/language-specs/ruby.lang.h:3
+#: ../gtksourceview/language-specs/ruby.lang.h:3
msgid "Class Variables"
msgstr "í?´ë??ì?¤ ë³?ì??"
-#: gtksourceview/language-specs/ruby.lang.h:4
+#: ../gtksourceview/language-specs/ruby.lang.h:4
msgid "Constants"
msgstr "ì??ì??"
-#: gtksourceview/language-specs/ruby.lang.h:5
+#: ../gtksourceview/language-specs/ruby.lang.h:5
msgid "Definitions"
msgstr "ì ?ì??"
-#: gtksourceview/language-specs/ruby.lang.h:6
+#: ../gtksourceview/language-specs/ruby.lang.h:7
msgid "Global Variables"
msgstr "ê¸?ë¡?ë²? ë³?ì??"
-#: gtksourceview/language-specs/ruby.lang.h:7
+#: ../gtksourceview/language-specs/ruby.lang.h:8
msgid "Instance Variables"
msgstr "ì?¸ì?¤í?´ì?¤ ë³?ì??"
-#: gtksourceview/language-specs/ruby.lang.h:10
+#: ../gtksourceview/language-specs/ruby.lang.h:11
msgid "Module Handlers"
msgstr "모ë?? í?¸ë?¤ë?¬"
-#: gtksourceview/language-specs/ruby.lang.h:11
+#: ../gtksourceview/language-specs/ruby.lang.h:12
msgid "Multiline Comment"
msgstr "ì?¬ë?¬ ì¤? 주ì??"
-#: gtksourceview/language-specs/ruby.lang.h:12
+#: ../gtksourceview/language-specs/ruby.lang.h:13
msgid "Pseudo Variables"
msgstr "ê°?ì§? ë³?ì??"
-#: gtksourceview/language-specs/ruby.lang.h:13
+#: ../gtksourceview/language-specs/ruby.lang.h:14
msgid "RegExp Variables"
msgstr "ì ?ê·?ì?? ë³?ì??"
-#: gtksourceview/language-specs/ruby.lang.h:14
-msgid "Regular Expression"
-msgstr "ì ?ê·?ì??"
-
-#: gtksourceview/language-specs/ruby.lang.h:15
-msgid "Regular Expression 2"
-msgstr "ì ?ê·?ì?? 2"
-
-#: gtksourceview/language-specs/ruby.lang.h:16
+#: ../gtksourceview/language-specs/ruby.lang.h:15
msgid "Ruby"
msgstr "Ruby"
-#: gtksourceview/language-specs/sh.lang.h:2
-msgid "Built-in Commands"
+#: ../gtksourceview/language-specs/ruby.lang.h:18
+msgid "Symbols"
+msgstr "�볼"
+
+#: ../gtksourceview/language-specs/scheme.lang.h:11
+msgid "Scheme"
+msgstr "��"
+
+#: ../gtksourceview/language-specs/sh.lang.h:2
+msgid "Built-in Command"
msgstr "ë?´ì?¥ ëª?ë ¹"
-#: gtksourceview/language-specs/sh.lang.h:3
-msgid "Common Commands"
+#: ../gtksourceview/language-specs/sh.lang.h:3
+msgid "Common Command"
msgstr "ë§?ì?´ ì?¬ì?©ë??ë?? ëª?ë ¹"
-#: gtksourceview/language-specs/sh.lang.h:10
-msgid "Redirections"
+#: ../gtksourceview/language-specs/sh.lang.h:8
+msgid "Operator"
+msgstr "ì?°ì?°ì??"
+
+#: ../gtksourceview/language-specs/sh.lang.h:9
+msgid "Punctuator"
+msgstr "구ë??ì ?"
+
+#: ../gtksourceview/language-specs/sh.lang.h:10
+msgid "Redirection"
msgstr "리ë?¤ì?´ë ?ì??"
-#: gtksourceview/language-specs/sh.lang.h:12
+#: ../gtksourceview/language-specs/sh.lang.h:12
msgid "Self"
msgstr "self"
-#: gtksourceview/language-specs/sh.lang.h:15
-msgid "Variable1"
-msgstr "ë³?ì??1"
-
-#: gtksourceview/language-specs/sh.lang.h:16
-msgid "Variable2"
-msgstr "ë³?ì??2"
-
-#: gtksourceview/language-specs/sh.lang.h:17
+#: ../gtksourceview/language-specs/sh.lang.h:17
msgid "sh"
msgstr "sh"
-#: gtksourceview/language-specs/sql.lang.h:1
+#: ../gtksourceview/language-specs/sql.lang.h:1
msgid "ANSI Datatypes"
msgstr "ANSI ë?°ì?´í?? í??ì??"
-#: gtksourceview/language-specs/sql.lang.h:2
+#. Reserved Words
+#: ../gtksourceview/language-specs/sql.lang.h:3
msgid "ANSI Reserved Words"
msgstr "ANSI ì??ì?½ì?´"
-#: gtksourceview/language-specs/sql.lang.h:3
+#. Aggregate Functions
+#: ../gtksourceview/language-specs/sql.lang.h:5
msgid "Aggregate Functions"
msgstr "ì§?í?© í?¨ì??"
-#: gtksourceview/language-specs/sql.lang.h:4
+#. Analytic Functions
+#: ../gtksourceview/language-specs/sql.lang.h:7
msgid "Analytic Functions"
msgstr "í?´ì??í?? í?¨ì??"
-#: gtksourceview/language-specs/sql.lang.h:6
+#: ../gtksourceview/language-specs/sql.lang.h:10
msgid "Character Functions Returning Character Values"
msgstr "문ì?? ê°?ì?? 리í?´í??ë?? 문ì?? í?¨ì??"
-#: gtksourceview/language-specs/sql.lang.h:7
+#: ../gtksourceview/language-specs/sql.lang.h:11
msgid "Character Functions Returning Number Values"
msgstr "ì?«ì?? ê°?ì?? 리í?´í??ë?? 문ì?? í?¨ì??"
-#: gtksourceview/language-specs/sql.lang.h:8
+#: ../gtksourceview/language-specs/sql.lang.h:12
+msgid "Collection Functions"
+msgstr "컬ë ?ì?? í?¨ì??"
+
+#: ../gtksourceview/language-specs/sql.lang.h:13
+msgid "Conditions"
+msgstr "ì¡°ê±´"
+
+#: ../gtksourceview/language-specs/sql.lang.h:14
msgid "Conversion Functions"
msgstr "ë³?í?? í?¨ì??"
-#: gtksourceview/language-specs/sql.lang.h:9
+#: ../gtksourceview/language-specs/sql.lang.h:15
+msgid "Data Mining Functions"
+msgstr "ë?°ì?´í?° ë§?ì?´ë?? í?¨ì??"
+
+#: ../gtksourceview/language-specs/sql.lang.h:16
msgid "Datetime Functions"
msgstr "ë? ì§?/ì??ê°? í?¨ì??"
-#: gtksourceview/language-specs/sql.lang.h:10
+#: ../gtksourceview/language-specs/sql.lang.h:17
+msgid "Encoding and Decoding Functions"
+msgstr "ì?¸ì½?ë?© ë°? ë??ì½?ë?© í?¨ì??"
+
+#: ../gtksourceview/language-specs/sql.lang.h:18
+msgid "Environment and Identifier Functions"
+msgstr "í??ê²½ ë°? ì??ë³?ì?? í?¨ì??"
+
+#: ../gtksourceview/language-specs/sql.lang.h:19
+msgid "General Comparison Functions"
+msgstr "ì?¼ë°? ë¹?êµ? í?¨ì??"
+
+#: ../gtksourceview/language-specs/sql.lang.h:20
+msgid "Hierarchical Function"
+msgstr "ê³?층 í?¨ì??"
+
+#: ../gtksourceview/language-specs/sql.lang.h:21
msgid "Integer Literals"
msgstr "ì ?ì?? ê¸?ì??"
-#: gtksourceview/language-specs/sql.lang.h:12
-msgid "Miscellaneous Single-Row Functions"
-msgstr "기í?? í?? ì¤? í?¨ì??"
+#: ../gtksourceview/language-specs/sql.lang.h:22
+msgid "Large Object Functions"
+msgstr "í?° ì?¤ë¸?ì ?í?¸ í?¨ì??"
+
+#. Model Functions
+#: ../gtksourceview/language-specs/sql.lang.h:25
+msgid "Model Functions"
+msgstr "모ë?¸ í?¨ì??"
+
+#: ../gtksourceview/language-specs/sql.lang.h:26
+msgid "NLS Character Functions"
+msgstr "NLS 문ì?? í?¨ì??"
+
+#: ../gtksourceview/language-specs/sql.lang.h:27
+msgid "NULL-Related Functions"
+msgstr "NULLê³¼ ê´?ê³?ë?? í?¨ì??"
-#: gtksourceview/language-specs/sql.lang.h:13
+#: ../gtksourceview/language-specs/sql.lang.h:28
msgid "Null"
msgstr "NULL"
-#: gtksourceview/language-specs/sql.lang.h:14
-msgid "Number Functions"
-msgstr "ì?«ì?? í?¨ì??"
-
-#: gtksourceview/language-specs/sql.lang.h:15
+#: ../gtksourceview/language-specs/sql.lang.h:29
msgid "Number Literals"
msgstr "ì?«ì?? ê¸?ì??"
-#: gtksourceview/language-specs/sql.lang.h:16
+#. Single-Row Functions
+#: ../gtksourceview/language-specs/sql.lang.h:31
+msgid "Numeric Functions"
+msgstr "ì??ì¹? í?¨ì??"
+
+#. Object Reference Functions
+#: ../gtksourceview/language-specs/sql.lang.h:33
msgid "Object Reference Functions"
msgstr "ì?¤ë¸?ì ?í?¸ 참조 í?¨ì??"
-#: gtksourceview/language-specs/sql.lang.h:17
+#. Datatypes
+#: ../gtksourceview/language-specs/sql.lang.h:36
msgid "Oracle Built-in Datatypes"
msgstr "ì?¤ë?¼í?´ ë?´ë¶? ë?°ì?´í??í??ì??"
-#: gtksourceview/language-specs/sql.lang.h:18
+#: ../gtksourceview/language-specs/sql.lang.h:37
msgid "Oracle Reserved Words"
msgstr "ì?¤ë?¼í?´ ì??ì?½ì?´"
-#: gtksourceview/language-specs/sql.lang.h:19
+#: ../gtksourceview/language-specs/sql.lang.h:38
+msgid "Oracle-Supplied Types"
+msgstr "ì?¤ë?¼í?´ ì ?ê³µ í??ì??"
+
+#: ../gtksourceview/language-specs/sql.lang.h:39
msgid "SQL"
msgstr "SQL"
-#: gtksourceview/language-specs/sql.lang.h:20
+#: ../gtksourceview/language-specs/sql.lang.h:40
+msgid "SQL Statements"
+msgstr "SQL 문�"
+
+#. SQL*Plus
+#: ../gtksourceview/language-specs/sql.lang.h:42
msgid "SQL*Plus At Sign"
msgstr "SQL*Plus At í??ì??"
-#: gtksourceview/language-specs/sql.lang.h:21
+#: ../gtksourceview/language-specs/sql.lang.h:43
msgid "SQL*Plus Commands"
msgstr "SQL*Plus ëª?ë ¹"
-#: gtksourceview/language-specs/sql.lang.h:22
+#: ../gtksourceview/language-specs/sql.lang.h:44
msgid "SQL*Plus Double At Sign"
msgstr "SQL*Plus At ë?? ê°? í??ì??"
-#: gtksourceview/language-specs/sql.lang.h:23
+#: ../gtksourceview/language-specs/sql.lang.h:45
msgid "SQL*Plus Slash"
msgstr "SQL*Plus ì?¬ë??ì??"
-#: gtksourceview/language-specs/sql.lang.h:24
+#: ../gtksourceview/language-specs/sql.lang.h:46
msgid "SQL/DS and DB2 Datatypes"
msgstr "SQL/DS ë°? DB2 ë?°ì?´í??í??ì??"
-#: gtksourceview/language-specs/sql.lang.h:25
+#: ../gtksourceview/language-specs/sql.lang.h:47
msgid "Size Clause"
msgstr "í?¬ê¸° í??기"
-#: gtksourceview/language-specs/sql.lang.h:27
+#. Literals
+#: ../gtksourceview/language-specs/sql.lang.h:50
msgid "Text Literals"
msgstr "í??ì?¤í?¸ ê¸?ì??"
-#: gtksourceview/language-specs/sql.lang.h:28
+#: ../gtksourceview/language-specs/sql.lang.h:51
msgid "Unlimited"
msgstr "무ì ?í??"
-#: gtksourceview/language-specs/verilog.lang.h:1
-#: gtksourceview/language-specs/nemerle.lang.h:1
-msgid "Binary Number"
-msgstr "ì?´ì§?ì??"
+#: ../gtksourceview/language-specs/sql.lang.h:52
+msgid "XML Functions"
+msgstr "XML í?¨ì??"
-#: gtksourceview/language-specs/verilog.lang.h:4
-msgid "Gates"
-msgstr "ê²?ì?´í?¸"
-
-#: gtksourceview/language-specs/verilog.lang.h:11
-msgid "Verilog"
-msgstr "Verilog"
-
-#: gtksourceview/language-specs/xml.lang.h:5
-msgid "Hexadecimal"
-msgstr "16ì§?ì??"
-
-#: gtksourceview/language-specs/xml.lang.h:8
-msgid "Tag"
-msgstr "í??ê·¸"
-
-#: gtksourceview/language-specs/xml.lang.h:9
-msgid "XML"
-msgstr "XML"
-
-#: gtksourceview/language-specs/haskell.lang.h:5
-msgid "Haskell"
-msgstr "Haskell"
-
-#: gtksourceview/language-specs/haskell.lang.h:8
-msgid "Keysymbols"
-msgstr "��볼"
-
-#: gtksourceview/language-specs/haskell.lang.h:16
-msgid "Type or Constructor"
-msgstr "í??ì?? ë°? ì??ì?±ì??"
+#: ../gtksourceview/language-specs/tcl.lang.h:6
+msgid "Tcl"
+msgstr "TCL"
-#: gtksourceview/language-specs/texinfo.lang.h:2
+#: ../gtksourceview/language-specs/texinfo.lang.h:2
msgid "Characters"
msgstr "문ì??"
-#: gtksourceview/language-specs/texinfo.lang.h:3
+#: ../gtksourceview/language-specs/texinfo.lang.h:3
msgid "File Attributes"
msgstr "í??ì?¼ ì??ì?±"
-#: gtksourceview/language-specs/texinfo.lang.h:4
+#: ../gtksourceview/language-specs/texinfo.lang.h:4
msgid "Formatting"
msgstr "í??ì??"
-#: gtksourceview/language-specs/texinfo.lang.h:5
+#: ../gtksourceview/language-specs/texinfo.lang.h:5
msgid "Generated Content"
msgstr "���� ��"
-#: gtksourceview/language-specs/texinfo.lang.h:7
+#: ../gtksourceview/language-specs/texinfo.lang.h:7
msgid "Indexing"
msgstr "ì°¾ì??보기"
-#: gtksourceview/language-specs/texinfo.lang.h:10
+#: ../gtksourceview/language-specs/texinfo.lang.h:10
msgid "Macro Parameters"
msgstr "매í?¬ë¡? ì?¸ì??"
-#: gtksourceview/language-specs/texinfo.lang.h:11
+#: ../gtksourceview/language-specs/texinfo.lang.h:11
msgid "Macros"
msgstr "매��"
-#: gtksourceview/language-specs/texinfo.lang.h:13
+#: ../gtksourceview/language-specs/texinfo.lang.h:13
msgid "Markup (block)"
msgstr "ë§?í?¬ì?? (ë¸?ë¡?)"
-#: gtksourceview/language-specs/texinfo.lang.h:14
+#: ../gtksourceview/language-specs/texinfo.lang.h:14
msgid "Markup (inline)"
msgstr "ë§?í?¬ì?? (ì?¸ë?¼ì?¸)"
-#: gtksourceview/language-specs/texinfo.lang.h:15
+#: ../gtksourceview/language-specs/texinfo.lang.h:15
msgid "Sectioning"
msgstr "ì?¹ì?? 구ë¶?"
-#: gtksourceview/language-specs/texinfo.lang.h:16
+#: ../gtksourceview/language-specs/texinfo.lang.h:16
msgid "Texinfo"
msgstr "Texinfo"
-#: gtksourceview/language-specs/vbnet.lang.h:3
+#: ../gtksourceview/language-specs/vbnet.lang.h:7
msgid "Old Style Comment"
msgstr "과거 ì?¤í??ì?¼ 주ì??"
-#: gtksourceview/language-specs/vbnet.lang.h:9
+#: ../gtksourceview/language-specs/vbnet.lang.h:12
msgid "VB.NET"
msgstr "VB.NET"
-#: gtksourceview/language-specs/nemerle.lang.h:4
-msgid "Core Keywords"
-msgstr "ì½?ì?´ í?¤ì??ë??"
-
-#: gtksourceview/language-specs/nemerle.lang.h:5
-msgid "Core Types"
-msgstr "ì½?ì?´ í??ì??"
-
-#: gtksourceview/language-specs/nemerle.lang.h:9
-msgid "Keywords Defined by Macros"
-msgstr "매í?¬ë¡?ë¡? ì ?ì??í?? í?¤ì??ë??"
-
-#: gtksourceview/language-specs/nemerle.lang.h:11
-msgid "Nemerle"
-msgstr "Nemerle"
+#: ../gtksourceview/language-specs/verilog.lang.h:4
+msgid "Gates"
+msgstr "ê²?ì?´í?¸"
-#: gtksourceview/language-specs/tcl.lang.h:6
-msgid "Tcl"
-msgstr "Tcl"
+#: ../gtksourceview/language-specs/verilog.lang.h:11
+msgid "Verilog"
+msgstr "Verilog"
-#: gtksourceview/language-specs/vhdl.lang.h:7
+#: ../gtksourceview/language-specs/vhdl.lang.h:7
msgid "True and False"
msgstr "참 거�"
-#: gtksourceview/language-specs/vhdl.lang.h:8
-msgid "Type"
-msgstr "í??ì??"
-
-#: gtksourceview/language-specs/vhdl.lang.h:9
+#: ../gtksourceview/language-specs/vhdl.lang.h:9
msgid "VHDL"
msgstr "VHDL"
-#: gtksourceview/language-specs/R.lang.h:1
-msgid "Assignment Operator"
-msgstr "ë??ì?? ì?°ì?°ì??"
-
-#: gtksourceview/language-specs/R.lang.h:2
-msgid "Delimiter"
-msgstr "구�"
+#: ../gtksourceview/language-specs/xml.lang.h:5
+msgid "Hexadecimal"
+msgstr "16ì§?ì??"
-#: gtksourceview/language-specs/R.lang.h:5
-msgid "Integer Number"
-msgstr "ì ?ì??"
+#: ../gtksourceview/language-specs/xml.lang.h:9
+msgid "XML"
+msgstr "XML"
-#: gtksourceview/language-specs/R.lang.h:8
-msgid "Reserved Class"
-msgstr "ì??ì?½ í?´ë??ì?¤"
+#~ msgid "Double Quote String"
+#~ msgstr "ì??ë?°ì?´í?? 문ì??ì?´"
-#: gtksourceview/language-specs/R.lang.h:9
-msgid "Reserved Constant"
-msgstr "ì??ì?½ ì??ì??"
+#~ msgid "Single Quote String"
+#~ msgstr "í??ë?°ì?´í?? 문ì??ì?´"
-#: gtksourceview/language-specs/gtkrc.lang.h:3
-msgid "GtkRC"
-msgstr "GtkRC"
+#~ msgid "Most Used Commands"
+#~ msgstr "ë§?ì?´ ì?¬ì?©ë??ë?? ëª?ë ¹"
-#: gtksourceview/language-specs/gtkrc.lang.h:4
-msgid "Include Directive"
-msgstr "include ì§?ì??ì?´"
+#~ msgid "Regular Expression"
+#~ msgstr "ì ?ê·?ì??"
-#: gtksourceview/language-specs/gtkrc.lang.h:5
-msgid "Keysymbol"
-msgstr "��볼"
+#~ msgid "Regular Expression 2"
+#~ msgstr "ì ?ê·?ì?? 2"
-#: gtksourceview/language-specs/gtkrc.lang.h:11
-msgid "State"
-msgstr "ì??í??"
+#~ msgid "Miscellaneous Single-Row Functions"
+#~ msgstr "기í?? í?? ì¤? í?¨ì??"
diff -pruN 1.6.1-3/po/lv.po 1.7.1-0ubuntu2/po/lv.po
--- 1.6.1-3/po/lv.po 1970-01-01 01:00:00.000000000 +0100
+++ 1.7.1-0ubuntu2/po/lv.po 2006-07-04 09:02:28.000000000 +0100
@@ -0,0 +1,1697 @@
+# translation of gtksourceview.HEAD.po to Latvian
+# This file is distributed under the same license as the PACKAGE package.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
+# Raivis Dejus <orvils gmail com>, 2006.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gtksourceview.HEAD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-07-04 11:00+0300\n"
+"PO-Revision-Date: 2006-07-03 17:09+0200\n"
+"Last-Translator: Ingrīda Irguļska <Ingrida Irgulska gmail com>\n"
+"Language-Team: Latvian <locale laka lv>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.10.2\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
+"2);\n"
+
+#: ../gtksourceview/gtksourcebuffer.c:278
+msgid "Escape Character"
+msgstr "Atsoļa rakstzīme"
+
+#: ../gtksourceview/gtksourcebuffer.c:279
+msgid "Escaping character for syntax patterns"
+msgstr "Atsoļa rakstzīme sintakses modeļiem"
+
+#: ../gtksourceview/gtksourcebuffer.c:287
+msgid "Check Brackets"
+msgstr "Parbaudīt iekavas"
+
+#: ../gtksourceview/gtksourcebuffer.c:288
+msgid "Whether to check and highlight matching brackets"
+msgstr "Vai pÄ?rbaudÄ«t un izgaismot savstarpÄ?ji saistÄ«tÄ?s iekavas"
+
+#: ../gtksourceview/gtksourcebuffer.c:296
+#: ../gtksourceview/gtksourceprintjob.c:296
+msgid "Highlight"
+msgstr "Izcelt"
+
+#: ../gtksourceview/gtksourcebuffer.c:297
+msgid "Whether to highlight syntax in the buffer"
+msgstr "Vai izcelt sintaksi buferī"
+
+#: ../gtksourceview/gtksourcebuffer.c:305
+msgid "Maximum Undo Levels"
+msgstr "MaksimimÄ?lais atsaukÅ¡anas lÄ«meÅ?u skaits"
+
+#: ../gtksourceview/gtksourcebuffer.c:306
+msgid "Number of undo levels for the buffer"
+msgstr "AtsaukÅ¡anas lÄ«meÅ?u skaits buferÄ«"
+
+#: ../gtksourceview/gtksourcebuffer.c:316
+#: ../gtksourceview/language-specs/desktop.lang.h:6
+#: ../gtksourceview/language-specs/ini.lang.h:7
+msgid "Language"
+msgstr "Valoda"
+
+#: ../gtksourceview/gtksourcebuffer.c:317
+msgid "Language object to get highlighting patterns from"
+msgstr "SaÅ?emt izceltos paraugus no valodas objekta"
+
+#: ../gtksourceview/gtksourcelanguagesmanager.c:114
+msgid "Language specification directories"
+msgstr "Valodu specifikÄ?ciju direktorijas"
+
+#: ../gtksourceview/gtksourcelanguagesmanager.c:115
+msgid ""
+"List of directories where the language specification files (.lang) are "
+"located"
+msgstr "Valodu specifikÄ?cijas failu(.lang) direktoriju saraksts"
+
+#: ../gtksourceview/gtksourceprintjob.c:265
+msgid "Configuration"
+msgstr "NoskaÅ?oÅ¡ana"
+
+#: ../gtksourceview/gtksourceprintjob.c:266
+msgid "Configuration options for the print job"
+msgstr "KonfigurÄ?cijas parametri drukÄ?Å¡anai"
+
+#: ../gtksourceview/gtksourceprintjob.c:273
+msgid "Source Buffer"
+msgstr "Avota buferis"
+
+#: ../gtksourceview/gtksourceprintjob.c:274
+msgid "GtkSourceBuffer object to print"
+msgstr "Gtk Avotu bufera objekts drukÄ?Å¡anai"
+
+#: ../gtksourceview/gtksourceprintjob.c:280
+#: ../gtksourceview/gtksourceview.c:233 ../gtksourceview/gtksourceview.c:234
+msgid "Tabs Width"
+msgstr "CiļÅ?u platums"
+
+#: ../gtksourceview/gtksourceprintjob.c:281
+msgid "Width in equivalent space characters of tabs"
+msgstr "Platums vienÄ?dÄ?s tabulÄ?Å¡anas rakstzÄ«mju atstarpÄ?s "
+
+#: ../gtksourceview/gtksourceprintjob.c:288
+msgid "Wrap Mode"
+msgstr "Aplieces režīms"
+
+#: ../gtksourceview/gtksourceprintjob.c:289
+msgid "Word wrapping mode"
+msgstr "VÄ?rda aplieces režīms"
+
+#: ../gtksourceview/gtksourceprintjob.c:297
+msgid "Whether to print the document with highlighted syntax"
+msgstr "Vai drukÄ?t dokumentu ar izceltu sintaksi"
+
+#: ../gtksourceview/gtksourceprintjob.c:305
+msgid "Font"
+msgstr "Fonts"
+
+#: ../gtksourceview/gtksourceprintjob.c:306
+msgid "GnomeFont name to use for the document text (deprecated)"
+msgstr "Gnome fonta nosaukums, ko izmantot dokumenta tekstam (pazeminÄ?tais)"
+
+#: ../gtksourceview/gtksourceprintjob.c:313
+msgid "Font Description"
+msgstr "Fonta apraksts"
+
+#: ../gtksourceview/gtksourceprintjob.c:314
+msgid "Font to use for the document text (e.g. \"Monospace 10\")"
+msgstr "Fonts, ko izmantot dokumenta tekstam (t.i. \"Monospace 10\")"
+
+#: ../gtksourceview/gtksourceprintjob.c:321
+#: ../gtksourceview/gtksourceprintjob.c:329
+msgid "Numbers Font"
+msgstr "Numuru fonts"
+
+#: ../gtksourceview/gtksourceprintjob.c:322
+msgid "GnomeFont name to use for the line numbers (deprecated)"
+msgstr "Gnome fonta nosaukums, ko izmantot rindu numuriem (pazeminÄ?tais)"
+
+#: ../gtksourceview/gtksourceprintjob.c:330
+msgid "Font description to use for the line numbers"
+msgstr "Fonta apraksts, ko izmantot rindu numuriem"
+
+#: ../gtksourceview/gtksourceprintjob.c:337
+msgid "Print Line Numbers"
+msgstr "DrukÄ?t rindu numurus"
+
+#: ../gtksourceview/gtksourceprintjob.c:338
+msgid "Interval of printed line numbers (0 means no numbers)"
+msgstr "PrintÄ?to rindas numuru intervÄ?ls (0 nozÄ«mÄ? - nav numuru)"
+
+#: ../gtksourceview/gtksourceprintjob.c:345
+msgid "Print Header"
+msgstr "DrukÄ?t galveni"
+
+#: ../gtksourceview/gtksourceprintjob.c:346
+msgid "Whether to print a header in each page"
+msgstr "Vai drukÄ?t galveni katrÄ? lapÄ?"
+
+#: ../gtksourceview/gtksourceprintjob.c:353
+msgid "Print Footer"
+msgstr "DrukÄ?t kÄ?jeni"
+
+#: ../gtksourceview/gtksourceprintjob.c:354
+msgid "Whether to print a footer in each page"
+msgstr "Vai drukÄ?t kÄ?jeni katrÄ? lapÄ?"
+
+#: ../gtksourceview/gtksourceprintjob.c:361
+msgid "Header and Footer Font"
+msgstr "Galvenes un kÄ?jenes fonts"
+
+#: ../gtksourceview/gtksourceprintjob.c:362
+msgid "GnomeFont name to use for the header and footer (deprecated)"
+msgstr "Gnome galvenes un kÄ?jenes fonta nosaukums (pazeminÄ?ts)"
+
+#: ../gtksourceview/gtksourceprintjob.c:369
+msgid "Header and Footer Font Description"
+msgstr "Galvenes un kÄ?jenes fonta apraksts"
+
+#: ../gtksourceview/gtksourceprintjob.c:370
+msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
+msgstr "Fonts galvenei un kÄ?jenei (t.i \"Monospace 10\")"
+
+#: ../gtksourceview/gtksourcestylescheme.c:264
+msgid "Base-N Integer"
+msgstr "BÄ?ze-N veselam skaitlim"
+
+#: ../gtksourceview/gtksourcestylescheme.c:269
+msgid "Character"
+msgstr "Rakstzīme"
+
+#: ../gtksourceview/gtksourcestylescheme.c:274
+#: ../gtksourceview/language-specs/latex.lang.h:2
+#: ../gtksourceview/language-specs/po.lang.h:1
+msgid "Comment"
+msgstr "KomentÄ?rs"
+
+#. $this = (datatype)
+#: ../gtksourceview/gtksourcestylescheme.c:279
+#: ../gtksourceview/language-specs/php.lang.h:14
+msgid "Data Type"
+msgstr "Datu tips"
+
+#.
+#. CSS functions, such as rgb(), clip(), or lang().
+#.
+#: ../gtksourceview/gtksourcestylescheme.c:284
+#: ../gtksourceview/language-specs/ada.lang.h:3
+#: ../gtksourceview/language-specs/css.lang.h:18
+#: ../gtksourceview/language-specs/octave.lang.h:4
+#: ../gtksourceview/language-specs/python.lang.h:5
+#: ../gtksourceview/language-specs/scheme.lang.h:2
+#: ../gtksourceview/language-specs/sh.lang.h:4
+msgid "Function"
+msgstr "Funkcija "
+
+#: ../gtksourceview/gtksourcestylescheme.c:289
+#: ../gtksourceview/language-specs/c.lang.h:6
+#: ../gtksourceview/language-specs/cpp.lang.h:6
+#: ../gtksourceview/language-specs/fortran.lang.h:1
+#: ../gtksourceview/language-specs/haskell.lang.h:3
+#: ../gtksourceview/language-specs/nemerle.lang.h:6
+#: ../gtksourceview/language-specs/octave.lang.h:1
+#: ../gtksourceview/language-specs/python.lang.h:2
+msgid "Decimal"
+msgstr "DecimÄ?ls "
+
+#: ../gtksourceview/gtksourcestylescheme.c:294
+msgid "Floating Point"
+msgstr "Peldošais Punkts"
+
+#. We cannot match \b at the end of a keyword automatically
+#. because it fails for let* etc. So we need to manually add it to the
+#. other keywords and match ([ \t]|$) for the one ending with a
+#. special character. Unfortnately this also means that if the highlight
+#. style for keywords sets the background color, for let* etc also the
+#. trailing space will be highlighted.
+#: ../gtksourceview/gtksourcestylescheme.c:299
+#: ../gtksourceview/language-specs/ada.lang.h:4
+#: ../gtksourceview/language-specs/gtkrc.lang.h:6
+#: ../gtksourceview/language-specs/haskell.lang.h:9
+#: ../gtksourceview/language-specs/latex.lang.h:5
+#: ../gtksourceview/language-specs/octave.lang.h:6
+#: ../gtksourceview/language-specs/po.lang.h:3
+#: ../gtksourceview/language-specs/python.lang.h:7
+#: ../gtksourceview/language-specs/R.lang.h:6
+#: ../gtksourceview/language-specs/scheme.lang.h:9
+#: ../gtksourceview/language-specs/tcl.lang.h:1
+#: ../gtksourceview/language-specs/texinfo.lang.h:8
+#: ../gtksourceview/language-specs/vhdl.lang.h:2
+msgid "Keyword"
+msgstr "AtslÄ?gvÄ?rds"
+
+#: ../gtksourceview/gtksourcestylescheme.c:304
+msgid "Preprocessor"
+msgstr "Priekšprocesors "
+
+#.
+#. <pattern-item _name = "Operator" style = "Operators">
+#. <regex>[:!#$%&*+./>=<? \\^|~\-]+</regex>
+#. </pattern-item>
+#.
+#. <keyword-list _name="Keysymbol" style = "Keyword">
+#. <keyword>::</keyword>
+#. <keyword>-></keyword>
+#. <keyword><-</keyword>
+#. <keyword>=></keyword>
+#. <keyword>=</keyword>
+#. <keyword>|</keyword>`
+#. <keyword>\</keyword>
+#. <keyword>@</keyword>
+#. <keyword>~</keyword>
+#. </keyword-list>
+#.
+#: ../gtksourceview/gtksourcestylescheme.c:309
+#: ../gtksourceview/language-specs/ada.lang.h:9
+#: ../gtksourceview/language-specs/c.lang.h:15
+#: ../gtksourceview/language-specs/cpp.lang.h:15
+#: ../gtksourceview/language-specs/csharp.lang.h:9
+#: ../gtksourceview/language-specs/css.lang.h:58
+#: ../gtksourceview/language-specs/html.lang.h:8
+#: ../gtksourceview/language-specs/fortran.lang.h:13
+#: ../gtksourceview/language-specs/haskell.lang.h:31
+#: ../gtksourceview/language-specs/idl.lang.h:9
+#: ../gtksourceview/language-specs/java.lang.h:11
+#: ../gtksourceview/language-specs/javascript.lang.h:23
+#: ../gtksourceview/language-specs/lua.lang.h:10
+#: ../gtksourceview/language-specs/makefile.lang.h:8
+#: ../gtksourceview/language-specs/nemerle.lang.h:15
+#: ../gtksourceview/language-specs/pascal.lang.h:18
+#: ../gtksourceview/language-specs/perl.lang.h:8
+#: ../gtksourceview/language-specs/po.lang.h:6
+#: ../gtksourceview/language-specs/scheme.lang.h:13
+#: ../gtksourceview/language-specs/sh.lang.h:13
+#: ../gtksourceview/language-specs/tcl.lang.h:4
+#: ../gtksourceview/language-specs/vbnet.lang.h:11
+#: ../gtksourceview/language-specs/vhdl.lang.h:6
+#: ../gtksourceview/language-specs/xml.lang.h:7
+msgid "String"
+msgstr "Virkne "
+
+#: ../gtksourceview/gtksourcestylescheme.c:314
+msgid "Specials"
+msgstr "Īpašie"
+
+#: ../gtksourceview/gtksourcestylescheme.c:321
+#: ../gtksourceview/language-specs/changelog.lang.h:6
+#: ../gtksourceview/language-specs/css.lang.h:36
+#: ../gtksourceview/language-specs/desktop.lang.h:10
+#: ../gtksourceview/language-specs/diff.lang.h:7
+#: ../gtksourceview/language-specs/gtkrc.lang.h:9
+#: ../gtksourceview/language-specs/ini.lang.h:10
+#: ../gtksourceview/language-specs/msil.lang.h:2
+#: ../gtksourceview/language-specs/po.lang.h:5
+msgid "Others"
+msgstr "Citi "
+
+#: ../gtksourceview/gtksourcestylescheme.c:326
+msgid "Others 2"
+msgstr "Citi 2 "
+
+#: ../gtksourceview/gtksourcestylescheme.c:331
+msgid "Others 3"
+msgstr "Citi 3 "
+
+#: ../gtksourceview/gtksourcestylescheme.c:368
+msgid "Default"
+msgstr "NoklusÄ?tais "
+
+#: ../gtksourceview/gtksourcetag.c:109
+msgid "Tag ID"
+msgstr "Birkas ID"
+
+#: ../gtksourceview/gtksourcetag.c:110
+msgid "ID used to refer to the source tag"
+msgstr "ID, lietots avota birkas norÄ?dÄ«Å¡anai"
+
+#: ../gtksourceview/gtksourcetag.c:117
+msgid "Tag style"
+msgstr "Birkas stils"
+
+#: ../gtksourceview/gtksourcetag.c:118
+msgid "The style associated with the source tag"
+msgstr "Stils, kas ir saistīts ar avota birku"
+
+#: ../gtksourceview/gtksourceview.c:217
+msgid "Show Line Numbers"
+msgstr "RÄ?dÄ«t lÄ«niju numurus"
+
+#: ../gtksourceview/gtksourceview.c:218
+msgid "Whether to display line numbers"
+msgstr "Vai rÄ?dÄ«t rindas numurus"
+
+#: ../gtksourceview/gtksourceview.c:225
+msgid "Show Line Markers"
+msgstr "RÄ?dÄ«t rindas marÄ·ierus"
+
+#: ../gtksourceview/gtksourceview.c:226
+msgid "Whether to display line marker pixbufs"
+msgstr "Vai rÄ?dÄ«t rindas marÄ·iera pixbuf-us"
+
+#: ../gtksourceview/gtksourceview.c:243
+msgid "Auto Indentation"
+msgstr "AutomÄ?tisko atkÄ?pju veidoÅ¡ana"
+
+#: ../gtksourceview/gtksourceview.c:244
+msgid "Whether to enable auto indentation"
+msgstr "Vai ieslÄ?gt automÄ?tiskÄ?s atkÄ?pes"
+
+#: ../gtksourceview/gtksourceview.c:250
+msgid "Insert Spaces Instead of Tabs"
+msgstr "Ievietot atstarpes sadales vietÄ?s"
+
+#: ../gtksourceview/gtksourceview.c:251
+msgid "Whether to insert spaces instead of tabs"
+msgstr "Vai ievietot atstarpes sadales vietÄ?s"
+
+#: ../gtksourceview/gtksourceview.c:258
+msgid "Show Right Margin"
+msgstr "RÄ?dÄ«t labo malu"
+
+#: ../gtksourceview/gtksourceview.c:259
+msgid "Whether to display the right margin"
+msgstr "Vai rÄ?dÄ«t labo malu"
+
+#: ../gtksourceview/gtksourceview.c:266
+msgid "Margin position"
+msgstr "Malas novietojums"
+
+#: ../gtksourceview/gtksourceview.c:267
+msgid "Position of the right margin"
+msgstr "LabÄ?s malas novietojums"
+
+#: ../gtksourceview/gtksourceview.c:276
+msgid "Use smart home/end"
+msgstr "Izmantot viedo Home/End"
+
+#: ../gtksourceview/gtksourceview.c:277
+msgid ""
+"HOME and END keys move to first/last non whitespace characters on line "
+"before going to the start/end of the line"
+msgstr ""
+"HOME un END pogas pÄ?rvieto uz pirmo/pÄ?dÄ?jo ne atstarpes simbolu rindÄ? pirms "
+"ieÅ¡anas uz sÄ?kumu/beigÄ?m rindÄ?"
+
+#: ../gtksourceview/gtksourceview.c:286
+msgid "Highlight current line"
+msgstr "Izcelt esošo rindu"
+
+#: ../gtksourceview/gtksourceview.c:287
+msgid "Whether to highlight the current line"
+msgstr "Vai izcelt esošo rindu"
+
+#: ../gtksourceview/gtksourceview.c:303
+msgid "Margin Line Alpha"
+msgstr "Malas līnija Alfa"
+
+#: ../gtksourceview/gtksourceview.c:304
+msgid "Transparency of the margin line"
+msgstr "Malas līnijas caurspīdīgums "
+
+#: ../gtksourceview/gtksourceview.c:321
+msgid "Margin Line Color"
+msgstr "Malas lÄ«nijas krÄ?sa"
+
+#: ../gtksourceview/gtksourceview.c:322
+msgid "Color to use for the right margin line"
+msgstr "KrÄ?sa, ko izmanto labÄ?s malas lÄ«nijai"
+
+#: ../gtksourceview/gtksourceview.c:338
+msgid "Margin Overlay Toggle"
+msgstr "Malas pÄ?rklÄ?juma pÄ?rslÄ?gÅ¡ana"
+
+#: ../gtksourceview/gtksourceview.c:339
+msgid "Whether to draw the right margin overlay"
+msgstr "Vai zÄ«mÄ?t labÄ?s malas pÄ?rklÄ?jumu"
+
+#: ../gtksourceview/gtksourceview.c:355
+msgid "Margin Overlay Alpha"
+msgstr "Malas pÄ?rklÄ?jums Alfa"
+
+#: ../gtksourceview/gtksourceview.c:356
+msgid "Transparency of the margin overlay"
+msgstr "Malas pÄ?rklajuma caurspÄ«dÄ«gums"
+
+#: ../gtksourceview/gtksourceview.c:373
+msgid "Margin Overlay Color"
+msgstr "Malas pÄ?rklÄ?juma krÄ?sa"
+
+#: ../gtksourceview/gtksourceview.c:374
+msgid "Color to use for drawing the margin overlay"
+msgstr "KrÄ?sa, ko izmanto malas pÄ?rklÄ?juma zÄ«mÄ?Å¡anai"
+
+#: ../gtksourceview/language-specs/ada.lang.h:1
+msgid "Ada"
+msgstr "Ada "
+
+#: ../gtksourceview/language-specs/ada.lang.h:2
+#: ../gtksourceview/language-specs/c.lang.h:4
+#: ../gtksourceview/language-specs/cpp.lang.h:4
+#: ../gtksourceview/language-specs/haskell.lang.h:2
+#: ../gtksourceview/language-specs/nemerle.lang.h:3
+#: ../gtksourceview/language-specs/vhdl.lang.h:1
+msgid "Character Constant"
+msgstr "Rakstzīmes konstante"
+
+#. Note: contains an hack to avoid considering ^COMMON a comment
+#. <string _name = "String 2" style = "String" end-at-line-end = "TRUE">
+#. <start-regex>'</start-regex>
+#. <end-regex>'</end-regex>
+#. </string>
+#: ../gtksourceview/language-specs/ada.lang.h:5
+#: ../gtksourceview/language-specs/c.lang.h:11
+#: ../gtksourceview/language-specs/cpp.lang.h:11
+#: ../gtksourceview/language-specs/csharp.lang.h:4
+#: ../gtksourceview/language-specs/css.lang.h:29
+#: ../gtksourceview/language-specs/desktop.lang.h:7
+#: ../gtksourceview/language-specs/diff.lang.h:5
+#: ../gtksourceview/language-specs/fortran.lang.h:9
+#: ../gtksourceview/language-specs/gtkrc.lang.h:7
+#: ../gtksourceview/language-specs/haskell.lang.h:10
+#: ../gtksourceview/language-specs/idl.lang.h:5
+#: ../gtksourceview/language-specs/ini.lang.h:8
+#: ../gtksourceview/language-specs/java.lang.h:5
+#: ../gtksourceview/language-specs/javascript.lang.h:13
+#: ../gtksourceview/language-specs/lua.lang.h:4
+#: ../gtksourceview/language-specs/makefile.lang.h:4
+#: ../gtksourceview/language-specs/nemerle.lang.h:10
+#: ../gtksourceview/language-specs/octave.lang.h:7
+#: ../gtksourceview/language-specs/pascal.lang.h:11
+#: ../gtksourceview/language-specs/perl.lang.h:3
+#: ../gtksourceview/language-specs/python.lang.h:8
+#: ../gtksourceview/language-specs/R.lang.h:7
+#: ../gtksourceview/language-specs/ruby.lang.h:10
+#: ../gtksourceview/language-specs/scheme.lang.h:10
+#: ../gtksourceview/language-specs/sh.lang.h:5
+#: ../gtksourceview/language-specs/sql.lang.h:23
+#: ../gtksourceview/language-specs/tcl.lang.h:2
+#: ../gtksourceview/language-specs/texinfo.lang.h:9
+#: ../gtksourceview/language-specs/vbnet.lang.h:6
+#: ../gtksourceview/language-specs/verilog.lang.h:7
+#: ../gtksourceview/language-specs/vhdl.lang.h:3
+msgid "Line Comment"
+msgstr "Rindas komentÄ?rs"
+
+#.
+#. For values like: z-index: 2;
+#. +/- before 0 is not allowed.
+#.
+#: ../gtksourceview/language-specs/ada.lang.h:6
+#: ../gtksourceview/language-specs/css.lang.h:34
+#: ../gtksourceview/language-specs/desktop.lang.h:9
+#: ../gtksourceview/language-specs/gtkrc.lang.h:8
+#: ../gtksourceview/language-specs/javascript.lang.h:16
+#: ../gtksourceview/language-specs/pascal.lang.h:14
+#: ../gtksourceview/language-specs/vhdl.lang.h:4
+msgid "Number"
+msgstr "Skaitlis "
+
+#: ../gtksourceview/language-specs/ada.lang.h:7
+msgid "Preprocessor Keyword"
+msgstr "PriekÅ¡procesora atslÄ?gvÄ?rds"
+
+#: ../gtksourceview/language-specs/ada.lang.h:8
+#: ../gtksourceview/language-specs/c.lang.h:14
+#: ../gtksourceview/language-specs/cpp.lang.h:14
+#: ../gtksourceview/language-specs/csharp.lang.h:8
+#: ../gtksourceview/language-specs/fortran.lang.h:12
+#: ../gtksourceview/language-specs/haskell.lang.h:13
+#: ../gtksourceview/language-specs/idl.lang.h:8
+#: ../gtksourceview/language-specs/java.lang.h:10
+#: ../gtksourceview/language-specs/makefile.lang.h:6
+#: ../gtksourceview/language-specs/nemerle.lang.h:14
+#: ../gtksourceview/language-specs/pascal.lang.h:17
+#: ../gtksourceview/language-specs/scheme.lang.h:12
+#: ../gtksourceview/language-specs/sql.lang.h:48
+#: ../gtksourceview/language-specs/vbnet.lang.h:10
+#: ../gtksourceview/language-specs/verilog.lang.h:9
+#: ../gtksourceview/language-specs/vhdl.lang.h:5
+msgid "Sources"
+msgstr "Avoti "
+
+#: ../gtksourceview/language-specs/ada.lang.h:10
+msgid "True And False"
+msgstr "Patiess un Aplams"
+
+#: ../gtksourceview/language-specs/ada.lang.h:11
+#: ../gtksourceview/language-specs/vhdl.lang.h:8
+msgid "Type"
+msgstr "Tips "
+
+#: ../gtksourceview/language-specs/c.lang.h:1
+#: ../gtksourceview/language-specs/cpp.lang.h:1
+msgid "'#if 0' Comment"
+msgstr "'#if 0' komentÄ?rs"
+
+#. Comments
+#: ../gtksourceview/language-specs/c.lang.h:2
+#: ../gtksourceview/language-specs/cpp.lang.h:2
+#: ../gtksourceview/language-specs/csharp.lang.h:1
+#: ../gtksourceview/language-specs/css.lang.h:9
+#: ../gtksourceview/language-specs/html.lang.h:2
+#: ../gtksourceview/language-specs/haskell.lang.h:1
+#: ../gtksourceview/language-specs/idl.lang.h:1
+#: ../gtksourceview/language-specs/java.lang.h:1
+#: ../gtksourceview/language-specs/javascript.lang.h:2
+#: ../gtksourceview/language-specs/lua.lang.h:1
+#: ../gtksourceview/language-specs/nemerle.lang.h:2
+#: ../gtksourceview/language-specs/sql.lang.h:9
+#: ../gtksourceview/language-specs/texinfo.lang.h:1
+#: ../gtksourceview/language-specs/verilog.lang.h:2
+#: ../gtksourceview/language-specs/xml.lang.h:2
+msgid "Block Comment"
+msgstr "Bloka komentÄ?rs"
+
+#: ../gtksourceview/language-specs/c.lang.h:3
+msgid "C"
+msgstr "C"
+
+#: ../gtksourceview/language-specs/c.lang.h:5
+#: ../gtksourceview/language-specs/cpp.lang.h:5
+msgid "Common Macro"
+msgstr "Kopīgs Makross"
+
+#: ../gtksourceview/language-specs/c.lang.h:7
+#: ../gtksourceview/language-specs/cpp.lang.h:7
+#: ../gtksourceview/language-specs/fortran.lang.h:2
+#: ../gtksourceview/language-specs/haskell.lang.h:4
+#: ../gtksourceview/language-specs/nemerle.lang.h:7
+#: ../gtksourceview/language-specs/octave.lang.h:3
+#: ../gtksourceview/language-specs/python.lang.h:4
+#: ../gtksourceview/language-specs/R.lang.h:4
+msgid "Floating Point Number"
+msgstr "Skaitlis ar peldošo punktu"
+
+#. FIXME WHY DOESN'T THIS WORK?
+#: ../gtksourceview/language-specs/c.lang.h:8
+#: ../gtksourceview/language-specs/cpp.lang.h:8
+#: ../gtksourceview/language-specs/fortran.lang.h:4
+#: ../gtksourceview/language-specs/haskell.lang.h:6
+#: ../gtksourceview/language-specs/nemerle.lang.h:8
+#: ../gtksourceview/language-specs/octave.lang.h:5
+#: ../gtksourceview/language-specs/pascal.lang.h:10
+#: ../gtksourceview/language-specs/python.lang.h:6
+msgid "Hex Number"
+msgstr "HeksavÄ?rtÄ«gs skaitlis"
+
+#: ../gtksourceview/language-specs/c.lang.h:9
+#: ../gtksourceview/language-specs/cpp.lang.h:9
+#: ../gtksourceview/language-specs/haskell.lang.h:7
+#: ../gtksourceview/language-specs/idl.lang.h:3
+msgid "Include/Pragma"
+msgstr "Iekļaut/Pragma"
+
+#: ../gtksourceview/language-specs/c.lang.h:10
+#: ../gtksourceview/language-specs/cpp.lang.h:10
+#: ../gtksourceview/language-specs/csharp.lang.h:3
+#: ../gtksourceview/language-specs/fortran.lang.h:7
+#: ../gtksourceview/language-specs/idl.lang.h:4
+#: ../gtksourceview/language-specs/javascript.lang.h:12
+#: ../gtksourceview/language-specs/lua.lang.h:3
+#: ../gtksourceview/language-specs/perl.lang.h:2
+#: ../gtksourceview/language-specs/ruby.lang.h:9
+#: ../gtksourceview/language-specs/vbnet.lang.h:1
+#: ../gtksourceview/language-specs/verilog.lang.h:6
+msgid "Keywords"
+msgstr "AtslÄ?gvÄ?rdi"
+
+#: ../gtksourceview/language-specs/c.lang.h:12
+#: ../gtksourceview/language-specs/cpp.lang.h:12
+#: ../gtksourceview/language-specs/fortran.lang.h:10
+#: ../gtksourceview/language-specs/haskell.lang.h:11
+#: ../gtksourceview/language-specs/nemerle.lang.h:12
+#: ../gtksourceview/language-specs/octave.lang.h:10
+#: ../gtksourceview/language-specs/python.lang.h:12
+#: ../gtksourceview/language-specs/verilog.lang.h:8
+msgid "Octal Number"
+msgstr "OktÄ?ls skaitlis"
+
+#: ../gtksourceview/language-specs/c.lang.h:13
+#: ../gtksourceview/language-specs/cpp.lang.h:13
+#: ../gtksourceview/language-specs/csharp.lang.h:6
+#: ../gtksourceview/language-specs/idl.lang.h:6
+#: ../gtksourceview/language-specs/vbnet.lang.h:8
+msgid "Preprocessor Definitions"
+msgstr "Priekšprocesora definīcijas"
+
+#: ../gtksourceview/language-specs/c.lang.h:16
+#: ../gtksourceview/language-specs/cpp.lang.h:16
+#: ../gtksourceview/language-specs/fortran.lang.h:15
+#: ../gtksourceview/language-specs/idl.lang.h:10
+#: ../gtksourceview/language-specs/verilog.lang.h:10
+msgid "Types"
+msgstr "Tipi"
+
+#: ../gtksourceview/language-specs/changelog.lang.h:1
+msgid "ChangeLog"
+msgstr "Notikumu žurnÄ?ls"
+
+#: ../gtksourceview/language-specs/changelog.lang.h:2
+msgid "Date"
+msgstr "Datums"
+
+#: ../gtksourceview/language-specs/changelog.lang.h:3
+msgid "Email"
+msgstr "E-pasts"
+
+#: ../gtksourceview/language-specs/changelog.lang.h:4
+msgid "File"
+msgstr "Fails"
+
+#: ../gtksourceview/language-specs/changelog.lang.h:5
+msgid "Marker"
+msgstr "MarÄ·ieris"
+
+#: ../gtksourceview/language-specs/cpp.lang.h:3
+msgid "C++"
+msgstr "C++"
+
+#: ../gtksourceview/language-specs/csharp.lang.h:2
+msgid "C#"
+msgstr "C#"
+
+#: ../gtksourceview/language-specs/csharp.lang.h:5
+#: ../gtksourceview/language-specs/lua.lang.h:7
+#: ../gtksourceview/language-specs/sh.lang.h:6
+msgid "Multiline String"
+msgstr "Daudzlīniju virkne"
+
+#: ../gtksourceview/language-specs/csharp.lang.h:7
+#: ../gtksourceview/language-specs/java.lang.h:9
+#: ../gtksourceview/language-specs/nemerle.lang.h:13
+#: ../gtksourceview/language-specs/vbnet.lang.h:9
+msgid "Primitives"
+msgstr "Primitīvi"
+
+#: ../gtksourceview/language-specs/csharp.lang.h:10
+#: ../gtksourceview/language-specs/css.lang.h:59
+#: ../gtksourceview/language-specs/fortran.lang.h:14
+#: ../gtksourceview/language-specs/java.lang.h:12
+#: ../gtksourceview/language-specs/javascript.lang.h:24
+#: ../gtksourceview/language-specs/lua.lang.h:11
+#: ../gtksourceview/language-specs/makefile.lang.h:9
+#: ../gtksourceview/language-specs/sh.lang.h:14
+msgid "String 2"
+msgstr "Virkne 2"
+
+#.
+#. At rules must occur at the start of a line.
+#.
+#: ../gtksourceview/language-specs/css.lang.h:4
+msgid "At Rules"
+msgstr "Pie noteikumiem"
+
+#.
+#. For CSS 2-style selectors: tag[attr="value"].
+#.
+#: ../gtksourceview/language-specs/css.lang.h:8
+msgid "Attribute Value Delimiters"
+msgstr "AttribÅ«ta vÄ?rtÄ«bas norobežotÄ?js"
+
+#: ../gtksourceview/language-specs/css.lang.h:10
+msgid "CSS"
+msgstr "CSS"
+
+#.
+#. Value length specifier. Unless it is 0, must always be like: -1.2em.
+#.
+#: ../gtksourceview/language-specs/css.lang.h:14
+msgid "Dimension"
+msgstr "Dimensija"
+
+#.
+#. Hexadecimal method of specifying colors. Can either be 3 or 6 in
+#. length: #ffcc00 = #fc0.
+#.
+#: ../gtksourceview/language-specs/css.lang.h:23
+msgid "Hexadecimal Color"
+msgstr "HeksadecimÄ?la krÄ?sa"
+
+#.
+#. Upgrades a rule set's importance when several rule sets conflict.
+#.
+#: ../gtksourceview/language-specs/css.lang.h:27
+msgid "Importance Modifier"
+msgstr "NozÄ«mÄ«guma pÄ?rveidotÄ?js"
+
+#: ../gtksourceview/language-specs/css.lang.h:28
+msgid "Known Property Values"
+msgstr "ZinÄ?mas rekvizÄ«tu vÄ?rtÄ«bas"
+
+#: ../gtksourceview/language-specs/css.lang.h:35
+#: ../gtksourceview/language-specs/javascript.lang.h:20
+#: ../gtksourceview/language-specs/php.lang.h:20
+#: ../gtksourceview/language-specs/sql.lang.h:34
+msgid "Operators"
+msgstr "OperÄ?tori"
+
+#: ../gtksourceview/language-specs/css.lang.h:37
+msgid "Property Names"
+msgstr "Rekvizītu nosaukumi"
+
+#.
+#. Brackets define a declaration block, parentheses define functions.
+#.
+#: ../gtksourceview/language-specs/css.lang.h:41
+#: ../gtksourceview/language-specs/javascript.lang.h:21
+msgid "Punctuators"
+msgstr "PunktuÄ?tori"
+
+#.
+#. Used to combine selectors. Example syntax:
+#.
+#. body * div#ID.className > p + ul li:first-child
+#.
+#: ../gtksourceview/language-specs/css.lang.h:47
+msgid "Selector Grammar"
+msgstr "Gramatikas iezÄ«mÄ?tÄ?js "
+
+#.
+#. Pseudo-class rules. Good to have syntax highlighting for these
+#. for mistypings.
+#.
+#: ../gtksourceview/language-specs/css.lang.h:52
+msgid "Selector Pseudo Classes"
+msgstr "Pseido klases iezÄ«mÄ?tÄ?js"
+
+#.
+#. Pseudo-element rules. Good to have syntax highlighting for these
+#. for mistypings.
+#.
+#: ../gtksourceview/language-specs/css.lang.h:57
+msgid "Selector Pseudo Elements"
+msgstr "Pseido elementu iezÄ«mÄ?tÄ?js"
+
+#.
+#. Escaped unicode characters can contain either 6 hexadecimal characters
+#. or 1-5 hex characters followed by one whitespace character.
+#.
+#: ../gtksourceview/language-specs/css.lang.h:64
+msgid "Unicode Character Reference"
+msgstr "Unicode rakstzīmes atsauce"
+
+#.
+#. Unicode range values.
+#.
+#: ../gtksourceview/language-specs/css.lang.h:68
+msgid "Unicode Range"
+msgstr "Unicode diapazons"
+
+#: ../gtksourceview/language-specs/desktop.lang.h:1
+msgid ".desktop"
+msgstr ".darbavirsma"
+
+#: ../gtksourceview/language-specs/desktop.lang.h:2
+#: ../gtksourceview/language-specs/gtkrc.lang.h:1
+#: ../gtksourceview/language-specs/ini.lang.h:2
+#: ../gtksourceview/language-specs/scheme.lang.h:1
+msgid "Boolean Value"
+msgstr "LoÄ£iskÄ? vÄ?rtÄ«ba"
+
+#: ../gtksourceview/language-specs/desktop.lang.h:3
+msgid "Encoding"
+msgstr "KodÄ?jums"
+
+#: ../gtksourceview/language-specs/desktop.lang.h:4
+msgid "Exec Parameter"
+msgstr "Izpildīšanas parametrs"
+
+#: ../gtksourceview/language-specs/desktop.lang.h:5
+#: ../gtksourceview/language-specs/ini.lang.h:5
+msgid "Group"
+msgstr "Grupa"
+
+#: ../gtksourceview/language-specs/desktop.lang.h:8
+#: ../gtksourceview/language-specs/ini.lang.h:9
+msgid "Non Standard Key"
+msgstr "Nestandarta atslÄ?ga"
+
+#: ../gtksourceview/language-specs/desktop.lang.h:11
+msgid "Standard Key"
+msgstr "Standarta atslÄ?ga"
+
+#: ../gtksourceview/language-specs/diff.lang.h:1
+msgid "Added line"
+msgstr "Pievienota rinda"
+
+#: ../gtksourceview/language-specs/diff.lang.h:2
+msgid "Changed line"
+msgstr "Izmainīta rinda"
+
+#: ../gtksourceview/language-specs/diff.lang.h:3
+msgid "Diff"
+msgstr "Diff"
+
+#: ../gtksourceview/language-specs/diff.lang.h:4
+msgid "Diff file"
+msgstr "Diff fails"
+
+#: ../gtksourceview/language-specs/diff.lang.h:6
+#: ../gtksourceview/language-specs/po.lang.h:4
+msgid "Location"
+msgstr "Vieta"
+
+#: ../gtksourceview/language-specs/diff.lang.h:8
+msgid "Removed line"
+msgstr "NoÅ?emta rinda"
+
+#: ../gtksourceview/language-specs/diff.lang.h:9
+msgid "Special case"
+msgstr "Īpašs gadījums"
+
+#: ../gtksourceview/language-specs/html.lang.h:1
+#: ../gtksourceview/language-specs/xml.lang.h:1
+msgid "Attribute"
+msgstr "Atribūts"
+
+#: ../gtksourceview/language-specs/html.lang.h:3
+#: ../gtksourceview/language-specs/xml.lang.h:3
+msgid "Closing Bracket"
+msgstr "AizveroÅ¡Ä? iekava"
+
+#: ../gtksourceview/language-specs/html.lang.h:4
+msgid "DTD"
+msgstr "DTD"
+
+#: ../gtksourceview/language-specs/html.lang.h:5
+#: ../gtksourceview/language-specs/xml.lang.h:4
+msgid "Entity"
+msgstr "Entītija"
+
+#: ../gtksourceview/language-specs/html.lang.h:6
+msgid "HTML"
+msgstr "HTML"
+
+#: ../gtksourceview/language-specs/html.lang.h:7
+#: ../gtksourceview/language-specs/latex.lang.h:7
+#: ../gtksourceview/language-specs/texinfo.lang.h:12
+#: ../gtksourceview/language-specs/xml.lang.h:6
+msgid "Markup"
+msgstr "MarÄ·Ä?jums"
+
+#: ../gtksourceview/language-specs/html.lang.h:9
+#: ../gtksourceview/language-specs/xml.lang.h:8
+msgid "Tag"
+msgstr "Birka"
+
+#: ../gtksourceview/language-specs/fortran.lang.h:3
+msgid "Fortran 95"
+msgstr "Fortran 95"
+
+#: ../gtksourceview/language-specs/fortran.lang.h:5
+msgid "Input/Output"
+msgstr "Ievads/Izvads"
+
+#: ../gtksourceview/language-specs/fortran.lang.h:6
+msgid "Intrinsics"
+msgstr "IekÅ¡Ä?jie"
+
+#: ../gtksourceview/language-specs/fortran.lang.h:11
+msgid "Read/Write"
+msgstr "Lasīt/Rakstīt"
+
+#. "duble-quoted strings"
+#: ../gtksourceview/language-specs/gtkrc.lang.h:2
+#: ../gtksourceview/language-specs/ini.lang.h:4
+#: ../gtksourceview/language-specs/octave.lang.h:2
+#: ../gtksourceview/language-specs/php.lang.h:16
+#: ../gtksourceview/language-specs/python.lang.h:3
+#: ../gtksourceview/language-specs/R.lang.h:3
+#: ../gtksourceview/language-specs/ruby.lang.h:6
+msgid "Double Quoted String"
+msgstr "Dubulti citÄ?ta virkne"
+
+#: ../gtksourceview/language-specs/gtkrc.lang.h:3
+msgid "GtkRC"
+msgstr "GtkRC"
+
+#: ../gtksourceview/language-specs/gtkrc.lang.h:4
+msgid "Include Directive"
+msgstr "Pievienot priekšnosacījumu"
+
+#: ../gtksourceview/language-specs/gtkrc.lang.h:5
+#: ../gtksourceview/language-specs/haskell.lang.h:8
+msgid "Keysymbol"
+msgstr "AtslÄ?gas simbols"
+
+#. 'single-quoted strings'
+#: ../gtksourceview/language-specs/gtkrc.lang.h:10
+#: ../gtksourceview/language-specs/ini.lang.h:11
+#: ../gtksourceview/language-specs/octave.lang.h:14
+#: ../gtksourceview/language-specs/php.lang.h:24
+#: ../gtksourceview/language-specs/python.lang.h:15
+#: ../gtksourceview/language-specs/R.lang.h:11
+#: ../gtksourceview/language-specs/ruby.lang.h:17
+msgid "Single Quoted String"
+msgstr "Vienreiz citÄ?ta virkne"
+
+#: ../gtksourceview/language-specs/gtkrc.lang.h:11
+msgid "State"
+msgstr "StÄ?voklis"
+
+#. $variable, $$dynamic-variable and even $$$more
+#: ../gtksourceview/language-specs/gtkrc.lang.h:12
+#: ../gtksourceview/language-specs/ini.lang.h:12
+#: ../gtksourceview/language-specs/php.lang.h:26
+#: ../gtksourceview/language-specs/tcl.lang.h:7
+msgid "Variable"
+msgstr "Mainīgais"
+
+#: ../gtksourceview/language-specs/haskell.lang.h:5
+msgid "Haskell"
+msgstr "Haskell"
+
+#: ../gtksourceview/language-specs/haskell.lang.h:12
+msgid "Preprocessor Definition"
+msgstr "Priekšprocesora definīcija"
+
+#: ../gtksourceview/language-specs/haskell.lang.h:32
+msgid "Type or Constructor"
+msgstr "Tips vai konstruktors"
+
+#: ../gtksourceview/language-specs/idl.lang.h:2
+msgid "IDL"
+msgstr "IDL"
+
+#: ../gtksourceview/language-specs/idl.lang.h:7
+msgid "Sectional"
+msgstr "DaļÄ?jis"
+
+#: ../gtksourceview/language-specs/ini.lang.h:1
+msgid ".ini"
+msgstr ".ini"
+
+#: ../gtksourceview/language-specs/ini.lang.h:3
+#: ../gtksourceview/language-specs/verilog.lang.h:3
+msgid "Decimal Number"
+msgstr "DecimÄ?ls skaitlis"
+
+#: ../gtksourceview/language-specs/ini.lang.h:6
+msgid "Integer"
+msgstr "Vesels skaitlis"
+
+#: ../gtksourceview/language-specs/java.lang.h:2
+msgid "Declarations"
+msgstr "PasludinÄ?Å¡anas"
+
+#: ../gtksourceview/language-specs/java.lang.h:3
+msgid "Flow"
+msgstr "Plūsma"
+
+#: ../gtksourceview/language-specs/java.lang.h:4
+msgid "Java"
+msgstr "Java"
+
+#: ../gtksourceview/language-specs/java.lang.h:6
+msgid "Memory"
+msgstr "AtmiÅ?a"
+
+#: ../gtksourceview/language-specs/java.lang.h:7
+msgid "Modifiers"
+msgstr "ModifikÄ?tori"
+
+#: ../gtksourceview/language-specs/java.lang.h:8
+msgid "Numeric"
+msgstr "Skaitlisks"
+
+#: ../gtksourceview/language-specs/javascript.lang.h:1
+#: ../gtksourceview/language-specs/php.lang.h:1
+msgid "Array Operators"
+msgstr "MasÄ«va operÄ?tori"
+
+#: ../gtksourceview/language-specs/javascript.lang.h:3
+msgid "Constructors"
+msgstr "Konstruktori"
+
+#: ../gtksourceview/language-specs/javascript.lang.h:4
+msgid "Error Handling"
+msgstr "Kļūdu apstrÄ?de"
+
+#: ../gtksourceview/language-specs/javascript.lang.h:5
+msgid "Floating-Point Number"
+msgstr "Skaitlis ar peldošo punktu"
+
+#: ../gtksourceview/language-specs/javascript.lang.h:6
+msgid "Flow Keywords"
+msgstr "PlÅ«smas atslÄ?gvÄ?rdi"
+
+#: ../gtksourceview/language-specs/javascript.lang.h:7
+msgid "Future Reserved Words"
+msgstr "NÄ?kotnes rezervÄ?tie vÄ?rdi"
+
+#: ../gtksourceview/language-specs/javascript.lang.h:8
+msgid "Global Functions"
+msgstr "GlobÄ?lÄ?s funkcijas"
+
+#: ../gtksourceview/language-specs/javascript.lang.h:9
+msgid "Global Properties"
+msgstr "GlobÄ?lÄ?s iespÄ?jas"
+
+#: ../gtksourceview/language-specs/javascript.lang.h:10
+#: ../gtksourceview/language-specs/verilog.lang.h:5
+msgid "Hexadecimal Number"
+msgstr "HeksadecimÄ?ls skaitlis"
+
+#: ../gtksourceview/language-specs/javascript.lang.h:11
+msgid "JavaScript"
+msgstr "JavaScript"
+
+#: ../gtksourceview/language-specs/javascript.lang.h:14
+msgid "Literals"
+msgstr "LiterÄ?ļi"
+
+#: ../gtksourceview/language-specs/javascript.lang.h:15
+msgid "Math Value Properties"
+msgstr "MatemÄ?tiskÄ?s vÄ?rtÄ«bas Ä«paÅ¡Ä«bas"
+
+#: ../gtksourceview/language-specs/javascript.lang.h:17
+msgid "Object Functions"
+msgstr "Objekta funkcijas"
+
+#: ../gtksourceview/language-specs/javascript.lang.h:18
+msgid "Object Properties"
+msgstr "Objekta īpašības"
+
+#: ../gtksourceview/language-specs/javascript.lang.h:19
+msgid "Objects"
+msgstr "Objekti"
+
+#: ../gtksourceview/language-specs/javascript.lang.h:22
+#: ../gtksourceview/language-specs/lua.lang.h:9
+#: ../gtksourceview/language-specs/octave.lang.h:13
+#: ../gtksourceview/language-specs/perl.lang.h:7
+#: ../gtksourceview/language-specs/php.lang.h:22
+#: ../gtksourceview/language-specs/python.lang.h:14
+#: ../gtksourceview/language-specs/R.lang.h:10
+#: ../gtksourceview/language-specs/ruby.lang.h:16
+#: ../gtksourceview/language-specs/sh.lang.h:11
+#: ../gtksourceview/language-specs/tcl.lang.h:3
+msgid "Scripts"
+msgstr "Skripti"
+
+#: ../gtksourceview/language-specs/javascript.lang.h:25
+msgid "Unicode Escape Sequence"
+msgstr "Unicode atsoļa secība"
+
+#: ../gtksourceview/language-specs/javascript.lang.h:26
+msgid "Word Operators"
+msgstr "VÄ?rda operÄ?tori"
+
+#: ../gtksourceview/language-specs/latex.lang.h:1
+msgid "Command"
+msgstr "Komanda"
+
+#: ../gtksourceview/language-specs/latex.lang.h:3
+msgid "Comment Environment"
+msgstr "KomentÄ?t vidi"
+
+#: ../gtksourceview/language-specs/latex.lang.h:4
+#: ../gtksourceview/language-specs/texinfo.lang.h:6
+msgid "Include"
+msgstr "Iekļaut"
+
+#: ../gtksourceview/language-specs/latex.lang.h:6
+msgid "LaTeX"
+msgstr "LaTeX"
+
+#: ../gtksourceview/language-specs/latex.lang.h:8
+msgid "Math"
+msgstr "MatemÄ?tisks"
+
+#: ../gtksourceview/language-specs/lua.lang.h:2
+#: ../gtksourceview/language-specs/makefile.lang.h:3
+msgid "Functions"
+msgstr "Funkcijas"
+
+#: ../gtksourceview/language-specs/lua.lang.h:5
+msgid "Line Comment 2"
+msgstr "Rindas komentÄ?rs 2"
+
+#: ../gtksourceview/language-specs/lua.lang.h:6
+msgid "Lua"
+msgstr "Lua"
+
+#: ../gtksourceview/language-specs/lua.lang.h:8
+#: ../gtksourceview/language-specs/sh.lang.h:7
+msgid "Multiline String 2"
+msgstr "Daudzlīniju virkne 2"
+
+#. `backticks-quoted strings`
+#: ../gtksourceview/language-specs/makefile.lang.h:1
+#: ../gtksourceview/language-specs/php.lang.h:3
+#: ../gtksourceview/language-specs/sh.lang.h:1
+msgid "Backtick String"
+msgstr "Atpakaļatzīmes virkne"
+
+#: ../gtksourceview/language-specs/makefile.lang.h:2
+msgid "Directives"
+msgstr "Priekšraksti"
+
+#: ../gtksourceview/language-specs/makefile.lang.h:5
+msgid "Makefile"
+msgstr "Faila veidotÄ?js"
+
+#: ../gtksourceview/language-specs/makefile.lang.h:7
+msgid "Special Targets"
+msgstr "SpeciÄ?lie mÄ?rÄ·i"
+
+#: ../gtksourceview/language-specs/makefile.lang.h:10
+msgid "Targets"
+msgstr "MerÄ·i"
+
+#: ../gtksourceview/language-specs/makefile.lang.h:11
+#: ../gtksourceview/language-specs/sh.lang.h:15
+msgid "Variable1"
+msgstr "Mainīgais1"
+
+#: ../gtksourceview/language-specs/makefile.lang.h:12
+#: ../gtksourceview/language-specs/sh.lang.h:16
+msgid "Variable2"
+msgstr "Mainīgais2"
+
+#: ../gtksourceview/language-specs/msil.lang.h:1
+msgid "MSIL"
+msgstr "MSIL"
+
+#: ../gtksourceview/language-specs/nemerle.lang.h:1
+#: ../gtksourceview/language-specs/verilog.lang.h:1
+msgid "Binary Number"
+msgstr "BinÄ?rs skaitlis"
+
+#: ../gtksourceview/language-specs/nemerle.lang.h:4
+msgid "Core Keywords"
+msgstr "Serdew atslÄ?gvÄ?rdi"
+
+#: ../gtksourceview/language-specs/nemerle.lang.h:5
+msgid "Core Types"
+msgstr "Serdes tipi"
+
+#: ../gtksourceview/language-specs/nemerle.lang.h:9
+msgid "Keywords Defined by Macros"
+msgstr "AtslÄ?gvÄ?rdi, kas definÄ?ti ar makrosu"
+
+#: ../gtksourceview/language-specs/nemerle.lang.h:11
+msgid "Nemerle"
+msgstr "Nemerle"
+
+#: ../gtksourceview/language-specs/octave.lang.h:8
+#: ../gtksourceview/language-specs/python.lang.h:10
+msgid "Multiline Double Quoted String"
+msgstr "DaudzlÄ«niju dubulti citÄ?ta virkne"
+
+#: ../gtksourceview/language-specs/octave.lang.h:9
+#: ../gtksourceview/language-specs/python.lang.h:11
+msgid "Multiline Single Quoted String"
+msgstr "DaudzlÄ«niju viena citÄ?ta virkne"
+
+#: ../gtksourceview/language-specs/octave.lang.h:11
+msgid "Octave"
+msgstr "OktÄ?va"
+
+#: ../gtksourceview/language-specs/octave.lang.h:12
+#: ../gtksourceview/language-specs/R.lang.h:9
+msgid "Reserved Constant"
+msgstr "RezervÄ?tas konstantes"
+
+#: ../gtksourceview/language-specs/pascal.lang.h:1
+msgid "Block Comment 1"
+msgstr "Bloka komentÄ?rs 1"
+
+#: ../gtksourceview/language-specs/pascal.lang.h:2
+msgid "Block Comment 2"
+msgstr "Bloka komentÄ?rs 2"
+
+#: ../gtksourceview/language-specs/pascal.lang.h:3
+msgid "Boolean Bitwise Operators"
+msgstr "LoÄ£iskie bitu operÄ?tori"
+
+#: ../gtksourceview/language-specs/pascal.lang.h:4
+msgid "Builtin Functions"
+msgstr "IntegrÄ?tas funkcijas"
+
+#: ../gtksourceview/language-specs/pascal.lang.h:5
+msgid "Builtin Types"
+msgstr "IntegrÄ?ti tipi"
+
+#: ../gtksourceview/language-specs/pascal.lang.h:6
+msgid "Builtin Values"
+msgstr "IntegrÄ?tas vÄ?rtÄ«bas"
+
+#: ../gtksourceview/language-specs/pascal.lang.h:7
+msgid "Functions and Function Modifiers"
+msgstr "Funckcijas un funkciju modifikÄ?tori"
+
+#: ../gtksourceview/language-specs/pascal.lang.h:8
+msgid "General Format"
+msgstr "VispÄ?rÄ?js formÄ?ts"
+
+#: ../gtksourceview/language-specs/pascal.lang.h:12
+msgid "Loop, Flow, and Exceptions Keywords"
+msgstr "Cikla, plÅ«smas un izÅ?Ä?mumu atslÄ?gvÄ?rdi"
+
+#: ../gtksourceview/language-specs/pascal.lang.h:13
+msgid "Math Operators"
+msgstr "MatemÄ?tikie operÄ?tori"
+
+#: ../gtksourceview/language-specs/pascal.lang.h:15
+msgid "Pascal"
+msgstr "Pascal"
+
+#: ../gtksourceview/language-specs/pascal.lang.h:16
+msgid "Preprocessor Defines"
+msgstr "Priekšprocesora definīcijas"
+
+#: ../gtksourceview/language-specs/pascal.lang.h:19
+msgid "Type, Class and Object Keywords"
+msgstr "Tipa, klases un objekta atslÄ?gvÄ?rdi"
+
+#: ../gtksourceview/language-specs/perl.lang.h:1
+msgid "Function Call"
+msgstr "Funkcijas izsaukums"
+
+#: ../gtksourceview/language-specs/perl.lang.h:4
+msgid "Method Call"
+msgstr "Metodes izsaukums"
+
+#: ../gtksourceview/language-specs/perl.lang.h:5
+msgid "POD"
+msgstr "POD"
+
+#: ../gtksourceview/language-specs/perl.lang.h:6
+msgid "Perl"
+msgstr "Perl"
+
+#: ../gtksourceview/language-specs/perl.lang.h:9
+#: ../gtksourceview/language-specs/tcl.lang.h:5
+msgid "String2"
+msgstr "Rinda2"
+
+#: ../gtksourceview/language-specs/perl.lang.h:10
+msgid "String3"
+msgstr "Rinda3"
+
+#: ../gtksourceview/language-specs/perl.lang.h:11
+msgid "Variables"
+msgstr "Mainīgie"
+
+#. # Bourne Shell Line Comment
+#: ../gtksourceview/language-specs/php.lang.h:5
+msgid "Bash Line Comment"
+msgstr "DalÄ«tas rindas komentÄ?rs"
+
+#. /* C Block Comment
+#: ../gtksourceview/language-specs/php.lang.h:7
+msgid "C Block Comment"
+msgstr "C bloka komentÄ?rs"
+
+#. // C++ Line Comment
+#: ../gtksourceview/language-specs/php.lang.h:9
+msgid "C++ Line Comment"
+msgstr "C++ rindas komentÄ?rs"
+
+#: ../gtksourceview/language-specs/php.lang.h:10
+msgid "Case Insensitive Keyword"
+msgstr "ReÄ£istra neatkarÄ«gs atslÄ?gvÄ?rds"
+
+#. This are keywords, the are recognised by php
+#: ../gtksourceview/language-specs/php.lang.h:12
+msgid "Case Sensitive Keyword"
+msgstr "ReÄ£istra jÅ«tÄ«gs atslÄ?gvÄ?rds"
+
+#. <? ?> <HTML> inside PHP <?
+#: ../gtksourceview/language-specs/php.lang.h:18
+msgid "First Open PHP Tag"
+msgstr "Vispirms atvÄ?rt PHP birku"
+
+#: ../gtksourceview/language-specs/php.lang.h:19
+msgid "HTML Block"
+msgstr "HTML bloks"
+
+#: ../gtksourceview/language-specs/php.lang.h:21
+msgid "PHP"
+msgstr "PHP"
+
+#: ../gtksourceview/language-specs/po.lang.h:2
+msgid "Format"
+msgstr "FormÄ?ts"
+
+#: ../gtksourceview/language-specs/po.lang.h:7
+msgid "gettext translation"
+msgstr "teksta ieguves tulkošana"
+
+#: ../gtksourceview/language-specs/python.lang.h:1
+#: ../gtksourceview/language-specs/ruby.lang.h:2
+msgid "Builtins"
+msgstr "IntegrÄ?tie"
+
+#: ../gtksourceview/language-specs/python.lang.h:9
+msgid "Module Handler"
+msgstr "Moduļa vadÄ«tÄ?js"
+
+#: ../gtksourceview/language-specs/python.lang.h:13
+msgid "Python"
+msgstr "Python"
+
+#: ../gtksourceview/language-specs/R.lang.h:1
+msgid "Assignment Operator"
+msgstr "PieÅ¡Ä·irÅ¡anas operÄ?tors"
+
+#: ../gtksourceview/language-specs/R.lang.h:2
+msgid "Delimiter"
+msgstr "AtdalÄ«tÄ?js"
+
+#: ../gtksourceview/language-specs/R.lang.h:5
+msgid "Integer Number"
+msgstr "Vesela skaitļa numurs"
+
+#: ../gtksourceview/language-specs/R.lang.h:8
+msgid "Reserved Class"
+msgstr "RezervÄ?ta klase"
+
+#: ../gtksourceview/language-specs/ruby.lang.h:1
+msgid "Attribute Definitions"
+msgstr "Attribūta definīcjas"
+
+#: ../gtksourceview/language-specs/ruby.lang.h:3
+msgid "Class Variables"
+msgstr "Klases mainīgie"
+
+#: ../gtksourceview/language-specs/ruby.lang.h:4
+msgid "Constants"
+msgstr "Konstantes"
+
+#: ../gtksourceview/language-specs/ruby.lang.h:5
+msgid "Definitions"
+msgstr "Definīcijas"
+
+#: ../gtksourceview/language-specs/ruby.lang.h:7
+msgid "Global Variables"
+msgstr "GlobÄ?lie mainÄ«gie"
+
+#: ../gtksourceview/language-specs/ruby.lang.h:8
+msgid "Instance Variables"
+msgstr "Instances mainīgie"
+
+#: ../gtksourceview/language-specs/ruby.lang.h:11
+msgid "Module Handlers"
+msgstr "Moduļa vadÄ«tÄ?ji"
+
+#: ../gtksourceview/language-specs/ruby.lang.h:12
+msgid "Multiline Comment"
+msgstr "DaudzlÄ«niju komentÄ?rs"
+
+#: ../gtksourceview/language-specs/ruby.lang.h:13
+msgid "Pseudo Variables"
+msgstr "Neīstie mainīgie"
+
+#: ../gtksourceview/language-specs/ruby.lang.h:14
+msgid "RegExp Variables"
+msgstr "RegExp mainīgie"
+
+#: ../gtksourceview/language-specs/ruby.lang.h:15
+msgid "Ruby"
+msgstr "Dimants "
+
+#: ../gtksourceview/language-specs/ruby.lang.h:18
+msgid "Symbols"
+msgstr "Simboli"
+
+#: ../gtksourceview/language-specs/scheme.lang.h:11
+msgid "Scheme"
+msgstr "ShÄ?ma"
+
+#: ../gtksourceview/language-specs/sh.lang.h:2
+msgid "Built-in Command"
+msgstr "IntegrÄ?tas komandas"
+
+#: ../gtksourceview/language-specs/sh.lang.h:3
+msgid "Common Command"
+msgstr "Kopīgas komandas"
+
+#: ../gtksourceview/language-specs/sh.lang.h:8
+msgid "Operator"
+msgstr "OperÄ?tors"
+
+#: ../gtksourceview/language-specs/sh.lang.h:9
+msgid "Punctuator"
+msgstr "PunktuÄ?tors"
+
+#: ../gtksourceview/language-specs/sh.lang.h:10
+msgid "Redirection"
+msgstr "PÄ?radresÄ?cija"
+
+#: ../gtksourceview/language-specs/sh.lang.h:12
+msgid "Self"
+msgstr "Paš"
+
+#: ../gtksourceview/language-specs/sh.lang.h:17
+msgid "sh"
+msgstr "sh"
+
+#: ../gtksourceview/language-specs/sql.lang.h:1
+msgid "ANSI Datatypes"
+msgstr "ANSI datu tipi"
+
+#. Reserved Words
+#: ../gtksourceview/language-specs/sql.lang.h:3
+msgid "ANSI Reserved Words"
+msgstr "ANS rezervÄ?tie nosaukumi"
+
+#. Aggregate Functions
+#: ../gtksourceview/language-specs/sql.lang.h:5
+msgid "Aggregate Functions"
+msgstr "Kopuma funkcijas"
+
+#. Analytic Functions
+#: ../gtksourceview/language-specs/sql.lang.h:7
+msgid "Analytic Functions"
+msgstr "AnalÄ«tiskÄ?s funkcijas"
+
+#: ../gtksourceview/language-specs/sql.lang.h:10
+msgid "Character Functions Returning Character Values"
+msgstr "Simbolu funkcijas, kas atgriež simboliskas vÄ?rtÄ«bas"
+
+#: ../gtksourceview/language-specs/sql.lang.h:11
+msgid "Character Functions Returning Number Values"
+msgstr "Simbolu funkcijas, kas atgriež skaitliskas vÄ?rtÄ«bas"
+
+#: ../gtksourceview/language-specs/sql.lang.h:12
+msgid "Collection Functions"
+msgstr "Kolekcijas funkcijas"
+
+#: ../gtksourceview/language-specs/sql.lang.h:13
+msgid "Conditions"
+msgstr "Nosacījumi"
+
+#: ../gtksourceview/language-specs/sql.lang.h:14
+msgid "Conversion Functions"
+msgstr "PÄ?rveidoÅ¡anas funkcijas"
+
+#: ../gtksourceview/language-specs/sql.lang.h:15
+msgid "Data Mining Functions"
+msgstr "Datizraces funkcijas"
+
+#: ../gtksourceview/language-specs/sql.lang.h:16
+msgid "Datetime Functions"
+msgstr "Laika un datuma funkcijas"
+
+#: ../gtksourceview/language-specs/sql.lang.h:17
+msgid "Encoding and Decoding Functions"
+msgstr "KodÄ?Å¡anas un DekodÄ?Å¡anas funkcijas"
+
+#: ../gtksourceview/language-specs/sql.lang.h:18
+msgid "Environment and Identifier Functions"
+msgstr "Vides un identifikÄ?tora funkcijas"
+
+#: ../gtksourceview/language-specs/sql.lang.h:19
+msgid "General Comparison Functions"
+msgstr "VispÄ?rÄ?ja salÄ«dzinÄ?juma funkcijas"
+
+#: ../gtksourceview/language-specs/sql.lang.h:20
+msgid "Hierarchical Function"
+msgstr "Hierarhiskas funkcijas"
+
+#: ../gtksourceview/language-specs/sql.lang.h:21
+msgid "Integer Literals"
+msgstr "Veselo skaitļu literÄ?ļi"
+
+#: ../gtksourceview/language-specs/sql.lang.h:22
+msgid "Large Object Functions"
+msgstr "Liela objekta funckcijas"
+
+#. Model Functions
+#: ../gtksourceview/language-specs/sql.lang.h:25
+msgid "Model Functions"
+msgstr "Modeļa funkcijas"
+
+#: ../gtksourceview/language-specs/sql.lang.h:26
+msgid "NLS Character Functions"
+msgstr "NLS simbolu funkcijas"
+
+#: ../gtksourceview/language-specs/sql.lang.h:27
+msgid "NULL-Related Functions"
+msgstr "NULL-saistītas funkcijas"
+
+#: ../gtksourceview/language-specs/sql.lang.h:28
+msgid "Null"
+msgstr "Nulle"
+
+#: ../gtksourceview/language-specs/sql.lang.h:29
+msgid "Number Literals"
+msgstr "Skaitļa literÄ?lis"
+
+#. Single-Row Functions
+#: ../gtksourceview/language-specs/sql.lang.h:31
+msgid "Numeric Functions"
+msgstr "Skaitliskas funkcijas"
+
+#. Object Reference Functions
+#: ../gtksourceview/language-specs/sql.lang.h:33
+msgid "Object Reference Functions"
+msgstr "Objekta atsauces funkcijas"
+
+#. Datatypes
+#: ../gtksourceview/language-specs/sql.lang.h:36
+msgid "Oracle Built-in Datatypes"
+msgstr "Oracle integrÄ?tie datu tipi"
+
+#: ../gtksourceview/language-specs/sql.lang.h:37
+msgid "Oracle Reserved Words"
+msgstr "Oracle rezervÄ?ti vÄ?rdi"
+
+#: ../gtksourceview/language-specs/sql.lang.h:38
+msgid "Oracle-Supplied Types"
+msgstr "Oracle-piegÄ?dÄ?tie tipi"
+
+#: ../gtksourceview/language-specs/sql.lang.h:39
+msgid "SQL"
+msgstr "SQL"
+
+#: ../gtksourceview/language-specs/sql.lang.h:40
+msgid "SQL Statements"
+msgstr "SQL priekšraksti"
+
+#. SQL*Plus
+#: ../gtksourceview/language-specs/sql.lang.h:42
+msgid "SQL*Plus At Sign"
+msgstr "SQL *Plus pie zīmes"
+
+#: ../gtksourceview/language-specs/sql.lang.h:43
+msgid "SQL*Plus Commands"
+msgstr "SQL *Plus komandas"
+
+#: ../gtksourceview/language-specs/sql.lang.h:44
+msgid "SQL*Plus Double At Sign"
+msgstr "SQL *Plus dubults pie zīmes"
+
+#: ../gtksourceview/language-specs/sql.lang.h:45
+msgid "SQL*Plus Slash"
+msgstr "SQL*Plus samazinÄ?t"
+
+#: ../gtksourceview/language-specs/sql.lang.h:46
+msgid "SQL/DS and DB2 Datatypes"
+msgstr "SQL/DS un DB2 datu tipi"
+
+#: ../gtksourceview/language-specs/sql.lang.h:47
+msgid "Size Clause"
+msgstr "Panta izmÄ?rs"
+
+#. Literals
+#: ../gtksourceview/language-specs/sql.lang.h:50
+msgid "Text Literals"
+msgstr "Teksta literÄ?ļi"
+
+#: ../gtksourceview/language-specs/sql.lang.h:51
+msgid "Unlimited"
+msgstr "Neierobežots"
+
+#: ../gtksourceview/language-specs/sql.lang.h:52
+msgid "XML Functions"
+msgstr "XML funkcijas"
+
+#: ../gtksourceview/language-specs/tcl.lang.h:6
+msgid "Tcl"
+msgstr "Tcl"
+
+#: ../gtksourceview/language-specs/texinfo.lang.h:2
+msgid "Characters"
+msgstr "Rakstzīmes"
+
+#: ../gtksourceview/language-specs/texinfo.lang.h:3
+msgid "File Attributes"
+msgstr "Faila atribūti"
+
+#: ../gtksourceview/language-specs/texinfo.lang.h:4
+msgid "Formatting"
+msgstr "FormatÄ?Å¡ana"
+
+#: ../gtksourceview/language-specs/texinfo.lang.h:5
+msgid "Generated Content"
+msgstr "Izveidotais saturs"
+
+#: ../gtksourceview/language-specs/texinfo.lang.h:7
+msgid "Indexing"
+msgstr "IndeksÄ?Å¡ana"
+
+#: ../gtksourceview/language-specs/texinfo.lang.h:10
+msgid "Macro Parameters"
+msgstr "Makrodefinīcijas parametri"
+
+#: ../gtksourceview/language-specs/texinfo.lang.h:11
+msgid "Macros"
+msgstr "Makrokomandas"
+
+#: ../gtksourceview/language-specs/texinfo.lang.h:13
+msgid "Markup (block)"
+msgstr "MarÄ·Ä?t (bloÄ·Ä?t)"
+
+#: ../gtksourceview/language-specs/texinfo.lang.h:14
+msgid "Markup (inline)"
+msgstr "MarÄ·Ä?t (iekļaut)"
+
+#: ../gtksourceview/language-specs/texinfo.lang.h:15
+msgid "Sectioning"
+msgstr "Nodalīšana"
+
+#: ../gtksourceview/language-specs/texinfo.lang.h:16
+msgid "Texinfo"
+msgstr "Teksta veida informÄ?cija"
+
+#: ../gtksourceview/language-specs/vbnet.lang.h:7
+msgid "Old Style Comment"
+msgstr "VecÄ? stila komentÄ?ri"
+
+#: ../gtksourceview/language-specs/vbnet.lang.h:12
+msgid "VB.NET"
+msgstr "VB.NET"
+
+#: ../gtksourceview/language-specs/verilog.lang.h:4
+msgid "Gates"
+msgstr "VÄ?rti"
+
+#: ../gtksourceview/language-specs/verilog.lang.h:11
+msgid "Verilog"
+msgstr "PÄ?rbaudes reÄ£istrs"
+
+#: ../gtksourceview/language-specs/vhdl.lang.h:7
+msgid "True and False"
+msgstr "Patiess un Aplams"
+
+#: ../gtksourceview/language-specs/vhdl.lang.h:9
+msgid "VHDL"
+msgstr "VHDL"
+
+#: ../gtksourceview/language-specs/xml.lang.h:5
+msgid "Hexadecimal"
+msgstr "HeksadecimÄ?ls"
+
+#: ../gtksourceview/language-specs/xml.lang.h:9
+msgid "XML"
+msgstr "XML"
diff -pruN 1.6.1-3/po/nb.po 1.7.1-0ubuntu2/po/nb.po
--- 1.6.1-3/po/nb.po 2006-02-18 12:55:22.000000000 +0000
+++ 1.7.1-0ubuntu2/po/nb.po 2006-04-20 17:49:52.000000000 +0100
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gtksourceview 1.2.x\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-18 13:48+0100\n"
+"POT-Creation-Date: 2006-03-06 16:09+0100\n"
"PO-Revision-Date: 2006-02-18 13:54+0100\n"
"Last-Translator: Kjartan Maraas <kmaraas gnome org>\n"
"Language-Team: Norwegian bokmal <i18n-nb lister ping uio no>\n"
diff -pruN 1.6.1-3/po/no.po 1.7.1-0ubuntu2/po/no.po
--- 1.6.1-3/po/no.po 2006-02-18 12:55:22.000000000 +0000
+++ 1.7.1-0ubuntu2/po/no.po 1970-01-01 01:00:00.000000000 +0100
@@ -1,1699 +0,0 @@
-# Norwegian messages for gtksourceview.
-# Copyright (C) 2003 Free Software Foundation, Inc.
-# Kjartan Maraas <kmaraas gnome org, 2003-2006.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: gtksourceview 1.2.x\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-18 13:48+0100\n"
-"PO-Revision-Date: 2006-02-18 13:54+0100\n"
-"Last-Translator: Kjartan Maraas <kmaraas gnome org>\n"
-"Language-Team: Norwegian bokmal <i18n-nb lister ping uio no>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../gtksourceview/gtksourcebuffer.c:278
-msgid "Escape Character"
-msgstr "Escape-tegn"
-
-#: ../gtksourceview/gtksourcebuffer.c:279
-msgid "Escaping character for syntax patterns"
-msgstr "Escape-tegn for syntaksmønster"
-
-#: ../gtksourceview/gtksourcebuffer.c:287
-msgid "Check Brackets"
-msgstr "Kontroller klammer"
-
-#: ../gtksourceview/gtksourcebuffer.c:288
-msgid "Whether to check and highlight matching brackets"
-msgstr "Om like klammer skal kontrolleres og markeres med farge"
-
-#: ../gtksourceview/gtksourcebuffer.c:296
-#: ../gtksourceview/gtksourceprintjob.c:296
-msgid "Highlight"
-msgstr "Marker med farger"
-
-#: ../gtksourceview/gtksourcebuffer.c:297
-msgid "Whether to highlight syntax in the buffer"
-msgstr "Om syntaksen i bufferen skal markeres med farger"
-
-#: ../gtksourceview/gtksourcebuffer.c:305
-msgid "Maximum Undo Levels"
-msgstr "Maksimalt antall angrenivåer"
-
-#: ../gtksourceview/gtksourcebuffer.c:306
-msgid "Number of undo levels for the buffer"
-msgstr "Antall angrenivåer for bufferen"
-
-#: ../gtksourceview/gtksourcebuffer.c:316
-#: ../gtksourceview/language-specs/desktop.lang.h:6
-#: ../gtksourceview/language-specs/ini.lang.h:7
-msgid "Language"
-msgstr "Språk"
-
-#: ../gtksourceview/gtksourcebuffer.c:317
-msgid "Language object to get highlighting patterns from"
-msgstr "Språkobjekt det skal hentes fargemarkeringsmønster fra"
-
-#: ../gtksourceview/gtksourcelanguagesmanager.c:114
-msgid "Language specification directories"
-msgstr "Kataloger for språkspesifikasjoner"
-
-#: ../gtksourceview/gtksourcelanguagesmanager.c:115
-msgid ""
-"List of directories where the language specification files (.lang) are "
-"located"
-msgstr "Liste over kataloger der språkspesifikasjonsfiler (.lang) finnes"
-
-#: ../gtksourceview/gtksourceprintjob.c:265
-msgid "Configuration"
-msgstr "Konfigurasjon"
-
-#: ../gtksourceview/gtksourceprintjob.c:266
-msgid "Configuration options for the print job"
-msgstr "Konfigurasjonsalternativer for utskriftsjobben"
-
-#: ../gtksourceview/gtksourceprintjob.c:273
-msgid "Source Buffer"
-msgstr "Kildekodebuffer"
-
-#: ../gtksourceview/gtksourceprintjob.c:274
-msgid "GtkSourceBuffer object to print"
-msgstr "GtkSourceBuffer-objekt som skal skrives ut"
-
-#: ../gtksourceview/gtksourceprintjob.c:280
-#: ../gtksourceview/gtksourceview.c:235 ../gtksourceview/gtksourceview.c:236
-msgid "Tabs Width"
-msgstr "Tabulatorbredde"
-
-#: ../gtksourceview/gtksourceprintjob.c:281
-msgid "Width in equivalent space characters of tabs"
-msgstr "Bredde i tilsvarende antall mellomrom som tabulatorer"
-
-#: ../gtksourceview/gtksourceprintjob.c:288
-msgid "Wrap Mode"
-msgstr "Brytningsmodus"
-
-#: ../gtksourceview/gtksourceprintjob.c:289
-msgid "Word wrapping mode"
-msgstr "Ordbrytningsmodus"
-
-#: ../gtksourceview/gtksourceprintjob.c:297
-msgid "Whether to print the document with highlighted syntax"
-msgstr "Om dokumentet skal skrives ut med fargemarkert syntaks"
-
-#: ../gtksourceview/gtksourceprintjob.c:305
-msgid "Font"
-msgstr "Skrift"
-
-#: ../gtksourceview/gtksourceprintjob.c:306
-msgid "GnomeFont name to use for the document text (deprecated)"
-msgstr "GnomeFont-navn som skal brukes for dokumentets tekst (utfaset)"
-
-#: ../gtksourceview/gtksourceprintjob.c:313
-msgid "Font Description"
-msgstr "Beskrivelse av skrift"
-
-#: ../gtksourceview/gtksourceprintjob.c:314
-msgid "Font to use for the document text (e.g. \"Monospace 10\")"
-msgstr "Skrift som skal brukes for dokumentets tekst (f.eks «Monospace 10»)"
-
-#: ../gtksourceview/gtksourceprintjob.c:321
-#: ../gtksourceview/gtksourceprintjob.c:329
-msgid "Numbers Font"
-msgstr "Skrift for tall"
-
-#: ../gtksourceview/gtksourceprintjob.c:322
-msgid "GnomeFont name to use for the line numbers (deprecated)"
-msgstr "GnomeFont-navn som skal brukes for linjenummer (utgått)"
-
-#: ../gtksourceview/gtksourceprintjob.c:330
-msgid "Font description to use for the line numbers"
-msgstr "Skriftbeskrivelse som skal brukes for linjenummer"
-
-#: ../gtksourceview/gtksourceprintjob.c:337
-msgid "Print Line Numbers"
-msgstr "Skriv ut linjenummer"
-
-#: ../gtksourceview/gtksourceprintjob.c:338
-msgid "Interval of printed line numbers (0 means no numbers)"
-msgstr "Intervall for utskrift av radnummer (0 betyr ingen tall)"
-
-#: ../gtksourceview/gtksourceprintjob.c:345
-msgid "Print Header"
-msgstr "Skriv ut topptekst"
-
-#: ../gtksourceview/gtksourceprintjob.c:346
-msgid "Whether to print a header in each page"
-msgstr "Om en topptekst skal skrives ut på hver side"
-
-#: ../gtksourceview/gtksourceprintjob.c:353
-msgid "Print Footer"
-msgstr "Skriv ut bunntekst"
-
-#: ../gtksourceview/gtksourceprintjob.c:354
-msgid "Whether to print a footer in each page"
-msgstr "Om en bunntekst skal skrives ut på hver side"
-
-#: ../gtksourceview/gtksourceprintjob.c:361
-msgid "Header and Footer Font"
-msgstr "Skrift for topp- og bunntekst"
-
-#: ../gtksourceview/gtksourceprintjob.c:362
-msgid "GnomeFont name to use for the header and footer (deprecated)"
-msgstr "GnomeFont-navn som skal brukes for topp- og bunntekst (utfaset)"
-
-#: ../gtksourceview/gtksourceprintjob.c:369
-msgid "Header and Footer Font Description"
-msgstr "Beskrivelse for topp- og bunntekst"
-
-#: ../gtksourceview/gtksourceprintjob.c:370
-msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
-msgstr "Skrift som skal brukes for topp- og bunntekst (f.eks «Monospace 10»)"
-
-#: ../gtksourceview/gtksourcestylescheme.c:264
-msgid "Base-N Integer"
-msgstr "Heltall i base-N"
-
-#: ../gtksourceview/gtksourcestylescheme.c:269
-msgid "Character"
-msgstr "Tegn"
-
-#: ../gtksourceview/gtksourcestylescheme.c:274
-#: ../gtksourceview/language-specs/latex.lang.h:2
-#: ../gtksourceview/language-specs/po.lang.h:1
-msgid "Comment"
-msgstr "Kommentar"
-
-#. $this = (datatype)
-#: ../gtksourceview/gtksourcestylescheme.c:279
-#: ../gtksourceview/language-specs/php.lang.h:14
-msgid "Data Type"
-msgstr "Datatype"
-
-#.
-#. CSS functions, such as rgb(), clip(), or lang().
-#.
-#: ../gtksourceview/gtksourcestylescheme.c:284
-#: ../gtksourceview/language-specs/ada.lang.h:3
-#: ../gtksourceview/language-specs/css.lang.h:18
-#: ../gtksourceview/language-specs/octave.lang.h:4
-#: ../gtksourceview/language-specs/python.lang.h:5
-#: ../gtksourceview/language-specs/scheme.lang.h:2
-#: ../gtksourceview/language-specs/sh.lang.h:4
-msgid "Function"
-msgstr "Funksjon"
-
-#: ../gtksourceview/gtksourcestylescheme.c:289
-#: ../gtksourceview/language-specs/c.lang.h:6
-#: ../gtksourceview/language-specs/cpp.lang.h:6
-#: ../gtksourceview/language-specs/fortran.lang.h:1
-#: ../gtksourceview/language-specs/haskell.lang.h:3
-#: ../gtksourceview/language-specs/nemerle.lang.h:6
-#: ../gtksourceview/language-specs/octave.lang.h:1
-#: ../gtksourceview/language-specs/python.lang.h:2
-msgid "Decimal"
-msgstr "Desimal"
-
-#: ../gtksourceview/gtksourcestylescheme.c:294
-msgid "Floating Point"
-msgstr "Flyttall"
-
-#. We cannot match \b at the end of a keyword automatically
-#. because it fails for let* etc. So we need to manually add it to the
-#. other keywords and match ([ \t]|$) for the one ending with a
-#. special character. Unfortnately this also means that if the highlight
-#. style for keywords sets the background color, for let* etc also the
-#. trailing space will be highlighted.
-#: ../gtksourceview/gtksourcestylescheme.c:299
-#: ../gtksourceview/language-specs/ada.lang.h:4
-#: ../gtksourceview/language-specs/gtkrc.lang.h:6
-#: ../gtksourceview/language-specs/haskell.lang.h:9
-#: ../gtksourceview/language-specs/latex.lang.h:5
-#: ../gtksourceview/language-specs/octave.lang.h:6
-#: ../gtksourceview/language-specs/po.lang.h:3
-#: ../gtksourceview/language-specs/python.lang.h:7
-#: ../gtksourceview/language-specs/R.lang.h:6
-#: ../gtksourceview/language-specs/scheme.lang.h:9
-#: ../gtksourceview/language-specs/tcl.lang.h:1
-#: ../gtksourceview/language-specs/texinfo.lang.h:8
-#: ../gtksourceview/language-specs/vhdl.lang.h:2
-msgid "Keyword"
-msgstr "Nøkkelord"
-
-#: ../gtksourceview/gtksourcestylescheme.c:304
-msgid "Preprocessor"
-msgstr "Preprosessor"
-
-#.
-#. <pattern-item _name = "Operator" style = "Operators">
-#. <regex>[:!#$%&*+./>=<? \\^|~\-]+</regex>
-#. </pattern-item>
-#.
-#. <keyword-list _name="Keysymbol" style = "Keyword">
-#. <keyword>::</keyword>
-#. <keyword>-></keyword>
-#. <keyword><-</keyword>
-#. <keyword>=></keyword>
-#. <keyword>=</keyword>
-#. <keyword>|</keyword>`
-#. <keyword>\</keyword>
-#. <keyword>@</keyword>
-#. <keyword>~</keyword>
-#. </keyword-list>
-#.
-#: ../gtksourceview/gtksourcestylescheme.c:309
-#: ../gtksourceview/language-specs/ada.lang.h:9
-#: ../gtksourceview/language-specs/c.lang.h:15
-#: ../gtksourceview/language-specs/cpp.lang.h:15
-#: ../gtksourceview/language-specs/csharp.lang.h:9
-#: ../gtksourceview/language-specs/css.lang.h:58
-#: ../gtksourceview/language-specs/html.lang.h:8
-#: ../gtksourceview/language-specs/fortran.lang.h:13
-#: ../gtksourceview/language-specs/haskell.lang.h:31
-#: ../gtksourceview/language-specs/idl.lang.h:9
-#: ../gtksourceview/language-specs/java.lang.h:11
-#: ../gtksourceview/language-specs/javascript.lang.h:23
-#: ../gtksourceview/language-specs/lua.lang.h:10
-#: ../gtksourceview/language-specs/makefile.lang.h:8
-#: ../gtksourceview/language-specs/nemerle.lang.h:15
-#: ../gtksourceview/language-specs/pascal.lang.h:18
-#: ../gtksourceview/language-specs/perl.lang.h:8
-#: ../gtksourceview/language-specs/po.lang.h:6
-#: ../gtksourceview/language-specs/scheme.lang.h:13
-#: ../gtksourceview/language-specs/sh.lang.h:13
-#: ../gtksourceview/language-specs/tcl.lang.h:4
-#: ../gtksourceview/language-specs/vbnet.lang.h:11
-#: ../gtksourceview/language-specs/vhdl.lang.h:6
-#: ../gtksourceview/language-specs/xml.lang.h:7
-msgid "String"
-msgstr "Streng"
-
-#: ../gtksourceview/gtksourcestylescheme.c:314
-msgid "Specials"
-msgstr "Spesialtegn"
-
-#: ../gtksourceview/gtksourcestylescheme.c:321
-#: ../gtksourceview/language-specs/changelog.lang.h:6
-#: ../gtksourceview/language-specs/css.lang.h:36
-#: ../gtksourceview/language-specs/desktop.lang.h:10
-#: ../gtksourceview/language-specs/diff.lang.h:7
-#: ../gtksourceview/language-specs/gtkrc.lang.h:9
-#: ../gtksourceview/language-specs/ini.lang.h:10
-#: ../gtksourceview/language-specs/msil.lang.h:2
-#: ../gtksourceview/language-specs/po.lang.h:5
-msgid "Others"
-msgstr "Andre"
-
-#: ../gtksourceview/gtksourcestylescheme.c:326
-msgid "Others 2"
-msgstr "Andre 2"
-
-#: ../gtksourceview/gtksourcestylescheme.c:331
-msgid "Others 3"
-msgstr "Andre 3"
-
-#: ../gtksourceview/gtksourcestylescheme.c:368
-msgid "Default"
-msgstr "Forvalg"
-
-#: ../gtksourceview/gtksourcetag.c:109
-msgid "Tag ID"
-msgstr "Merke-ID"
-
-#: ../gtksourceview/gtksourcetag.c:110
-msgid "ID used to refer to the source tag"
-msgstr "ID som brukes til å referede til merket i kilden"
-
-#: ../gtksourceview/gtksourcetag.c:117
-msgid "Tag style"
-msgstr "Stil for merke"
-
-#: ../gtksourceview/gtksourcetag.c:118
-msgid "The style associated with the source tag"
-msgstr "Stil assosiert med kildentaggen"
-
-#: ../gtksourceview/gtksourceview.c:219
-msgid "Show Line Numbers"
-msgstr "Vis linjenummer"
-
-#: ../gtksourceview/gtksourceview.c:220
-msgid "Whether to display line numbers"
-msgstr "Om linjenummer skal vises"
-
-#: ../gtksourceview/gtksourceview.c:227
-msgid "Show Line Markers"
-msgstr "Vis linjemarkører"
-
-#: ../gtksourceview/gtksourceview.c:228
-msgid "Whether to display line marker pixbufs"
-msgstr "Om bilder skal vises for linjemarkører"
-
-#: ../gtksourceview/gtksourceview.c:245
-msgid "Auto Indentation"
-msgstr "Automatisk innrykk"
-
-#: ../gtksourceview/gtksourceview.c:246
-msgid "Whether to enable auto indentation"
-msgstr "Om automatisk innrykk skal aktiveres"
-
-#: ../gtksourceview/gtksourceview.c:252
-msgid "Insert Spaces Instead of Tabs"
-msgstr "Sett inn mellomrom i stedet for tabulator"
-
-#: ../gtksourceview/gtksourceview.c:253
-msgid "Whether to insert spaces instead of tabs"
-msgstr "Om mellomrom skal settes inn i stedet for tabulator"
-
-#: ../gtksourceview/gtksourceview.c:260
-msgid "Show Right Margin"
-msgstr "Vis høyre marg"
-
-#: ../gtksourceview/gtksourceview.c:261
-msgid "Whether to display the right margin"
-msgstr "Om høyre marg skal vises"
-
-#: ../gtksourceview/gtksourceview.c:268
-msgid "Margin position"
-msgstr "Posisjon for marg"
-
-#: ../gtksourceview/gtksourceview.c:269
-msgid "Position of the right margin"
-msgstr "Posisjon for høyre marg"
-
-#: ../gtksourceview/gtksourceview.c:278
-msgid "Use smart home/end"
-msgstr "Bruk smart home/end"
-
-#: ../gtksourceview/gtksourceview.c:279
-msgid ""
-"HOME and END keys move to first/last non whitespace characters on line "
-"before going to the start/end of the line"
-msgstr ""
-"HOME- og END-tastene flytter til første/siste tegn som ikke er mellomrom på "
-"linjen før de går til begynnelsen/slutten på linjen"
-
-#: ../gtksourceview/gtksourceview.c:288
-msgid "Highlight current line"
-msgstr "Uthev aktiv linje"
-
-#: ../gtksourceview/gtksourceview.c:289
-msgid "Whether to highlight the current line"
-msgstr "Om aktiv linje skal utheves"
-
-#: ../gtksourceview/gtksourceview.c:305
-msgid "Margin Line Alpha"
-msgstr "Gjennomsiktighet for marg"
-
-#: ../gtksourceview/gtksourceview.c:306
-msgid "Transparency of the margin line"
-msgstr "Gjennomsiktighet for marg"
-
-#: ../gtksourceview/gtksourceview.c:323
-msgid "Margin Line Color"
-msgstr "Farge for marg"
-
-#: ../gtksourceview/gtksourceview.c:324
-msgid "Color to use for the right margin line"
-msgstr "Farge som skal brukes på høyre marg"
-
-#: ../gtksourceview/gtksourceview.c:340
-#, fuzzy
-msgid "Margin Overlay Toggle"
-msgstr "Slå av/på ..."
-
-#: ../gtksourceview/gtksourceview.c:341
-#, fuzzy
-msgid "Whether to draw the right margin overlay"
-msgstr "Om høyre ... skal tegnes"
-
-#: ../gtksourceview/gtksourceview.c:357
-#, fuzzy
-msgid "Margin Overlay Alpha"
-msgstr "Alpha for ..."
-
-#: ../gtksourceview/gtksourceview.c:358
-#, fuzzy
-msgid "Transparency of the margin overlay"
-msgstr "Gjennomsiktighet for ..."
-
-#: ../gtksourceview/gtksourceview.c:375
-#, fuzzy
-msgid "Margin Overlay Color"
-msgstr "Farge for "
-
-#: ../gtksourceview/gtksourceview.c:376
-#, fuzzy
-msgid "Color to use for drawing the margin overlay"
-msgstr "Farge som skal brukes for å tegne "
-
-#: ../gtksourceview/language-specs/ada.lang.h:1
-msgid "Ada"
-msgstr "Ada"
-
-#: ../gtksourceview/language-specs/ada.lang.h:2
-#: ../gtksourceview/language-specs/c.lang.h:4
-#: ../gtksourceview/language-specs/cpp.lang.h:4
-#: ../gtksourceview/language-specs/haskell.lang.h:2
-#: ../gtksourceview/language-specs/nemerle.lang.h:3
-#: ../gtksourceview/language-specs/vhdl.lang.h:1
-msgid "Character Constant"
-msgstr "Tegnkonstant"
-
-#. Note: contains an hack to avoid considering ^COMMON a comment
-#. <string _name = "String 2" style = "String" end-at-line-end = "TRUE">
-#. <start-regex>'</start-regex>
-#. <end-regex>'</end-regex>
-#. </string>
-#: ../gtksourceview/language-specs/ada.lang.h:5
-#: ../gtksourceview/language-specs/c.lang.h:11
-#: ../gtksourceview/language-specs/cpp.lang.h:11
-#: ../gtksourceview/language-specs/csharp.lang.h:4
-#: ../gtksourceview/language-specs/css.lang.h:29
-#: ../gtksourceview/language-specs/desktop.lang.h:7
-#: ../gtksourceview/language-specs/diff.lang.h:5
-#: ../gtksourceview/language-specs/fortran.lang.h:9
-#: ../gtksourceview/language-specs/gtkrc.lang.h:7
-#: ../gtksourceview/language-specs/haskell.lang.h:10
-#: ../gtksourceview/language-specs/idl.lang.h:5
-#: ../gtksourceview/language-specs/ini.lang.h:8
-#: ../gtksourceview/language-specs/java.lang.h:5
-#: ../gtksourceview/language-specs/javascript.lang.h:13
-#: ../gtksourceview/language-specs/lua.lang.h:4
-#: ../gtksourceview/language-specs/makefile.lang.h:4
-#: ../gtksourceview/language-specs/nemerle.lang.h:10
-#: ../gtksourceview/language-specs/octave.lang.h:7
-#: ../gtksourceview/language-specs/pascal.lang.h:11
-#: ../gtksourceview/language-specs/perl.lang.h:3
-#: ../gtksourceview/language-specs/python.lang.h:8
-#: ../gtksourceview/language-specs/R.lang.h:7
-#: ../gtksourceview/language-specs/ruby.lang.h:10
-#: ../gtksourceview/language-specs/scheme.lang.h:10
-#: ../gtksourceview/language-specs/sh.lang.h:5
-#: ../gtksourceview/language-specs/sql.lang.h:23
-#: ../gtksourceview/language-specs/tcl.lang.h:2
-#: ../gtksourceview/language-specs/texinfo.lang.h:9
-#: ../gtksourceview/language-specs/vbnet.lang.h:6
-#: ../gtksourceview/language-specs/verilog.lang.h:7
-#: ../gtksourceview/language-specs/vhdl.lang.h:3
-msgid "Line Comment"
-msgstr "Linjekommentar"
-
-#.
-#. For values like: z-index: 2;
-#. +/- before 0 is not allowed.
-#.
-#: ../gtksourceview/language-specs/ada.lang.h:6
-#: ../gtksourceview/language-specs/css.lang.h:34
-#: ../gtksourceview/language-specs/desktop.lang.h:9
-#: ../gtksourceview/language-specs/gtkrc.lang.h:8
-#: ../gtksourceview/language-specs/javascript.lang.h:16
-#: ../gtksourceview/language-specs/pascal.lang.h:14
-#: ../gtksourceview/language-specs/vhdl.lang.h:4
-msgid "Number"
-msgstr "Tall"
-
-#: ../gtksourceview/language-specs/ada.lang.h:7
-msgid "Preprocessor Keyword"
-msgstr "Nøkkelord for preprosessor"
-
-#: ../gtksourceview/language-specs/ada.lang.h:8
-#: ../gtksourceview/language-specs/c.lang.h:14
-#: ../gtksourceview/language-specs/cpp.lang.h:14
-#: ../gtksourceview/language-specs/csharp.lang.h:8
-#: ../gtksourceview/language-specs/fortran.lang.h:12
-#: ../gtksourceview/language-specs/haskell.lang.h:13
-#: ../gtksourceview/language-specs/idl.lang.h:8
-#: ../gtksourceview/language-specs/java.lang.h:10
-#: ../gtksourceview/language-specs/makefile.lang.h:6
-#: ../gtksourceview/language-specs/nemerle.lang.h:14
-#: ../gtksourceview/language-specs/pascal.lang.h:17
-#: ../gtksourceview/language-specs/scheme.lang.h:12
-#: ../gtksourceview/language-specs/sql.lang.h:48
-#: ../gtksourceview/language-specs/vbnet.lang.h:10
-#: ../gtksourceview/language-specs/verilog.lang.h:9
-#: ../gtksourceview/language-specs/vhdl.lang.h:5
-msgid "Sources"
-msgstr "Kildekode"
-
-#: ../gtksourceview/language-specs/ada.lang.h:10
-msgid "True And False"
-msgstr "Sann og usann"
-
-#: ../gtksourceview/language-specs/ada.lang.h:11
-#: ../gtksourceview/language-specs/vhdl.lang.h:8
-msgid "Type"
-msgstr "Type"
-
-#: ../gtksourceview/language-specs/c.lang.h:1
-#: ../gtksourceview/language-specs/cpp.lang.h:1
-msgid "'#if 0' Comment"
-msgstr "«#if 0»-kommentar"
-
-#. Comments
-#: ../gtksourceview/language-specs/c.lang.h:2
-#: ../gtksourceview/language-specs/cpp.lang.h:2
-#: ../gtksourceview/language-specs/csharp.lang.h:1
-#: ../gtksourceview/language-specs/css.lang.h:9
-#: ../gtksourceview/language-specs/html.lang.h:2
-#: ../gtksourceview/language-specs/haskell.lang.h:1
-#: ../gtksourceview/language-specs/idl.lang.h:1
-#: ../gtksourceview/language-specs/java.lang.h:1
-#: ../gtksourceview/language-specs/javascript.lang.h:2
-#: ../gtksourceview/language-specs/lua.lang.h:1
-#: ../gtksourceview/language-specs/nemerle.lang.h:2
-#: ../gtksourceview/language-specs/sql.lang.h:9
-#: ../gtksourceview/language-specs/texinfo.lang.h:1
-#: ../gtksourceview/language-specs/verilog.lang.h:2
-#: ../gtksourceview/language-specs/xml.lang.h:2
-msgid "Block Comment"
-msgstr "Kommentar for blokk"
-
-#: ../gtksourceview/language-specs/c.lang.h:3
-msgid "C"
-msgstr "C"
-
-#: ../gtksourceview/language-specs/c.lang.h:5
-#: ../gtksourceview/language-specs/cpp.lang.h:5
-msgid "Common Macro"
-msgstr "Vanlig makro"
-
-#: ../gtksourceview/language-specs/c.lang.h:7
-#: ../gtksourceview/language-specs/cpp.lang.h:7
-#: ../gtksourceview/language-specs/fortran.lang.h:2
-#: ../gtksourceview/language-specs/haskell.lang.h:4
-#: ../gtksourceview/language-specs/nemerle.lang.h:7
-#: ../gtksourceview/language-specs/octave.lang.h:3
-#: ../gtksourceview/language-specs/python.lang.h:4
-#: ../gtksourceview/language-specs/R.lang.h:4
-msgid "Floating Point Number"
-msgstr "Flyttall"
-
-#. FIXME WHY DOESN'T THIS WORK?
-#: ../gtksourceview/language-specs/c.lang.h:8
-#: ../gtksourceview/language-specs/cpp.lang.h:8
-#: ../gtksourceview/language-specs/fortran.lang.h:4
-#: ../gtksourceview/language-specs/haskell.lang.h:6
-#: ../gtksourceview/language-specs/nemerle.lang.h:8
-#: ../gtksourceview/language-specs/octave.lang.h:5
-#: ../gtksourceview/language-specs/pascal.lang.h:10
-#: ../gtksourceview/language-specs/python.lang.h:6
-msgid "Hex Number"
-msgstr "Heksadesimalt tall"
-
-#: ../gtksourceview/language-specs/c.lang.h:9
-#: ../gtksourceview/language-specs/cpp.lang.h:9
-#: ../gtksourceview/language-specs/haskell.lang.h:7
-#: ../gtksourceview/language-specs/idl.lang.h:3
-msgid "Include/Pragma"
-msgstr "Include/pragma"
-
-#: ../gtksourceview/language-specs/c.lang.h:10
-#: ../gtksourceview/language-specs/cpp.lang.h:10
-#: ../gtksourceview/language-specs/csharp.lang.h:3
-#: ../gtksourceview/language-specs/fortran.lang.h:7
-#: ../gtksourceview/language-specs/idl.lang.h:4
-#: ../gtksourceview/language-specs/javascript.lang.h:12
-#: ../gtksourceview/language-specs/lua.lang.h:3
-#: ../gtksourceview/language-specs/perl.lang.h:2
-#: ../gtksourceview/language-specs/ruby.lang.h:9
-#: ../gtksourceview/language-specs/vbnet.lang.h:1
-#: ../gtksourceview/language-specs/verilog.lang.h:6
-msgid "Keywords"
-msgstr "Nøkkelord"
-
-#: ../gtksourceview/language-specs/c.lang.h:12
-#: ../gtksourceview/language-specs/cpp.lang.h:12
-#: ../gtksourceview/language-specs/fortran.lang.h:10
-#: ../gtksourceview/language-specs/haskell.lang.h:11
-#: ../gtksourceview/language-specs/nemerle.lang.h:12
-#: ../gtksourceview/language-specs/octave.lang.h:10
-#: ../gtksourceview/language-specs/python.lang.h:12
-#: ../gtksourceview/language-specs/verilog.lang.h:8
-msgid "Octal Number"
-msgstr "Oktalt tall"
-
-#: ../gtksourceview/language-specs/c.lang.h:13
-#: ../gtksourceview/language-specs/cpp.lang.h:13
-#: ../gtksourceview/language-specs/csharp.lang.h:6
-#: ../gtksourceview/language-specs/idl.lang.h:6
-#: ../gtksourceview/language-specs/vbnet.lang.h:8
-msgid "Preprocessor Definitions"
-msgstr "Preprosessordefinisjoner"
-
-#: ../gtksourceview/language-specs/c.lang.h:16
-#: ../gtksourceview/language-specs/cpp.lang.h:16
-#: ../gtksourceview/language-specs/fortran.lang.h:15
-#: ../gtksourceview/language-specs/idl.lang.h:10
-#: ../gtksourceview/language-specs/verilog.lang.h:10
-msgid "Types"
-msgstr "Typer"
-
-#: ../gtksourceview/language-specs/changelog.lang.h:1
-msgid "ChangeLog"
-msgstr "Endringslogg"
-
-#: ../gtksourceview/language-specs/changelog.lang.h:2
-msgid "Date"
-msgstr "Dato"
-
-#: ../gtksourceview/language-specs/changelog.lang.h:3
-msgid "Email"
-msgstr "E-post"
-
-#: ../gtksourceview/language-specs/changelog.lang.h:4
-msgid "File"
-msgstr "Fil"
-
-#: ../gtksourceview/language-specs/changelog.lang.h:5
-msgid "Marker"
-msgstr "Markør"
-
-#: ../gtksourceview/language-specs/cpp.lang.h:3
-msgid "C++"
-msgstr "C++"
-
-#: ../gtksourceview/language-specs/csharp.lang.h:2
-msgid "C#"
-msgstr "C#"
-
-#: ../gtksourceview/language-specs/csharp.lang.h:5
-#: ../gtksourceview/language-specs/lua.lang.h:7
-#: ../gtksourceview/language-specs/sh.lang.h:6
-msgid "Multiline String"
-msgstr "Flerlinjestreng"
-
-#: ../gtksourceview/language-specs/csharp.lang.h:7
-#: ../gtksourceview/language-specs/java.lang.h:9
-#: ../gtksourceview/language-specs/nemerle.lang.h:13
-#: ../gtksourceview/language-specs/vbnet.lang.h:9
-msgid "Primitives"
-msgstr "Primitiver"
-
-#: ../gtksourceview/language-specs/csharp.lang.h:10
-#: ../gtksourceview/language-specs/css.lang.h:59
-#: ../gtksourceview/language-specs/fortran.lang.h:14
-#: ../gtksourceview/language-specs/java.lang.h:12
-#: ../gtksourceview/language-specs/javascript.lang.h:24
-#: ../gtksourceview/language-specs/lua.lang.h:11
-#: ../gtksourceview/language-specs/makefile.lang.h:9
-#: ../gtksourceview/language-specs/sh.lang.h:14
-msgid "String 2"
-msgstr "Streng 2"
-
-#.
-#. At rules must occur at the start of a line.
-#.
-#: ../gtksourceview/language-specs/css.lang.h:4
-msgid "At Rules"
-msgstr "«At»-regler"
-
-#.
-#. For CSS 2-style selectors: tag[attr="value"].
-#.
-#: ../gtksourceview/language-specs/css.lang.h:8
-msgid "Attribute Value Delimiters"
-msgstr "Verdiseparatorer for attributter"
-
-#: ../gtksourceview/language-specs/css.lang.h:10
-msgid "CSS"
-msgstr "CSS"
-
-#.
-#. Value length specifier. Unless it is 0, must always be like: -1.2em.
-#.
-#: ../gtksourceview/language-specs/css.lang.h:14
-msgid "Dimension"
-msgstr "Dimensjon"
-
-#.
-#. Hexadecimal method of specifying colors. Can either be 3 or 6 in
-#. length: #ffcc00 = #fc0.
-#.
-#: ../gtksourceview/language-specs/css.lang.h:23
-msgid "Hexadecimal Color"
-msgstr "Heksadesimal farge"
-
-#.
-#. Upgrades a rule set's importance when several rule sets conflict.
-#.
-#: ../gtksourceview/language-specs/css.lang.h:27
-msgid "Importance Modifier"
-msgstr "Endring av viktighet"
-
-#: ../gtksourceview/language-specs/css.lang.h:28
-msgid "Known Property Values"
-msgstr "Kjente verdier for egenskaper"
-
-#: ../gtksourceview/language-specs/css.lang.h:35
-#: ../gtksourceview/language-specs/javascript.lang.h:20
-#: ../gtksourceview/language-specs/php.lang.h:20
-#: ../gtksourceview/language-specs/sql.lang.h:34
-msgid "Operators"
-msgstr "Operatorer"
-
-#: ../gtksourceview/language-specs/css.lang.h:37
-msgid "Property Names"
-msgstr "Navn på egenskaper"
-
-#.
-#. Brackets define a declaration block, parentheses define functions.
-#.
-#: ../gtksourceview/language-specs/css.lang.h:41
-#: ../gtksourceview/language-specs/javascript.lang.h:21
-msgid "Punctuators"
-msgstr "Stopptegn"
-
-#.
-#. Used to combine selectors. Example syntax:
-#.
-#. body * div#ID.className > p + ul li:first-child
-#.
-#: ../gtksourceview/language-specs/css.lang.h:47
-msgid "Selector Grammar"
-msgstr "Gramatikk for utvelger"
-
-#.
-#. Pseudo-class rules. Good to have syntax highlighting for these
-#. for mistypings.
-#.
-#: ../gtksourceview/language-specs/css.lang.h:52
-msgid "Selector Pseudo Classes"
-msgstr "Pseudoklasser for utvelger"
-
-#.
-#. Pseudo-element rules. Good to have syntax highlighting for these
-#. for mistypings.
-#.
-#: ../gtksourceview/language-specs/css.lang.h:57
-msgid "Selector Pseudo Elements"
-msgstr "Pseudoelementer for utvelger"
-
-#.
-#. Escaped unicode characters can contain either 6 hexadecimal characters
-#. or 1-5 hex characters followed by one whitespace character.
-#.
-#: ../gtksourceview/language-specs/css.lang.h:64
-msgid "Unicode Character Reference"
-msgstr "Unicode tegnreferanse"
-
-#.
-#. Unicode range values.
-#.
-#: ../gtksourceview/language-specs/css.lang.h:68
-msgid "Unicode Range"
-msgstr "Unicode-område"
-
-#: ../gtksourceview/language-specs/desktop.lang.h:1
-msgid ".desktop"
-msgstr ".desktop"
-
-#: ../gtksourceview/language-specs/desktop.lang.h:2
-#: ../gtksourceview/language-specs/gtkrc.lang.h:1
-#: ../gtksourceview/language-specs/ini.lang.h:2
-#: ../gtksourceview/language-specs/scheme.lang.h:1
-msgid "Boolean Value"
-msgstr "Bolsk verdi"
-
-#: ../gtksourceview/language-specs/desktop.lang.h:3
-msgid "Encoding"
-msgstr "Koding"
-
-#: ../gtksourceview/language-specs/desktop.lang.h:4
-msgid "Exec Parameter"
-msgstr "Exec-parameter"
-
-#: ../gtksourceview/language-specs/desktop.lang.h:5
-#: ../gtksourceview/language-specs/ini.lang.h:5
-msgid "Group"
-msgstr "Gruppe"
-
-#: ../gtksourceview/language-specs/desktop.lang.h:8
-#: ../gtksourceview/language-specs/ini.lang.h:9
-msgid "Non Standard Key"
-msgstr "Ikke-standard nøkkel"
-
-#: ../gtksourceview/language-specs/desktop.lang.h:11
-msgid "Standard Key"
-msgstr "Standard nøkkel"
-
-#: ../gtksourceview/language-specs/diff.lang.h:1
-msgid "Added line"
-msgstr "Tillagt linje"
-
-#: ../gtksourceview/language-specs/diff.lang.h:2
-msgid "Changed line"
-msgstr "Endret linje"
-
-#: ../gtksourceview/language-specs/diff.lang.h:3
-msgid "Diff"
-msgstr "Diff"
-
-#: ../gtksourceview/language-specs/diff.lang.h:4
-msgid "Diff file"
-msgstr "Diff-fil"
-
-#: ../gtksourceview/language-specs/diff.lang.h:6
-#: ../gtksourceview/language-specs/po.lang.h:4
-msgid "Location"
-msgstr "Lokasjon"
-
-#: ../gtksourceview/language-specs/diff.lang.h:8
-msgid "Removed line"
-msgstr "Fjernet linje"
-
-#: ../gtksourceview/language-specs/diff.lang.h:9
-msgid "Special case"
-msgstr "Spesialtilfelle"
-
-#: ../gtksourceview/language-specs/html.lang.h:1
-#: ../gtksourceview/language-specs/xml.lang.h:1
-msgid "Attribute"
-msgstr "Attributt"
-
-#: ../gtksourceview/language-specs/html.lang.h:3
-#: ../gtksourceview/language-specs/xml.lang.h:3
-msgid "Closing Bracket"
-msgstr "Avsluttende klamme"
-
-#: ../gtksourceview/language-specs/html.lang.h:4
-msgid "DTD"
-msgstr "DTD"
-
-#: ../gtksourceview/language-specs/html.lang.h:5
-#: ../gtksourceview/language-specs/xml.lang.h:4
-msgid "Entity"
-msgstr "Entitet"
-
-#: ../gtksourceview/language-specs/html.lang.h:6
-msgid "HTML"
-msgstr "HTML"
-
-#: ../gtksourceview/language-specs/html.lang.h:7
-#: ../gtksourceview/language-specs/latex.lang.h:7
-#: ../gtksourceview/language-specs/texinfo.lang.h:12
-#: ../gtksourceview/language-specs/xml.lang.h:6
-msgid "Markup"
-msgstr "Merking"
-
-#: ../gtksourceview/language-specs/html.lang.h:9
-#: ../gtksourceview/language-specs/xml.lang.h:8
-msgid "Tag"
-msgstr "Merke"
-
-#: ../gtksourceview/language-specs/fortran.lang.h:3
-msgid "Fortran 95"
-msgstr "Fortran 95"
-
-#: ../gtksourceview/language-specs/fortran.lang.h:5
-msgid "Input/Output"
-msgstr "Inn-/utdata"
-
-#: ../gtksourceview/language-specs/fortran.lang.h:6
-msgid "Intrinsics"
-msgstr "Detaljer"
-
-#: ../gtksourceview/language-specs/fortran.lang.h:11
-msgid "Read/Write"
-msgstr "Les/skriv"
-
-#. "duble-quoted strings"
-#: ../gtksourceview/language-specs/gtkrc.lang.h:2
-#: ../gtksourceview/language-specs/ini.lang.h:4
-#: ../gtksourceview/language-specs/octave.lang.h:2
-#: ../gtksourceview/language-specs/php.lang.h:16
-#: ../gtksourceview/language-specs/python.lang.h:3
-#: ../gtksourceview/language-specs/R.lang.h:3
-#: ../gtksourceview/language-specs/ruby.lang.h:6
-msgid "Double Quoted String"
-msgstr "Dobbeltsitert streng"
-
-#: ../gtksourceview/language-specs/gtkrc.lang.h:3
-msgid "GtkRC"
-msgstr "GtkRC"
-
-#: ../gtksourceview/language-specs/gtkrc.lang.h:4
-msgid "Include Directive"
-msgstr "Include-direktiv"
-
-#: ../gtksourceview/language-specs/gtkrc.lang.h:5
-#: ../gtksourceview/language-specs/haskell.lang.h:8
-msgid "Keysymbol"
-msgstr "Tastesymbol"
-
-#. 'single-quoted strings'
-#: ../gtksourceview/language-specs/gtkrc.lang.h:10
-#: ../gtksourceview/language-specs/ini.lang.h:11
-#: ../gtksourceview/language-specs/octave.lang.h:14
-#: ../gtksourceview/language-specs/php.lang.h:24
-#: ../gtksourceview/language-specs/python.lang.h:15
-#: ../gtksourceview/language-specs/R.lang.h:11
-#: ../gtksourceview/language-specs/ruby.lang.h:17
-msgid "Single Quoted String"
-msgstr "Enkeltsitert streng"
-
-#: ../gtksourceview/language-specs/gtkrc.lang.h:11
-msgid "State"
-msgstr "Tilstand"
-
-#. $variable, $$dynamic-variable and even $$$more
-#: ../gtksourceview/language-specs/gtkrc.lang.h:12
-#: ../gtksourceview/language-specs/ini.lang.h:12
-#: ../gtksourceview/language-specs/php.lang.h:26
-#: ../gtksourceview/language-specs/tcl.lang.h:7
-msgid "Variable"
-msgstr "Variabel"
-
-#: ../gtksourceview/language-specs/haskell.lang.h:5
-msgid "Haskell"
-msgstr "Haskell"
-
-#: ../gtksourceview/language-specs/haskell.lang.h:12
-msgid "Preprocessor Definition"
-msgstr "Preprosessordefinisjoner"
-
-#: ../gtksourceview/language-specs/haskell.lang.h:32
-msgid "Type or Constructor"
-msgstr "Type eller konstruktør"
-
-#: ../gtksourceview/language-specs/idl.lang.h:2
-msgid "IDL"
-msgstr "IDL"
-
-#: ../gtksourceview/language-specs/idl.lang.h:7
-msgid "Sectional"
-msgstr "Seksjonell"
-
-#: ../gtksourceview/language-specs/ini.lang.h:1
-msgid ".ini"
-msgstr ".ini"
-
-#: ../gtksourceview/language-specs/ini.lang.h:3
-#: ../gtksourceview/language-specs/verilog.lang.h:3
-msgid "Decimal Number"
-msgstr "Desimaltall"
-
-#: ../gtksourceview/language-specs/ini.lang.h:6
-msgid "Integer"
-msgstr "Heltall"
-
-#: ../gtksourceview/language-specs/java.lang.h:2
-msgid "Declarations"
-msgstr "Deklarasjoner"
-
-#: ../gtksourceview/language-specs/java.lang.h:3
-msgid "Flow"
-msgstr "Flyt"
-
-#: ../gtksourceview/language-specs/java.lang.h:4
-msgid "Java"
-msgstr "Java"
-
-#: ../gtksourceview/language-specs/java.lang.h:6
-msgid "Memory"
-msgstr "Minne"
-
-#: ../gtksourceview/language-specs/java.lang.h:7
-msgid "Modifiers"
-msgstr "Endringstaster"
-
-#: ../gtksourceview/language-specs/java.lang.h:8
-msgid "Numeric"
-msgstr "Numerisk"
-
-#: ../gtksourceview/language-specs/javascript.lang.h:1
-#: ../gtksourceview/language-specs/php.lang.h:1
-msgid "Array Operators"
-msgstr "Tabelloperatorer"
-
-#: ../gtksourceview/language-specs/javascript.lang.h:3
-msgid "Constructors"
-msgstr "Konstruktører"
-
-#: ../gtksourceview/language-specs/javascript.lang.h:4
-msgid "Error Handling"
-msgstr "Feilhåndtering"
-
-#: ../gtksourceview/language-specs/javascript.lang.h:5
-msgid "Floating-Point Number"
-msgstr "Flyttall"
-
-#: ../gtksourceview/language-specs/javascript.lang.h:6
-msgid "Flow Keywords"
-msgstr "Nøkkelord for flyt"
-
-#: ../gtksourceview/language-specs/javascript.lang.h:7
-msgid "Future Reserved Words"
-msgstr "Fremtidige reserverte ord"
-
-#: ../gtksourceview/language-specs/javascript.lang.h:8
-msgid "Global Functions"
-msgstr "Globale funksjoner"
-
-#: ../gtksourceview/language-specs/javascript.lang.h:9
-msgid "Global Properties"
-msgstr "Globale egenskaper"
-
-#: ../gtksourceview/language-specs/javascript.lang.h:10
-#: ../gtksourceview/language-specs/verilog.lang.h:5
-msgid "Hexadecimal Number"
-msgstr "Heksadesimalt tall"
-
-#: ../gtksourceview/language-specs/javascript.lang.h:11
-msgid "JavaScript"
-msgstr "JavaScript"
-
-#: ../gtksourceview/language-specs/javascript.lang.h:14
-msgid "Literals"
-msgstr "Tekstbokstaver"
-
-#: ../gtksourceview/language-specs/javascript.lang.h:15
-msgid "Math Value Properties"
-msgstr "Egenskaper for matematiske verdier"
-
-#: ../gtksourceview/language-specs/javascript.lang.h:17
-msgid "Object Functions"
-msgstr "Objektfunksjoner"
-
-#: ../gtksourceview/language-specs/javascript.lang.h:18
-msgid "Object Properties"
-msgstr "Egenskaper for objekter"
-
-#: ../gtksourceview/language-specs/javascript.lang.h:19
-msgid "Objects"
-msgstr "Objekter"
-
-#: ../gtksourceview/language-specs/javascript.lang.h:22
-#: ../gtksourceview/language-specs/lua.lang.h:9
-#: ../gtksourceview/language-specs/octave.lang.h:13
-#: ../gtksourceview/language-specs/perl.lang.h:7
-#: ../gtksourceview/language-specs/php.lang.h:22
-#: ../gtksourceview/language-specs/python.lang.h:14
-#: ../gtksourceview/language-specs/R.lang.h:10
-#: ../gtksourceview/language-specs/ruby.lang.h:16
-#: ../gtksourceview/language-specs/sh.lang.h:11
-#: ../gtksourceview/language-specs/tcl.lang.h:3
-msgid "Scripts"
-msgstr "Skript"
-
-#: ../gtksourceview/language-specs/javascript.lang.h:25
-msgid "Unicode Escape Sequence"
-msgstr "Unicode «escape»-sekvens"
-
-#: ../gtksourceview/language-specs/javascript.lang.h:26
-msgid "Word Operators"
-msgstr "Ord-operatorer"
-
-#: ../gtksourceview/language-specs/latex.lang.h:1
-msgid "Command"
-msgstr "Kommando"
-
-#: ../gtksourceview/language-specs/latex.lang.h:3
-msgid "Comment Environment"
-msgstr "Kommentarmiljø"
-
-#: ../gtksourceview/language-specs/latex.lang.h:4
-#: ../gtksourceview/language-specs/texinfo.lang.h:6
-msgid "Include"
-msgstr "Include"
-
-#: ../gtksourceview/language-specs/latex.lang.h:6
-msgid "LaTeX"
-msgstr "LaTex"
-
-#: ../gtksourceview/language-specs/latex.lang.h:8
-msgid "Math"
-msgstr "Matematikk"
-
-#: ../gtksourceview/language-specs/lua.lang.h:2
-#: ../gtksourceview/language-specs/makefile.lang.h:3
-msgid "Functions"
-msgstr "Funksjoner"
-
-#: ../gtksourceview/language-specs/lua.lang.h:5
-msgid "Line Comment 2"
-msgstr "Linjekommentar 2"
-
-#: ../gtksourceview/language-specs/lua.lang.h:6
-msgid "Lua"
-msgstr "Lua"
-
-#: ../gtksourceview/language-specs/lua.lang.h:8
-#: ../gtksourceview/language-specs/sh.lang.h:7
-msgid "Multiline String 2"
-msgstr "Flerlinjestreng 2"
-
-#. `backticks-quoted strings`
-#: ../gtksourceview/language-specs/makefile.lang.h:1
-#: ../gtksourceview/language-specs/php.lang.h:3
-#: ../gtksourceview/language-specs/sh.lang.h:1
-msgid "Backtick String"
-msgstr "Streng for bakovervendt sitattegn"
-
-#: ../gtksourceview/language-specs/makefile.lang.h:2
-msgid "Directives"
-msgstr "Direktiver"
-
-#: ../gtksourceview/language-specs/makefile.lang.h:5
-msgid "Makefile"
-msgstr "Makefil"
-
-#: ../gtksourceview/language-specs/makefile.lang.h:7
-msgid "Special Targets"
-msgstr "Spesialmål"
-
-#: ../gtksourceview/language-specs/makefile.lang.h:10
-msgid "Targets"
-msgstr "MÃ¥l"
-
-#: ../gtksourceview/language-specs/makefile.lang.h:11
-#: ../gtksourceview/language-specs/sh.lang.h:15
-msgid "Variable1"
-msgstr "Variabel1"
-
-#: ../gtksourceview/language-specs/makefile.lang.h:12
-#: ../gtksourceview/language-specs/sh.lang.h:16
-msgid "Variable2"
-msgstr "Variabel2"
-
-#: ../gtksourceview/language-specs/msil.lang.h:1
-msgid "MSIL"
-msgstr "MSIL"
-
-#: ../gtksourceview/language-specs/nemerle.lang.h:1
-#: ../gtksourceview/language-specs/verilog.lang.h:1
-msgid "Binary Number"
-msgstr "Binært tall"
-
-#: ../gtksourceview/language-specs/nemerle.lang.h:4
-msgid "Core Keywords"
-msgstr "Hovednøkkelord"
-
-#: ../gtksourceview/language-specs/nemerle.lang.h:5
-msgid "Core Types"
-msgstr "Hovedtyper"
-
-#: ../gtksourceview/language-specs/nemerle.lang.h:9
-msgid "Keywords Defined by Macros"
-msgstr "Nøkkelord definert av makroer"
-
-#: ../gtksourceview/language-specs/nemerle.lang.h:11
-msgid "Nemerle"
-msgstr "Nemerle"
-
-#: ../gtksourceview/language-specs/octave.lang.h:8
-#: ../gtksourceview/language-specs/python.lang.h:10
-msgid "Multiline Double Quoted String"
-msgstr "Dobbeltsitert streng over flere linjer"
-
-#: ../gtksourceview/language-specs/octave.lang.h:9
-#: ../gtksourceview/language-specs/python.lang.h:11
-msgid "Multiline Single Quoted String"
-msgstr "Enkeltsitert streng over flere linjer"
-
-#: ../gtksourceview/language-specs/octave.lang.h:11
-msgid "Octave"
-msgstr "Octave"
-
-#: ../gtksourceview/language-specs/octave.lang.h:12
-#: ../gtksourceview/language-specs/R.lang.h:9
-msgid "Reserved Constant"
-msgstr "Reservert konstant"
-
-#: ../gtksourceview/language-specs/pascal.lang.h:1
-msgid "Block Comment 1"
-msgstr "Blokk-kommentar 1"
-
-#: ../gtksourceview/language-specs/pascal.lang.h:2
-msgid "Block Comment 2"
-msgstr "Blokk-kommentar 2"
-
-#: ../gtksourceview/language-specs/pascal.lang.h:3
-msgid "Boolean Bitwise Operators"
-msgstr "Bolske bitvise operatorer"
-
-#: ../gtksourceview/language-specs/pascal.lang.h:4
-msgid "Builtin Functions"
-msgstr "Innebygde funksjoner"
-
-#: ../gtksourceview/language-specs/pascal.lang.h:5
-msgid "Builtin Types"
-msgstr "Innebygde typer"
-
-#: ../gtksourceview/language-specs/pascal.lang.h:6
-msgid "Builtin Values"
-msgstr "Innebygde verdier"
-
-#: ../gtksourceview/language-specs/pascal.lang.h:7
-msgid "Functions and Function Modifiers"
-msgstr "Funksjoner og funksjonsmodifikatorer"
-
-#: ../gtksourceview/language-specs/pascal.lang.h:8
-msgid "General Format"
-msgstr "Generelt format"
-
-#: ../gtksourceview/language-specs/pascal.lang.h:12
-msgid "Loop, Flow, and Exceptions Keywords"
-msgstr "Nøkkelord for løkker, flyt og unntak"
-
-#: ../gtksourceview/language-specs/pascal.lang.h:13
-msgid "Math Operators"
-msgstr "Matematiske operatorer"
-
-#: ../gtksourceview/language-specs/pascal.lang.h:15
-msgid "Pascal"
-msgstr "Pascal"
-
-#: ../gtksourceview/language-specs/pascal.lang.h:16
-msgid "Preprocessor Defines"
-msgstr "Preprosessordefinisjoner"
-
-#: ../gtksourceview/language-specs/pascal.lang.h:19
-msgid "Type, Class and Object Keywords"
-msgstr "Nøkkelord for type, klasse og objekt"
-
-#: ../gtksourceview/language-specs/perl.lang.h:1
-msgid "Function Call"
-msgstr "Funksjonskall"
-
-#: ../gtksourceview/language-specs/perl.lang.h:4
-msgid "Method Call"
-msgstr "Metodekall"
-
-#: ../gtksourceview/language-specs/perl.lang.h:5
-msgid "POD"
-msgstr "POD"
-
-#: ../gtksourceview/language-specs/perl.lang.h:6
-msgid "Perl"
-msgstr "Perl"
-
-#: ../gtksourceview/language-specs/perl.lang.h:9
-#: ../gtksourceview/language-specs/tcl.lang.h:5
-msgid "String2"
-msgstr "Streng2"
-
-#: ../gtksourceview/language-specs/perl.lang.h:10
-msgid "String3"
-msgstr "Streng3"
-
-#: ../gtksourceview/language-specs/perl.lang.h:11
-msgid "Variables"
-msgstr "Variabler"
-
-#. # Bourne Shell Line Comment
-#: ../gtksourceview/language-specs/php.lang.h:5
-msgid "Bash Line Comment"
-msgstr "Linjekommentar i bash"
-
-#. /* C Block Comment
-#: ../gtksourceview/language-specs/php.lang.h:7
-msgid "C Block Comment"
-msgstr "Kommentar for blokk i C"
-
-#. // C++ Line Comment
-#: ../gtksourceview/language-specs/php.lang.h:9
-msgid "C++ Line Comment"
-msgstr "C++ linjekommentar"
-
-#: ../gtksourceview/language-specs/php.lang.h:10
-msgid "Case Insensitive Keyword"
-msgstr "Nøkkelord som ikke skiller mellom små/store bokstaver"
-
-#. This are keywords, the are recognised by php
-#: ../gtksourceview/language-specs/php.lang.h:12
-msgid "Case Sensitive Keyword"
-msgstr "Nøkkelord som skiller mellom små/store bokstaver"
-
-#. <? ?> <HTML> inside PHP <?
-#: ../gtksourceview/language-specs/php.lang.h:18
-msgid "First Open PHP Tag"
-msgstr "Første åpne PHP-tagg"
-
-#: ../gtksourceview/language-specs/php.lang.h:19
-msgid "HTML Block"
-msgstr "HTML-blokk"
-
-#: ../gtksourceview/language-specs/php.lang.h:21
-msgid "PHP"
-msgstr "PHP"
-
-#: ../gtksourceview/language-specs/po.lang.h:2
-msgid "Format"
-msgstr "Format"
-
-#: ../gtksourceview/language-specs/po.lang.h:7
-msgid "gettext translation"
-msgstr "gettext-oversettelse"
-
-#: ../gtksourceview/language-specs/python.lang.h:1
-#: ../gtksourceview/language-specs/ruby.lang.h:2
-msgid "Builtins"
-msgstr "Innebygget"
-
-#: ../gtksourceview/language-specs/python.lang.h:9
-msgid "Module Handler"
-msgstr "Modulhåndterer"
-
-#: ../gtksourceview/language-specs/python.lang.h:13
-msgid "Python"
-msgstr "Python"
-
-#: ../gtksourceview/language-specs/R.lang.h:1
-msgid "Assignment Operator"
-msgstr "Tildelingsoperatorer"
-
-#: ../gtksourceview/language-specs/R.lang.h:2
-msgid "Delimiter"
-msgstr "Skilletegn"
-
-#: ../gtksourceview/language-specs/R.lang.h:5
-msgid "Integer Number"
-msgstr "Heltall"
-
-#: ../gtksourceview/language-specs/R.lang.h:8
-msgid "Reserved Class"
-msgstr "Reservert klasse"
-
-#: ../gtksourceview/language-specs/ruby.lang.h:1
-msgid "Attribute Definitions"
-msgstr "Attributtdefinisjoner"
-
-#: ../gtksourceview/language-specs/ruby.lang.h:3
-msgid "Class Variables"
-msgstr "Klassevariabler"
-
-#: ../gtksourceview/language-specs/ruby.lang.h:4
-msgid "Constants"
-msgstr "Konstanter"
-
-#: ../gtksourceview/language-specs/ruby.lang.h:5
-msgid "Definitions"
-msgstr "Definisjoner"
-
-#: ../gtksourceview/language-specs/ruby.lang.h:7
-msgid "Global Variables"
-msgstr "Globale variabler"
-
-#: ../gtksourceview/language-specs/ruby.lang.h:8
-msgid "Instance Variables"
-msgstr "Instansvariabler"
-
-#: ../gtksourceview/language-specs/ruby.lang.h:11
-msgid "Module Handlers"
-msgstr "Modulhåndterere"
-
-#: ../gtksourceview/language-specs/ruby.lang.h:12
-msgid "Multiline Comment"
-msgstr "Flerlinjekommentar"
-
-#: ../gtksourceview/language-specs/ruby.lang.h:13
-msgid "Pseudo Variables"
-msgstr "Pseudovariabler"
-
-#: ../gtksourceview/language-specs/ruby.lang.h:14
-msgid "RegExp Variables"
-msgstr "RegExp-variabler"
-
-#: ../gtksourceview/language-specs/ruby.lang.h:15
-msgid "Ruby"
-msgstr "Ruby"
-
-#: ../gtksourceview/language-specs/ruby.lang.h:18
-msgid "Symbols"
-msgstr "Symboler"
-
-#: ../gtksourceview/language-specs/scheme.lang.h:11
-msgid "Scheme"
-msgstr "Scheme"
-
-#: ../gtksourceview/language-specs/sh.lang.h:2
-msgid "Built-in Command"
-msgstr "Innebygd kommando"
-
-#: ../gtksourceview/language-specs/sh.lang.h:3
-msgid "Common Command"
-msgstr "Vanlig kommando"
-
-#: ../gtksourceview/language-specs/sh.lang.h:8
-msgid "Operator"
-msgstr "Operator"
-
-#: ../gtksourceview/language-specs/sh.lang.h:9
-msgid "Punctuator"
-msgstr "Stopptegn"
-
-#: ../gtksourceview/language-specs/sh.lang.h:10
-msgid "Redirection"
-msgstr "Omdirigering"
-
-#: ../gtksourceview/language-specs/sh.lang.h:12
-msgid "Self"
-msgstr "Self"
-
-#: ../gtksourceview/language-specs/sh.lang.h:17
-msgid "sh"
-msgstr "sh"
-
-#: ../gtksourceview/language-specs/sql.lang.h:1
-msgid "ANSI Datatypes"
-msgstr "ANSI-datatyper"
-
-#. Reserved Words
-#: ../gtksourceview/language-specs/sql.lang.h:3
-msgid "ANSI Reserved Words"
-msgstr "Reserverte ord fra ANSI"
-
-#. Aggregate Functions
-#: ../gtksourceview/language-specs/sql.lang.h:5
-msgid "Aggregate Functions"
-msgstr "Aggregatfunksjoner"
-
-#. Analytic Functions
-#: ../gtksourceview/language-specs/sql.lang.h:7
-msgid "Analytic Functions"
-msgstr "Analytiske funksjoner"
-
-#: ../gtksourceview/language-specs/sql.lang.h:10
-msgid "Character Functions Returning Character Values"
-msgstr "Tegnfunksjoner som returnerer tegnverdier"
-
-#: ../gtksourceview/language-specs/sql.lang.h:11
-msgid "Character Functions Returning Number Values"
-msgstr "Tegnfunksjoner som returnerer tallverdier"
-
-#: ../gtksourceview/language-specs/sql.lang.h:12
-msgid "Collection Functions"
-msgstr "Samlingsfunksjoner"
-
-#: ../gtksourceview/language-specs/sql.lang.h:13
-msgid "Conditions"
-msgstr "Betingelser"
-
-#: ../gtksourceview/language-specs/sql.lang.h:14
-msgid "Conversion Functions"
-msgstr "Konverteringsfunksjoner"
-
-#: ../gtksourceview/language-specs/sql.lang.h:15
-msgid "Data Mining Functions"
-msgstr "Datauthentingsfunksjoner"
-
-#: ../gtksourceview/language-specs/sql.lang.h:16
-msgid "Datetime Functions"
-msgstr "Dato- og tidsfunksjoner"
-
-#: ../gtksourceview/language-specs/sql.lang.h:17
-msgid "Encoding and Decoding Functions"
-msgstr "Funksjoner for koding og dekoding"
-
-#: ../gtksourceview/language-specs/sql.lang.h:18
-msgid "Environment and Identifier Functions"
-msgstr "Funksjoner for miljø og identifikatorer"
-
-#: ../gtksourceview/language-specs/sql.lang.h:19
-msgid "General Comparison Functions"
-msgstr "Generelle sammenligningsfunksjoner"
-
-#: ../gtksourceview/language-specs/sql.lang.h:20
-msgid "Hierarchical Function"
-msgstr "Hierarkiske funksjoner"
-
-#: ../gtksourceview/language-specs/sql.lang.h:21
-msgid "Integer Literals"
-msgstr "Heltallsbokstaver"
-
-#: ../gtksourceview/language-specs/sql.lang.h:22
-msgid "Large Object Functions"
-msgstr "Funksjoner for store objekter"
-
-#. Model Functions
-#: ../gtksourceview/language-specs/sql.lang.h:25
-msgid "Model Functions"
-msgstr "Funksjoner for modeller"
-
-#: ../gtksourceview/language-specs/sql.lang.h:26
-msgid "NLS Character Functions"
-msgstr "Funksjoner for NLS-tegn"
-
-#: ../gtksourceview/language-specs/sql.lang.h:27
-msgid "NULL-Related Functions"
-msgstr "NULL-relaterte funksjoner"
-
-#: ../gtksourceview/language-specs/sql.lang.h:28
-msgid "Null"
-msgstr "Null"
-
-#: ../gtksourceview/language-specs/sql.lang.h:29
-msgid "Number Literals"
-msgstr "Nummerbokstaver"
-
-#. Single-Row Functions
-#: ../gtksourceview/language-specs/sql.lang.h:31
-msgid "Numeric Functions"
-msgstr "Numeriske funksjoner"
-
-#. Object Reference Functions
-#: ../gtksourceview/language-specs/sql.lang.h:33
-msgid "Object Reference Functions"
-msgstr "Objektreferansefunksjoner"
-
-#. Datatypes
-#: ../gtksourceview/language-specs/sql.lang.h:36
-msgid "Oracle Built-in Datatypes"
-msgstr "Innebyggede datatyper i Oracle"
-
-#: ../gtksourceview/language-specs/sql.lang.h:37
-msgid "Oracle Reserved Words"
-msgstr "Reserverte ord i Oracle"
-
-#: ../gtksourceview/language-specs/sql.lang.h:38
-msgid "Oracle-Supplied Types"
-msgstr "Innebyggede typer i Oracle"
-
-#: ../gtksourceview/language-specs/sql.lang.h:39
-msgid "SQL"
-msgstr "SQL"
-
-#: ../gtksourceview/language-specs/sql.lang.h:40
-msgid "SQL Statements"
-msgstr "SQL-uttrykk"
-
-#. SQL*Plus
-#: ../gtksourceview/language-specs/sql.lang.h:42
-msgid "SQL*Plus At Sign"
-msgstr "SQL*Plus og-tegn"
-
-#: ../gtksourceview/language-specs/sql.lang.h:43
-msgid "SQL*Plus Commands"
-msgstr "SQL*Plus-kommandoer"
-
-#: ../gtksourceview/language-specs/sql.lang.h:44
-msgid "SQL*Plus Double At Sign"
-msgstr "SQL*Plus dobbelt og-tegn"
-
-#: ../gtksourceview/language-specs/sql.lang.h:45
-msgid "SQL*Plus Slash"
-msgstr "SQL*Plus skråstrek"
-
-#: ../gtksourceview/language-specs/sql.lang.h:46
-msgid "SQL/DS and DB2 Datatypes"
-msgstr "SQL/DS- og DB2-datatyper"
-
-#: ../gtksourceview/language-specs/sql.lang.h:47
-msgid "Size Clause"
-msgstr "Størrelsesklausul"
-
-#. Literals
-#: ../gtksourceview/language-specs/sql.lang.h:50
-msgid "Text Literals"
-msgstr "Tekstbokstaver"
-
-#: ../gtksourceview/language-specs/sql.lang.h:51
-msgid "Unlimited"
-msgstr "Ubegrenset"
-
-#: ../gtksourceview/language-specs/sql.lang.h:52
-msgid "XML Functions"
-msgstr "XML-funksjoner"
-
-#: ../gtksourceview/language-specs/tcl.lang.h:6
-msgid "Tcl"
-msgstr "Tcl"
-
-#: ../gtksourceview/language-specs/texinfo.lang.h:2
-msgid "Characters"
-msgstr "Tegn"
-
-#: ../gtksourceview/language-specs/texinfo.lang.h:3
-msgid "File Attributes"
-msgstr "Filattributter"
-
-#: ../gtksourceview/language-specs/texinfo.lang.h:4
-msgid "Formatting"
-msgstr "Formattering"
-
-#: ../gtksourceview/language-specs/texinfo.lang.h:5
-msgid "Generated Content"
-msgstr "Generert innhold"
-
-#: ../gtksourceview/language-specs/texinfo.lang.h:7
-msgid "Indexing"
-msgstr "Indeksering"
-
-#: ../gtksourceview/language-specs/texinfo.lang.h:10
-msgid "Macro Parameters"
-msgstr "Makro-parameter"
-
-#: ../gtksourceview/language-specs/texinfo.lang.h:11
-msgid "Macros"
-msgstr "Makroer"
-
-#: ../gtksourceview/language-specs/texinfo.lang.h:13
-msgid "Markup (block)"
-msgstr "Merking (blokk)"
-
-#: ../gtksourceview/language-specs/texinfo.lang.h:14
-msgid "Markup (inline)"
-msgstr "Merking (i teksten)"
-
-#: ../gtksourceview/language-specs/texinfo.lang.h:15
-msgid "Sectioning"
-msgstr "Seksjonering"
-
-#: ../gtksourceview/language-specs/texinfo.lang.h:16
-msgid "Texinfo"
-msgstr "Texinfo"
-
-#: ../gtksourceview/language-specs/vbnet.lang.h:7
-msgid "Old Style Comment"
-msgstr "Gammel type kommentar"
-
-#: ../gtksourceview/language-specs/vbnet.lang.h:12
-msgid "VB.NET"
-msgstr "VB.NET"
-
-#: ../gtksourceview/language-specs/verilog.lang.h:4
-msgid "Gates"
-msgstr "Porter"
-
-#: ../gtksourceview/language-specs/verilog.lang.h:11
-msgid "Verilog"
-msgstr "Verilog"
-
-#: ../gtksourceview/language-specs/vhdl.lang.h:7
-msgid "True and False"
-msgstr "Sann og usann"
-
-#: ../gtksourceview/language-specs/vhdl.lang.h:9
-msgid "VHDL"
-msgstr "VHDL"
-
-#: ../gtksourceview/language-specs/xml.lang.h:5
-msgid "Hexadecimal"
-msgstr "Heksadesimal"
-
-#: ../gtksourceview/language-specs/xml.lang.h:9
-msgid "XML"
-msgstr "XML"
diff -pruN 1.6.1-3/po/pl.po 1.7.1-0ubuntu2/po/pl.po
--- 1.6.1-3/po/pl.po 2005-09-03 18:08:09.000000000 +0100
+++ 1.7.1-0ubuntu2/po/pl.po 2006-04-20 17:49:53.000000000 +0100
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gtksourceview\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-03 19:07+0200\n"
+"POT-Creation-Date: 2006-04-19 09:37+0200\n"
"PO-Revision-Date: 2005-09-03 08:20+0100\n"
"Last-Translator: Gnome PL Team <translators gnomepl org>\n"
"Language-Team: Polish <translation-team-pl lists sourceforge net>\n"
@@ -18,182 +18,182 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../gtksourceview/gtksourcebuffer.c:279
+#: ../gtksourceview/gtksourcebuffer.c:278
msgid "Escape Character"
msgstr "Znak sterujÄ?cy"
-#: ../gtksourceview/gtksourcebuffer.c:280
+#: ../gtksourceview/gtksourcebuffer.c:279
msgid "Escaping character for syntax patterns"
msgstr "Znaki sterujÄ?ce dla wzorów skÅ?adni"
-#: ../gtksourceview/gtksourcebuffer.c:288
+#: ../gtksourceview/gtksourcebuffer.c:287
msgid "Check Brackets"
msgstr "Kontrola nawiasów"
-#: ../gtksourceview/gtksourcebuffer.c:289
+#: ../gtksourceview/gtksourcebuffer.c:288
msgid "Whether to check and highlight matching brackets"
msgstr "OkreÅ?la czy kontrolowaÄ? i wyróżniaÄ? pasujÄ?ce pary nawiasów"
-#: ../gtksourceview/gtksourcebuffer.c:297
-#: ../gtksourceview/gtksourceprintjob.c:295
+#: ../gtksourceview/gtksourcebuffer.c:296
+#: ../gtksourceview/gtksourceprintjob.c:296
msgid "Highlight"
msgstr "Wyróżnianie"
-#: ../gtksourceview/gtksourcebuffer.c:298
+#: ../gtksourceview/gtksourcebuffer.c:297
msgid "Whether to highlight syntax in the buffer"
msgstr "OkreÅ?la czy wyróżniaÄ? skÅ?adniÄ? w buforze"
-#: ../gtksourceview/gtksourcebuffer.c:306
+#: ../gtksourceview/gtksourcebuffer.c:305
msgid "Maximum Undo Levels"
msgstr "Maksymalna liczba cofniÄ?Ä?"
-#: ../gtksourceview/gtksourcebuffer.c:307
+#: ../gtksourceview/gtksourcebuffer.c:306
msgid "Number of undo levels for the buffer"
msgstr "Maksymalna liczba cofniÄ?Ä? dla bufora"
-#: ../gtksourceview/gtksourcebuffer.c:317
+#: ../gtksourceview/gtksourcebuffer.c:316
#: ../gtksourceview/language-specs/desktop.lang.h:6
#: ../gtksourceview/language-specs/ini.lang.h:7
msgid "Language"
msgstr "JÄ?zyk"
-#: ../gtksourceview/gtksourcebuffer.c:318
+#: ../gtksourceview/gtksourcebuffer.c:317
msgid "Language object to get highlighting patterns from"
msgstr "Obiekt jÄ?zykowy, z którego należy pobieraÄ? wzorce wyróżnieÅ?"
-#: ../gtksourceview/gtksourcelanguagesmanager.c:119
+#: ../gtksourceview/gtksourcelanguagesmanager.c:114
msgid "Language specification directories"
msgstr "Katalogi specyfikacji jÄ?zyka"
-#: ../gtksourceview/gtksourcelanguagesmanager.c:120
+#: ../gtksourceview/gtksourcelanguagesmanager.c:115
msgid ""
"List of directories where the language specification files (.lang) are "
"located"
msgstr ""
"Lista katalagów, w których przechowywane sÄ? pliki specyfikacji jÄ?zyka (.lang)"
-#: ../gtksourceview/gtksourceprintjob.c:264
+#: ../gtksourceview/gtksourceprintjob.c:265
msgid "Configuration"
msgstr "Konfiguracja"
-#: ../gtksourceview/gtksourceprintjob.c:265
+#: ../gtksourceview/gtksourceprintjob.c:266
msgid "Configuration options for the print job"
msgstr "Opcje konfiguracyjne wydruku"
-#: ../gtksourceview/gtksourceprintjob.c:272
+#: ../gtksourceview/gtksourceprintjob.c:273
msgid "Source Buffer"
msgstr "Bufor źródÅ?owy"
-#: ../gtksourceview/gtksourceprintjob.c:273
+#: ../gtksourceview/gtksourceprintjob.c:274
msgid "GtkSourceBuffer object to print"
msgstr "Drukowany obiekt GtkSourceBuffer"
-#: ../gtksourceview/gtksourceprintjob.c:279
-#: ../gtksourceview/gtksourceview.c:221 ../gtksourceview/gtksourceview.c:222
+#: ../gtksourceview/gtksourceprintjob.c:280
+#: ../gtksourceview/gtksourceview.c:233 ../gtksourceview/gtksourceview.c:234
msgid "Tabs Width"
msgstr "SzerokoÅ?Ä? tabulatorów"
-#: ../gtksourceview/gtksourceprintjob.c:280
+#: ../gtksourceview/gtksourceprintjob.c:281
msgid "Width in equivalent space characters of tabs"
msgstr "SzerokoÅ?Ä? tabulatorów w odpowiadajÄ?cym im spacjach"
-#: ../gtksourceview/gtksourceprintjob.c:287
+#: ../gtksourceview/gtksourceprintjob.c:288
msgid "Wrap Mode"
msgstr "Tryb zawijania"
-#: ../gtksourceview/gtksourceprintjob.c:288
+#: ../gtksourceview/gtksourceprintjob.c:289
msgid "Word wrapping mode"
msgstr "Tryb zawijania wierszy"
-#: ../gtksourceview/gtksourceprintjob.c:296
+#: ../gtksourceview/gtksourceprintjob.c:297
msgid "Whether to print the document with highlighted syntax"
msgstr "OkreÅ?la czy drukowaÄ? dokument z wyróżnianiem skÅ?adni"
-#: ../gtksourceview/gtksourceprintjob.c:304
+#: ../gtksourceview/gtksourceprintjob.c:305
msgid "Font"
msgstr "Czcionka"
-#: ../gtksourceview/gtksourceprintjob.c:305
+#: ../gtksourceview/gtksourceprintjob.c:306
msgid "GnomeFont name to use for the document text (deprecated)"
msgstr "Nazwa czcionki GNOME używanej w dokumentach tekstowych (przestarzaÅ?e)"
-#: ../gtksourceview/gtksourceprintjob.c:312
+#: ../gtksourceview/gtksourceprintjob.c:313
msgid "Font Description"
msgstr "Opis czcionki"
-#: ../gtksourceview/gtksourceprintjob.c:313
+#: ../gtksourceview/gtksourceprintjob.c:314
msgid "Font to use for the document text (e.g. \"Monospace 10\")"
msgstr "Czcionka używana w dokumentach tekstowych (np. \"Monospace 10\")"
-#: ../gtksourceview/gtksourceprintjob.c:320
-#: ../gtksourceview/gtksourceprintjob.c:328
+#: ../gtksourceview/gtksourceprintjob.c:321
+#: ../gtksourceview/gtksourceprintjob.c:329
msgid "Numbers Font"
msgstr "Czcionka numerów"
-#: ../gtksourceview/gtksourceprintjob.c:321
+#: ../gtksourceview/gtksourceprintjob.c:322
msgid "GnomeFont name to use for the line numbers (deprecated)"
msgstr "Nazwa czcionki GNOME używanej do numeracji wierszy (przestarzaÅ?e)"
-#: ../gtksourceview/gtksourceprintjob.c:329
+#: ../gtksourceview/gtksourceprintjob.c:330
msgid "Font description to use for the line numbers"
msgstr "Opis czcionki używanej do numeracji wierszy"
-#: ../gtksourceview/gtksourceprintjob.c:336
+#: ../gtksourceview/gtksourceprintjob.c:337
msgid "Print Line Numbers"
msgstr "Drukowanie numerów wierszy"
-#: ../gtksourceview/gtksourceprintjob.c:337
+#: ../gtksourceview/gtksourceprintjob.c:338
msgid "Interval of printed line numbers (0 means no numbers)"
msgstr "Przerwa pomiÄ?dzy numerowaniem wierszy (0 oznacza brak numerowania)"
-#: ../gtksourceview/gtksourceprintjob.c:344
+#: ../gtksourceview/gtksourceprintjob.c:345
msgid "Print Header"
msgstr "Drukowanie nagÅ?ówka"
-#: ../gtksourceview/gtksourceprintjob.c:345
+#: ../gtksourceview/gtksourceprintjob.c:346
msgid "Whether to print a header in each page"
msgstr "OkreÅ?la czy drukowaÄ? nagÅ?ówek na każdej stronie"
-#: ../gtksourceview/gtksourceprintjob.c:352
+#: ../gtksourceview/gtksourceprintjob.c:353
msgid "Print Footer"
msgstr "Drukowanie stopki"
-#: ../gtksourceview/gtksourceprintjob.c:353
+#: ../gtksourceview/gtksourceprintjob.c:354
msgid "Whether to print a footer in each page"
msgstr "OkreÅ?la czy drukowaÄ? stopkÄ? na każdej stronie"
-#: ../gtksourceview/gtksourceprintjob.c:360
+#: ../gtksourceview/gtksourceprintjob.c:361
msgid "Header and Footer Font"
msgstr "Czcionka nagÅ?ówka i stopki"
-#: ../gtksourceview/gtksourceprintjob.c:361
+#: ../gtksourceview/gtksourceprintjob.c:362
msgid "GnomeFont name to use for the header and footer (deprecated)"
msgstr "Nazwa czcionki GNOME użytej w nagÅ?ówku i stopce (przestarzaÅ?e)"
-#: ../gtksourceview/gtksourceprintjob.c:368
+#: ../gtksourceview/gtksourceprintjob.c:369
msgid "Header and Footer Font Description"
msgstr "Opis czcionki nagÅ?ówka i stopki"
-#: ../gtksourceview/gtksourceprintjob.c:369
+#: ../gtksourceview/gtksourceprintjob.c:370
msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
msgstr "Czcionka używana w nagÅ?ówku i stopce (np. \"Monospace 10\")"
-#: ../gtksourceview/gtksourcestylescheme.c:262
+#: ../gtksourceview/gtksourcestylescheme.c:264
msgid "Base-N Integer"
msgstr "Liczba caÅ?kowita o podstawie N"
-#: ../gtksourceview/gtksourcestylescheme.c:267
+#: ../gtksourceview/gtksourcestylescheme.c:269
msgid "Character"
msgstr "Znak"
-#: ../gtksourceview/gtksourcestylescheme.c:272
-#: ../gtksourceview/language-specs/latex.lang.h:1
+#: ../gtksourceview/gtksourcestylescheme.c:274
+#: ../gtksourceview/language-specs/latex.lang.h:2
#: ../gtksourceview/language-specs/po.lang.h:1
msgid "Comment"
msgstr "Komentarz"
#. $this = (datatype)
-#: ../gtksourceview/gtksourcestylescheme.c:277
+#: ../gtksourceview/gtksourcestylescheme.c:279
#: ../gtksourceview/language-specs/php.lang.h:14
msgid "Data Type"
msgstr "Typ danych"
@@ -201,46 +201,63 @@ msgstr "Typ danych"
#.
#. CSS functions, such as rgb(), clip(), or lang().
#.
-#: ../gtksourceview/gtksourcestylescheme.c:282
+#: ../gtksourceview/gtksourcestylescheme.c:284
#: ../gtksourceview/language-specs/ada.lang.h:3
#: ../gtksourceview/language-specs/css.lang.h:18
+#: ../gtksourceview/language-specs/octave.lang.h:4
+#: ../gtksourceview/language-specs/python.lang.h:5
+#: ../gtksourceview/language-specs/scheme.lang.h:2
+#: ../gtksourceview/language-specs/sh.lang.h:4
msgid "Function"
msgstr "Funkcja"
-#: ../gtksourceview/gtksourcestylescheme.c:287
+#: ../gtksourceview/gtksourcestylescheme.c:289
#: ../gtksourceview/language-specs/c.lang.h:6
#: ../gtksourceview/language-specs/cpp.lang.h:6
#: ../gtksourceview/language-specs/fortran.lang.h:1
#: ../gtksourceview/language-specs/haskell.lang.h:3
#: ../gtksourceview/language-specs/nemerle.lang.h:6
+#: ../gtksourceview/language-specs/octave.lang.h:1
#: ../gtksourceview/language-specs/python.lang.h:2
msgid "Decimal"
msgstr "Kropka dziesiÄ?tna"
-#: ../gtksourceview/gtksourcestylescheme.c:292
+#: ../gtksourceview/gtksourcestylescheme.c:294
msgid "Floating Point"
msgstr "Lisczba zmiennoprzecinkowa"
-#: ../gtksourceview/gtksourcestylescheme.c:297
+#. We cannot match \b at the end of a keyword automatically
+#. because it fails for let* etc. So we need to manually add it to the
+#. other keywords and match ([ \t]|$) for the one ending with a
+#. special character. Unfortnately this also means that if the highlight
+#. style for keywords sets the background color, for let* etc also the
+#. trailing space will be highlighted.
+#: ../gtksourceview/gtksourcestylescheme.c:299
+#: ../gtksourceview/language-specs/ada.lang.h:4
#: ../gtksourceview/language-specs/gtkrc.lang.h:6
-#: ../gtksourceview/language-specs/latex.lang.h:4
+#: ../gtksourceview/language-specs/haskell.lang.h:9
+#: ../gtksourceview/language-specs/latex.lang.h:5
+#: ../gtksourceview/language-specs/octave.lang.h:6
#: ../gtksourceview/language-specs/po.lang.h:3
+#: ../gtksourceview/language-specs/python.lang.h:7
#: ../gtksourceview/language-specs/R.lang.h:6
+#: ../gtksourceview/language-specs/scheme.lang.h:9
+#: ../gtksourceview/language-specs/tcl.lang.h:1
#: ../gtksourceview/language-specs/texinfo.lang.h:8
#: ../gtksourceview/language-specs/vhdl.lang.h:2
msgid "Keyword"
msgstr "SÅ?owo kluczowe"
-#: ../gtksourceview/gtksourcestylescheme.c:302
+#: ../gtksourceview/gtksourcestylescheme.c:304
msgid "Preprocessor"
msgstr "Preprocesor"
#.
-#. <pattern-item _name = "Operators" style = "Operators">
+#. <pattern-item _name = "Operator" style = "Operators">
#. <regex>[:!#$%&*+./>=<? \\^|~\-]+</regex>
#. </pattern-item>
#.
-#. <keyword-list _name="Keysymbols" style = "Keyword">
+#. <keyword-list _name="Keysymbol" style = "Keyword">
#. <keyword>::</keyword>
#. <keyword>-></keyword>
#. <keyword><-</keyword>
@@ -252,14 +269,14 @@ msgstr "Preprocesor"
#. <keyword>~</keyword>
#. </keyword-list>
#.
-#: ../gtksourceview/gtksourcestylescheme.c:307
+#: ../gtksourceview/gtksourcestylescheme.c:309
#: ../gtksourceview/language-specs/ada.lang.h:9
#: ../gtksourceview/language-specs/c.lang.h:15
#: ../gtksourceview/language-specs/cpp.lang.h:15
#: ../gtksourceview/language-specs/csharp.lang.h:9
#: ../gtksourceview/language-specs/css.lang.h:58
#: ../gtksourceview/language-specs/html.lang.h:8
-#: ../gtksourceview/language-specs/fortran.lang.h:12
+#: ../gtksourceview/language-specs/fortran.lang.h:13
#: ../gtksourceview/language-specs/haskell.lang.h:31
#: ../gtksourceview/language-specs/idl.lang.h:9
#: ../gtksourceview/language-specs/java.lang.h:11
@@ -270,8 +287,7 @@ msgstr "Preprocesor"
#: ../gtksourceview/language-specs/pascal.lang.h:18
#: ../gtksourceview/language-specs/perl.lang.h:8
#: ../gtksourceview/language-specs/po.lang.h:6
-#: ../gtksourceview/language-specs/python.lang.h:14
-#: ../gtksourceview/language-specs/ruby.lang.h:18
+#: ../gtksourceview/language-specs/scheme.lang.h:13
#: ../gtksourceview/language-specs/sh.lang.h:13
#: ../gtksourceview/language-specs/tcl.lang.h:4
#: ../gtksourceview/language-specs/vbnet.lang.h:11
@@ -280,11 +296,12 @@ msgstr "Preprocesor"
msgid "String"
msgstr "Napis"
-#: ../gtksourceview/gtksourcestylescheme.c:312
+#: ../gtksourceview/gtksourcestylescheme.c:314
msgid "Specials"
msgstr "Specjalne"
-#: ../gtksourceview/gtksourcestylescheme.c:319
+#: ../gtksourceview/gtksourcestylescheme.c:321
+#: ../gtksourceview/language-specs/changelog.lang.h:6
#: ../gtksourceview/language-specs/css.lang.h:36
#: ../gtksourceview/language-specs/desktop.lang.h:10
#: ../gtksourceview/language-specs/diff.lang.h:7
@@ -295,87 +312,87 @@ msgstr "Specjalne"
msgid "Others"
msgstr "Inne"
-#: ../gtksourceview/gtksourcestylescheme.c:324
+#: ../gtksourceview/gtksourcestylescheme.c:326
msgid "Others 2"
msgstr "Inne 2"
-#: ../gtksourceview/gtksourcestylescheme.c:329
+#: ../gtksourceview/gtksourcestylescheme.c:331
msgid "Others 3"
msgstr "Inne 3"
-#: ../gtksourceview/gtksourcestylescheme.c:366
+#: ../gtksourceview/gtksourcestylescheme.c:368
msgid "Default"
msgstr "DomyÅ?lnie"
-#: ../gtksourceview/gtksourcetag.c:108
+#: ../gtksourceview/gtksourcetag.c:109
msgid "Tag ID"
msgstr "ID znacznika"
-#: ../gtksourceview/gtksourcetag.c:109
+#: ../gtksourceview/gtksourcetag.c:110
msgid "ID used to refer to the source tag"
msgstr "ID używane do odwoÅ?ywania siÄ? do znacznika źródÅ?a"
-#: ../gtksourceview/gtksourcetag.c:116
+#: ../gtksourceview/gtksourcetag.c:117
msgid "Tag style"
msgstr "Styl znacznika"
-#: ../gtksourceview/gtksourcetag.c:117
+#: ../gtksourceview/gtksourcetag.c:118
msgid "The style associated with the source tag"
msgstr "Styl przypisany do znacznika źródÅ?a"
-#: ../gtksourceview/gtksourceview.c:205
+#: ../gtksourceview/gtksourceview.c:217
msgid "Show Line Numbers"
msgstr "WyÅ?wietlanie numerów wierszy"
-#: ../gtksourceview/gtksourceview.c:206
+#: ../gtksourceview/gtksourceview.c:218
msgid "Whether to display line numbers"
msgstr "OkreÅ?la czy wyÅ?wietlaÄ? numery wierszy"
-#: ../gtksourceview/gtksourceview.c:213
+#: ../gtksourceview/gtksourceview.c:225
msgid "Show Line Markers"
msgstr "WyÅ?wietlanie znaczników wierszy"
-#: ../gtksourceview/gtksourceview.c:214
+#: ../gtksourceview/gtksourceview.c:226
msgid "Whether to display line marker pixbufs"
msgstr "OkreÅ?la czy wyÅ?wietlaÄ? bufory piksmap znaczników wierszy"
-#: ../gtksourceview/gtksourceview.c:231
+#: ../gtksourceview/gtksourceview.c:243
msgid "Auto Indentation"
msgstr "Automatyczne wciÄ?cia"
-#: ../gtksourceview/gtksourceview.c:232
+#: ../gtksourceview/gtksourceview.c:244
msgid "Whether to enable auto indentation"
msgstr "OkreÅ?la czy wÅ?Ä?czyÄ? automatyczne wciÄ?cia tekstu"
-#: ../gtksourceview/gtksourceview.c:238
+#: ../gtksourceview/gtksourceview.c:250
msgid "Insert Spaces Instead of Tabs"
msgstr "Wstawianie spacji zamiast tabulatorów"
-#: ../gtksourceview/gtksourceview.c:239
+#: ../gtksourceview/gtksourceview.c:251
msgid "Whether to insert spaces instead of tabs"
msgstr "OkreÅ?la czy wstawiaÄ? spacje zamiast tabulatorów"
-#: ../gtksourceview/gtksourceview.c:246
+#: ../gtksourceview/gtksourceview.c:258
msgid "Show Right Margin"
msgstr "WyÅ?wietl prawy margines"
-#: ../gtksourceview/gtksourceview.c:247
+#: ../gtksourceview/gtksourceview.c:259
msgid "Whether to display the right margin"
msgstr "OkreÅ?la czy wyÅ?wietlaÄ? prawy margines"
-#: ../gtksourceview/gtksourceview.c:254
+#: ../gtksourceview/gtksourceview.c:266
msgid "Margin position"
msgstr "PoÅ?ożenie marginesu"
-#: ../gtksourceview/gtksourceview.c:255
+#: ../gtksourceview/gtksourceview.c:267
msgid "Position of the right margin"
msgstr "PoÅ?ożenie prawego marginesu"
-#: ../gtksourceview/gtksourceview.c:264
+#: ../gtksourceview/gtksourceview.c:276
msgid "Use smart home/end"
msgstr "Użycie sprytnych klawiszy home/end"
-#: ../gtksourceview/gtksourceview.c:265
+#: ../gtksourceview/gtksourceview.c:277
msgid ""
"HOME and END keys move to first/last non whitespace characters on line "
"before going to the start/end of the line"
@@ -383,14 +400,54 @@ msgstr ""
"Klawisze HOME i END najpierw przenoszÄ? do pierwszych/ostatnich znaków w "
"wierszu a nastÄ?pnie na poczÄ?tek/koniec wiersza"
-#: ../gtksourceview/gtksourceview.c:274
+#: ../gtksourceview/gtksourceview.c:286
msgid "Highlight current line"
msgstr "Wyróżnienie bieżÄ?cego wiersza"
-#: ../gtksourceview/gtksourceview.c:275
+#: ../gtksourceview/gtksourceview.c:287
msgid "Whether to highlight the current line"
msgstr "OkreÅ?la czy wyróżniaÄ? bieżÄ?cy wiersz"
+#: ../gtksourceview/gtksourceview.c:303
+msgid "Margin Line Alpha"
+msgstr "KanaÅ? alfa linii marginesu"
+
+#: ../gtksourceview/gtksourceview.c:304
+msgid "Transparency of the margin line"
+msgstr "PrzezroczystoÅ?Ä? linii marginesu"
+
+#: ../gtksourceview/gtksourceview.c:321
+msgid "Margin Line Color"
+msgstr "Kolor linii marginesu"
+
+#: ../gtksourceview/gtksourceview.c:322
+msgid "Color to use for the right margin line"
+msgstr "Kolor linii prawego marginesu"
+
+#: ../gtksourceview/gtksourceview.c:338
+msgid "Margin Overlay Toggle"
+msgstr "PrzeÅ?Ä?czanie paska marginesu"
+
+#: ../gtksourceview/gtksourceview.c:339
+msgid "Whether to draw the right margin overlay"
+msgstr "OkreÅ?la czy wyÅ?wietlaÄ? pasek prawego marginesu"
+
+#: ../gtksourceview/gtksourceview.c:355
+msgid "Margin Overlay Alpha"
+msgstr "KanaÅ? alfa paska marginesu"
+
+#: ../gtksourceview/gtksourceview.c:356
+msgid "Transparency of the margin overlay"
+msgstr "PrzezroczystoÅ?Ä? paska marginesu"
+
+#: ../gtksourceview/gtksourceview.c:373
+msgid "Margin Overlay Color"
+msgstr "Kolor paska marginesu"
+
+#: ../gtksourceview/gtksourceview.c:374
+msgid "Color to use for drawing the margin overlay"
+msgstr "Kolor używany do rysowania paska marginesu"
+
#: ../gtksourceview/language-specs/ada.lang.h:1
msgid "Ada"
msgstr "Ada"
@@ -404,24 +461,7 @@ msgstr "Ada"
msgid "Character Constant"
msgstr "StaÅ?a znakowa"
-#: ../gtksourceview/language-specs/ada.lang.h:4
-#: ../gtksourceview/language-specs/c.lang.h:10
-#: ../gtksourceview/language-specs/cpp.lang.h:10
-#: ../gtksourceview/language-specs/csharp.lang.h:3
-#: ../gtksourceview/language-specs/fortran.lang.h:7
-#: ../gtksourceview/language-specs/haskell.lang.h:9
-#: ../gtksourceview/language-specs/idl.lang.h:4
-#: ../gtksourceview/language-specs/javascript.lang.h:12
-#: ../gtksourceview/language-specs/lua.lang.h:3
-#: ../gtksourceview/language-specs/perl.lang.h:2
-#: ../gtksourceview/language-specs/python.lang.h:6
-#: ../gtksourceview/language-specs/ruby.lang.h:8
-#: ../gtksourceview/language-specs/tcl.lang.h:1
-#: ../gtksourceview/language-specs/vbnet.lang.h:1
-#: ../gtksourceview/language-specs/verilog.lang.h:6
-msgid "Keywords"
-msgstr "SÅ?owa kluczowe"
-
+#. Note: contains an hack to avoid considering ^COMMON a comment
#. <string _name = "String 2" style = "String" end-at-line-end = "TRUE">
#. <start-regex>'</start-regex>
#. <end-regex>'</end-regex>
@@ -433,7 +473,7 @@ msgstr "SÅ?owa kluczowe"
#: ../gtksourceview/language-specs/css.lang.h:29
#: ../gtksourceview/language-specs/desktop.lang.h:7
#: ../gtksourceview/language-specs/diff.lang.h:5
-#: ../gtksourceview/language-specs/fortran.lang.h:8
+#: ../gtksourceview/language-specs/fortran.lang.h:9
#: ../gtksourceview/language-specs/gtkrc.lang.h:7
#: ../gtksourceview/language-specs/haskell.lang.h:10
#: ../gtksourceview/language-specs/idl.lang.h:5
@@ -443,11 +483,13 @@ msgstr "SÅ?owa kluczowe"
#: ../gtksourceview/language-specs/lua.lang.h:4
#: ../gtksourceview/language-specs/makefile.lang.h:4
#: ../gtksourceview/language-specs/nemerle.lang.h:10
+#: ../gtksourceview/language-specs/octave.lang.h:7
#: ../gtksourceview/language-specs/pascal.lang.h:11
#: ../gtksourceview/language-specs/perl.lang.h:3
-#: ../gtksourceview/language-specs/python.lang.h:7
+#: ../gtksourceview/language-specs/python.lang.h:8
#: ../gtksourceview/language-specs/R.lang.h:7
-#: ../gtksourceview/language-specs/ruby.lang.h:9
+#: ../gtksourceview/language-specs/ruby.lang.h:10
+#: ../gtksourceview/language-specs/scheme.lang.h:10
#: ../gtksourceview/language-specs/sh.lang.h:5
#: ../gtksourceview/language-specs/sql.lang.h:23
#: ../gtksourceview/language-specs/tcl.lang.h:2
@@ -473,21 +515,21 @@ msgid "Number"
msgstr "Liczba"
#: ../gtksourceview/language-specs/ada.lang.h:7
-msgid "Preprocessor Keywords"
-msgstr "SÅ?owa kluczowe preprocesora"
+msgid "Preprocessor Keyword"
+msgstr "SÅ?owo kluczowe preprocesora"
#: ../gtksourceview/language-specs/ada.lang.h:8
#: ../gtksourceview/language-specs/c.lang.h:14
#: ../gtksourceview/language-specs/cpp.lang.h:14
#: ../gtksourceview/language-specs/csharp.lang.h:8
-#: ../gtksourceview/language-specs/fortran.lang.h:11
+#: ../gtksourceview/language-specs/fortran.lang.h:12
#: ../gtksourceview/language-specs/haskell.lang.h:13
#: ../gtksourceview/language-specs/idl.lang.h:8
#: ../gtksourceview/language-specs/java.lang.h:10
#: ../gtksourceview/language-specs/makefile.lang.h:6
#: ../gtksourceview/language-specs/nemerle.lang.h:14
#: ../gtksourceview/language-specs/pascal.lang.h:17
-#: ../gtksourceview/language-specs/php.lang.h:24
+#: ../gtksourceview/language-specs/scheme.lang.h:12
#: ../gtksourceview/language-specs/sql.lang.h:48
#: ../gtksourceview/language-specs/vbnet.lang.h:10
#: ../gtksourceview/language-specs/verilog.lang.h:9
@@ -500,13 +542,9 @@ msgid "True And False"
msgstr "Prawda i faÅ?sz"
#: ../gtksourceview/language-specs/ada.lang.h:11
-#: ../gtksourceview/language-specs/c.lang.h:16
-#: ../gtksourceview/language-specs/cpp.lang.h:16
-#: ../gtksourceview/language-specs/fortran.lang.h:14
-#: ../gtksourceview/language-specs/idl.lang.h:10
-#: ../gtksourceview/language-specs/verilog.lang.h:10
-msgid "Types"
-msgstr "Typy"
+#: ../gtksourceview/language-specs/vhdl.lang.h:8
+msgid "Type"
+msgstr "Typ"
#: ../gtksourceview/language-specs/c.lang.h:1
#: ../gtksourceview/language-specs/cpp.lang.h:1
@@ -546,7 +584,8 @@ msgstr "ZwykÅ?e makro"
#: ../gtksourceview/language-specs/fortran.lang.h:2
#: ../gtksourceview/language-specs/haskell.lang.h:4
#: ../gtksourceview/language-specs/nemerle.lang.h:7
-#: ../gtksourceview/language-specs/python.lang.h:3
+#: ../gtksourceview/language-specs/octave.lang.h:3
+#: ../gtksourceview/language-specs/python.lang.h:4
#: ../gtksourceview/language-specs/R.lang.h:4
msgid "Floating Point Number"
msgstr "Liczba zmiennoprzecinkowa"
@@ -557,8 +596,9 @@ msgstr "Liczba zmiennoprzecinkowa"
#: ../gtksourceview/language-specs/fortran.lang.h:4
#: ../gtksourceview/language-specs/haskell.lang.h:6
#: ../gtksourceview/language-specs/nemerle.lang.h:8
+#: ../gtksourceview/language-specs/octave.lang.h:5
#: ../gtksourceview/language-specs/pascal.lang.h:10
-#: ../gtksourceview/language-specs/python.lang.h:5
+#: ../gtksourceview/language-specs/python.lang.h:6
msgid "Hex Number"
msgstr "Liczba szesnastkowa"
@@ -569,12 +609,27 @@ msgstr "Liczba szesnastkowa"
msgid "Include/Pragma"
msgstr "Include/Pragma"
+#: ../gtksourceview/language-specs/c.lang.h:10
+#: ../gtksourceview/language-specs/cpp.lang.h:10
+#: ../gtksourceview/language-specs/csharp.lang.h:3
+#: ../gtksourceview/language-specs/fortran.lang.h:7
+#: ../gtksourceview/language-specs/idl.lang.h:4
+#: ../gtksourceview/language-specs/javascript.lang.h:12
+#: ../gtksourceview/language-specs/lua.lang.h:3
+#: ../gtksourceview/language-specs/perl.lang.h:2
+#: ../gtksourceview/language-specs/ruby.lang.h:9
+#: ../gtksourceview/language-specs/vbnet.lang.h:1
+#: ../gtksourceview/language-specs/verilog.lang.h:6
+msgid "Keywords"
+msgstr "SÅ?owa kluczowe"
+
#: ../gtksourceview/language-specs/c.lang.h:12
#: ../gtksourceview/language-specs/cpp.lang.h:12
-#: ../gtksourceview/language-specs/fortran.lang.h:9
+#: ../gtksourceview/language-specs/fortran.lang.h:10
#: ../gtksourceview/language-specs/haskell.lang.h:11
#: ../gtksourceview/language-specs/nemerle.lang.h:12
-#: ../gtksourceview/language-specs/python.lang.h:11
+#: ../gtksourceview/language-specs/octave.lang.h:10
+#: ../gtksourceview/language-specs/python.lang.h:12
#: ../gtksourceview/language-specs/verilog.lang.h:8
msgid "Octal Number"
msgstr "Liczba ósemkowa"
@@ -582,12 +637,39 @@ msgstr "Liczba ósemkowa"
#: ../gtksourceview/language-specs/c.lang.h:13
#: ../gtksourceview/language-specs/cpp.lang.h:13
#: ../gtksourceview/language-specs/csharp.lang.h:6
-#: ../gtksourceview/language-specs/haskell.lang.h:12
#: ../gtksourceview/language-specs/idl.lang.h:6
#: ../gtksourceview/language-specs/vbnet.lang.h:8
msgid "Preprocessor Definitions"
msgstr "Definicje preprocesora"
+#: ../gtksourceview/language-specs/c.lang.h:16
+#: ../gtksourceview/language-specs/cpp.lang.h:16
+#: ../gtksourceview/language-specs/fortran.lang.h:15
+#: ../gtksourceview/language-specs/idl.lang.h:10
+#: ../gtksourceview/language-specs/verilog.lang.h:10
+msgid "Types"
+msgstr "Typy"
+
+#: ../gtksourceview/language-specs/changelog.lang.h:1
+msgid "ChangeLog"
+msgstr "Dziennik zmian"
+
+#: ../gtksourceview/language-specs/changelog.lang.h:2
+msgid "Date"
+msgstr "Data"
+
+#: ../gtksourceview/language-specs/changelog.lang.h:3
+msgid "Email"
+msgstr "E-mail"
+
+#: ../gtksourceview/language-specs/changelog.lang.h:4
+msgid "File"
+msgstr "Plik"
+
+#: ../gtksourceview/language-specs/changelog.lang.h:5
+msgid "Marker"
+msgstr "Znacznik"
+
#: ../gtksourceview/language-specs/cpp.lang.h:3
msgid "C++"
msgstr "C++"
@@ -598,7 +680,6 @@ msgstr "C#"
#: ../gtksourceview/language-specs/csharp.lang.h:5
#: ../gtksourceview/language-specs/lua.lang.h:7
-#: ../gtksourceview/language-specs/python.lang.h:9
#: ../gtksourceview/language-specs/sh.lang.h:6
msgid "Multiline String"
msgstr "Wielowierszowy ciÄ?g znaków"
@@ -612,13 +693,11 @@ msgstr "Typy PoczÄ?tkowe"
#: ../gtksourceview/language-specs/csharp.lang.h:10
#: ../gtksourceview/language-specs/css.lang.h:59
-#: ../gtksourceview/language-specs/fortran.lang.h:13
+#: ../gtksourceview/language-specs/fortran.lang.h:14
#: ../gtksourceview/language-specs/java.lang.h:12
#: ../gtksourceview/language-specs/javascript.lang.h:24
#: ../gtksourceview/language-specs/lua.lang.h:11
#: ../gtksourceview/language-specs/makefile.lang.h:9
-#: ../gtksourceview/language-specs/python.lang.h:15
-#: ../gtksourceview/language-specs/ruby.lang.h:19
#: ../gtksourceview/language-specs/sh.lang.h:14
msgid "String 2"
msgstr "CiÄ?g znaków 2"
@@ -670,7 +749,6 @@ msgstr "Znane wartoÅ?ci wÅ?aÅ?ciwoÅ?ci"
#: ../gtksourceview/language-specs/css.lang.h:35
#: ../gtksourceview/language-specs/javascript.lang.h:20
#: ../gtksourceview/language-specs/php.lang.h:20
-#: ../gtksourceview/language-specs/sh.lang.h:8
#: ../gtksourceview/language-specs/sql.lang.h:34
msgid "Operators"
msgstr "Operatory"
@@ -684,7 +762,6 @@ msgstr "Nazwy wÅ?aÅ?ciwoÅ?ci"
#.
#: ../gtksourceview/language-specs/css.lang.h:41
#: ../gtksourceview/language-specs/javascript.lang.h:21
-#: ../gtksourceview/language-specs/sh.lang.h:9
msgid "Punctuators"
msgstr "Znaki przestankowe"
@@ -735,6 +812,7 @@ msgstr ".desktop"
#: ../gtksourceview/language-specs/desktop.lang.h:2
#: ../gtksourceview/language-specs/gtkrc.lang.h:1
#: ../gtksourceview/language-specs/ini.lang.h:2
+#: ../gtksourceview/language-specs/scheme.lang.h:1
msgid "Boolean Value"
msgstr "WartoÅ?Ä? logiczna"
@@ -791,8 +869,8 @@ msgstr "Przypadek specjalny"
#: ../gtksourceview/language-specs/html.lang.h:1
#: ../gtksourceview/language-specs/xml.lang.h:1
-msgid "Attributes"
-msgstr "Atrybuty"
+msgid "Attribute"
+msgstr "Atrybut"
#: ../gtksourceview/language-specs/html.lang.h:3
#: ../gtksourceview/language-specs/xml.lang.h:3
@@ -813,15 +891,16 @@ msgid "HTML"
msgstr "HTML"
#: ../gtksourceview/language-specs/html.lang.h:7
-#: ../gtksourceview/language-specs/latex.lang.h:6
+#: ../gtksourceview/language-specs/latex.lang.h:7
#: ../gtksourceview/language-specs/texinfo.lang.h:12
#: ../gtksourceview/language-specs/xml.lang.h:6
msgid "Markup"
msgstr "Znacznik"
#: ../gtksourceview/language-specs/html.lang.h:9
-msgid "Tags"
-msgstr "Znaczniki"
+#: ../gtksourceview/language-specs/xml.lang.h:8
+msgid "Tag"
+msgstr "Znacznik"
#: ../gtksourceview/language-specs/fortran.lang.h:3
msgid "Fortran 95"
@@ -835,14 +914,19 @@ msgstr "WejÅ?cie/WyjÅ?cie"
msgid "Intrinsics"
msgstr "WnÄ?trza"
-#: ../gtksourceview/language-specs/fortran.lang.h:10
+#: ../gtksourceview/language-specs/fortran.lang.h:11
msgid "Read/Write"
msgstr "Odczyt/Zapis"
+#. "duble-quoted strings"
#: ../gtksourceview/language-specs/gtkrc.lang.h:2
#: ../gtksourceview/language-specs/ini.lang.h:4
+#: ../gtksourceview/language-specs/octave.lang.h:2
+#: ../gtksourceview/language-specs/php.lang.h:16
+#: ../gtksourceview/language-specs/python.lang.h:3
#: ../gtksourceview/language-specs/R.lang.h:3
-msgid "Double Quote String"
+#: ../gtksourceview/language-specs/ruby.lang.h:6
+msgid "Double Quoted String"
msgstr "CiÄ?g znaków w cudzysÅ?owiu"
#: ../gtksourceview/language-specs/gtkrc.lang.h:3
@@ -854,13 +938,19 @@ msgid "Include Directive"
msgstr "Dyrektywa include"
#: ../gtksourceview/language-specs/gtkrc.lang.h:5
+#: ../gtksourceview/language-specs/haskell.lang.h:8
msgid "Keysymbol"
msgstr "Symbol kluczowy"
+#. 'single-quoted strings'
#: ../gtksourceview/language-specs/gtkrc.lang.h:10
#: ../gtksourceview/language-specs/ini.lang.h:11
+#: ../gtksourceview/language-specs/octave.lang.h:14
+#: ../gtksourceview/language-specs/php.lang.h:24
+#: ../gtksourceview/language-specs/python.lang.h:15
#: ../gtksourceview/language-specs/R.lang.h:11
-msgid "Single Quote String"
+#: ../gtksourceview/language-specs/ruby.lang.h:17
+msgid "Single Quoted String"
msgstr "CiÄ?g znaków w cudzysÅ?owiu pojedynczym"
#: ../gtksourceview/language-specs/gtkrc.lang.h:11
@@ -871,6 +961,7 @@ msgstr "Stan"
#: ../gtksourceview/language-specs/gtkrc.lang.h:12
#: ../gtksourceview/language-specs/ini.lang.h:12
#: ../gtksourceview/language-specs/php.lang.h:26
+#: ../gtksourceview/language-specs/tcl.lang.h:7
msgid "Variable"
msgstr "Zmienna"
@@ -878,9 +969,9 @@ msgstr "Zmienna"
msgid "Haskell"
msgstr "Haskell"
-#: ../gtksourceview/language-specs/haskell.lang.h:8
-msgid "Keysymbols"
-msgstr "Symbole kluczowe"
+#: ../gtksourceview/language-specs/haskell.lang.h:12
+msgid "Preprocessor Definition"
+msgstr "Definicja preprocesora"
#: ../gtksourceview/language-specs/haskell.lang.h:32
msgid "Type or Constructor"
@@ -995,10 +1086,12 @@ msgstr "Obiekty"
#: ../gtksourceview/language-specs/javascript.lang.h:22
#: ../gtksourceview/language-specs/lua.lang.h:9
+#: ../gtksourceview/language-specs/octave.lang.h:13
#: ../gtksourceview/language-specs/perl.lang.h:7
-#: ../gtksourceview/language-specs/python.lang.h:13
+#: ../gtksourceview/language-specs/php.lang.h:22
+#: ../gtksourceview/language-specs/python.lang.h:14
#: ../gtksourceview/language-specs/R.lang.h:10
-#: ../gtksourceview/language-specs/ruby.lang.h:17
+#: ../gtksourceview/language-specs/ruby.lang.h:16
#: ../gtksourceview/language-specs/sh.lang.h:11
#: ../gtksourceview/language-specs/tcl.lang.h:3
msgid "Scripts"
@@ -1012,31 +1105,29 @@ msgstr "Sekwencja sterujÄ?ca unikodu"
msgid "Word Operators"
msgstr "Operatory sÅ?owa"
-#: ../gtksourceview/language-specs/latex.lang.h:2
+#: ../gtksourceview/language-specs/latex.lang.h:1
+msgid "Command"
+msgstr "Polecenie"
+
+#: ../gtksourceview/language-specs/latex.lang.h:3
msgid "Comment Environment"
msgstr "Å?rodowisko komentarza"
-#: ../gtksourceview/language-specs/latex.lang.h:3
+#: ../gtksourceview/language-specs/latex.lang.h:4
#: ../gtksourceview/language-specs/texinfo.lang.h:6
msgid "Include"
msgstr "Zawieranie"
-#: ../gtksourceview/language-specs/latex.lang.h:5
+#: ../gtksourceview/language-specs/latex.lang.h:6
msgid "LaTeX"
msgstr "LaTeX"
-#: ../gtksourceview/language-specs/latex.lang.h:7
+#: ../gtksourceview/language-specs/latex.lang.h:8
msgid "Math"
msgstr "Matematyka"
-#: ../gtksourceview/language-specs/latex.lang.h:8
-msgid "Most Used Commands"
-msgstr "NajczÄ?Å?ciej używane polecenia"
-
#: ../gtksourceview/language-specs/lua.lang.h:2
#: ../gtksourceview/language-specs/makefile.lang.h:3
-#: ../gtksourceview/language-specs/python.lang.h:4
-#: ../gtksourceview/language-specs/sh.lang.h:4
msgid "Functions"
msgstr "Funkcja"
@@ -1049,7 +1140,6 @@ msgid "Lua"
msgstr "Lua"
#: ../gtksourceview/language-specs/lua.lang.h:8
-#: ../gtksourceview/language-specs/python.lang.h:10
#: ../gtksourceview/language-specs/sh.lang.h:7
msgid "Multiline String 2"
msgstr "Wielowierszowy ciÄ?g znaków 2"
@@ -1112,6 +1202,25 @@ msgstr "SÅ?owa kluczowe zdefiniowane prz
msgid "Nemerle"
msgstr "Nemerle"
+#: ../gtksourceview/language-specs/octave.lang.h:8
+#: ../gtksourceview/language-specs/python.lang.h:10
+msgid "Multiline Double Quoted String"
+msgstr "Wielowierszowy ciÄ?g znaków w cudzysÅ?owiu"
+
+#: ../gtksourceview/language-specs/octave.lang.h:9
+#: ../gtksourceview/language-specs/python.lang.h:11
+msgid "Multiline Single Quoted String"
+msgstr "Wielowierszowy ciÄ?g znaków w cudzysÅ?owiu pojedynczym"
+
+#: ../gtksourceview/language-specs/octave.lang.h:11
+msgid "Octave"
+msgstr "Octave"
+
+#: ../gtksourceview/language-specs/octave.lang.h:12
+#: ../gtksourceview/language-specs/R.lang.h:9
+msgid "Reserved Constant"
+msgstr "WartoÅ?Ä? zastrzeżona"
+
#: ../gtksourceview/language-specs/pascal.lang.h:1
msgid "Block Comment 1"
msgstr "Komentarz blokowy 1"
@@ -1190,7 +1299,6 @@ msgid "String3"
msgstr "CiÄ?g znaków3"
#: ../gtksourceview/language-specs/perl.lang.h:11
-#: ../gtksourceview/language-specs/tcl.lang.h:7
msgid "Variables"
msgstr "Zmienne"
@@ -1218,11 +1326,6 @@ msgstr "SÅ?owo kluczowe bez rozróżnian
msgid "Case Sensitive Keyword"
msgstr "SÅ?owo kluczowe z rozróżnianiem wielkoÅ?ci liter"
-#. "duble-quoted strings"
-#: ../gtksourceview/language-specs/php.lang.h:16
-msgid "Double Quoted String"
-msgstr "CiÄ?g znaków w cudzysÅ?owiu"
-
#. <? ?> <HTML> inside PHP <?
#: ../gtksourceview/language-specs/php.lang.h:18
msgid "First Open PHP Tag"
@@ -1236,11 +1339,6 @@ msgstr "Blok HTML"
msgid "PHP"
msgstr "PHP"
-#. 'single-quoted strings'
-#: ../gtksourceview/language-specs/php.lang.h:23
-msgid "Single Quoted String"
-msgstr "CiÄ?g znaków w cudzysÅ?owiu pojedynczym"
-
#: ../gtksourceview/language-specs/po.lang.h:2
msgid "Format"
msgstr "Format"
@@ -1255,11 +1353,11 @@ msgstr "tÅ?umaczenie gettext"
msgid "Builtins"
msgstr "Typy wbudowane"
-#: ../gtksourceview/language-specs/python.lang.h:8
+#: ../gtksourceview/language-specs/python.lang.h:9
msgid "Module Handler"
msgstr "Uchwyt moduÅ?u"
-#: ../gtksourceview/language-specs/python.lang.h:12
+#: ../gtksourceview/language-specs/python.lang.h:13
msgid "Python"
msgstr "Python"
@@ -1279,10 +1377,6 @@ msgstr "Liczba caÅ?kowita"
msgid "Reserved Class"
msgstr "Klasa zastrzeżona"
-#: ../gtksourceview/language-specs/R.lang.h:9
-msgid "Reserved Constant"
-msgstr "WartoÅ?Ä? zastrzeżona"
-
#: ../gtksourceview/language-specs/ruby.lang.h:1
msgid "Attribute Definitions"
msgstr "Definicje atrybutów"
@@ -1299,58 +1393,65 @@ msgstr "StaÅ?e"
msgid "Definitions"
msgstr "Definicje"
-#: ../gtksourceview/language-specs/ruby.lang.h:6
+#: ../gtksourceview/language-specs/ruby.lang.h:7
msgid "Global Variables"
msgstr "Zmienne globalne"
-#: ../gtksourceview/language-specs/ruby.lang.h:7
+#: ../gtksourceview/language-specs/ruby.lang.h:8
msgid "Instance Variables"
msgstr "Zmienne instancji"
-#: ../gtksourceview/language-specs/ruby.lang.h:10
+#: ../gtksourceview/language-specs/ruby.lang.h:11
msgid "Module Handlers"
msgstr "Uchwyty moduÅ?u"
-#: ../gtksourceview/language-specs/ruby.lang.h:11
+#: ../gtksourceview/language-specs/ruby.lang.h:12
msgid "Multiline Comment"
msgstr "Komentarz wielowierszowy"
-#: ../gtksourceview/language-specs/ruby.lang.h:12
+#: ../gtksourceview/language-specs/ruby.lang.h:13
msgid "Pseudo Variables"
msgstr "Pseudo zmienne"
-#: ../gtksourceview/language-specs/ruby.lang.h:13
+#: ../gtksourceview/language-specs/ruby.lang.h:14
msgid "RegExp Variables"
msgstr "Zmienne wyrażeÅ? regularnych"
-#: ../gtksourceview/language-specs/ruby.lang.h:14
-msgid "Regular Expression"
-msgstr "Wyrażenie regularne"
-
#: ../gtksourceview/language-specs/ruby.lang.h:15
-msgid "Regular Expression 2"
-msgstr "Wyrażenie regularne 2"
-
-#: ../gtksourceview/language-specs/ruby.lang.h:16
msgid "Ruby"
msgstr "Ruby"
+#: ../gtksourceview/language-specs/ruby.lang.h:18
+msgid "Symbols"
+msgstr "Symbole"
+
+#: ../gtksourceview/language-specs/scheme.lang.h:11
+msgid "Scheme"
+msgstr "Scheme"
+
#: ../gtksourceview/language-specs/sh.lang.h:2
-msgid "Built-in Commands"
-msgstr "Funkcje wbudowane"
+msgid "Built-in Command"
+msgstr "Polecenie wbudowane"
#: ../gtksourceview/language-specs/sh.lang.h:3
-msgid "Common Commands"
-msgstr "NajczÄ?Å?ciej używane polecenia"
+msgid "Common Command"
+msgstr "Polecenie podstawowe"
+
+#: ../gtksourceview/language-specs/sh.lang.h:8
+msgid "Operator"
+msgstr "Operator"
+
+#: ../gtksourceview/language-specs/sh.lang.h:9
+msgid "Punctuator"
+msgstr "Znak interpunkcyjny"
#: ../gtksourceview/language-specs/sh.lang.h:10
-msgid "Redirections"
-msgstr "Przekierowania"
+msgid "Redirection"
+msgstr "Przekierowanie"
-# Fixme - nie mam pojÄ?cia co tu wsadziÄ?
#: ../gtksourceview/language-specs/sh.lang.h:12
msgid "Self"
-msgstr "Sam"
+msgstr "Self"
#: ../gtksourceview/language-specs/sh.lang.h:17
msgid "sh"
@@ -1585,10 +1686,6 @@ msgstr "Verilog"
msgid "True and False"
msgstr "Prawda i faÅ?sz"
-#: ../gtksourceview/language-specs/vhdl.lang.h:8
-msgid "Type"
-msgstr "Typ"
-
#: ../gtksourceview/language-specs/vhdl.lang.h:9
msgid "VHDL"
msgstr "VHDL"
@@ -1597,10 +1694,6 @@ msgstr "VHDL"
msgid "Hexadecimal"
msgstr "Szesnastkowy"
-#: ../gtksourceview/language-specs/xml.lang.h:8
-msgid "Tag"
-msgstr "Znacznik"
-
#: ../gtksourceview/language-specs/xml.lang.h:9
msgid "XML"
msgstr "XML"
diff -pruN 1.6.1-3/po/ta.po 1.7.1-0ubuntu2/po/ta.po
--- 1.6.1-3/po/ta.po 2005-03-08 10:47:59.000000000 +0000
+++ 1.7.1-0ubuntu2/po/ta.po 2006-07-20 09:09:56.000000000 +0100
@@ -1,450 +1,506 @@
+# translation of gtksourceview.HEAD.ta.po to Tamil
# translation of ta.po to Tamil
# Tamil translation of Tamil Gnome SourceView 2.4.
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc.
# Dinesh Nadarajah <n_dinesh yahoo com>, 2003.
# Jayaradha N <jaya pune redhat com>, 2004.
+# Felix <ifelix redhat com>, 2006.
#
#
msgid ""
msgstr ""
-"Project-Id-Version: ta\n"
+"Project-Id-Version: gtksourceview.HEAD.ta\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-08 11:38+0100\n"
-"PO-Revision-Date: 2004-09-02 14:49+0530\n"
-"Last-Translator: Jayaradha N <jaya pune redhat com>\n"
-"Language-Team: Tamil <zhakanini yahoogroups com>\n"
+"POT-Creation-Date: 2006-06-26 07:14+0200\n"
+"PO-Revision-Date: 2006-06-28 14:34+0530\n"
+"Last-Translator: Felix <ifelix redhat com>\n"
+"Language-Team: Tamil <ta li org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"17:19-0500\n"
-"X-Generator: KBabel 1.3.1\n"
-"Plural-Forms: Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.9.1\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n\n"
"\n"
-#: gtksourceview/gtksourcebuffer.c:279
+#: ../gtksourceview/gtksourcebuffer.c:278
msgid "Escape Character"
msgstr "வி��ப�� �ழ�த�த����ள�"
-#: gtksourceview/gtksourcebuffer.c:280
+#: ../gtksourceview/gtksourcebuffer.c:279
msgid "Escaping character for syntax patterns"
msgstr "த��ரியல� மாதிரி���ான வி��ப�ி �ழ�த�த����ள�"
-#: gtksourceview/gtksourcebuffer.c:288
+#: ../gtksourceview/gtksourcebuffer.c:287
msgid "Check Brackets"
msgstr "���ப�ப���றி�ள� ��தி"
-#: gtksourceview/gtksourcebuffer.c:289
+#: ../gtksourceview/gtksourcebuffer.c:288
msgid "Whether to check and highlight matching brackets"
msgstr "தனிப�ப��த�தப�ப��� ப�ர�ந�த�ம� ���ப�ப�����றி�ள� ��தி��� வ�ண���மா"
-#: gtksourceview/gtksourcebuffer.c:297 gtksourceview/gtksourceprintjob.c:295
+#: ../gtksourceview/gtksourcebuffer.c:296
+#: ../gtksourceview/gtksourceprintjob.c:296
msgid "Highlight"
msgstr "தனிப�ப��த�தப�ப���"
-#: gtksourceview/gtksourcebuffer.c:298
+#: ../gtksourceview/gtksourcebuffer.c:297
msgid "Whether to highlight syntax in the buffer"
msgstr "த��ரியல� ���ய�த�தில� தனிப�ப��த�த வ�ண���மா"
-#: gtksourceview/gtksourcebuffer.c:306
+#: ../gtksourceview/gtksourcebuffer.c:305
msgid "Maximum Undo Levels"
msgstr "�தி�ப��� ��யல�ந���� ம���ம�"
-#: gtksourceview/gtksourcebuffer.c:307
+#: ../gtksourceview/gtksourcebuffer.c:306
msgid "Number of undo levels for the buffer"
msgstr "���ய�த�திற��ான ��யல�ந���� ம���ம�"
-#: gtksourceview/gtksourcebuffer.c:317
-#: gtksourceview/language-specs/desktop.lang.h:6
-#: gtksourceview/language-specs/ini.lang.h:7
+#: ../gtksourceview/gtksourcebuffer.c:316
+#: ../gtksourceview/language-specs/desktop.lang.h:6
+#: ../gtksourceview/language-specs/ini.lang.h:7
msgid "Language"
msgstr "ம�ழி"
-#: gtksourceview/gtksourcebuffer.c:318
+#: ../gtksourceview/gtksourcebuffer.c:317
msgid "Language object to get highlighting patterns from"
msgstr "தனிப�ப��த�தல� மாதிரிய� ப�ற வ�ண��ிய ம�ழி ப�ர�ள��ள�"
-#: gtksourceview/gtksourcelanguagesmanager.c:119
+#: ../gtksourceview/gtksourcelanguagesmanager.c:114
msgid "Language specification directories"
msgstr "ம�ழி ��றிப�ப�ள�ள ���வ��ள�"
-#: gtksourceview/gtksourcelanguagesmanager.c:120
+#: ../gtksourceview/gtksourcelanguagesmanager.c:115
msgid ""
"List of directories where the language specification files (.lang) are "
"located"
msgstr "ம�ழி பற�றிய ��றிப�ப��ள� ��ண�� ���வ��ளின� ப���ியல� (.lang)"
-#: gtksourceview/gtksourceprintjob.c:264
+#: ../gtksourceview/gtksourceprintjob.c:265
msgid "Configuration"
msgstr "�ம�ப�ப�"
-#: gtksourceview/gtksourceprintjob.c:265
+#: ../gtksourceview/gtksourceprintjob.c:266
msgid "Configuration options for the print job"
msgstr "�����ி����ம� வ�ல����ான �ம�ப�ப�த�த�ர�வ�"
-#: gtksourceview/gtksourceprintjob.c:272
+#: ../gtksourceview/gtksourceprintjob.c:273
msgid "Source Buffer"
msgstr "ம�ல ���ய�ம�"
-#: gtksourceview/gtksourceprintjob.c:273
+#: ../gtksourceview/gtksourceprintjob.c:274
msgid "GtkSourceBuffer object to print"
msgstr "GtkSourceBuffer ப�ர�ள� �����ி���"
-#: gtksourceview/gtksourceprintjob.c:279 gtksourceview/gtksourceview.c:222
-#: gtksourceview/gtksourceview.c:223
+#: ../gtksourceview/gtksourceprintjob.c:280
+#: ../gtksourceview/gtksourceview.c:233 ../gtksourceview/gtksourceview.c:234
msgid "Tabs Width"
msgstr "தத�தல� ��லம�"
-#: gtksourceview/gtksourceprintjob.c:280
+#: ../gtksourceview/gtksourceprintjob.c:281
msgid "Width in equivalent space characters of tabs"
msgstr "�ர� தத�தல� ���வ�ளி �ள�ள �ழ�த�த����ளின� ��லம�"
-#: gtksourceview/gtksourceprintjob.c:287
+#: ../gtksourceview/gtksourceprintjob.c:288
msgid "Wrap Mode"
msgstr "ம�ிப�ப� ம�ற�ம�"
-#: gtksourceview/gtksourceprintjob.c:288
+#: ../gtksourceview/gtksourceprintjob.c:289
msgid "Word wrapping mode"
msgstr "�ர� ம����ல� பா����"
-#: gtksourceview/gtksourceprintjob.c:296
+#: ../gtksourceview/gtksourceprintjob.c:297
msgid "Whether to print the document with highlighted syntax"
msgstr "தனிப�ப��த�தப�ப��� த��ரியல��� �வணத�த� �����ி��� வ�ண���மா"
-#: gtksourceview/gtksourceprintjob.c:304
+#: ../gtksourceview/gtksourceprintjob.c:305
msgid "Font"
msgstr "�ழ�த�த� வ��"
-#: gtksourceview/gtksourceprintjob.c:305
+#: ../gtksourceview/gtksourceprintjob.c:306
msgid "GnomeFont name to use for the document text (deprecated)"
msgstr "�ர� �வணத�தில� பயன�ப��த�த வ�ண��ிய ��ன�ம� �ழ�த�த�ர� ப�யர� (deprecated)"
-#: gtksourceview/gtksourceprintjob.c:312
+#: ../gtksourceview/gtksourceprintjob.c:313
msgid "Font Description"
msgstr "�ழ�த�த�ர� விள���ம�"
-#: gtksourceview/gtksourceprintjob.c:313
-#, fuzzy
+#: ../gtksourceview/gtksourceprintjob.c:314
msgid "Font to use for the document text (e.g. \"Monospace 10\")"
-msgstr "�ர� �வணத�தில� பயன�ப��த�த வ�ண��ிய ��ன�ம� �ழ�த�த�ர� ப�யர� (deprecated)"
+msgstr "�வண �ர����� பயன�ப��த�தப�ப��ம� �ழ�த�த�ர� (�.�ா. \"Monospace 10\")"
-#: gtksourceview/gtksourceprintjob.c:320 gtksourceview/gtksourceprintjob.c:328
+#: ../gtksourceview/gtksourceprintjob.c:321
+#: ../gtksourceview/gtksourceprintjob.c:329
msgid "Numbers Font"
msgstr "�ண� �ழ�த�த�ர�"
-#: gtksourceview/gtksourceprintjob.c:321
+#: ../gtksourceview/gtksourceprintjob.c:322
msgid "GnomeFont name to use for the line numbers (deprecated)"
msgstr "வரி �ண�ண� ��றி��� வ�ண��ிய ��ன�ம� �ழ�த�த�ர� ப�யர�(deprecated)"
-#: gtksourceview/gtksourceprintjob.c:329
+#: ../gtksourceview/gtksourceprintjob.c:330
msgid "Font description to use for the line numbers"
msgstr "வரி �ண�ண� ��றி��� வ�ண��ிய ��ன�ம� �ழ�த�த�ர� ப�யர�"
-#: gtksourceview/gtksourceprintjob.c:336
+#: ../gtksourceview/gtksourceprintjob.c:337
msgid "Print Line Numbers"
msgstr "வரி �ண�ண� �����ி"
-#: gtksourceview/gtksourceprintjob.c:337
+#: ../gtksourceview/gtksourceprintjob.c:338
msgid "Interval of printed line numbers (0 means no numbers)"
msgstr "�����ி���ப�ப��� �ண��ளின� ���வ�ளி(0 �ண��ள� �த�வ�மில�ல�)"
-#: gtksourceview/gtksourceprintjob.c:344
+#: ../gtksourceview/gtksourceprintjob.c:345
msgid "Print Header"
msgstr "�����ி��� தல�ப�ப�"
-#: gtksourceview/gtksourceprintjob.c:345
+#: ../gtksourceview/gtksourceprintjob.c:346
msgid "Whether to print a header in each page"
msgstr "�வ�வ�ர� ப���த�தில�ம� தல�ப�ப� �����ி��� வ�ண���மா"
-#: gtksourceview/gtksourceprintjob.c:352
+#: ../gtksourceview/gtksourceprintjob.c:353
msgid "Print Footer"
msgstr "�����ி����ம� ��ி����றிப�ப�"
-#: gtksourceview/gtksourceprintjob.c:353
+#: ../gtksourceview/gtksourceprintjob.c:354
msgid "Whether to print a footer in each page"
msgstr "��ி����றிப�ப� �வ�வ�ர� ப���த�தில�ம� �����ி��� வ�ண���மா"
-#: gtksourceview/gtksourceprintjob.c:360
+#: ../gtksourceview/gtksourceprintjob.c:361
msgid "Header and Footer Font"
msgstr "��ி����றிப�ப� மற�ற�ம� ம�ல� ��றிப�ப� �ழ�த�த�ர�"
-#: gtksourceview/gtksourceprintjob.c:361
+#: ../gtksourceview/gtksourceprintjob.c:362
msgid "GnomeFont name to use for the header and footer (deprecated)"
msgstr "��ி����றிப�ப� மற�ற�ம� ம�ல� ��றிப�ப����� பயன�ப��ம� ��ன�ம� �ழ�த�த�ர� ப�யர�(தனிப�ப���)"
-#: gtksourceview/gtksourceprintjob.c:368
+#: ../gtksourceview/gtksourceprintjob.c:369
msgid "Header and Footer Font Description"
msgstr "��ி����றிப�ப� மற�ற�ம� ம�ல� ��றிப�ப� �ழ�த�த�ர� விள���ம�"
-#: gtksourceview/gtksourceprintjob.c:369
-#, fuzzy
+#: ../gtksourceview/gtksourceprintjob.c:370
msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
-msgstr "��ி����றிப�ப� மற�ற�ம� ம�ல� ��றிப�ப����� பயன�ப��ம� ��ன�ம� �ழ�த�த�ர� ப�யர�(தனிப�ப���)"
+msgstr "தல�ப�ப��ள� மற�ற�ம� ��ி����றிப�ப��ள����� பயன�ப��த�தப�ப��ம� �ழ�த�த�ர� (�.�ா. \"Monospace 10\")"
-#: gtksourceview/gtksourcestylescheme.c:262
+#: ../gtksourceview/gtksourcestylescheme.c:264
msgid "Base-N Integer"
msgstr "��ிப�ப��-N �யல� �ண�"
-#: gtksourceview/gtksourcestylescheme.c:267
+#: ../gtksourceview/gtksourcestylescheme.c:269
msgid "Character"
msgstr "�ழ�த�த�"
-#: gtksourceview/gtksourcestylescheme.c:272
-#: gtksourceview/language-specs/latex.lang.h:1
-#: gtksourceview/language-specs/po.lang.h:1
+#: ../gtksourceview/gtksourcestylescheme.c:274
+#: ../gtksourceview/language-specs/latex.lang.h:2
+#: ../gtksourceview/language-specs/po.lang.h:1
msgid "Comment"
msgstr "��றிப�ப�ர�"
#. $this = (datatype)
-#: gtksourceview/gtksourcestylescheme.c:277
-#: gtksourceview/language-specs/php.lang.h:14
+#: ../gtksourceview/gtksourcestylescheme.c:279
+#: ../gtksourceview/language-specs/php.lang.h:14
msgid "Data Type"
msgstr "த�வல� வ��"
#.
#. CSS functions, such as rgb(), clip(), or lang().
#.
-#: gtksourceview/gtksourcestylescheme.c:282
-#: gtksourceview/language-specs/ada.lang.h:3
-#: gtksourceview/language-specs/css.lang.h:17
+#: ../gtksourceview/gtksourcestylescheme.c:284
+#: ../gtksourceview/language-specs/ada.lang.h:3
+#: ../gtksourceview/language-specs/css.lang.h:18
+#: ../gtksourceview/language-specs/octave.lang.h:4
+#: ../gtksourceview/language-specs/python.lang.h:5
+#: ../gtksourceview/language-specs/scheme.lang.h:2
+#: ../gtksourceview/language-specs/sh.lang.h:4
msgid "Function"
msgstr "��யல�"
-#: gtksourceview/gtksourcestylescheme.c:287
-#: gtksourceview/language-specs/c.lang.h:6
-#: gtksourceview/language-specs/cpp.lang.h:6
-#: gtksourceview/language-specs/fortran.lang.h:1
-#: gtksourceview/language-specs/python.lang.h:2
-#: gtksourceview/language-specs/haskell.lang.h:3
-#: gtksourceview/language-specs/nemerle.lang.h:6
+#: ../gtksourceview/gtksourcestylescheme.c:289
+#: ../gtksourceview/language-specs/c.lang.h:6
+#: ../gtksourceview/language-specs/cpp.lang.h:6
+#: ../gtksourceview/language-specs/fortran.lang.h:1
+#: ../gtksourceview/language-specs/haskell.lang.h:3
+#: ../gtksourceview/language-specs/nemerle.lang.h:6
+#: ../gtksourceview/language-specs/octave.lang.h:1
+#: ../gtksourceview/language-specs/python.lang.h:2
msgid "Decimal"
msgstr "த�மம�"
-#: gtksourceview/gtksourcestylescheme.c:292
+#: ../gtksourceview/gtksourcestylescheme.c:294
msgid "Floating Point"
msgstr "மித����ம� ப�ள�ளி"
-#: gtksourceview/gtksourcestylescheme.c:297
-#: gtksourceview/language-specs/latex.lang.h:3
-#: gtksourceview/language-specs/po.lang.h:3
-#: gtksourceview/language-specs/texinfo.lang.h:8
-#: gtksourceview/language-specs/vhdl.lang.h:2
-#: gtksourceview/language-specs/R.lang.h:6
-#: gtksourceview/language-specs/gtkrc.lang.h:6
+#. We cannot match \b at the end of a keyword automatically
+#. because it fails for let* etc. So we need to manually add it to the
+#. other keywords and match ([ \t]|$) for the one ending with a
+#. special character. Unfortnately this also means that if the highlight
+#. style for keywords sets the background color, for let* etc also the
+#. trailing space will be highlighted.
+#: ../gtksourceview/gtksourcestylescheme.c:299
+#: ../gtksourceview/language-specs/ada.lang.h:4
+#: ../gtksourceview/language-specs/gtkrc.lang.h:6
+#: ../gtksourceview/language-specs/haskell.lang.h:9
+#: ../gtksourceview/language-specs/latex.lang.h:5
+#: ../gtksourceview/language-specs/octave.lang.h:6
+#: ../gtksourceview/language-specs/po.lang.h:3
+#: ../gtksourceview/language-specs/python.lang.h:7
+#: ../gtksourceview/language-specs/R.lang.h:6
+#: ../gtksourceview/language-specs/scheme.lang.h:9
+#: ../gtksourceview/language-specs/tcl.lang.h:1
+#: ../gtksourceview/language-specs/texinfo.lang.h:8
+#: ../gtksourceview/language-specs/vhdl.lang.h:2
msgid "Keyword"
msgstr "வி��வார�த�த�"
-#: gtksourceview/gtksourcestylescheme.c:302
+#: ../gtksourceview/gtksourcestylescheme.c:304
msgid "Preprocessor"
msgstr "ம�ன���யல�"
-#: gtksourceview/gtksourcestylescheme.c:307
-#: gtksourceview/language-specs/ada.lang.h:9
-#: gtksourceview/language-specs/c.lang.h:15
-#: gtksourceview/language-specs/cpp.lang.h:15
-#: gtksourceview/language-specs/csharp.lang.h:8
-#: gtksourceview/language-specs/css.lang.h:63
-#: gtksourceview/language-specs/html.lang.h:8
-#: gtksourceview/language-specs/fortran.lang.h:12
-#: gtksourceview/language-specs/idl.lang.h:9
-#: gtksourceview/language-specs/java.lang.h:11
-#: gtksourceview/language-specs/javascript.lang.h:33
-#: gtksourceview/language-specs/lua.lang.h:10
-#: gtksourceview/language-specs/pascal.lang.h:18
-#: gtksourceview/language-specs/perl.lang.h:8
-#: gtksourceview/language-specs/po.lang.h:6
-#: gtksourceview/language-specs/python.lang.h:14
-#: gtksourceview/language-specs/ruby.lang.h:18
-#: gtksourceview/language-specs/sh.lang.h:13
-#: gtksourceview/language-specs/xml.lang.h:7
-#: gtksourceview/language-specs/haskell.lang.h:15
-#: gtksourceview/language-specs/vbnet.lang.h:7
-#: gtksourceview/language-specs/nemerle.lang.h:15
-#: gtksourceview/language-specs/tcl.lang.h:4
-#: gtksourceview/language-specs/vhdl.lang.h:6
+#.
+#. <pattern-item _name = "Operator" style = "Operators">
+#. <regex>[:!#$%&*+./>=<? \\^|~\-]+</regex>
+#. </pattern-item>
+#.
+#. <keyword-list _name="Keysymbol" style = "Keyword">
+#. <keyword>::</keyword>
+#. <keyword>-></keyword>
+#. <keyword><-</keyword>
+#. <keyword>=></keyword>
+#. <keyword>=</keyword>
+#. <keyword>|</keyword>`
+#. <keyword>\</keyword>
+#. <keyword>@</keyword>
+#. <keyword>~</keyword>
+#. </keyword-list>
+#.
+#: ../gtksourceview/gtksourcestylescheme.c:309
+#: ../gtksourceview/language-specs/ada.lang.h:9
+#: ../gtksourceview/language-specs/c.lang.h:15
+#: ../gtksourceview/language-specs/cpp.lang.h:15
+#: ../gtksourceview/language-specs/csharp.lang.h:9
+#: ../gtksourceview/language-specs/css.lang.h:58
+#: ../gtksourceview/language-specs/html.lang.h:8
+#: ../gtksourceview/language-specs/fortran.lang.h:13
+#: ../gtksourceview/language-specs/haskell.lang.h:31
+#: ../gtksourceview/language-specs/idl.lang.h:9
+#: ../gtksourceview/language-specs/java.lang.h:11
+#: ../gtksourceview/language-specs/javascript.lang.h:23
+#: ../gtksourceview/language-specs/lua.lang.h:10
+#: ../gtksourceview/language-specs/makefile.lang.h:8
+#: ../gtksourceview/language-specs/nemerle.lang.h:15
+#: ../gtksourceview/language-specs/pascal.lang.h:18
+#: ../gtksourceview/language-specs/perl.lang.h:8
+#: ../gtksourceview/language-specs/po.lang.h:6
+#: ../gtksourceview/language-specs/scheme.lang.h:13
+#: ../gtksourceview/language-specs/sh.lang.h:13
+#: ../gtksourceview/language-specs/tcl.lang.h:4
+#: ../gtksourceview/language-specs/vbnet.lang.h:11
+#: ../gtksourceview/language-specs/vhdl.lang.h:6
+#: ../gtksourceview/language-specs/xml.lang.h:7
msgid "String"
msgstr "�ரம�"
-#: gtksourceview/gtksourcestylescheme.c:312
+#: ../gtksourceview/gtksourcestylescheme.c:314
msgid "Specials"
msgstr "�ிறப�ப��ள�"
-#.
-#. Proposed language specification for CSS (Cascading Style Sheet) files.
-#.
-#. Reference used:
-#. http://www.w3.org/TR/CSS2/
-#.
-#. Tested with:
-#. http://www.simplebits.com/css/simple.css
-#.
-#. Submitted by Scott Martin (scott coffeeblack org)
-#.
-#. FIXME: find the correct mimetype
-#: gtksourceview/gtksourcestylescheme.c:319
-#: gtksourceview/language-specs/css.lang.h:46
-#: gtksourceview/language-specs/desktop.lang.h:10
-#: gtksourceview/language-specs/diff.lang.h:7
-#: gtksourceview/language-specs/ini.lang.h:10
-#: gtksourceview/language-specs/msil.lang.h:2
-#: gtksourceview/language-specs/po.lang.h:5
-#: gtksourceview/language-specs/gtkrc.lang.h:9
+#: ../gtksourceview/gtksourcestylescheme.c:321
+#: ../gtksourceview/language-specs/changelog.lang.h:6
+#: ../gtksourceview/language-specs/css.lang.h:36
+#: ../gtksourceview/language-specs/desktop.lang.h:10
+#: ../gtksourceview/language-specs/diff.lang.h:7
+#: ../gtksourceview/language-specs/gtkrc.lang.h:9
+#: ../gtksourceview/language-specs/ini.lang.h:10
+#: ../gtksourceview/language-specs/msil.lang.h:2
+#: ../gtksourceview/language-specs/po.lang.h:5
msgid "Others"
msgstr "மற�றவ�"
-#: gtksourceview/gtksourcestylescheme.c:324
+#: ../gtksourceview/gtksourcestylescheme.c:326
msgid "Others 2"
msgstr "மற�றவ� 2"
-#: gtksourceview/gtksourcestylescheme.c:329
+#: ../gtksourceview/gtksourcestylescheme.c:331
msgid "Others 3"
msgstr "மற�றவ� 3"
-#: gtksourceview/gtksourcestylescheme.c:366
+#: ../gtksourceview/gtksourcestylescheme.c:368
msgid "Default"
msgstr "���ாநில�"
-#: gtksourceview/gtksourcetag.c:108
+#: ../gtksourceview/gtksourcetag.c:109
msgid "Tag ID"
msgstr "��றிப�ப� ID"
-#: gtksourceview/gtksourcetag.c:109
+#: ../gtksourceview/gtksourcetag.c:110
msgid "ID used to refer to the source tag"
msgstr "ம�ல ��றிப�ப� ��றிப�பி� பயன�ப��ம� ID"
-#: gtksourceview/gtksourcetag.c:116
+#: ../gtksourceview/gtksourcetag.c:117
msgid "Tag style"
msgstr "��றிப�ப� பாணி"
-#: gtksourceview/gtksourcetag.c:117
-msgid "The style associated to the source tag"
-msgstr "ம�ல ��றிப�ப��� த��ர�ப���ய பாணி"
+#: ../gtksourceview/gtksourcetag.c:118
+msgid "The style associated with the source tag"
+msgstr "ம�ல ������ன� த��ர�ப���ய த�ற�றம�"
-#: gtksourceview/gtksourceview.c:206
+#: ../gtksourceview/gtksourceview.c:217
msgid "Show Line Numbers"
msgstr "வரி �ண��ள� �ா����"
-#: gtksourceview/gtksourceview.c:207
+#: ../gtksourceview/gtksourceview.c:218
msgid "Whether to display line numbers"
msgstr "வரி �ண��ள� �ா��� வ�ண���மா"
-#: gtksourceview/gtksourceview.c:214
+#: ../gtksourceview/gtksourceview.c:225
msgid "Show Line Markers"
msgstr "வரி ��றி�ள� �ா����"
-#: gtksourceview/gtksourceview.c:215
+#: ../gtksourceview/gtksourceview.c:226
msgid "Whether to display line marker pixbufs"
msgstr "வரி பி��ஸ�ப�ப� ��றிப�ப��ள� �ா��� வ�ண���மா"
-#: gtksourceview/gtksourceview.c:232
+#: ../gtksourceview/gtksourceview.c:243
msgid "Auto Indentation"
msgstr "தானா� �த����ம�"
-#: gtksourceview/gtksourceview.c:233
+#: ../gtksourceview/gtksourceview.c:244
msgid "Whether to enable auto indentation"
msgstr "தானா� �த����த�த� ��யல�ப��த�த வ�ண���மா"
-#: gtksourceview/gtksourceview.c:239
+#: ../gtksourceview/gtksourceview.c:250
msgid "Insert Spaces Instead of Tabs"
msgstr "தத�தல����� பதிலா� ���வ�ளிய� ��ர��வ�ம�"
-#: gtksourceview/gtksourceview.c:240
+#: ../gtksourceview/gtksourceview.c:251
msgid "Whether to insert spaces instead of tabs"
msgstr "தத�தல����� பதிலா� ���வ�ளிய� ��ர�� வ�ண���மா"
-#: gtksourceview/gtksourceview.c:247
+#: ../gtksourceview/gtksourceview.c:258
msgid "Show Right Margin"
msgstr "வலத� �ரத�த� �ா����"
-#: gtksourceview/gtksourceview.c:248
+#: ../gtksourceview/gtksourceview.c:259
msgid "Whether to display the right margin"
msgstr "வலத� �ரத�த� �ா��� வ�ண���மா"
-#: gtksourceview/gtksourceview.c:255
+#: ../gtksourceview/gtksourceview.c:266
msgid "Margin position"
msgstr "�ர நில�"
-#: gtksourceview/gtksourceview.c:256
+#: ../gtksourceview/gtksourceview.c:267
msgid "Position of the right margin"
msgstr "வலத� �ரல� நில�"
-#: gtksourceview/gtksourceview.c:265
+#: ../gtksourceview/gtksourceview.c:276
msgid "Use smart home/end"
msgstr "ப�த�தி�ாலி home/end பயன�ப��த�த�"
-#: gtksourceview/gtksourceview.c:266
+#: ../gtksourceview/gtksourceview.c:277
msgid ""
-"HOME and END keys move to first/last characters on line first before going "
-"to the start/end of the line"
-msgstr "HOME மற�ற�ம� END வி���ள� வரியிம� ம�தல�/����ி �ழ�த�த����ள� �ா����ம�"
+"HOME and END keys move to first/last non whitespace characters on line "
+"before going to the start/end of the line"
+msgstr ""
+"HOME and END keys move to first/last non whitespace characters on line "
+"before going to the start/end of the line"
-#: gtksourceview/gtksourceview.c:275
+#: ../gtksourceview/gtksourceview.c:286
msgid "Highlight current line"
-msgstr ""
+msgstr "ந�ப�ப� வரிய� ம�ன�னில�ப�ப��த�த�"
-#: gtksourceview/gtksourceview.c:276
-#, fuzzy
+#: ../gtksourceview/gtksourceview.c:287
msgid "Whether to highlight the current line"
-msgstr "த��ரியல� ���ய�த�தில� தனிப�ப��த�த வ�ண���மா"
+msgstr "ந�ப�ப� வரிய� ம�ன�னில�ப�ப��த�த வ�ண���மா"
+
+#: ../gtksourceview/gtksourceview.c:303
+msgid "Margin Line Alpha"
+msgstr "�ர ���� �ல��பா"
+
+#: ../gtksourceview/gtksourceview.c:304
+msgid "Transparency of the margin line"
+msgstr "�ர �����ின� ���ர�வல�"
+
+#: ../gtksourceview/gtksourceview.c:321
+msgid "Margin Line Color"
+msgstr "�ர ���� நிறம�"
+
+#: ../gtksourceview/gtksourceview.c:322
+msgid "Color to use for the right margin line"
+msgstr "வலத� �ர �����ிற��� பயன�ப��த�தப�ப��ம� நிறம�"
+
+#: ../gtksourceview/gtksourceview.c:338
+msgid "Margin Overlay Toggle"
+msgstr "�ர ம�ல�வர�ம� மாற�றி"
-#: gtksourceview/language-specs/ada.lang.h:1
+#: ../gtksourceview/gtksourceview.c:339
+msgid "Whether to draw the right margin overlay"
+msgstr "வலத� �ர ம�ல�வர�தல� வர�ய வ�ண���மா"
+
+#: ../gtksourceview/gtksourceview.c:355
+msgid "Margin Overlay Alpha"
+msgstr "�ரம� ம�ல�வர�ம� �ல��பா"
+
+#: ../gtksourceview/gtksourceview.c:356
+msgid "Transparency of the margin overlay"
+msgstr "�ரம� ம�ல�வர�ம� ���ர�வல�"
+
+#: ../gtksourceview/gtksourceview.c:373
+msgid "Margin Overlay Color"
+msgstr "�ரம� ம�ல�வர�ம� நிறம�"
+
+#: ../gtksourceview/gtksourceview.c:374
+msgid "Color to use for drawing the margin overlay"
+msgstr "�ரம� ம�ல� வர�ய பயன�ப��ம� நிறம�"
+
+#: ../gtksourceview/language-specs/ada.lang.h:1
msgid "Ada"
msgstr "Ada"
-#: gtksourceview/language-specs/ada.lang.h:2
-#: gtksourceview/language-specs/c.lang.h:4
-#: gtksourceview/language-specs/cpp.lang.h:4
-#: gtksourceview/language-specs/haskell.lang.h:2
-#: gtksourceview/language-specs/nemerle.lang.h:3
-#: gtksourceview/language-specs/vhdl.lang.h:1
+#: ../gtksourceview/language-specs/ada.lang.h:2
+#: ../gtksourceview/language-specs/c.lang.h:4
+#: ../gtksourceview/language-specs/cpp.lang.h:4
+#: ../gtksourceview/language-specs/haskell.lang.h:2
+#: ../gtksourceview/language-specs/nemerle.lang.h:3
+#: ../gtksourceview/language-specs/vhdl.lang.h:1
msgid "Character Constant"
msgstr "நில�யான �ழ�த�த�"
-#: gtksourceview/language-specs/ada.lang.h:4
-#: gtksourceview/language-specs/c.lang.h:10
-#: gtksourceview/language-specs/cpp.lang.h:10
-#: gtksourceview/language-specs/csharp.lang.h:3
-#: gtksourceview/language-specs/fortran.lang.h:7
-#: gtksourceview/language-specs/idl.lang.h:4
-#: gtksourceview/language-specs/javascript.lang.h:11
-#: gtksourceview/language-specs/lua.lang.h:3
-#: gtksourceview/language-specs/perl.lang.h:2
-#: gtksourceview/language-specs/python.lang.h:6
-#: gtksourceview/language-specs/ruby.lang.h:8
-#: gtksourceview/language-specs/verilog.lang.h:6
-#: gtksourceview/language-specs/haskell.lang.h:9
-#: gtksourceview/language-specs/vbnet.lang.h:1
-#: gtksourceview/language-specs/tcl.lang.h:1
-msgid "Keywords"
-msgstr "வி��வார�த�"
-
-#: gtksourceview/language-specs/ada.lang.h:5
-#: gtksourceview/language-specs/c.lang.h:11
-#: gtksourceview/language-specs/cpp.lang.h:11
-#: gtksourceview/language-specs/csharp.lang.h:4
-#: gtksourceview/language-specs/css.lang.h:28
-#: gtksourceview/language-specs/desktop.lang.h:7
-#: gtksourceview/language-specs/diff.lang.h:5
-#: gtksourceview/language-specs/fortran.lang.h:8
-#: gtksourceview/language-specs/idl.lang.h:5
-#: gtksourceview/language-specs/ini.lang.h:8
-#: gtksourceview/language-specs/java.lang.h:5
-#: gtksourceview/language-specs/javascript.lang.h:12
-#: gtksourceview/language-specs/lua.lang.h:4
-#: gtksourceview/language-specs/pascal.lang.h:11
-#: gtksourceview/language-specs/perl.lang.h:3
-#: gtksourceview/language-specs/python.lang.h:7
-#: gtksourceview/language-specs/ruby.lang.h:9
-#: gtksourceview/language-specs/sh.lang.h:5
-#: gtksourceview/language-specs/sql.lang.h:11
-#: gtksourceview/language-specs/verilog.lang.h:7
-#: gtksourceview/language-specs/haskell.lang.h:10
-#: gtksourceview/language-specs/texinfo.lang.h:9
-#: gtksourceview/language-specs/vbnet.lang.h:2
-#: gtksourceview/language-specs/nemerle.lang.h:10
-#: gtksourceview/language-specs/tcl.lang.h:2
-#: gtksourceview/language-specs/vhdl.lang.h:3
-#: gtksourceview/language-specs/R.lang.h:7
-#: gtksourceview/language-specs/gtkrc.lang.h:7
+#. Note: contains an hack to avoid considering ^COMMON a comment
+#. <string _name = "String 2" style = "String" end-at-line-end = "TRUE">
+#. <start-regex>'</start-regex>
+#. <end-regex>'</end-regex>
+#. </string>
+#: ../gtksourceview/language-specs/ada.lang.h:5
+#: ../gtksourceview/language-specs/c.lang.h:11
+#: ../gtksourceview/language-specs/cpp.lang.h:11
+#: ../gtksourceview/language-specs/csharp.lang.h:4
+#: ../gtksourceview/language-specs/css.lang.h:29
+#: ../gtksourceview/language-specs/desktop.lang.h:7
+#: ../gtksourceview/language-specs/diff.lang.h:5
+#: ../gtksourceview/language-specs/fortran.lang.h:9
+#: ../gtksourceview/language-specs/gtkrc.lang.h:7
+#: ../gtksourceview/language-specs/haskell.lang.h:10
+#: ../gtksourceview/language-specs/idl.lang.h:5
+#: ../gtksourceview/language-specs/ini.lang.h:8
+#: ../gtksourceview/language-specs/java.lang.h:5
+#: ../gtksourceview/language-specs/javascript.lang.h:13
+#: ../gtksourceview/language-specs/lua.lang.h:4
+#: ../gtksourceview/language-specs/makefile.lang.h:4
+#: ../gtksourceview/language-specs/nemerle.lang.h:10
+#: ../gtksourceview/language-specs/octave.lang.h:7
+#: ../gtksourceview/language-specs/pascal.lang.h:11
+#: ../gtksourceview/language-specs/perl.lang.h:3
+#: ../gtksourceview/language-specs/python.lang.h:8
+#: ../gtksourceview/language-specs/R.lang.h:7
+#: ../gtksourceview/language-specs/ruby.lang.h:10
+#: ../gtksourceview/language-specs/scheme.lang.h:10
+#: ../gtksourceview/language-specs/sh.lang.h:5
+#: ../gtksourceview/language-specs/sql.lang.h:23
+#: ../gtksourceview/language-specs/tcl.lang.h:2
+#: ../gtksourceview/language-specs/texinfo.lang.h:9
+#: ../gtksourceview/language-specs/vbnet.lang.h:6
+#: ../gtksourceview/language-specs/verilog.lang.h:7
+#: ../gtksourceview/language-specs/vhdl.lang.h:3
msgid "Line Comment"
msgstr "வரி ��றிப�ப�"
@@ -452,176 +508,226 @@ msgstr "வரி à®?à¯?றிபà¯?பà
#. For values like: z-index: 2;
#. +/- before 0 is not allowed.
#.
-#: gtksourceview/language-specs/ada.lang.h:6
-#: gtksourceview/language-specs/css.lang.h:33
-#: gtksourceview/language-specs/desktop.lang.h:9
-#: gtksourceview/language-specs/javascript.lang.h:15
-#: gtksourceview/language-specs/pascal.lang.h:14
-#: gtksourceview/language-specs/vhdl.lang.h:4
-#: gtksourceview/language-specs/gtkrc.lang.h:8
+#: ../gtksourceview/language-specs/ada.lang.h:6
+#: ../gtksourceview/language-specs/css.lang.h:34
+#: ../gtksourceview/language-specs/desktop.lang.h:9
+#: ../gtksourceview/language-specs/gtkrc.lang.h:8
+#: ../gtksourceview/language-specs/javascript.lang.h:16
+#: ../gtksourceview/language-specs/pascal.lang.h:14
+#: ../gtksourceview/language-specs/vhdl.lang.h:4
msgid "Number"
msgstr "�ண�"
-#: gtksourceview/language-specs/ada.lang.h:7
-msgid "Preprocessor Keywords"
-msgstr "ம�ன� ��யல� வி�� வார�த�த�"
-
-#: gtksourceview/language-specs/ada.lang.h:8
-#: gtksourceview/language-specs/c.lang.h:14
-#: gtksourceview/language-specs/cpp.lang.h:14
-#: gtksourceview/language-specs/csharp.lang.h:7
-#: gtksourceview/language-specs/fortran.lang.h:11
-#: gtksourceview/language-specs/idl.lang.h:8
-#: gtksourceview/language-specs/java.lang.h:10
-#: gtksourceview/language-specs/pascal.lang.h:17
-#: gtksourceview/language-specs/php.lang.h:23
-#: gtksourceview/language-specs/sql.lang.h:26
-#: gtksourceview/language-specs/verilog.lang.h:9
-#: gtksourceview/language-specs/haskell.lang.h:14
-#: gtksourceview/language-specs/vbnet.lang.h:6
-#: gtksourceview/language-specs/nemerle.lang.h:14
-#: gtksourceview/language-specs/vhdl.lang.h:5
+#: ../gtksourceview/language-specs/ada.lang.h:7
+msgid "Preprocessor Keyword"
+msgstr "ம�ன� ��யல� ம����ிய����ல�"
+
+#: ../gtksourceview/language-specs/ada.lang.h:8
+#: ../gtksourceview/language-specs/c.lang.h:14
+#: ../gtksourceview/language-specs/cpp.lang.h:14
+#: ../gtksourceview/language-specs/csharp.lang.h:8
+#: ../gtksourceview/language-specs/fortran.lang.h:12
+#: ../gtksourceview/language-specs/haskell.lang.h:13
+#: ../gtksourceview/language-specs/idl.lang.h:8
+#: ../gtksourceview/language-specs/java.lang.h:10
+#: ../gtksourceview/language-specs/makefile.lang.h:6
+#: ../gtksourceview/language-specs/nemerle.lang.h:14
+#: ../gtksourceview/language-specs/pascal.lang.h:17
+#: ../gtksourceview/language-specs/scheme.lang.h:12
+#: ../gtksourceview/language-specs/sql.lang.h:48
+#: ../gtksourceview/language-specs/vbnet.lang.h:10
+#: ../gtksourceview/language-specs/verilog.lang.h:9
+#: ../gtksourceview/language-specs/vhdl.lang.h:5
msgid "Sources"
msgstr "ம�ல���ள�"
-#: gtksourceview/language-specs/ada.lang.h:10
+#: ../gtksourceview/language-specs/ada.lang.h:10
msgid "True And False"
msgstr "�ண�ம� மற�ற�ம� ப�ய�"
-#: gtksourceview/language-specs/ada.lang.h:11
-#: gtksourceview/language-specs/c.lang.h:16
-#: gtksourceview/language-specs/cpp.lang.h:16
-#: gtksourceview/language-specs/fortran.lang.h:14
-#: gtksourceview/language-specs/idl.lang.h:10
-#: gtksourceview/language-specs/verilog.lang.h:10
-msgid "Types"
-msgstr "வ���ள�"
+#: ../gtksourceview/language-specs/ada.lang.h:11
+#: ../gtksourceview/language-specs/vhdl.lang.h:8
+msgid "Type"
+msgstr "வ��"
-#: gtksourceview/language-specs/c.lang.h:1
-#: gtksourceview/language-specs/cpp.lang.h:1
+#: ../gtksourceview/language-specs/c.lang.h:1
+#: ../gtksourceview/language-specs/cpp.lang.h:1
msgid "'#if 0' Comment"
msgstr "'#if 0' ��றிப�ப�"
-#: gtksourceview/language-specs/c.lang.h:2
-#: gtksourceview/language-specs/cpp.lang.h:2
-#: gtksourceview/language-specs/csharp.lang.h:1
-#: gtksourceview/language-specs/css.lang.h:9
-#: gtksourceview/language-specs/html.lang.h:2
-#: gtksourceview/language-specs/idl.lang.h:1
-#: gtksourceview/language-specs/java.lang.h:1
-#: gtksourceview/language-specs/javascript.lang.h:2
-#: gtksourceview/language-specs/lua.lang.h:1
-#: gtksourceview/language-specs/sql.lang.h:5
-#: gtksourceview/language-specs/verilog.lang.h:2
-#: gtksourceview/language-specs/xml.lang.h:2
-#: gtksourceview/language-specs/haskell.lang.h:1
-#: gtksourceview/language-specs/texinfo.lang.h:1
-#: gtksourceview/language-specs/nemerle.lang.h:2
+#. Comments
+#: ../gtksourceview/language-specs/c.lang.h:2
+#: ../gtksourceview/language-specs/cpp.lang.h:2
+#: ../gtksourceview/language-specs/csharp.lang.h:1
+#: ../gtksourceview/language-specs/css.lang.h:9
+#: ../gtksourceview/language-specs/html.lang.h:2
+#: ../gtksourceview/language-specs/haskell.lang.h:1
+#: ../gtksourceview/language-specs/idl.lang.h:1
+#: ../gtksourceview/language-specs/java.lang.h:1
+#: ../gtksourceview/language-specs/javascript.lang.h:2
+#: ../gtksourceview/language-specs/lua.lang.h:1
+#: ../gtksourceview/language-specs/nemerle.lang.h:2
+#: ../gtksourceview/language-specs/sql.lang.h:9
+#: ../gtksourceview/language-specs/texinfo.lang.h:1
+#: ../gtksourceview/language-specs/verilog.lang.h:2
+#: ../gtksourceview/language-specs/xml.lang.h:2
msgid "Block Comment"
msgstr "ப��தி ��றிப�ப�"
-#: gtksourceview/language-specs/c.lang.h:3
+#: ../gtksourceview/language-specs/c.lang.h:3
msgid "C"
msgstr "C"
-#: gtksourceview/language-specs/c.lang.h:5
-#: gtksourceview/language-specs/cpp.lang.h:5
+#: ../gtksourceview/language-specs/c.lang.h:5
+#: ../gtksourceview/language-specs/cpp.lang.h:5
msgid "Common Macro"
msgstr "ப�த� மா��ர�"
-#: gtksourceview/language-specs/c.lang.h:7
-#: gtksourceview/language-specs/cpp.lang.h:7
-#: gtksourceview/language-specs/fortran.lang.h:2
-#: gtksourceview/language-specs/python.lang.h:3
-#: gtksourceview/language-specs/haskell.lang.h:4
-#: gtksourceview/language-specs/nemerle.lang.h:7
-#: gtksourceview/language-specs/R.lang.h:4
+#: ../gtksourceview/language-specs/c.lang.h:7
+#: ../gtksourceview/language-specs/cpp.lang.h:7
+#: ../gtksourceview/language-specs/fortran.lang.h:2
+#: ../gtksourceview/language-specs/haskell.lang.h:4
+#: ../gtksourceview/language-specs/nemerle.lang.h:7
+#: ../gtksourceview/language-specs/octave.lang.h:3
+#: ../gtksourceview/language-specs/python.lang.h:4
+#: ../gtksourceview/language-specs/R.lang.h:4
msgid "Floating Point Number"
msgstr "பின�ன �ண��ள�"
#. FIXME WHY DOESN'T THIS WORK?
-#: gtksourceview/language-specs/c.lang.h:8
-#: gtksourceview/language-specs/cpp.lang.h:8
-#: gtksourceview/language-specs/fortran.lang.h:4
-#: gtksourceview/language-specs/pascal.lang.h:10
-#: gtksourceview/language-specs/python.lang.h:5
-#: gtksourceview/language-specs/haskell.lang.h:6
-#: gtksourceview/language-specs/nemerle.lang.h:8
+#: ../gtksourceview/language-specs/c.lang.h:8
+#: ../gtksourceview/language-specs/cpp.lang.h:8
+#: ../gtksourceview/language-specs/fortran.lang.h:4
+#: ../gtksourceview/language-specs/haskell.lang.h:6
+#: ../gtksourceview/language-specs/nemerle.lang.h:8
+#: ../gtksourceview/language-specs/octave.lang.h:5
+#: ../gtksourceview/language-specs/pascal.lang.h:10
+#: ../gtksourceview/language-specs/python.lang.h:6
msgid "Hex Number"
msgstr "�ண�ம �ண�"
-#: gtksourceview/language-specs/c.lang.h:9
-#: gtksourceview/language-specs/cpp.lang.h:9
-#: gtksourceview/language-specs/idl.lang.h:3
-#: gtksourceview/language-specs/haskell.lang.h:7
+#: ../gtksourceview/language-specs/c.lang.h:9
+#: ../gtksourceview/language-specs/cpp.lang.h:9
+#: ../gtksourceview/language-specs/haskell.lang.h:7
+#: ../gtksourceview/language-specs/idl.lang.h:3
msgid "Include/Pragma"
msgstr "��ர�/ப�ரா��மா"
-#: gtksourceview/language-specs/c.lang.h:12
-#: gtksourceview/language-specs/cpp.lang.h:12
-#: gtksourceview/language-specs/fortran.lang.h:9
-#: gtksourceview/language-specs/python.lang.h:11
-#: gtksourceview/language-specs/verilog.lang.h:8
-#: gtksourceview/language-specs/haskell.lang.h:11
-#: gtksourceview/language-specs/nemerle.lang.h:12
+#: ../gtksourceview/language-specs/c.lang.h:10
+#: ../gtksourceview/language-specs/cpp.lang.h:10
+#: ../gtksourceview/language-specs/csharp.lang.h:3
+#: ../gtksourceview/language-specs/fortran.lang.h:7
+#: ../gtksourceview/language-specs/idl.lang.h:4
+#: ../gtksourceview/language-specs/javascript.lang.h:12
+#: ../gtksourceview/language-specs/lua.lang.h:3
+#: ../gtksourceview/language-specs/perl.lang.h:2
+#: ../gtksourceview/language-specs/ruby.lang.h:9
+#: ../gtksourceview/language-specs/vbnet.lang.h:1
+#: ../gtksourceview/language-specs/verilog.lang.h:6
+msgid "Keywords"
+msgstr "வி��வார�த�"
+
+#: ../gtksourceview/language-specs/c.lang.h:12
+#: ../gtksourceview/language-specs/cpp.lang.h:12
+#: ../gtksourceview/language-specs/fortran.lang.h:10
+#: ../gtksourceview/language-specs/haskell.lang.h:11
+#: ../gtksourceview/language-specs/nemerle.lang.h:12
+#: ../gtksourceview/language-specs/octave.lang.h:10
+#: ../gtksourceview/language-specs/python.lang.h:12
+#: ../gtksourceview/language-specs/verilog.lang.h:8
msgid "Octal Number"
msgstr "பதினர�ம �ண�"
-#: gtksourceview/language-specs/c.lang.h:13
-#: gtksourceview/language-specs/cpp.lang.h:13
-#: gtksourceview/language-specs/csharp.lang.h:5
-#: gtksourceview/language-specs/idl.lang.h:6
-#: gtksourceview/language-specs/haskell.lang.h:13
-#: gtksourceview/language-specs/vbnet.lang.h:4
+#: ../gtksourceview/language-specs/c.lang.h:13
+#: ../gtksourceview/language-specs/cpp.lang.h:13
+#: ../gtksourceview/language-specs/csharp.lang.h:6
+#: ../gtksourceview/language-specs/idl.lang.h:6
+#: ../gtksourceview/language-specs/vbnet.lang.h:8
msgid "Preprocessor Definitions"
msgstr "ம�ம� ��யல� ��றிப�ப��ள�"
-#: gtksourceview/language-specs/cpp.lang.h:3
+#: ../gtksourceview/language-specs/c.lang.h:16
+#: ../gtksourceview/language-specs/cpp.lang.h:16
+#: ../gtksourceview/language-specs/fortran.lang.h:15
+#: ../gtksourceview/language-specs/idl.lang.h:10
+#: ../gtksourceview/language-specs/verilog.lang.h:10
+msgid "Types"
+msgstr "வ���ள�"
+
+#: ../gtksourceview/language-specs/changelog.lang.h:1
+msgid "ChangeLog"
+msgstr "பதிவ� மாற�ற�"
+
+#: ../gtksourceview/language-specs/changelog.lang.h:2
+msgid "Date"
+msgstr "த�தி"
+
+#: ../gtksourceview/language-specs/changelog.lang.h:3
+msgid "Email"
+msgstr "மின�ன���ல�"
+
+#: ../gtksourceview/language-specs/changelog.lang.h:4
+msgid "File"
+msgstr "��ப�ப�"
+
+#: ../gtksourceview/language-specs/changelog.lang.h:5
+msgid "Marker"
+msgstr "��றிப�பி"
+
+#: ../gtksourceview/language-specs/cpp.lang.h:3
msgid "C++"
msgstr "C++"
-#: gtksourceview/language-specs/csharp.lang.h:2
+#: ../gtksourceview/language-specs/csharp.lang.h:2
msgid "C#"
msgstr "C#"
-#: gtksourceview/language-specs/csharp.lang.h:6
-#: gtksourceview/language-specs/java.lang.h:9
-#: gtksourceview/language-specs/vbnet.lang.h:5
-#: gtksourceview/language-specs/nemerle.lang.h:13
+#: ../gtksourceview/language-specs/csharp.lang.h:5
+#: ../gtksourceview/language-specs/lua.lang.h:7
+#: ../gtksourceview/language-specs/sh.lang.h:6
+msgid "Multiline String"
+msgstr "பல �ர���ள�"
+
+#: ../gtksourceview/language-specs/csharp.lang.h:7
+#: ../gtksourceview/language-specs/java.lang.h:9
+#: ../gtksourceview/language-specs/nemerle.lang.h:13
+#: ../gtksourceview/language-specs/vbnet.lang.h:9
msgid "Primitives"
msgstr "Primitives"
-#: gtksourceview/language-specs/csharp.lang.h:9
-#: gtksourceview/language-specs/css.lang.h:64
-#: gtksourceview/language-specs/fortran.lang.h:13
-#: gtksourceview/language-specs/java.lang.h:12
-#: gtksourceview/language-specs/javascript.lang.h:34
-#: gtksourceview/language-specs/lua.lang.h:11
-#: gtksourceview/language-specs/python.lang.h:15
-#: gtksourceview/language-specs/ruby.lang.h:19
-#: gtksourceview/language-specs/sh.lang.h:14
-#: gtksourceview/language-specs/vbnet.lang.h:8
+#: ../gtksourceview/language-specs/csharp.lang.h:10
+#: ../gtksourceview/language-specs/css.lang.h:59
+#: ../gtksourceview/language-specs/fortran.lang.h:14
+#: ../gtksourceview/language-specs/java.lang.h:12
+#: ../gtksourceview/language-specs/javascript.lang.h:24
+#: ../gtksourceview/language-specs/lua.lang.h:11
+#: ../gtksourceview/language-specs/makefile.lang.h:9
+#: ../gtksourceview/language-specs/sh.lang.h:14
msgid "String 2"
msgstr "�ரம� 2"
#.
#. At rules must occur at the start of a line.
#.
-#: gtksourceview/language-specs/css.lang.h:4
+#: ../gtksourceview/language-specs/css.lang.h:4
msgid "At Rules"
msgstr "விதி�ளில�"
#.
#. For CSS 2-style selectors: tag[attr="value"].
#.
-#: gtksourceview/language-specs/css.lang.h:8
+#: ../gtksourceview/language-specs/css.lang.h:8
msgid "Attribute Value Delimiters"
msgstr "பண�ப� மதிப�ப��ள� மற�ற�ம� வர�யற��ள�"
+#: ../gtksourceview/language-specs/css.lang.h:10
+msgid "CSS"
+msgstr "CSS"
+
#.
#. Value length specifier. Unless it is 0, must always be like: -1.2em.
#.
-#: gtksourceview/language-specs/css.lang.h:13
+#: ../gtksourceview/language-specs/css.lang.h:14
msgid "Dimension"
msgstr "�ளவ�"
@@ -629,43 +735,46 @@ msgstr "�ளவ�"
#. Hexadecimal method of specifying colors. Can either be 3 or 6 in
#. length: #ffcc00 = #fc0.
#.
-#: gtksourceview/language-specs/css.lang.h:22
+#: ../gtksourceview/language-specs/css.lang.h:23
msgid "Hexadecimal Color"
msgstr "�ண�ம த�ம நிறம�"
#.
#. Upgrades a rule set's importance when several rule sets conflict.
#.
-#: gtksourceview/language-specs/css.lang.h:26
+#: ../gtksourceview/language-specs/css.lang.h:27
msgid "Importance Modifier"
msgstr "ம����ிய திர�த�தி"
-#: gtksourceview/language-specs/css.lang.h:27
+#: ../gtksourceview/language-specs/css.lang.h:28
msgid "Known Property Values"
msgstr "த�ரிந�த பண�ப� மதிப�ப��ள�"
-#: gtksourceview/language-specs/css.lang.h:34
-#: gtksourceview/language-specs/javascript.lang.h:19
-#: gtksourceview/language-specs/php.lang.h:19
-#: gtksourceview/language-specs/sh.lang.h:8
-#: gtksourceview/language-specs/haskell.lang.h:12
+#: ../gtksourceview/language-specs/css.lang.h:35
+#: ../gtksourceview/language-specs/javascript.lang.h:20
+#: ../gtksourceview/language-specs/php.lang.h:20
+#: ../gtksourceview/language-specs/sql.lang.h:34
msgid "Operators"
msgstr "��யல�ப��த�தி�ள�"
-#: gtksourceview/language-specs/css.lang.h:47
+#: ../gtksourceview/language-specs/css.lang.h:37
msgid "Property Names"
msgstr "பண�ப� மதிப�ப��ள�"
#.
#. Brackets define a declaration block, parentheses define functions.
#.
-#: gtksourceview/language-specs/css.lang.h:51
-#: gtksourceview/language-specs/javascript.lang.h:20
-#: gtksourceview/language-specs/sh.lang.h:9
+#: ../gtksourceview/language-specs/css.lang.h:41
+#: ../gtksourceview/language-specs/javascript.lang.h:21
msgid "Punctuators"
msgstr "�ிறப�ப� ��றி�ள�"
-#: gtksourceview/language-specs/css.lang.h:52
+#.
+#. Used to combine selectors. Example syntax:
+#.
+#. body * div#ID.className > p + ul li:first-child
+#.
+#: ../gtksourceview/language-specs/css.lang.h:47
msgid "Selector Grammar"
msgstr "�ல���ணத�த� த�ர�வ� ��ய�"
@@ -673,7 +782,7 @@ msgstr "à®?லà®?à¯?à®?ணதà¯?தà¯? à
#. Pseudo-class rules. Good to have syntax highlighting for these
#. for mistypings.
#.
-#: gtksourceview/language-specs/css.lang.h:57
+#: ../gtksourceview/language-specs/css.lang.h:52
msgid "Selector Pseudo Classes"
msgstr "Pseudo Classes த�ர�வ�"
@@ -681,7 +790,7 @@ msgstr "Pseudo Classes தà¯?à®°à¯?வà¯
#. Pseudo-element rules. Good to have syntax highlighting for these
#. for mistypings.
#.
-#: gtksourceview/language-specs/css.lang.h:62
+#: ../gtksourceview/language-specs/css.lang.h:57
msgid "Selector Pseudo Elements"
msgstr "ப�ய� �ற�ப�ப� த�ர�வ�"
@@ -689,850 +798,906 @@ msgstr "பà¯?யà¯? à®?à®±à¯?பà¯?பà
#. Escaped unicode characters can contain either 6 hexadecimal characters
#. or 1-5 hex characters followed by one whitespace character.
#.
-#: gtksourceview/language-specs/css.lang.h:69
+#: ../gtksourceview/language-specs/css.lang.h:64
msgid "Unicode Character Reference"
msgstr "ய�னி������ �ழ�த�த�ர� ��றிப�ப��ள�"
#.
#. Unicode range values.
#.
-#: gtksourceview/language-specs/css.lang.h:73
+#: ../gtksourceview/language-specs/css.lang.h:68
msgid "Unicode Range"
msgstr "ய�னி������ வரம�ப�"
-#: gtksourceview/language-specs/desktop.lang.h:1
+#: ../gtksourceview/language-specs/desktop.lang.h:1
msgid ".desktop"
msgstr ".desktop"
-#: gtksourceview/language-specs/desktop.lang.h:2
-#: gtksourceview/language-specs/ini.lang.h:2
-#: gtksourceview/language-specs/gtkrc.lang.h:1
+#: ../gtksourceview/language-specs/desktop.lang.h:2
+#: ../gtksourceview/language-specs/gtkrc.lang.h:1
+#: ../gtksourceview/language-specs/ini.lang.h:2
+#: ../gtksourceview/language-specs/scheme.lang.h:1
msgid "Boolean Value"
msgstr "ப�லியன� மதிப�ப�"
-#: gtksourceview/language-specs/desktop.lang.h:3
+#: ../gtksourceview/language-specs/desktop.lang.h:3
msgid "Encoding"
msgstr "��றிம�ற�யா���ம�"
-#: gtksourceview/language-specs/desktop.lang.h:4
+#: ../gtksourceview/language-specs/desktop.lang.h:4
msgid "Exec Parameter"
msgstr "�ளவ�ர� �ய���ம�"
-#: gtksourceview/language-specs/desktop.lang.h:5
-#: gtksourceview/language-specs/ini.lang.h:5
+#: ../gtksourceview/language-specs/desktop.lang.h:5
+#: ../gtksourceview/language-specs/ini.lang.h:5
msgid "Group"
msgstr "த���ப�ப�"
-#: gtksourceview/language-specs/desktop.lang.h:8
-#: gtksourceview/language-specs/ini.lang.h:9
+#: ../gtksourceview/language-specs/desktop.lang.h:8
+#: ../gtksourceview/language-specs/ini.lang.h:9
msgid "Non Standard Key"
msgstr "த��தரமற�ற வி��"
-#: gtksourceview/language-specs/desktop.lang.h:11
+#: ../gtksourceview/language-specs/desktop.lang.h:11
msgid "Standard Key"
msgstr "த��தர வி��"
-#: gtksourceview/language-specs/diff.lang.h:1
+#: ../gtksourceview/language-specs/diff.lang.h:1
msgid "Added line"
msgstr "��ர����ப�ப��� வரி"
-#: gtksourceview/language-specs/diff.lang.h:2
+#: ../gtksourceview/language-specs/diff.lang.h:2
msgid "Changed line"
msgstr "மாற�றப�ப��� வரி"
-#: gtksourceview/language-specs/diff.lang.h:3
+#: ../gtksourceview/language-specs/diff.lang.h:3
msgid "Diff"
msgstr "Diff"
-#: gtksourceview/language-specs/diff.lang.h:4
+#: ../gtksourceview/language-specs/diff.lang.h:4
msgid "Diff file"
msgstr "Diff ��ப�ப�"
-#: gtksourceview/language-specs/diff.lang.h:6
-#: gtksourceview/language-specs/po.lang.h:4
+#: ../gtksourceview/language-specs/diff.lang.h:6
+#: ../gtksourceview/language-specs/po.lang.h:4
msgid "Location"
msgstr "_��ம�"
-#: gtksourceview/language-specs/diff.lang.h:8
+#: ../gtksourceview/language-specs/diff.lang.h:8
msgid "Removed line"
msgstr "ந����ப�ப��� வரி"
-#: gtksourceview/language-specs/diff.lang.h:9
+#: ../gtksourceview/language-specs/diff.lang.h:9
msgid "Special case"
msgstr "�ிறப�ப� �ளவ�"
-#: gtksourceview/language-specs/html.lang.h:1
-#: gtksourceview/language-specs/xml.lang.h:1
-msgid "Attributes"
+#: ../gtksourceview/language-specs/html.lang.h:1
+#: ../gtksourceview/language-specs/xml.lang.h:1
+msgid "Attribute"
msgstr "பண�ப��ள�"
-#: gtksourceview/language-specs/html.lang.h:3
-#: gtksourceview/language-specs/xml.lang.h:3
+#: ../gtksourceview/language-specs/html.lang.h:3
+#: ../gtksourceview/language-specs/xml.lang.h:3
msgid "Closing Bracket"
msgstr "ம���ம� ���ப�ப���றி"
-#: gtksourceview/language-specs/html.lang.h:4
+#: ../gtksourceview/language-specs/html.lang.h:4
msgid "DTD"
msgstr "DTD"
-#: gtksourceview/language-specs/html.lang.h:5
-#: gtksourceview/language-specs/xml.lang.h:4
+#: ../gtksourceview/language-specs/html.lang.h:5
+#: ../gtksourceview/language-specs/xml.lang.h:4
msgid "Entity"
msgstr "Entity"
-#: gtksourceview/language-specs/html.lang.h:6
+#: ../gtksourceview/language-specs/html.lang.h:6
msgid "HTML"
msgstr "HTML"
-#: gtksourceview/language-specs/html.lang.h:7
-#: gtksourceview/language-specs/latex.lang.h:5
-#: gtksourceview/language-specs/xml.lang.h:6
-#: gtksourceview/language-specs/texinfo.lang.h:12
+#: ../gtksourceview/language-specs/html.lang.h:7
+#: ../gtksourceview/language-specs/latex.lang.h:7
+#: ../gtksourceview/language-specs/texinfo.lang.h:12
+#: ../gtksourceview/language-specs/xml.lang.h:6
msgid "Markup"
msgstr "Markup"
-#: gtksourceview/language-specs/html.lang.h:9
-msgid "Tags"
-msgstr "������ள� (Tags)"
+#: ../gtksourceview/language-specs/html.lang.h:9
+#: ../gtksourceview/language-specs/xml.lang.h:8
+msgid "Tag"
+msgstr "��றி"
-#: gtksourceview/language-specs/fortran.lang.h:3
+#: ../gtksourceview/language-specs/fortran.lang.h:3
msgid "Fortran 95"
msgstr "�ப���ரான� 95"
-#: gtksourceview/language-specs/fortran.lang.h:5
+#: ../gtksourceview/language-specs/fortran.lang.h:5
msgid "Input/Output"
msgstr "�ள�ள���/விள�வ�"
-#: gtksourceview/language-specs/fortran.lang.h:6
+#: ../gtksourceview/language-specs/fortran.lang.h:6
msgid "Intrinsics"
msgstr "�ன�ரன�ஸி��"
-#: gtksourceview/language-specs/fortran.lang.h:10
+#: ../gtksourceview/language-specs/fortran.lang.h:11
msgid "Read/Write"
msgstr "�ழ�த�/ப�ி"
-#: gtksourceview/language-specs/idl.lang.h:2
+#. "duble-quoted strings"
+#: ../gtksourceview/language-specs/gtkrc.lang.h:2
+#: ../gtksourceview/language-specs/ini.lang.h:4
+#: ../gtksourceview/language-specs/octave.lang.h:2
+#: ../gtksourceview/language-specs/php.lang.h:16
+#: ../gtksourceview/language-specs/python.lang.h:3
+#: ../gtksourceview/language-specs/R.lang.h:3
+#: ../gtksourceview/language-specs/ruby.lang.h:6
+msgid "Double Quoted String"
+msgstr "�ர�ம�ற���ள� �ரம�"
+
+#: ../gtksourceview/language-specs/gtkrc.lang.h:3
+msgid "GtkRC"
+msgstr "GtkRC"
+
+#: ../gtksourceview/language-specs/gtkrc.lang.h:4
+msgid "Include Directive"
+msgstr "ந�ர�ி ��ர�����"
+
+#: ../gtksourceview/language-specs/gtkrc.lang.h:5
+#: ../gtksourceview/language-specs/haskell.lang.h:8
+msgid "Keysymbol"
+msgstr "ம����ிய ��றிய���"
+
+#. 'single-quoted strings'
+#: ../gtksourceview/language-specs/gtkrc.lang.h:10
+#: ../gtksourceview/language-specs/ini.lang.h:11
+#: ../gtksourceview/language-specs/octave.lang.h:14
+#: ../gtksourceview/language-specs/php.lang.h:24
+#: ../gtksourceview/language-specs/python.lang.h:15
+#: ../gtksourceview/language-specs/R.lang.h:11
+#: ../gtksourceview/language-specs/ruby.lang.h:17
+msgid "Single Quoted String"
+msgstr "�ர� ம�ற���ள� �ரம�"
+
+#: ../gtksourceview/language-specs/gtkrc.lang.h:11
+msgid "State"
+msgstr "நில�"
+
+#. $variable, $$dynamic-variable and even $$$more
+#: ../gtksourceview/language-specs/gtkrc.lang.h:12
+#: ../gtksourceview/language-specs/ini.lang.h:12
+#: ../gtksourceview/language-specs/php.lang.h:26
+#: ../gtksourceview/language-specs/tcl.lang.h:7
+msgid "Variable"
+msgstr "மாறிலி�ள�"
+
+#: ../gtksourceview/language-specs/haskell.lang.h:5
+msgid "Haskell"
+msgstr "Haskell"
+
+#: ../gtksourceview/language-specs/haskell.lang.h:12
+msgid "Preprocessor Definition"
+msgstr "ம�ன� ��யல� ��றிப�ப��ள�"
+
+#: ../gtksourceview/language-specs/haskell.lang.h:32
+msgid "Type or Constructor"
+msgstr "�ன�ஸ���ர���ர� வ��"
+
+#: ../gtksourceview/language-specs/idl.lang.h:2
msgid "IDL"
msgstr "IDL"
-#: gtksourceview/language-specs/idl.lang.h:7
+#: ../gtksourceview/language-specs/idl.lang.h:7
msgid "Sectional"
msgstr "ப��தியா���ப�ப���"
-#: gtksourceview/language-specs/ini.lang.h:1
+#: ../gtksourceview/language-specs/ini.lang.h:1
msgid ".ini"
-msgstr ""
+msgstr ".ini"
-#: gtksourceview/language-specs/ini.lang.h:3
-#: gtksourceview/language-specs/verilog.lang.h:3
+#: ../gtksourceview/language-specs/ini.lang.h:3
+#: ../gtksourceview/language-specs/verilog.lang.h:3
msgid "Decimal Number"
msgstr "த�ம �ண�"
-#: gtksourceview/language-specs/ini.lang.h:4
-#: gtksourceview/language-specs/R.lang.h:3
-#: gtksourceview/language-specs/gtkrc.lang.h:2
-#, fuzzy
-msgid "Double Quote String"
-msgstr "�ர�ம�ற���ள� �ரம�"
-
-#: gtksourceview/language-specs/ini.lang.h:6
-#, fuzzy
+#: ../gtksourceview/language-specs/ini.lang.h:6
msgid "Integer"
-msgstr "��ிப�ப��-N �யல� �ண�"
+msgstr "ம�ழ� �ண�"
-#: gtksourceview/language-specs/ini.lang.h:11
-#: gtksourceview/language-specs/R.lang.h:11
-#: gtksourceview/language-specs/gtkrc.lang.h:10
-#, fuzzy
-msgid "Single Quote String"
-msgstr "�ர� ம�ற���ள� �ரம�"
-
-#. $variable, $$dynamic-variable and even $$$more
-#: gtksourceview/language-specs/ini.lang.h:12
-#: gtksourceview/language-specs/php.lang.h:25
-#: gtksourceview/language-specs/gtkrc.lang.h:12
-msgid "Variable"
-msgstr "மாறிலி�ள�"
-
-#: gtksourceview/language-specs/java.lang.h:2
+#: ../gtksourceview/language-specs/java.lang.h:2
msgid "Declarations"
msgstr "�றிவ�ப�ப��ள�"
-#: gtksourceview/language-specs/java.lang.h:3
+#: ../gtksourceview/language-specs/java.lang.h:3
msgid "Flow"
msgstr "����ம�"
-#: gtksourceview/language-specs/java.lang.h:4
+#: ../gtksourceview/language-specs/java.lang.h:4
msgid "Java"
msgstr "�ாவா"
-#: gtksourceview/language-specs/java.lang.h:6
+#: ../gtksourceview/language-specs/java.lang.h:6
msgid "Memory"
msgstr "நின�வ�ம�"
-#: gtksourceview/language-specs/java.lang.h:7
+#: ../gtksourceview/language-specs/java.lang.h:7
msgid "Modifiers"
msgstr "மாற�றி�ள�"
-#: gtksourceview/language-specs/java.lang.h:8
+#: ../gtksourceview/language-specs/java.lang.h:8
msgid "Numeric"
msgstr "�ண�"
-#: gtksourceview/language-specs/javascript.lang.h:1
-#: gtksourceview/language-specs/php.lang.h:1
+#: ../gtksourceview/language-specs/javascript.lang.h:1
+#: ../gtksourceview/language-specs/php.lang.h:1
msgid "Array Operators"
msgstr "�ணி ��யல�பா���ள�"
-#: gtksourceview/language-specs/javascript.lang.h:3
+#: ../gtksourceview/language-specs/javascript.lang.h:3
msgid "Constructors"
msgstr "�ன�ஸ���ர���ர�"
-#: gtksourceview/language-specs/javascript.lang.h:4
+#: ../gtksourceview/language-specs/javascript.lang.h:4
msgid "Error Handling"
msgstr "பிழ� ��யாளள�"
-#: gtksourceview/language-specs/javascript.lang.h:5
+#: ../gtksourceview/language-specs/javascript.lang.h:5
msgid "Floating-Point Number"
msgstr "பின�ன �ண��ள�"
-#: gtksourceview/language-specs/javascript.lang.h:6
+#: ../gtksourceview/language-specs/javascript.lang.h:6
msgid "Flow Keywords"
msgstr "வி��வார�த�த� ����ம�"
-#: gtksourceview/language-specs/javascript.lang.h:7
+#: ../gtksourceview/language-specs/javascript.lang.h:7
msgid "Future Reserved Words"
msgstr "ம�ன�ன����ரி����யா� ம�ன�பதிவ� ��ய�யப�ப��� வார�த�த��ள�"
-#: gtksourceview/language-specs/javascript.lang.h:8
+#: ../gtksourceview/language-specs/javascript.lang.h:8
msgid "Global Functions"
msgstr "ப�த� ��யல�"
-#: gtksourceview/language-specs/javascript.lang.h:9
+#: ../gtksourceview/language-specs/javascript.lang.h:9
msgid "Global Properties"
msgstr "ப�த� பண�ப��ள�"
-#: gtksourceview/language-specs/javascript.lang.h:10
-#: gtksourceview/language-specs/verilog.lang.h:5
+#: ../gtksourceview/language-specs/javascript.lang.h:10
+#: ../gtksourceview/language-specs/verilog.lang.h:5
msgid "Hexadecimal Number"
msgstr "�ண�ம �ண��ள�"
-#: gtksourceview/language-specs/javascript.lang.h:13
+#: ../gtksourceview/language-specs/javascript.lang.h:11
+msgid "JavaScript"
+msgstr "�ாவா�ிற�நிரல�"
+
+#: ../gtksourceview/language-specs/javascript.lang.h:14
msgid "Literals"
msgstr "�ப�ப�ிய�"
-#: gtksourceview/language-specs/javascript.lang.h:14
+#: ../gtksourceview/language-specs/javascript.lang.h:15
msgid "Math Value Properties"
msgstr "Math மதிப�ப� பண�ப��ள�"
-#: gtksourceview/language-specs/javascript.lang.h:16
+#: ../gtksourceview/language-specs/javascript.lang.h:17
msgid "Object Functions"
msgstr "ப�ர�ள� ��யல��ள�"
-#: gtksourceview/language-specs/javascript.lang.h:17
+#: ../gtksourceview/language-specs/javascript.lang.h:18
msgid "Object Properties"
msgstr "ப�ர�ள� பண�ப��ள�"
-#: gtksourceview/language-specs/javascript.lang.h:18
+#: ../gtksourceview/language-specs/javascript.lang.h:19
msgid "Objects"
msgstr "ப�ர�ள��ள�"
-#.
-#. Proposed language specification for JavaScript files.
-#.
-#. Reference used:
-#. http://www.ecma-international.org/publications/files/ecma-st/ECMA-262.pdf
-#.
-#. Tested with:
-#. http://www.coffeeblack.org/scripts/map.js
-#.
-#. Submitted by Scott Martin (scott coffeeblack org)
-#.
-#: gtksourceview/language-specs/javascript.lang.h:32
-#: gtksourceview/language-specs/lua.lang.h:9
-#: gtksourceview/language-specs/perl.lang.h:7
-#: gtksourceview/language-specs/python.lang.h:13
-#: gtksourceview/language-specs/ruby.lang.h:17
-#: gtksourceview/language-specs/sh.lang.h:11
-#: gtksourceview/language-specs/tcl.lang.h:3
-#: gtksourceview/language-specs/R.lang.h:10
+#: ../gtksourceview/language-specs/javascript.lang.h:22
+#: ../gtksourceview/language-specs/lua.lang.h:9
+#: ../gtksourceview/language-specs/octave.lang.h:13
+#: ../gtksourceview/language-specs/perl.lang.h:7
+#: ../gtksourceview/language-specs/php.lang.h:22
+#: ../gtksourceview/language-specs/python.lang.h:14
+#: ../gtksourceview/language-specs/R.lang.h:10
+#: ../gtksourceview/language-specs/ruby.lang.h:16
+#: ../gtksourceview/language-specs/sh.lang.h:11
+#: ../gtksourceview/language-specs/tcl.lang.h:3
msgid "Scripts"
msgstr "�ிற�நிரல��ள�"
-#: gtksourceview/language-specs/javascript.lang.h:35
+#: ../gtksourceview/language-specs/javascript.lang.h:25
msgid "Unicode Escape Sequence"
msgstr "ய�னி������ வி��ப�� வரி�ள�"
-#: gtksourceview/language-specs/javascript.lang.h:36
+#: ../gtksourceview/language-specs/javascript.lang.h:26
msgid "Word Operators"
msgstr "வ�ர��� ��யல�"
-#: gtksourceview/language-specs/latex.lang.h:2
-#: gtksourceview/language-specs/texinfo.lang.h:6
+#: ../gtksourceview/language-specs/latex.lang.h:1
+msgid "Command"
+msgstr "����ள�"
+
+#: ../gtksourceview/language-specs/latex.lang.h:3
+msgid "Comment Environment"
+msgstr "��றிப�ப� ��ழ�நில�"
+
+#: ../gtksourceview/language-specs/latex.lang.h:4
+#: ../gtksourceview/language-specs/texinfo.lang.h:6
msgid "Include"
msgstr "��ர�"
-#: gtksourceview/language-specs/latex.lang.h:4
+#: ../gtksourceview/language-specs/latex.lang.h:6
msgid "LaTeX"
msgstr "LaTeX"
-#: gtksourceview/language-specs/latex.lang.h:6
+#: ../gtksourceview/language-specs/latex.lang.h:8
msgid "Math"
msgstr "Math"
-#: gtksourceview/language-specs/latex.lang.h:7
-msgid "Most Used Commands"
-msgstr "�தி�ம� பயன�ப��த�த�ம� ����ள��ள�"
-
-#: gtksourceview/language-specs/lua.lang.h:2
-#: gtksourceview/language-specs/python.lang.h:4
-#: gtksourceview/language-specs/sh.lang.h:4
+#: ../gtksourceview/language-specs/lua.lang.h:2
+#: ../gtksourceview/language-specs/makefile.lang.h:3
msgid "Functions"
msgstr "��யல��ள�"
-#: gtksourceview/language-specs/lua.lang.h:5
+#: ../gtksourceview/language-specs/lua.lang.h:5
msgid "Line Comment 2"
msgstr "�ண� ��றிப�ப� 2"
-#: gtksourceview/language-specs/lua.lang.h:6
+#: ../gtksourceview/language-specs/lua.lang.h:6
msgid "Lua"
msgstr "Lua"
-#: gtksourceview/language-specs/lua.lang.h:7
-#: gtksourceview/language-specs/python.lang.h:9
-#: gtksourceview/language-specs/sh.lang.h:6
-msgid "Multiline String"
-msgstr "பல �ர���ள�"
-
-#: gtksourceview/language-specs/lua.lang.h:8
-#: gtksourceview/language-specs/python.lang.h:10
-#: gtksourceview/language-specs/sh.lang.h:7
+#: ../gtksourceview/language-specs/lua.lang.h:8
+#: ../gtksourceview/language-specs/sh.lang.h:7
msgid "Multiline String 2"
msgstr "பலவரி �ரம� 2"
-#: gtksourceview/language-specs/pascal.lang.h:1
+#. `backticks-quoted strings`
+#: ../gtksourceview/language-specs/makefile.lang.h:1
+#: ../gtksourceview/language-specs/php.lang.h:3
+#: ../gtksourceview/language-specs/sh.lang.h:1
+msgid "Backtick String"
+msgstr "Backtick �ரம�"
+
+#: ../gtksourceview/language-specs/makefile.lang.h:2
+msgid "Directives"
+msgstr "விள������ள�"
+
+#: ../gtksourceview/language-specs/makefile.lang.h:5
+msgid "Makefile"
+msgstr "��ப�ப� �ர�வா����"
+
+#: ../gtksourceview/language-specs/makefile.lang.h:7
+msgid "Special Targets"
+msgstr "�ிறப�ப� �ல�����ள�"
+
+#: ../gtksourceview/language-specs/makefile.lang.h:10
+msgid "Targets"
+msgstr "�ல�����ள�"
+
+#: ../gtksourceview/language-specs/makefile.lang.h:11
+#: ../gtksourceview/language-specs/sh.lang.h:15
+msgid "Variable1"
+msgstr "மாறி1"
+
+#: ../gtksourceview/language-specs/makefile.lang.h:12
+#: ../gtksourceview/language-specs/sh.lang.h:16
+msgid "Variable2"
+msgstr "மாறி2"
+
+#: ../gtksourceview/language-specs/msil.lang.h:1
+msgid "MSIL"
+msgstr "MSIL"
+
+#: ../gtksourceview/language-specs/nemerle.lang.h:1
+#: ../gtksourceview/language-specs/verilog.lang.h:1
+msgid "Binary Number"
+msgstr "�ர�ம �ண�"
+
+#: ../gtksourceview/language-specs/nemerle.lang.h:4
+msgid "Core Keywords"
+msgstr "��ர� ம����ிய��ற��ள�"
+
+#: ../gtksourceview/language-specs/nemerle.lang.h:5
+msgid "Core Types"
+msgstr "��ர� வ���ள�"
+
+#: ../gtksourceview/language-specs/nemerle.lang.h:9
+msgid "Keywords Defined by Macros"
+msgstr "ம���ர����ளால� ��றிப�பி�ப�ப��� ம����ிய ��ற��ள�"
+
+#: ../gtksourceview/language-specs/nemerle.lang.h:11
+msgid "Nemerle"
+msgstr "Nemerle"
+
+#: ../gtksourceview/language-specs/octave.lang.h:8
+#: ../gtksourceview/language-specs/python.lang.h:10
+msgid "Multiline Double Quoted String"
+msgstr "பல வரி �ற�ற� ம�ற���ளி�ப�ப��� �ரம�"
+
+#: ../gtksourceview/language-specs/octave.lang.h:9
+#: ../gtksourceview/language-specs/python.lang.h:11
+msgid "Multiline Single Quoted String"
+msgstr "பல வரி �ற�ற� ம�ற���ளி�ப�ப��� �ரம�"
+
+#: ../gtksourceview/language-specs/octave.lang.h:11
+msgid "Octave"
+msgstr "Octave"
+
+#: ../gtksourceview/language-specs/octave.lang.h:12
+#: ../gtksourceview/language-specs/R.lang.h:9
+msgid "Reserved Constant"
+msgstr "தல���ழ� மாறிலி"
+
+#: ../gtksourceview/language-specs/pascal.lang.h:1
msgid "Block Comment 1"
msgstr "ப��தி ��றிப�ப� 1"
-#: gtksourceview/language-specs/pascal.lang.h:2
+#: ../gtksourceview/language-specs/pascal.lang.h:2
msgid "Block Comment 2"
msgstr "ப��தி ��றிப�ப� 2"
-#: gtksourceview/language-specs/pascal.lang.h:3
+#: ../gtksourceview/language-specs/pascal.lang.h:3
msgid "Boolean Bitwise Operators"
msgstr "ப�லியம� பி��வழி ��யல�"
-#: gtksourceview/language-specs/pascal.lang.h:4
+#: ../gtksourceview/language-specs/pascal.lang.h:4
msgid "Builtin Functions"
msgstr "�ள� ��யல�"
-#: gtksourceview/language-specs/pascal.lang.h:5
+#: ../gtksourceview/language-specs/pascal.lang.h:5
msgid "Builtin Types"
msgstr "�ள� வ��"
-#: gtksourceview/language-specs/pascal.lang.h:6
+#: ../gtksourceview/language-specs/pascal.lang.h:6
msgid "Builtin Values"
msgstr "�ள� மதிப�ப�"
-#: gtksourceview/language-specs/pascal.lang.h:7
+#: ../gtksourceview/language-specs/pascal.lang.h:7
msgid "Functions and Function Modifiers"
msgstr "��யல� மற�ற�ம� ��யல� மாற�றி"
-#: gtksourceview/language-specs/pascal.lang.h:8
+#: ../gtksourceview/language-specs/pascal.lang.h:8
msgid "General Format"
msgstr "ப�த� �ம�ப�ப�"
-#: gtksourceview/language-specs/pascal.lang.h:12
+#: ../gtksourceview/language-specs/pascal.lang.h:12
msgid "Loop, Flow, and Exceptions Keywords"
msgstr "ல�ம�, ����ம�, மற�ற�ம� பிழ� வி��வார�த�த��ள�"
-#: gtksourceview/language-specs/pascal.lang.h:13
+#: ../gtksourceview/language-specs/pascal.lang.h:13
msgid "Math Operators"
msgstr "Math ��யல�"
-#: gtksourceview/language-specs/pascal.lang.h:15
+#: ../gtksourceview/language-specs/pascal.lang.h:15
msgid "Pascal"
msgstr "பாஸ��ல�"
-#: gtksourceview/language-specs/pascal.lang.h:16
+#: ../gtksourceview/language-specs/pascal.lang.h:16
msgid "Preprocessor Defines"
msgstr "ம�ன� ��யல� ��றிப�ப�"
-#: gtksourceview/language-specs/pascal.lang.h:19
-#, fuzzy
+#: ../gtksourceview/language-specs/pascal.lang.h:19
msgid "Type, Class and Object Keywords"
-msgstr "��ளாஸ� வ�� மற�ற�ம� ப�ர�ள� வி�� வார�த�த�"
+msgstr "வ��, வ��ப�ப� மற�ற�ம� ப�ர�ள� ம����ிய����ற��ள�"
-#: gtksourceview/language-specs/perl.lang.h:1
+#: ../gtksourceview/language-specs/perl.lang.h:1
msgid "Function Call"
msgstr "��யல� �ழ�ப�ப�"
-#: gtksourceview/language-specs/perl.lang.h:4
+#: ../gtksourceview/language-specs/perl.lang.h:4
msgid "Method Call"
msgstr "ம�ற� �ழ�ப�ப�"
-#: gtksourceview/language-specs/perl.lang.h:5
+#: ../gtksourceview/language-specs/perl.lang.h:5
msgid "POD"
-msgstr ""
+msgstr "POD"
-#: gtksourceview/language-specs/perl.lang.h:6
+#: ../gtksourceview/language-specs/perl.lang.h:6
msgid "Perl"
msgstr "Perl"
-#: gtksourceview/language-specs/perl.lang.h:9
-#: gtksourceview/language-specs/tcl.lang.h:5
+#: ../gtksourceview/language-specs/perl.lang.h:9
+#: ../gtksourceview/language-specs/tcl.lang.h:5
msgid "String2"
msgstr "�ரம�2"
-#: gtksourceview/language-specs/perl.lang.h:10
+#: ../gtksourceview/language-specs/perl.lang.h:10
msgid "String3"
msgstr "�ரம�3"
-#: gtksourceview/language-specs/perl.lang.h:11
-#: gtksourceview/language-specs/tcl.lang.h:7
+#: ../gtksourceview/language-specs/perl.lang.h:11
msgid "Variables"
msgstr "மாற�றிலி�ள�"
-#. `backticks-quoted strings`
-#: gtksourceview/language-specs/php.lang.h:3
-#: gtksourceview/language-specs/sh.lang.h:1
-msgid "Backtick String"
-msgstr "Backtick �ரம�"
-
#. # Bourne Shell Line Comment
-#: gtksourceview/language-specs/php.lang.h:5
+#: ../gtksourceview/language-specs/php.lang.h:5
msgid "Bash Line Comment"
msgstr "பாஷ� வரி ��றிப�ப�"
#. /* C Block Comment
-#: gtksourceview/language-specs/php.lang.h:7
+#: ../gtksourceview/language-specs/php.lang.h:7
msgid "C Block Comment"
msgstr "C ப��தி ��றிப�ப�"
#. // C++ Line Comment
-#: gtksourceview/language-specs/php.lang.h:9
+#: ../gtksourceview/language-specs/php.lang.h:9
msgid "C++ Line Comment"
msgstr "C++ ப��தி ��றிப�ப�"
-#: gtksourceview/language-specs/php.lang.h:10
+#: ../gtksourceview/language-specs/php.lang.h:10
msgid "Case Insensitive Keyword"
msgstr "ப�ரிய �ிறிய �ழ�த�த����ள� மாற�றி �ணராத வி�� வார�த�த�"
#. This are keywords, the are recognised by php
-#: gtksourceview/language-specs/php.lang.h:12
+#: ../gtksourceview/language-specs/php.lang.h:12
msgid "Case Sensitive Keyword"
msgstr "ப�ரிய �ிறிய �ழ�த�த����ள� மாற�றி �ணர�ம� வி�� வார�த�த�"
-#. "duble-quoted strings"
-#: gtksourceview/language-specs/php.lang.h:16
-msgid "Double Quoted String"
-msgstr "�ர�ம�ற���ள� �ரம�"
-
-#: gtksourceview/language-specs/php.lang.h:17
+#. <? ?> <HTML> inside PHP <?
+#: ../gtksourceview/language-specs/php.lang.h:18
msgid "First Open PHP Tag"
msgstr "PHP ��றிய� ம�தலில� திற"
-#: gtksourceview/language-specs/php.lang.h:18
+#: ../gtksourceview/language-specs/php.lang.h:19
msgid "HTML Block"
msgstr "HTML ப��தி"
-#: gtksourceview/language-specs/php.lang.h:20
+#: ../gtksourceview/language-specs/php.lang.h:21
msgid "PHP"
msgstr "PHP"
-#. 'single-quoted strings'
-#: gtksourceview/language-specs/php.lang.h:22
-msgid "Single Quoted String"
-msgstr "�ர� ம�ற���ள� �ரம�"
-
-#: gtksourceview/language-specs/po.lang.h:2
+#: ../gtksourceview/language-specs/po.lang.h:2
msgid "Format"
msgstr "வ�ிவம�ப�ப�"
-#: gtksourceview/language-specs/po.lang.h:7
+#: ../gtksourceview/language-specs/po.lang.h:7
msgid "gettext translation"
msgstr "gettext ம�ழிப�யர�ப�"
-#: gtksourceview/language-specs/python.lang.h:1
-#: gtksourceview/language-specs/ruby.lang.h:2
+#: ../gtksourceview/language-specs/python.lang.h:1
+#: ../gtksourceview/language-specs/ruby.lang.h:2
msgid "Builtins"
msgstr "�ள�வ�தி"
-#: gtksourceview/language-specs/python.lang.h:8
+#: ../gtksourceview/language-specs/python.lang.h:9
msgid "Module Handler"
msgstr "ப��தி ��யாளள�"
-#: gtksourceview/language-specs/python.lang.h:12
+#: ../gtksourceview/language-specs/python.lang.h:13
msgid "Python"
msgstr "ப�த�தான�"
-#: gtksourceview/language-specs/ruby.lang.h:1
+#: ../gtksourceview/language-specs/R.lang.h:1
+msgid "Assignment Operator"
+msgstr "�த������� ��றிய���"
+
+#: ../gtksourceview/language-specs/R.lang.h:2
+msgid "Delimiter"
+msgstr "வர�யற�"
+
+#: ../gtksourceview/language-specs/R.lang.h:5
+msgid "Integer Number"
+msgstr "ம�ழ� �ண�"
+
+#: ../gtksourceview/language-specs/R.lang.h:8
+msgid "Reserved Class"
+msgstr "தல���ழ� வ��ப�ப�"
+
+#: ../gtksourceview/language-specs/ruby.lang.h:1
msgid "Attribute Definitions"
msgstr "பண�ப� ��றிப�ப��ள�"
-#: gtksourceview/language-specs/ruby.lang.h:3
+#: ../gtksourceview/language-specs/ruby.lang.h:3
msgid "Class Variables"
msgstr "Class மாறிலி�ள�"
-#: gtksourceview/language-specs/ruby.lang.h:4
+#: ../gtksourceview/language-specs/ruby.lang.h:4
msgid "Constants"
msgstr "நில�யானவ��ள�"
-#: gtksourceview/language-specs/ruby.lang.h:5
+#: ../gtksourceview/language-specs/ruby.lang.h:5
msgid "Definitions"
msgstr "விள������ள�"
-#: gtksourceview/language-specs/ruby.lang.h:6
+#: ../gtksourceview/language-specs/ruby.lang.h:7
msgid "Global Variables"
msgstr "ப�த� மாறிலி�ள�"
-#: gtksourceview/language-specs/ruby.lang.h:7
+#: ../gtksourceview/language-specs/ruby.lang.h:8
msgid "Instance Variables"
msgstr "நி�ழ� மாறிலி�ள�"
-#: gtksourceview/language-specs/ruby.lang.h:10
+#: ../gtksourceview/language-specs/ruby.lang.h:11
msgid "Module Handlers"
msgstr "ப��தி ��யாளல�"
-#: gtksourceview/language-specs/ruby.lang.h:11
+#: ../gtksourceview/language-specs/ruby.lang.h:12
msgid "Multiline Comment"
msgstr "பலவரி ��றிப�ப��ள�"
-#: gtksourceview/language-specs/ruby.lang.h:12
+#: ../gtksourceview/language-specs/ruby.lang.h:13
msgid "Pseudo Variables"
msgstr "ப�ய� மாறிலி�ள�"
-#: gtksourceview/language-specs/ruby.lang.h:13
+#: ../gtksourceview/language-specs/ruby.lang.h:14
msgid "RegExp Variables"
msgstr "RegExp மாறிலி�ள�"
-#: gtksourceview/language-specs/ruby.lang.h:14
-msgid "Regular Expression"
-msgstr "�யல�பான ��ற�ற�"
-
-#: gtksourceview/language-specs/ruby.lang.h:15
-msgid "Regular Expression 2"
-msgstr "�யல�பான ��ற�ற� 2"
-
-#: gtksourceview/language-specs/ruby.lang.h:16
+#: ../gtksourceview/language-specs/ruby.lang.h:15
msgid "Ruby"
msgstr "ர�பி"
-#: gtksourceview/language-specs/sh.lang.h:2
-#, fuzzy
-msgid "Built-in Commands"
-msgstr "�ள� ��யல�"
-
-#: gtksourceview/language-specs/sh.lang.h:3
-#, fuzzy
-msgid "Common Commands"
-msgstr "�தி�ம� பயன�ப��த�த�ம� ����ள��ள�"
-
-#: gtksourceview/language-specs/sh.lang.h:10
-#, fuzzy
-msgid "Redirections"
-msgstr "விள������ள�"
+#: ../gtksourceview/language-specs/ruby.lang.h:18
+msgid "Symbols"
+msgstr "��றிய����ள�"
+
+#: ../gtksourceview/language-specs/scheme.lang.h:11
+msgid "Scheme"
+msgstr "தி���ம�"
+
+#: ../gtksourceview/language-specs/sh.lang.h:2
+msgid "Built-in Command"
+msgstr "���ப�தியப�ப��� ����ள�"
+
+#: ../gtksourceview/language-specs/sh.lang.h:3
+msgid "Common Command"
+msgstr "ப�த�வான ����ள�"
+
+#: ../gtksourceview/language-specs/sh.lang.h:8
+msgid "Operator"
+msgstr "��றிய���"
+
+#: ../gtksourceview/language-specs/sh.lang.h:9
+msgid "Punctuator"
+msgstr "நிற�த�தற���றி"
+
+#: ../gtksourceview/language-specs/sh.lang.h:10
+msgid "Redirection"
+msgstr "மற� தி��"
-#: gtksourceview/language-specs/sh.lang.h:12
+#: ../gtksourceview/language-specs/sh.lang.h:12
msgid "Self"
msgstr "தானா�"
-#: gtksourceview/language-specs/sh.lang.h:15
-#, fuzzy
-msgid "Variable1"
-msgstr "மாறிலி�ள�"
-
-#: gtksourceview/language-specs/sh.lang.h:16
-#, fuzzy
-msgid "Variable2"
-msgstr "மாறிலி�ள�"
-
-#: gtksourceview/language-specs/sh.lang.h:17
+#: ../gtksourceview/language-specs/sh.lang.h:17
msgid "sh"
-msgstr ""
+msgstr "sh"
-#: gtksourceview/language-specs/sql.lang.h:1
+#: ../gtksourceview/language-specs/sql.lang.h:1
msgid "ANSI Datatypes"
msgstr "ANSI த�வல� வ��"
-#: gtksourceview/language-specs/sql.lang.h:2
+#. Reserved Words
+#: ../gtksourceview/language-specs/sql.lang.h:3
msgid "ANSI Reserved Words"
msgstr "ANSI ம�ன�பதிவான வார�த�த��ள�"
-#: gtksourceview/language-specs/sql.lang.h:3
+#. Aggregate Functions
+#: ../gtksourceview/language-specs/sql.lang.h:5
msgid "Aggregate Functions"
msgstr "�ர����ிண�ந�த ��யல�பா���ள�"
-#: gtksourceview/language-specs/sql.lang.h:4
+#. Analytic Functions
+#: ../gtksourceview/language-specs/sql.lang.h:7
msgid "Analytic Functions"
msgstr "ப��த�தாய�ம� ��யல��ள�"
-#: gtksourceview/language-specs/sql.lang.h:6
+#: ../gtksourceview/language-specs/sql.lang.h:10
msgid "Character Functions Returning Character Values"
msgstr "�ழ�த�த� மதிப�ப��ள� தர�ம� �ழ�த�த� ��யல�"
-#: gtksourceview/language-specs/sql.lang.h:7
+#: ../gtksourceview/language-specs/sql.lang.h:11
msgid "Character Functions Returning Number Values"
msgstr "�ண�த�த� மதிப�ப��ள� தர�ம� �ழ�த�த� ��யல�"
-#: gtksourceview/language-specs/sql.lang.h:8
+#: ../gtksourceview/language-specs/sql.lang.h:12
+msgid "Collection Functions"
+msgstr "த���ப�ப� ��யல��ள�"
+
+#: ../gtksourceview/language-specs/sql.lang.h:13
+msgid "Conditions"
+msgstr "நிபந�தன��ள�"
+
+#: ../gtksourceview/language-specs/sql.lang.h:14
msgid "Conversion Functions"
msgstr "மாற�ற ��யல�"
-#: gtksourceview/language-specs/sql.lang.h:9
+#: ../gtksourceview/language-specs/sql.lang.h:15
+msgid "Data Mining Functions"
+msgstr "தரவ� ப�திவ� ��யல�பா���ள�"
+
+#: ../gtksourceview/language-specs/sql.lang.h:16
msgid "Datetime Functions"
msgstr "த�தி ந�ர ��யல��ள�"
-#: gtksourceview/language-specs/sql.lang.h:10
+#: ../gtksourceview/language-specs/sql.lang.h:17
+msgid "Encoding and Decoding Functions"
+msgstr "��றிம�ற� மற�ற�ம� ��றிம�ற�ந����ல� ��யல�பா���ள�"
+
+#: ../gtksourceview/language-specs/sql.lang.h:18
+msgid "Environment and Identifier Functions"
+msgstr "��ழல�நில� மற�ற�ம� ���யாள ��யல�பா���ள�"
+
+#: ../gtksourceview/language-specs/sql.lang.h:19
+msgid "General Comparison Functions"
+msgstr "ப�த�வான �ப�பி��ம� ��யல�பா���ள�"
+
+#: ../gtksourceview/language-specs/sql.lang.h:20
+msgid "Hierarchical Function"
+msgstr "ப�ிம�ற� ��யல�பா���ள�"
+
+#: ../gtksourceview/language-specs/sql.lang.h:21
msgid "Integer Literals"
msgstr "�யல��ண� பின�பற�றல�"
-#: gtksourceview/language-specs/sql.lang.h:12
-msgid "Miscellaneous Single-Row Functions"
-msgstr "மற�ற �ர�-வரி�� ��யல�"
+#: ../gtksourceview/language-specs/sql.lang.h:22
+msgid "Large Object Functions"
+msgstr "ப�ரிய ப�ர�ள� ��யல�பா���ள�"
+
+#. Model Functions
+#: ../gtksourceview/language-specs/sql.lang.h:25
+msgid "Model Functions"
+msgstr "மாதிரி ��யல�பா���ள�"
+
+#: ../gtksourceview/language-specs/sql.lang.h:26
+msgid "NLS Character Functions"
+msgstr "NLS �ழ�த�த� ��யல�பா���ள�"
+
+#: ../gtksourceview/language-specs/sql.lang.h:27
+msgid "NULL-Related Functions"
+msgstr "�ன�ற�மில�லாதத� த��ர�பான ��யல�பா���ள�"
-#: gtksourceview/language-specs/sql.lang.h:13
+#: ../gtksourceview/language-specs/sql.lang.h:28
msgid "Null"
msgstr "�த�வ�மில�ல�"
-#: gtksourceview/language-specs/sql.lang.h:14
-msgid "Number Functions"
-msgstr "�ண� ��யல�"
-
-#: gtksourceview/language-specs/sql.lang.h:15
+#: ../gtksourceview/language-specs/sql.lang.h:29
msgid "Number Literals"
msgstr "�ண� பின�பற�றல�"
-#: gtksourceview/language-specs/sql.lang.h:16
+#. Single-Row Functions
+#: ../gtksourceview/language-specs/sql.lang.h:31
+msgid "Numeric Functions"
+msgstr "�ண� ��யல�பா���ள�"
+
+#. Object Reference Functions
+#: ../gtksourceview/language-specs/sql.lang.h:33
msgid "Object Reference Functions"
msgstr "ப�ர�ள� ��றிப�ப� ��யல��ள�"
-#: gtksourceview/language-specs/sql.lang.h:17
+#. Datatypes
+#: ../gtksourceview/language-specs/sql.lang.h:36
msgid "Oracle Built-in Datatypes"
msgstr "�ர���ிள� �ள� த�வல� வ��"
-#: gtksourceview/language-specs/sql.lang.h:18
+#: ../gtksourceview/language-specs/sql.lang.h:37
msgid "Oracle Reserved Words"
msgstr "�ர���ிள� �ற���னவ� �த����ப�ப��� வார�த�த��ள�"
-#: gtksourceview/language-specs/sql.lang.h:19
+#: ../gtksourceview/language-specs/sql.lang.h:38
+msgid "Oracle-Supplied Types"
+msgstr "�ர���ிள� வழ���ிய வ���ள�"
+
+#: ../gtksourceview/language-specs/sql.lang.h:39
msgid "SQL"
msgstr "SQL"
-#: gtksourceview/language-specs/sql.lang.h:20
+#: ../gtksourceview/language-specs/sql.lang.h:40
+msgid "SQL Statements"
+msgstr "SQL ����ள��ள�"
+
+#. SQL*Plus
+#: ../gtksourceview/language-specs/sql.lang.h:42
msgid "SQL*Plus At Sign"
msgstr "SQL*Plus At Sign"
-#: gtksourceview/language-specs/sql.lang.h:21
+#: ../gtksourceview/language-specs/sql.lang.h:43
msgid "SQL*Plus Commands"
msgstr "SQL*Plus ����ள��ள�"
-#: gtksourceview/language-specs/sql.lang.h:22
+#: ../gtksourceview/language-specs/sql.lang.h:44
msgid "SQL*Plus Double At Sign"
msgstr "SQL*Plus Double At Sign"
-#: gtksourceview/language-specs/sql.lang.h:23
+#: ../gtksourceview/language-specs/sql.lang.h:45
msgid "SQL*Plus Slash"
msgstr "SQL*Plus �ாய�����"
-#: gtksourceview/language-specs/sql.lang.h:24
+#: ../gtksourceview/language-specs/sql.lang.h:46
msgid "SQL/DS and DB2 Datatypes"
msgstr "SQL/DS மற�ற�ம� DB2 த�வல�வ��"
-#: gtksourceview/language-specs/sql.lang.h:25
+#: ../gtksourceview/language-specs/sql.lang.h:47
msgid "Size Clause"
msgstr "�ளவ� Clause"
-#: gtksourceview/language-specs/sql.lang.h:27
+#. Literals
+#: ../gtksourceview/language-specs/sql.lang.h:50
msgid "Text Literals"
msgstr "�ர� பின�த��ர�"
-#: gtksourceview/language-specs/sql.lang.h:28
+#: ../gtksourceview/language-specs/sql.lang.h:51
msgid "Unlimited"
msgstr "�ல�ல�யற�ற"
-#: gtksourceview/language-specs/verilog.lang.h:1
-#: gtksourceview/language-specs/nemerle.lang.h:1
-msgid "Binary Number"
-msgstr "�ர�ம �ண�"
-
-#: gtksourceview/language-specs/verilog.lang.h:4
-msgid "Gates"
-msgstr "வா�ல�"
-
-#: gtksourceview/language-specs/verilog.lang.h:11
-msgid "Verilog"
-msgstr "Verilog"
-
-#: gtksourceview/language-specs/xml.lang.h:5
-msgid "Hexadecimal"
-msgstr "�ண�ம"
-
-#: gtksourceview/language-specs/xml.lang.h:8
-msgid "Tag"
-msgstr "��றி"
-
-#: gtksourceview/language-specs/xml.lang.h:9
-msgid "XML"
-msgstr "XML"
-
-#: gtksourceview/language-specs/haskell.lang.h:5
-msgid "Haskell"
-msgstr "Haskell"
-
-#: gtksourceview/language-specs/haskell.lang.h:8
-msgid "Keysymbols"
-msgstr "வி�����யாளம�"
+#: ../gtksourceview/language-specs/sql.lang.h:52
+msgid "XML Functions"
+msgstr "XML ��யல�பா���ள�"
-#: gtksourceview/language-specs/haskell.lang.h:16
-msgid "Type or Constructor"
-msgstr "�ன�ஸ���ர���ர� வ��"
+#: ../gtksourceview/language-specs/tcl.lang.h:6
+msgid "Tcl"
+msgstr "Tcl"
-#: gtksourceview/language-specs/texinfo.lang.h:2
+#: ../gtksourceview/language-specs/texinfo.lang.h:2
msgid "Characters"
msgstr "�ழ�த�த����ள�"
-#: gtksourceview/language-specs/texinfo.lang.h:3
+#: ../gtksourceview/language-specs/texinfo.lang.h:3
msgid "File Attributes"
msgstr "��ப�ப� பண�ப��ள�"
-#: gtksourceview/language-specs/texinfo.lang.h:4
+#: ../gtksourceview/language-specs/texinfo.lang.h:4
msgid "Formatting"
msgstr "வ�ிவம�ப�ப�"
-#: gtksourceview/language-specs/texinfo.lang.h:5
+#: ../gtksourceview/language-specs/texinfo.lang.h:5
msgid "Generated Content"
msgstr "ப�த� �ள�ள�������ள�"
-#: gtksourceview/language-specs/texinfo.lang.h:7
+#: ../gtksourceview/language-specs/texinfo.lang.h:7
msgid "Indexing"
msgstr "����வண��ள�"
-#: gtksourceview/language-specs/texinfo.lang.h:10
+#: ../gtksourceview/language-specs/texinfo.lang.h:10
msgid "Macro Parameters"
msgstr "மா��ர� �ளவ�ர����ள�"
-#: gtksourceview/language-specs/texinfo.lang.h:11
+#: ../gtksourceview/language-specs/texinfo.lang.h:11
msgid "Macros"
msgstr "மா��ர�"
-#: gtksourceview/language-specs/texinfo.lang.h:13
+#: ../gtksourceview/language-specs/texinfo.lang.h:13
msgid "Markup (block)"
msgstr "��றிம�ழி (block)"
-#: gtksourceview/language-specs/texinfo.lang.h:14
+#: ../gtksourceview/language-specs/texinfo.lang.h:14
msgid "Markup (inline)"
msgstr "��றிம�ழி (inline)"
-#: gtksourceview/language-specs/texinfo.lang.h:15
+#: ../gtksourceview/language-specs/texinfo.lang.h:15
msgid "Sectioning"
msgstr "ப��தியா���ல�"
-#: gtksourceview/language-specs/texinfo.lang.h:16
+#: ../gtksourceview/language-specs/texinfo.lang.h:16
msgid "Texinfo"
msgstr "�ர�த�வல�"
-#: gtksourceview/language-specs/vbnet.lang.h:3
+#: ../gtksourceview/language-specs/vbnet.lang.h:7
msgid "Old Style Comment"
msgstr "பழ�ய பாணி ��றிப�ப�"
-#: gtksourceview/language-specs/vbnet.lang.h:9
+#: ../gtksourceview/language-specs/vbnet.lang.h:12
msgid "VB.NET"
msgstr "VB.NET"
-#: gtksourceview/language-specs/nemerle.lang.h:4
-#, fuzzy
-msgid "Core Keywords"
-msgstr "வி��வார�த�த� ����ம�"
-
-#: gtksourceview/language-specs/nemerle.lang.h:5
-#, fuzzy
-msgid "Core Types"
-msgstr "வ���ள�"
-
-#: gtksourceview/language-specs/nemerle.lang.h:9
-msgid "Keywords Defined by Macros"
-msgstr ""
-
-#: gtksourceview/language-specs/nemerle.lang.h:11
-#, fuzzy
-msgid "Nemerle"
-msgstr "�ண�"
+#: ../gtksourceview/language-specs/verilog.lang.h:4
+msgid "Gates"
+msgstr "வா�ல�"
-#: gtksourceview/language-specs/tcl.lang.h:6
-msgid "Tcl"
-msgstr ""
+#: ../gtksourceview/language-specs/verilog.lang.h:11
+msgid "Verilog"
+msgstr "Verilog"
-#: gtksourceview/language-specs/vhdl.lang.h:7
-#, fuzzy
+#: ../gtksourceview/language-specs/vhdl.lang.h:7
msgid "True and False"
-msgstr "�ண�ம� மற�ற�ம� ப�ய�"
-
-#: gtksourceview/language-specs/vhdl.lang.h:8
-#, fuzzy
-msgid "Type"
-msgstr "வ���ள�"
+msgstr "�ரி மற�ற�ம� தவற�"
-#: gtksourceview/language-specs/vhdl.lang.h:9
+#: ../gtksourceview/language-specs/vhdl.lang.h:9
msgid "VHDL"
-msgstr ""
-
-#: gtksourceview/language-specs/R.lang.h:1
-#, fuzzy
-msgid "Assignment Operator"
-msgstr "�ணி ��யல�பா���ள�"
-
-#: gtksourceview/language-specs/R.lang.h:2
-#, fuzzy
-msgid "Delimiter"
-msgstr "�ல�ல�யற�ற"
-
-#: gtksourceview/language-specs/R.lang.h:5
-#, fuzzy
-msgid "Integer Number"
-msgstr "�ர�ம �ண�"
-
-#: gtksourceview/language-specs/R.lang.h:8
-#, fuzzy
-msgid "Reserved Class"
-msgstr "ANSI ம�ன�பதிவான வார�த�த��ள�"
+msgstr "VHDL"
-#: gtksourceview/language-specs/R.lang.h:9
-#, fuzzy
-msgid "Reserved Constant"
-msgstr "ப�த� �ள�ள�������ள�"
-
-#: gtksourceview/language-specs/gtkrc.lang.h:3
-msgid "GtkRC"
-msgstr ""
-
-#: gtksourceview/language-specs/gtkrc.lang.h:4
-msgid "Include Directive"
-msgstr ""
-
-#: gtksourceview/language-specs/gtkrc.lang.h:5
-#, fuzzy
-msgid "Keysymbol"
-msgstr "வி�����யாளம�"
-
-#: gtksourceview/language-specs/gtkrc.lang.h:11
-#, fuzzy
-msgid "State"
-msgstr "வா�ல�"
-
-#~ msgid "Font description name to use for the document text"
-#~ msgstr "�ர� �வணத�தில� பயன�ப��த�த வ�ண��ிய �ழ�த�த�ர� விள��� ப�யர�"
-
-#~ msgid "Font description name to use for the header and footer"
-#~ msgstr "��ி����றிப�ப� மற�ற�ம� ம�ல� ��றிப�ப� �ழ�த�த�ர� விள��� ப�யர�"
-
-#~ msgid "Plain Old Documentation"
-#~ msgstr "மி�ப�பழ�ய �வணம�"
-
-#~ msgid "CSS"
-#~ msgstr "CSS"
+#: ../gtksourceview/language-specs/xml.lang.h:5
+msgid "Hexadecimal"
+msgstr "�ண�ம"
-#~ msgid "JavaScript"
-#~ msgstr "�ாவா�ிற�நிரல�"
+#: ../gtksourceview/language-specs/xml.lang.h:9
+msgid "XML"
+msgstr "XML"
-#~ msgid "MSIL"
-#~ msgstr "MSIL"
diff -pruN 1.6.1-3/po/vi.po 1.7.1-0ubuntu2/po/vi.po
--- 1.6.1-3/po/vi.po 2006-01-15 11:23:13.000000000 +0000
+++ 1.7.1-0ubuntu2/po/vi.po 2006-07-20 09:09:56.000000000 +0100
@@ -803,7 +803,7 @@ msgstr "Tham chiếu ký tự Unicode"
#.
#:../gtksourceview/language-specs/css.lang.h:68
msgid "Unicode Range"
-msgstr "Phạm v� Unicode"
+msgstr "Phạm vi Unicode"
#:../gtksourceview/language-specs/desktop.lang.h:1
msgid ".desktop"
diff -pruN 1.6.1-3/tests/Makefile.in 1.7.1-0ubuntu2/tests/Makefile.in
--- 1.6.1-3/tests/Makefile.in 2006-04-10 09:25:45.000000000 +0100
+++ 1.7.1-0ubuntu2/tests/Makefile.in 2006-07-24 18:40:55.000000000 +0100
@@ -76,6 +76,7 @@ CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ALL_LINGUAS = @ALL_LINGUAS@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
@@ -93,7 +94,6 @@ CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
