diff --git a/Makefile.in b/Makefile.in index 7872cea..401d885 100644 --- a/Makefile.in +++ b/Makefile.in @@ -160,7 +160,7 @@ CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in AUTHORS COPYING ChangeLog \ INSTALL NEWS TODO compile config.guess config.rpath config.sub \ - depcomp install-sh ltmain.sh missing + install-sh ltmain.sh missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) diff --git a/autogen.sh b/autogen.sh index f47c552..56b9dd5 100755 --- a/autogen.sh +++ b/autogen.sh @@ -3,8 +3,8 @@ export WANT_AUTOCONF_2_5="1" export WANT_AUTOMAKE_1_7="1" -aclocal -libtoolize --automake --force --copy -automake -a -c +libtoolize --copy +intltoolize --copy --force +aclocal -I m4 autoconf - +automake --add-missing --copy diff --git a/data/Makefile.am b/data/Makefile.am index 63cdf43..c6e1236 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -5,7 +5,7 @@ desktop_in_files = xmlcopyeditor.desktop.in desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) @INTLTOOL_DESKTOP_RULE@ -appdatadir = $(datadir)/appdata +appdatadir = $(datadir)/metainfo appdata_in_files = xmlcopyeditor.appdata.xml.in appdata_DATA = $(appdata_in_files:.xml.in=.xml) @INTLTOOL_XML_RULE@ diff --git a/data/Makefile.in b/data/Makefile.in index df599bd..e86e121 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -312,7 +312,7 @@ NULL = desktopdir = $(datadir)/applications desktop_in_files = xmlcopyeditor.desktop.in desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) -appdatadir = $(datadir)/appdata +appdatadir = $(datadir)/metainfo appdata_in_files = xmlcopyeditor.appdata.xml.in appdata_DATA = $(appdata_in_files:.xml.in=.xml) man_MANS = xmlcopyeditor.1 diff --git a/data/xmlcopyeditor.appdata.xml.in b/data/xmlcopyeditor.appdata.xml.in index 99748eb..3982616 100644 --- a/data/xmlcopyeditor.appdata.xml.in +++ b/data/xmlcopyeditor.appdata.xml.in @@ -1,11 +1,11 @@ - - xmlcopyeditor.desktop - CC0 + + xmlcopyeditor.desktop + GPL-2.0+ + XML Copy Editor + fast, free, validating XML editor + - <_p> - fast, free, validating XML editor - <_p> XML Copy Editor is an XML editor focusing on editing document markup languages like DITA, DocBook, WordprocessingML. Features: DTD/XML @@ -15,9 +15,10 @@ Spelling and style check with built-in spell/style checker. + <_screenshot type="default" width="640" height="387">https://a.fsdn.com/con/app/proj/xml-copy-editor/screenshots/151221.jpg http://xml-copy-editor.sourceforge.net/ zaneuji_at_users.sf.net - + diff --git a/debian/compat b/debian/compat index 45a4fb7..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -8 +9 diff --git a/debian/control b/debian/control index f6807d8..d2d6752 100644 --- a/debian/control +++ b/debian/control @@ -1,21 +1,20 @@ Source: xmlcopyeditor Section: editors -Priority: extra +Priority: optional Maintainer: Zane U. Ji -Build-Depends: debhelper (>= 8.0.0), autotools-dev, x11proto-composite-dev, - x11proto-randr-dev, libxfixes-dev, libxerces-c-dev, libglib2.0-0, - libxdmcp-dev, mime-support, gettext, file, libxinerama-dev, intltool, - libcairo2-dev, libxcb1-dev, libxcb-render0-dev, libxi-dev, libgtk2.0-dev, - mawk, libgdk-pixbuf2.0-dev, libglib2.0-dev, libatk1.0-dev, - libxml-parser-perl, libcroco3, libx11-dev, perl-modules, libpopt0, libxml2, - pkg-config, libpcre3-dev, libwxgtk2.8-dev, libfreetype6-dev, x11proto-kb-dev, - x11proto-damage-dev, libfontconfig1-dev, x11proto-xinerama-dev, - libexpat1-dev, libxml2-dev, libpthread-stubs0-dev, libxext-dev, - libxrandr-dev, libxau-dev, libenchant-dev, libpixman-1-dev, - libxcomposite-dev, libxrender-dev, libboost1.48-dev, libpng12-dev, - libunistring0, libegl1-mesa-lts-saucy, libmagic1, x11proto-render-dev, - libexpat1, libxcb-shm0-dev, libpcre3, libpango1.0-dev, - libgl1-mesa-glx-lts-saucy, libxcursor-dev, libxdamage-dev, libxslt1-dev, cpio +Build-Depends: debhelper (>= 8.0.0), autotools-dev, cpio, file, gettext, + intltool, libatk1.0-dev, libboost-dev, libcairo2-dev, libcroco3, + libenchant-dev, libexpat1, libexpat1-dev, libfontconfig1-dev, + libfreetype6-dev, libgdk-pixbuf2.0-dev, libglib2.0-0, libglib2.0-dev, + libgtk-3-dev, libmagic1, libpango1.0-dev, libpcre3, libpcre3-dev, + libpixman-1-dev, libpopt0, libpthread-stubs0-dev, libwxgtk3.0-gtk3-dev, + libx11-dev, libxau-dev, libxcb-render0-dev, libxcb-shm0-dev, libxcb1-dev, + libxcomposite-dev, libxcursor-dev, libxdamage-dev, libxdmcp-dev, + libxerces-c-dev, libxext-dev, libxfixes-dev, libxi-dev, libxinerama-dev, + libxml-parser-perl, libxml2, libxml2-dev, libxrandr-dev, libxrender-dev, + libxslt1-dev, mawk, mime-support, perl-modules, pkg-config, + x11proto-composite-dev, x11proto-damage-dev, x11proto-kb-dev, + x11proto-randr-dev, x11proto-render-dev, x11proto-xinerama-dev Standards-Version: 3.9.2 Homepage: http://xml-copy-editor.sourceforge.net/ Vcs-Git: git://git.code.sf.net/p/xml-copy-editor/code diff --git a/depcomp b/depcomp index b39f98f..65cbf70 100755 --- a/depcomp +++ b/depcomp @@ -1,9 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2016-01-11.22; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ scriptversion=2016-01-11.22; # UTC # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -783,7 +783,7 @@ exit 0 # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff --git a/install-sh b/install-sh index 59990a1..8175c64 100755 --- a/install-sh +++ b/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2014-09-12.12; # UTC +scriptversion=2018-03-11.20; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -271,15 +271,18 @@ do fi dst=$dst_arg - # If destination is a directory, append the input filename; won't work - # if double slashes aren't ignored. + # If destination is a directory, append the input filename. if test -d "$dst"; then if test "$is_target_a_directory" = never; then echo "$0: $dst_arg: Is a directory" >&2 exit 1 fi dstdir=$dst - dst=$dstdir/`basename "$src"` + dstbase=`basename "$src"` + case $dst in + */) dst=$dst$dstbase;; + *) dst=$dst/$dstbase;; + esac dstdir_status=0 else dstdir=`dirname "$dst"` @@ -288,6 +291,11 @@ do fi fi + case $dstdir in + */) dstdirslash=$dstdir;; + *) dstdirslash=$dstdir/;; + esac + obsolete_mkdir_used=false if test $dstdir_status != 0; then @@ -324,14 +332,16 @@ do # is incompatible with FreeBSD 'install' when (umask & 300) != 0. ;; *) - # $RANDOM is not portable (e.g. dash); use it when possible to - # lower collision chance + # Note that $RANDOM variable is not portable (e.g. dash); Use it + # here however when possible just to lower collision chance. tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 - # As "mkdir -p" follows symlinks and we work in /tmp possibly; so - # create the $tmpdir first (and fail if unsuccessful) to make sure - # that nobody tries to guess the $tmpdir name. + # Because "mkdir -p" follows existing symlinks and we likely work + # directly in world-writeable /tmp, make sure that the '$tmpdir' + # directory is successfully created first before we actually test + # 'mkdir -p' feature. if (umask $mkdir_umask && $mkdirprog $mkdir_mode "$tmpdir" && exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 @@ -434,8 +444,8 @@ do else # Make a couple of temp file names in the proper directory. - dsttmp=$dstdir/_inst.$$_ - rmtmp=$dstdir/_rm.$$_ + dsttmp=${dstdirslash}_inst.$$_ + rmtmp=${dstdirslash}_rm.$$_ # Trap to clean up those temp files at exit. trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 @@ -500,9 +510,9 @@ do done # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff --git a/ltmain.sh b/ltmain.sh index a736cf9..0cb7f90 100644 --- a/ltmain.sh +++ b/ltmain.sh @@ -31,7 +31,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.6 Debian-2.4.6-2" +VERSION="2.4.6 Debian-2.4.6-14" package_revision=2.4.6 @@ -387,7 +387,7 @@ EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. # putting '$debug_cmd' at the start of all your functions, you can get # bash to show function call trace with: # -# debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name +# debug_cmd='echo "${FUNCNAME[0]} $*" >&2' bash your-script-name debug_cmd=${debug_cmd-":"} exit_cmd=: @@ -1370,7 +1370,7 @@ func_lt_ver () #! /bin/sh # Set a version string for this script. -scriptversion=2014-01-07.03; # UTC +scriptversion=2015-10-07.11; # UTC # A portable, pluggable option parser for Bourne shell. # Written by Gary V. Vaughan, 2010 @@ -1530,6 +1530,8 @@ func_run_hooks () { $debug_cmd + _G_rc_run_hooks=false + case " $hookable_fns " in *" $1 "*) ;; *) func_fatal_error "'$1' does not support hook funcions.n" ;; @@ -1538,16 +1540,16 @@ func_run_hooks () eval _G_hook_fns=\$$1_hooks; shift for _G_hook in $_G_hook_fns; do - eval $_G_hook '"$@"' - - # store returned options list back into positional - # parameters for next 'cmd' execution. - eval _G_hook_result=\$${_G_hook}_result - eval set dummy "$_G_hook_result"; shift + if eval $_G_hook '"$@"'; then + # store returned options list back into positional + # parameters for next 'cmd' execution. + eval _G_hook_result=\$${_G_hook}_result + eval set dummy "$_G_hook_result"; shift + _G_rc_run_hooks=: + fi done - func_quote_for_eval ${1+"$@"} - func_run_hooks_result=$func_quote_for_eval_result + $_G_rc_run_hooks && func_run_hooks_result=$_G_hook_result } @@ -1557,10 +1559,16 @@ func_run_hooks () ## --------------- ## # In order to add your own option parsing hooks, you must accept the -# full positional parameter list in your hook function, remove any -# options that you action, and then pass back the remaining unprocessed +# full positional parameter list in your hook function, you may remove/edit +# any options that you action, and then pass back the remaining unprocessed # options in '_result', escaped suitably for -# 'eval'. Like this: +# 'eval'. In this case you also must return $EXIT_SUCCESS to let the +# hook's caller know that it should pay attention to +# '_result'. Returning $EXIT_FAILURE signalizes that +# arguments are left untouched by the hook and therefore caller will ignore the +# result variable. +# +# Like this: # # my_options_prep () # { @@ -1570,9 +1578,11 @@ func_run_hooks () # usage_message=$usage_message' # -s, --silent don'\''t print informational messages # ' -# -# func_quote_for_eval ${1+"$@"} -# my_options_prep_result=$func_quote_for_eval_result +# # No change in '$@' (ignored completely by this hook). There is +# # no need to do the equivalent (but slower) action: +# # func_quote_for_eval ${1+"$@"} +# # my_options_prep_result=$func_quote_for_eval_result +# false # } # func_add_hook func_options_prep my_options_prep # @@ -1581,25 +1591,37 @@ func_run_hooks () # { # $debug_cmd # +# args_changed=false +# # # Note that for efficiency, we parse as many options as we can # # recognise in a loop before passing the remainder back to the # # caller on the first unrecognised argument we encounter. # while test $# -gt 0; do # opt=$1; shift # case $opt in -# --silent|-s) opt_silent=: ;; +# --silent|-s) opt_silent=: +# args_changed=: +# ;; # # Separate non-argument short options: # -s*) func_split_short_opt "$_G_opt" # set dummy "$func_split_short_opt_name" \ # "-$func_split_short_opt_arg" ${1+"$@"} # shift +# args_changed=: # ;; -# *) set dummy "$_G_opt" "$*"; shift; break ;; +# *) # Make sure the first unrecognised option "$_G_opt" +# # is added back to "$@", we could need that later +# # if $args_changed is true. +# set dummy "$_G_opt" ${1+"$@"}; shift; break ;; # esac # done # -# func_quote_for_eval ${1+"$@"} -# my_silent_option_result=$func_quote_for_eval_result +# if $args_changed; then +# func_quote_for_eval ${1+"$@"} +# my_silent_option_result=$func_quote_for_eval_result +# fi +# +# $args_changed # } # func_add_hook func_parse_options my_silent_option # @@ -1611,16 +1633,32 @@ func_run_hooks () # $opt_silent && $opt_verbose && func_fatal_help "\ # '--silent' and '--verbose' options are mutually exclusive." # -# func_quote_for_eval ${1+"$@"} -# my_option_validation_result=$func_quote_for_eval_result +# false # } # func_add_hook func_validate_options my_option_validation # -# You'll alse need to manually amend $usage_message to reflect the extra +# You'll also need to manually amend $usage_message to reflect the extra # options you parse. It's preferable to append if you can, so that # multiple option parsing hooks can be added safely. +# func_options_finish [ARG]... +# ---------------------------- +# Finishing the option parse loop (call 'func_options' hooks ATM). +func_options_finish () +{ + $debug_cmd + + _G_func_options_finish_exit=false + if func_run_hooks func_options ${1+"$@"}; then + func_options_finish_result=$func_run_hooks_result + _G_func_options_finish_exit=: + fi + + $_G_func_options_finish_exit +} + + # func_options [ARG]... # --------------------- # All the functions called inside func_options are hookable. See the @@ -1630,17 +1668,28 @@ func_options () { $debug_cmd - func_options_prep ${1+"$@"} - eval func_parse_options \ - ${func_options_prep_result+"$func_options_prep_result"} - eval func_validate_options \ - ${func_parse_options_result+"$func_parse_options_result"} + _G_rc_options=false - eval func_run_hooks func_options \ - ${func_validate_options_result+"$func_validate_options_result"} + for my_func in options_prep parse_options validate_options options_finish + do + if eval func_$my_func '${1+"$@"}'; then + eval _G_res_var='$'"func_${my_func}_result" + eval set dummy "$_G_res_var" ; shift + _G_rc_options=: + fi + done - # save modified positional parameters for caller - func_options_result=$func_run_hooks_result + # Save modified positional parameters for caller. As a top-level + # options-parser function we always need to set the 'func_options_result' + # variable (regardless the $_G_rc_options value). + if $_G_rc_options; then + func_options_result=$_G_res_var + else + func_quote_for_eval ${1+"$@"} + func_options_result=$func_quote_for_eval_result + fi + + $_G_rc_options } @@ -1649,9 +1698,9 @@ func_options () # All initialisations required before starting the option parse loop. # Note that when calling hook functions, we pass through the list of # positional parameters. If a hook function modifies that list, and -# needs to propogate that back to rest of this script, then the complete +# needs to propagate that back to rest of this script, then the complete # modified list must be put in 'func_run_hooks_result' before -# returning. +# returning $EXIT_SUCCESS (otherwise $EXIT_FAILURE is returned). func_hookable func_options_prep func_options_prep () { @@ -1661,10 +1710,14 @@ func_options_prep () opt_verbose=false opt_warning_types= - func_run_hooks func_options_prep ${1+"$@"} + _G_rc_options_prep=false + if func_run_hooks func_options_prep ${1+"$@"}; then + _G_rc_options_prep=: + # save modified positional parameters for caller + func_options_prep_result=$func_run_hooks_result + fi - # save modified positional parameters for caller - func_options_prep_result=$func_run_hooks_result + $_G_rc_options_prep } @@ -1678,18 +1731,20 @@ func_parse_options () func_parse_options_result= + _G_rc_parse_options=false # this just eases exit handling while test $# -gt 0; do # Defer to hook functions for initial option parsing, so they # get priority in the event of reusing an option name. - func_run_hooks func_parse_options ${1+"$@"} - - # Adjust func_parse_options positional parameters to match - eval set dummy "$func_run_hooks_result"; shift + if func_run_hooks func_parse_options ${1+"$@"}; then + eval set dummy "$func_run_hooks_result"; shift + _G_rc_parse_options=: + fi # Break out of the loop if we already parsed every option. test $# -gt 0 || break + _G_match_parse_options=: _G_opt=$1 shift case $_G_opt in @@ -1704,7 +1759,10 @@ func_parse_options () ;; --warnings|--warning|-W) - test $# = 0 && func_missing_arg $_G_opt && break + if test $# = 0 && func_missing_arg $_G_opt; then + _G_rc_parse_options=: + break + fi case " $warning_categories $1" in *" $1 "*) # trailing space prevents matching last $1 above @@ -1757,15 +1815,25 @@ func_parse_options () shift ;; - --) break ;; + --) _G_rc_parse_options=: ; break ;; -*) func_fatal_help "unrecognised option: '$_G_opt'" ;; - *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; + *) set dummy "$_G_opt" ${1+"$@"}; shift + _G_match_parse_options=false + break + ;; esac + + $_G_match_parse_options && _G_rc_parse_options=: done - # save modified positional parameters for caller - func_quote_for_eval ${1+"$@"} - func_parse_options_result=$func_quote_for_eval_result + + if $_G_rc_parse_options; then + # save modified positional parameters for caller + func_quote_for_eval ${1+"$@"} + func_parse_options_result=$func_quote_for_eval_result + fi + + $_G_rc_parse_options } @@ -1778,16 +1846,21 @@ func_validate_options () { $debug_cmd + _G_rc_validate_options=false + # Display all warnings if -W was not given. test -n "$opt_warning_types" || opt_warning_types=" $warning_categories" - func_run_hooks func_validate_options ${1+"$@"} + if func_run_hooks func_validate_options ${1+"$@"}; then + # save modified positional parameters for caller + func_validate_options_result=$func_run_hooks_result + _G_rc_validate_options=: + fi # Bail if the options were screwed! $exit_cmd $EXIT_FAILURE - # save modified positional parameters for caller - func_validate_options_result=$func_run_hooks_result + $_G_rc_validate_options } @@ -2068,7 +2141,7 @@ include the following information: compiler: $LTCC compiler flags: $LTCFLAGS linker: $LD (gnu? $with_gnu_ld) - version: $progname $scriptversion Debian-2.4.6-2 + version: $progname $scriptversion Debian-2.4.6-14 automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` @@ -2270,6 +2343,8 @@ libtool_options_prep () nonopt= preserve_args= + _G_rc_lt_options_prep=: + # Shorthand for --mode=foo, only valid as the first argument case $1 in clean|clea|cle|cl) @@ -2293,11 +2368,18 @@ libtool_options_prep () uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) shift; set dummy --mode uninstall ${1+"$@"}; shift ;; + *) + _G_rc_lt_options_prep=false + ;; esac - # Pass back the list of options. - func_quote_for_eval ${1+"$@"} - libtool_options_prep_result=$func_quote_for_eval_result + if $_G_rc_lt_options_prep; then + # Pass back the list of options. + func_quote_for_eval ${1+"$@"} + libtool_options_prep_result=$func_quote_for_eval_result + fi + + $_G_rc_lt_options_prep } func_add_hook func_options_prep libtool_options_prep @@ -2309,9 +2391,12 @@ libtool_parse_options () { $debug_cmd + _G_rc_lt_parse_options=false + # Perform our own loop to consume as many options as possible in # each iteration. while test $# -gt 0; do + _G_match_lt_parse_options=: _G_opt=$1 shift case $_G_opt in @@ -2386,15 +2471,22 @@ libtool_parse_options () func_append preserve_args " $_G_opt" ;; - # An option not handled by this hook function: - *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; + # An option not handled by this hook function: + *) set dummy "$_G_opt" ${1+"$@"} ; shift + _G_match_lt_parse_options=false + break + ;; esac + $_G_match_lt_parse_options && _G_rc_lt_parse_options=: done + if $_G_rc_lt_parse_options; then + # save modified positional parameters for caller + func_quote_for_eval ${1+"$@"} + libtool_parse_options_result=$func_quote_for_eval_result + fi - # save modified positional parameters for caller - func_quote_for_eval ${1+"$@"} - libtool_parse_options_result=$func_quote_for_eval_result + $_G_rc_lt_parse_options } func_add_hook func_parse_options libtool_parse_options @@ -7275,10 +7367,13 @@ func_mode_link () # -specs=* GCC specs files # -stdlib=* select c++ std lib with clang # -fsanitize=* Clang/GCC memory and address sanitizer + # -fuse-ld=* Linker select flags for GCC + # -static-* direct GCC to link specific libraries statically + # -fcilkplus Cilk Plus language extension features for C/C++ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ - -specs=*|-fsanitize=*) + -specs=*|-fsanitize=*|-fuse-ld=*|-static-*|-fcilkplus) func_quote_for_eval "$arg" arg=$func_quote_for_eval_result func_append compile_command " $arg" diff --git a/m4/libtool.m4 b/m4/libtool.m4 index ee80844..a6d21ae 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -1041,8 +1041,8 @@ int forced_loaded() { return 2;} _LT_EOF echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD - echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD - $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD + echo "$AR cr libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD + $AR cr libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD cat > conftest.c << _LT_EOF @@ -1492,7 +1492,7 @@ need_locks=$enable_libtool_lock m4_defun([_LT_PROG_AR], [AC_CHECK_TOOLS(AR, [ar], false) : ${AR=ar} -: ${AR_FLAGS=cru} +: ${AR_FLAGS=cr} _LT_DECL([], [AR], [1], [The archiver]) _LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) @@ -4063,7 +4063,8 @@ _LT_EOF if AC_TRY_EVAL(ac_compile); then # Now try to grab the symbols. nlist=conftest.nm - if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then + $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&AS_MESSAGE_LOG_FD + if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&AS_MESSAGE_LOG_FD && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" @@ -4703,6 +4704,12 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ;; + # flang / f18. f95 an alias for gfortran or flang on Debian + flang* | f18* | f95*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; # icc used to be incompatible with GCC. # ICC 10 doesn't accept -KPIC any more. icc* | ifort*) @@ -6438,7 +6445,7 @@ if test yes != "$_lt_caught_CXX_error"; then # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' else GXX=no @@ -6813,7 +6820,7 @@ if test yes != "$_lt_caught_CXX_error"; then # 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 -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test yes = "$GXX"; then @@ -6878,7 +6885,7 @@ if test yes != "$_lt_caught_CXX_error"; then # 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 -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test yes = "$GXX"; then @@ -7217,7 +7224,7 @@ if test yes != "$_lt_caught_CXX_error"; then # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' else # FIXME: insert proper C++ library support @@ -7301,7 +7308,7 @@ if test yes != "$_lt_caught_CXX_error"; then # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' else # g++ 2.7 appears to require '-G' NOT '-shared' on this # platform. @@ -7312,7 +7319,7 @@ if test yes != "$_lt_caught_CXX_error"; then # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' fi _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir' diff --git a/missing b/missing index f62bbae..625aeb1 100755 --- a/missing +++ b/missing @@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2013-10-28.13; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ scriptversion=2013-10-28.13; # UTC # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -101,9 +101,9 @@ else exit $st fi -perl_URL=http://www.perl.org/ -flex_URL=http://flex.sourceforge.net/ -gnu_software_URL=http://www.gnu.org/software +perl_URL=https://www.perl.org/ +flex_URL=https://github.com/westes/flex +gnu_software_URL=https://www.gnu.org/software program_details () { @@ -207,9 +207,9 @@ give_advice "$1" | sed -e '1s/^/WARNING: /' \ exit $st # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff --git a/po/Makefile.in.in b/po/Makefile.in.in index 3faee95..fcd2c3b 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -33,8 +33,7 @@ exec_prefix = @exec_prefix@ datadir = @datadir@ datarootdir = @datarootdir@ libdir = @libdir@ -DATADIRNAME = @DATADIRNAME@ -itlocaledir = $(prefix)/$(DATADIRNAME)/locale +localedir = @localedir@ subdir = po install_sh = @install_sh@ # Automake >= 1.8 provides @mkdir_p@. @@ -63,9 +62,7 @@ USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGU POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done) DISTFILES = Makefile.in.in POTFILES.in $(POFILES) -EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS \ - Preferences01.png Preferences02.png Settings.png translate.txt \ - Rules-quot *.gmo *.pot *.sed *.sin +EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS POTFILES = \ # This comment gets stripped out @@ -82,7 +79,7 @@ INTLTOOL__v_MSGFMT_0 = @echo " MSGFMT" $@; .po.pox: $(MAKE) $(GETTEXT_PACKAGE).pot - $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox + $(MSGMERGE) $* $(GETTEXT_PACKAGE).pot -o $*.pox .po.mo: $(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $< @@ -110,7 +107,7 @@ install-data-no: all install-data-yes: all linguas="$(USE_LINGUAS)"; \ for lang in $$linguas; do \ - dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \ + dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \ $(mkdir_p) $$dir; \ if test -r $$lang.gmo; then \ $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ @@ -144,8 +141,8 @@ install-exec installcheck: uninstall: linguas="$(USE_LINGUAS)"; \ 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; \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ done check: all $(GETTEXT_PACKAGE).pot diff --git a/po/ca.gmo b/po/ca.gmo index 21bb115..86ab6b7 100644 Binary files a/po/ca.gmo and b/po/ca.gmo differ diff --git a/po/de.gmo b/po/de.gmo index 578a7b4..b23b490 100644 Binary files a/po/de.gmo and b/po/de.gmo differ diff --git a/po/en_US.gmo b/po/en_US.gmo index 27616b3..295f545 100644 Binary files a/po/en_US.gmo and b/po/en_US.gmo differ diff --git a/po/es.gmo b/po/es.gmo index 1f6d0ab..b5b465b 100644 Binary files a/po/es.gmo and b/po/es.gmo differ diff --git a/po/fr.gmo b/po/fr.gmo index 553e391..d471e85 100644 Binary files a/po/fr.gmo and b/po/fr.gmo differ diff --git a/po/it.gmo b/po/it.gmo index 9edb9b8..aed4878 100644 Binary files a/po/it.gmo and b/po/it.gmo differ diff --git a/po/km.gmo b/po/km.gmo index 0e124c9..ff088cc 100644 Binary files a/po/km.gmo and b/po/km.gmo differ diff --git a/po/nl.gmo b/po/nl.gmo index b4a5043..1dc117e 100644 Binary files a/po/nl.gmo and b/po/nl.gmo differ diff --git a/po/ru.gmo b/po/ru.gmo index d5e2a82..e2bc689 100644 Binary files a/po/ru.gmo and b/po/ru.gmo differ diff --git a/po/sk.gmo b/po/sk.gmo index 9bd9a60..2b77e65 100644 Binary files a/po/sk.gmo and b/po/sk.gmo differ diff --git a/po/sv.gmo b/po/sv.gmo index cfe16a4..b874ee0 100644 Binary files a/po/sv.gmo and b/po/sv.gmo differ diff --git a/po/uk_UA.gmo b/po/uk_UA.gmo index cb54ed5..8058aac 100644 Binary files a/po/uk_UA.gmo and b/po/uk_UA.gmo differ diff --git a/po/xmlcopyeditor.pot b/po/xmlcopyeditor.pot index 720d78a..e43d2a6 100644 --- a/po/xmlcopyeditor.pot +++ b/po/xmlcopyeditor.pot @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-23 21:53+0800\n" +"Report-Msgid-Bugs-To: https://sourceforge.net/p/xml-copy-editor/bugs/\n" +"POT-Creation-Date: 2020-08-18 22:38+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,12 +16,9 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" #: ../data/xmlcopyeditor.appdata.xml.in.h:1 -msgid "fast, free, validating XML editor" -msgstr "" - -#: ../data/xmlcopyeditor.appdata.xml.in.h:2 msgid "" "XML Copy Editor is an XML editor focusing on editing document markup " "languages like DITA, DocBook, WordprocessingML. Features: DTD/XML Schema/" @@ -31,14 +28,14 @@ msgid "" "with built-in spell/style checker." msgstr "" -#: ../data/xmlcopyeditor.appdata.xml.in.h:3 +#: ../data/xmlcopyeditor.appdata.xml.in.h:2 msgid "https://a.fsdn.com/con/app/proj/xml-copy-editor/screenshots/151221.jpg" msgstr "" #: ../data/xmlcopyeditor.desktop.in.h:1 ../src/xmlcopyeditor.cpp:394 -#: ../src/xmlcopyeditor.cpp:1341 ../src/xmlcopyeditor.cpp:1439 -#: ../src/xmlcopyeditor.cpp:1677 ../src/xmlcopyeditor.cpp:1756 -#: ../src/xmlcopyeditor.cpp:3634 +#: ../src/xmlcopyeditor.cpp:1341 ../src/xmlcopyeditor.cpp:1441 +#: ../src/xmlcopyeditor.cpp:1679 ../src/xmlcopyeditor.cpp:1758 +#: ../src/xmlcopyeditor.cpp:3632 msgid "XML Copy Editor" msgstr "" @@ -91,47 +88,47 @@ msgstr "" msgid "Select " msgstr "" -#: ../src/commandpanel.cpp:47 ../src/commandpanel.cpp:165 +#: ../src/commandpanel.cpp:48 ../src/commandpanel.cpp:166 msgid "{path}" msgstr "" -#: ../src/commandpanel.cpp:48 ../src/commandpanel.cpp:166 +#: ../src/commandpanel.cpp:49 ../src/commandpanel.cpp:167 msgid "{name}" msgstr "" -#: ../src/commandpanel.cpp:49 ../src/commandpanel.cpp:167 +#: ../src/commandpanel.cpp:50 ../src/commandpanel.cpp:168 msgid "{extension}" msgstr "" -#: ../src/commandpanel.cpp:50 ../src/commandpanel.cpp:164 +#: ../src/commandpanel.cpp:51 ../src/commandpanel.cpp:165 msgid "{fullpath}" msgstr "" -#: ../src/commandpanel.cpp:65 +#: ../src/commandpanel.cpp:66 msgid "&Run" msgstr "" -#: ../src/commandpanel.cpp:73 +#: ../src/commandpanel.cpp:74 msgid "&Wait" msgstr "" -#: ../src/commandpanel.cpp:79 +#: ../src/commandpanel.cpp:80 msgid "Output options" msgstr "" -#: ../src/commandpanel.cpp:84 +#: ../src/commandpanel.cpp:85 msgid "I&gnore" msgstr "" -#: ../src/commandpanel.cpp:90 +#: ../src/commandpanel.cpp:91 msgid "I&nsert" msgstr "" -#: ../src/commandpanel.cpp:95 +#: ../src/commandpanel.cpp:96 msgid "New &document" msgstr "" -#: ../src/commandpanel.cpp:116 +#: ../src/commandpanel.cpp:117 msgid "Variables" msgstr "" @@ -348,7 +345,7 @@ msgid "Cannot initialise spellcheck" msgstr "" #: ../src/mynotebook.cpp:89 ../src/wrapdaisy.cpp:555 -#: ../src/xmlcopyeditor.cpp:5352 +#: ../src/xmlcopyeditor.cpp:5350 msgid "Close" msgstr "" @@ -421,7 +418,7 @@ msgid "Language (restart required)" msgstr "" #: ../src/mypropertysheet.cpp:184 ../src/styledialog.cpp:340 -#: ../src/xmlcopyeditor.cpp:5003 +#: ../src/xmlcopyeditor.cpp:5001 msgid "Default" msgstr "" @@ -469,7 +466,7 @@ msgstr "" msgid "Cannot access application directory" msgstr "" -#: ../src/mypropertysheet.cpp:261 ../src/xmlcopyeditor.cpp:2614 +#: ../src/mypropertysheet.cpp:261 ../src/xmlcopyeditor.cpp:2612 msgid "Options" msgstr "" @@ -477,8 +474,8 @@ msgstr "" msgid "Style" msgstr "" -#: ../src/styledialog.cpp:102 ../src/xmlcopyeditor.cpp:5485 -#: ../src/xmlcopyeditor.cpp:5489 +#: ../src/styledialog.cpp:102 ../src/xmlcopyeditor.cpp:5483 +#: ../src/xmlcopyeditor.cpp:5487 msgid "Spelling" msgstr "" @@ -593,6 +590,13 @@ msgstr "" msgid "Cannot check document: " msgstr "" +#: ../src/styledialog.cpp:511 +#, c-format +msgid "%i error" +msgid_plural "%i errors" +msgstr[0] "" +msgstr[1] "" + #: ../src/styledialog.cpp:526 msgid "No items selected" msgstr "" @@ -741,16 +745,16 @@ msgstr "" msgid "Error at line %d: %s" msgstr "" -#: ../src/wrapxerces.cpp:173 +#: ../src/wrapxerces.cpp:174 msgid "Unexpected validation error" msgstr "" -#: ../src/wrapxerces.cpp:251 +#: ../src/wrapxerces.cpp:252 #, c-format msgid "%s at line %llu, column %llu: %s%s" msgstr "" -#: ../src/wrapxerces.h:58 ../src/xmlcopyeditor.cpp:5538 +#: ../src/wrapxerces.h:58 ../src/xmlcopyeditor.cpp:5536 msgid "Warning" msgstr "" @@ -771,7 +775,7 @@ msgid "" msgstr "" #: ../src/xmlcopyeditorcopy.h:27 -msgid "Copyright © 2005-2018 Gerald Schmidt " +msgid "Copyright © 2005-2020 Gerald Schmidt " msgstr "" #: ../src/xmlcopyeditorcopy.h:28 @@ -806,7 +810,7 @@ msgid "The operating system has turned down a request for additional memory" msgstr "" #: ../src/xmlcopyeditor.cpp:478 ../src/xmlcopyeditor.cpp:557 -#: ../src/xmlcopyeditor.cpp:4799 +#: ../src/xmlcopyeditor.cpp:4797 msgid "Out of memory" msgstr "" @@ -870,572 +874,585 @@ msgstr "" msgid "Command line processing incomplete: no file specified" msgstr "" -#: ../src/xmlcopyeditor.cpp:1387 +#: ../src/xmlcopyeditor.cpp:1389 msgid "Parse in progress..." msgstr "" -#: ../src/xmlcopyeditor.cpp:1406 +#: ../src/xmlcopyeditor.cpp:1408 msgid "well-formed" msgstr "" -#: ../src/xmlcopyeditor.cpp:1438 +#: ../src/xmlcopyeditor.cpp:1440 msgid "Do you want to save the changes to " msgstr "" -#: ../src/xmlcopyeditor.cpp:1629 ../src/xmlcopyeditor.cpp:1631 +#: ../src/xmlcopyeditor.cpp:1631 ../src/xmlcopyeditor.cpp:1633 msgid "Attributes hidden" msgstr "" -#: ../src/xmlcopyeditor.cpp:1636 ../src/xmlcopyeditor.cpp:1638 +#: ../src/xmlcopyeditor.cpp:1638 ../src/xmlcopyeditor.cpp:1640 msgid "Tags hidden" msgstr "" -#: ../src/xmlcopyeditor.cpp:1651 ../src/xmlcopyeditor.cpp:1653 +#: ../src/xmlcopyeditor.cpp:1653 ../src/xmlcopyeditor.cpp:1655 msgid "Tags locked" msgstr "" -#: ../src/xmlcopyeditor.cpp:1704 ../src/xmlcopyeditor.cpp:1706 +#: ../src/xmlcopyeditor.cpp:1706 ../src/xmlcopyeditor.cpp:1708 msgid "Modified" msgstr "" -#: ../src/xmlcopyeditor.cpp:1735 +#: ../src/xmlcopyeditor.cpp:1737 #, c-format msgid "Ln %i Col %i" msgstr "" -#: ../src/xmlcopyeditor.cpp:1926 +#: ../src/xmlcopyeditor.cpp:1928 msgid "Cannot open clipboard" msgstr "" -#: ../src/xmlcopyeditor.cpp:1931 +#: ../src/xmlcopyeditor.cpp:1933 msgid "Cannot paste as new document: no text on clipboard" msgstr "" -#: ../src/xmlcopyeditor.cpp:2047 +#: ../src/xmlcopyeditor.cpp:2023 ../src/xmlcopyeditor.cpp:2818 +#, c-format +msgid "%i replacement made" +msgid_plural "%i replacements made" +msgstr[0] "" +msgstr[1] "" + +#: ../src/xmlcopyeditor.cpp:2049 msgid "Preparing Print Preview..." msgstr "" -#: ../src/xmlcopyeditor.cpp:2068 +#: ../src/xmlcopyeditor.cpp:2070 msgid "Preparing to print..." msgstr "" -#: ../src/xmlcopyeditor.cpp:2127 ../src/xmlcopyeditor.cpp:2147 +#: ../src/xmlcopyeditor.cpp:2129 ../src/xmlcopyeditor.cpp:2145 msgid "Find" msgstr "" -#: ../src/xmlcopyeditor.cpp:2154 ../src/xmlcopyeditor.cpp:2264 -#: ../src/xmlcopyeditor.cpp:2358 +#: ../src/xmlcopyeditor.cpp:2152 ../src/xmlcopyeditor.cpp:2262 +#: ../src/xmlcopyeditor.cpp:2356 msgid "This functionality requires Microsoft Windows" msgstr "" -#: ../src/xmlcopyeditor.cpp:2160 +#: ../src/xmlcopyeditor.cpp:2158 msgid "Import Microsoft Word Document" msgstr "" -#: ../src/xmlcopyeditor.cpp:2255 +#: ../src/xmlcopyeditor.cpp:2253 msgid "[b]DAISY export stopped[/b]: " msgstr "" -#: ../src/xmlcopyeditor.cpp:2258 +#: ../src/xmlcopyeditor.cpp:2256 msgid "DAISY export completed. Output files are stored in: [b]" msgstr "" -#: ../src/xmlcopyeditor.cpp:2273 +#: ../src/xmlcopyeditor.cpp:2271 #, c-format msgid "Cannot open [b]%s[/b] for import" msgstr "" -#: ../src/xmlcopyeditor.cpp:2283 +#: ../src/xmlcopyeditor.cpp:2281 msgid "Import in progress..." msgstr "" -#: ../src/xmlcopyeditor.cpp:2291 +#: ../src/xmlcopyeditor.cpp:2289 msgid "(lossless conversion requires version 2003 or later)" msgstr "" -#: ../src/xmlcopyeditor.cpp:2298 ../src/xmlcopyeditor.cpp:2419 +#: ../src/xmlcopyeditor.cpp:2296 ../src/xmlcopyeditor.cpp:2417 msgid "Cannot start Microsoft Word" msgstr "" -#: ../src/xmlcopyeditor.cpp:2302 ../src/xmlcopyeditor.cpp:2423 +#: ../src/xmlcopyeditor.cpp:2300 ../src/xmlcopyeditor.cpp:2421 msgid "A more recent version of Microsoft Word is required" msgstr "" -#: ../src/xmlcopyeditor.cpp:2309 +#: ../src/xmlcopyeditor.cpp:2307 #, c-format msgid "Microsoft Word cannot save [b]%s[/b] as XML" msgstr "" -#: ../src/xmlcopyeditor.cpp:2314 +#: ../src/xmlcopyeditor.cpp:2312 msgid "Microsoft Word cannot save this document as WordprocessingML " msgstr "" -#: ../src/xmlcopyeditor.cpp:2322 +#: ../src/xmlcopyeditor.cpp:2320 msgid "Opening imported file..." msgstr "" -#: ../src/xmlcopyeditor.cpp:2339 +#: ../src/xmlcopyeditor.cpp:2337 msgid "Cannot open imported file" msgstr "" -#: ../src/xmlcopyeditor.cpp:2391 +#: ../src/xmlcopyeditor.cpp:2389 msgid "Export Microsoft Word Document" msgstr "" -#: ../src/xmlcopyeditor.cpp:2412 +#: ../src/xmlcopyeditor.cpp:2410 msgid "Export in progress..." msgstr "" -#: ../src/xmlcopyeditor.cpp:2426 +#: ../src/xmlcopyeditor.cpp:2424 #, c-format msgid "Microsoft Word cannot save %s" msgstr "" -#: ../src/xmlcopyeditor.cpp:2455 +#: ../src/xmlcopyeditor.cpp:2453 msgid "Cannot save temporary file" msgstr "" -#: ../src/xmlcopyeditor.cpp:2616 +#: ../src/xmlcopyeditor.cpp:2614 msgid "Preferences" msgstr "" -#: ../src/xmlcopyeditor.cpp:2661 +#: ../src/xmlcopyeditor.cpp:2659 msgid "Enter line number:" msgstr "" -#: ../src/xmlcopyeditor.cpp:2662 +#: ../src/xmlcopyeditor.cpp:2660 msgid "Go To" msgstr "" -#: ../src/xmlcopyeditor.cpp:2671 +#: ../src/xmlcopyeditor.cpp:2669 #, c-format msgid "'%s' is not a valid line number" msgstr "" -#: ../src/xmlcopyeditor.cpp:2700 +#: ../src/xmlcopyeditor.cpp:2698 msgid "Replace" msgstr "" -#: ../src/xmlcopyeditor.cpp:2721 +#: ../src/xmlcopyeditor.cpp:2715 msgid "Find and Replace" msgstr "" -#: ../src/xmlcopyeditor.cpp:2814 +#: ../src/xmlcopyeditor.cpp:2808 msgid "Cannot replace: " msgstr "" -#: ../src/xmlcopyeditor.cpp:2855 +#: ../src/xmlcopyeditor.cpp:2849 msgid "XML document (*.xml)" msgstr "" -#: ../src/xmlcopyeditor.cpp:2879 +#: ../src/xmlcopyeditor.cpp:2873 msgid "Choose a document type:" msgstr "" -#: ../src/xmlcopyeditor.cpp:2879 +#: ../src/xmlcopyeditor.cpp:2873 msgid "New Document" msgstr "" -#: ../src/xmlcopyeditor.cpp:2920 +#: ../src/xmlcopyeditor.cpp:2914 #, c-format msgid "Document%i" msgstr "" -#: ../src/xmlcopyeditor.cpp:2987 +#: ../src/xmlcopyeditor.cpp:2981 msgid "Open Large Document" msgstr "" -#: ../src/xmlcopyeditor.cpp:2987 ../src/xmlcopyeditor.cpp:5444 -#: ../src/xmlcopyeditor.cpp:5446 +#: ../src/xmlcopyeditor.cpp:2981 ../src/xmlcopyeditor.cpp:5442 +#: ../src/xmlcopyeditor.cpp:5444 msgid "Open" msgstr "" -#: ../src/xmlcopyeditor.cpp:3023 +#: ../src/xmlcopyeditor.cpp:3017 #, c-format msgid "Cannot open %s." msgstr "" -#: ../src/xmlcopyeditor.cpp:3031 ../src/xmlcopyeditor.cpp:3606 +#: ../src/xmlcopyeditor.cpp:3025 ../src/xmlcopyeditor.cpp:3604 #, c-format msgid "%s is already open" msgstr "" -#: ../src/xmlcopyeditor.cpp:3053 +#: ../src/xmlcopyeditor.cpp:3047 #, c-format msgid "Cannot open %s" msgstr "" -#: ../src/xmlcopyeditor.cpp:3172 +#: ../src/xmlcopyeditor.cpp:3170 #, c-format msgid "Cannot open %s: unknown encoding %s" msgstr "" -#: ../src/xmlcopyeditor.cpp:3203 +#: ../src/xmlcopyeditor.cpp:3201 #, c-format msgid "Cannot open %s: out of memory" msgstr "" -#: ../src/xmlcopyeditor.cpp:3224 +#: ../src/xmlcopyeditor.cpp:3222 #, c-format msgid "Cannot open %s: conversion from encoding %s failed" msgstr "" -#: ../src/xmlcopyeditor.cpp:3233 ../src/xmlcopyeditor.cpp:4027 +#: ../src/xmlcopyeditor.cpp:3231 ../src/xmlcopyeditor.cpp:4025 msgid "Creating document view..." msgstr "" -#: ../src/xmlcopyeditor.cpp:3474 +#: ../src/xmlcopyeditor.cpp:3472 msgid "Edited document empty" msgstr "" -#: ../src/xmlcopyeditor.cpp:3587 +#: ../src/xmlcopyeditor.cpp:3585 msgid "Save As" msgstr "" -#: ../src/xmlcopyeditor.cpp:3795 +#: ../src/xmlcopyeditor.cpp:3793 msgid "DTD Validation in progress..." msgstr "" -#: ../src/xmlcopyeditor.cpp:3818 ../src/xmlcopyeditor.cpp:3890 +#: ../src/xmlcopyeditor.cpp:3816 ../src/xmlcopyeditor.cpp:3888 msgid "valid" msgstr "" -#: ../src/xmlcopyeditor.cpp:3839 +#: ../src/xmlcopyeditor.cpp:3837 msgid "Select RELAX NG grammar" msgstr "" -#: ../src/xmlcopyeditor.cpp:3840 ../src/xmlcopyeditor.cpp:4127 -#: ../src/xmlcopyeditor.cpp:5799 +#: ../src/xmlcopyeditor.cpp:3838 ../src/xmlcopyeditor.cpp:4125 +#: ../src/xmlcopyeditor.cpp:5797 msgid "Choose a file:" msgstr "" -#: ../src/xmlcopyeditor.cpp:3841 +#: ../src/xmlcopyeditor.cpp:3839 msgid "RELAX NG grammar" msgstr "" -#: ../src/xmlcopyeditor.cpp:3869 +#: ../src/xmlcopyeditor.cpp:3867 msgid "RELAX NG validation in progress..." msgstr "" -#: ../src/xmlcopyeditor.cpp:3934 +#: ../src/xmlcopyeditor.cpp:3932 msgid "Validation in progress..." msgstr "" -#: ../src/xmlcopyeditor.cpp:3945 +#: ../src/xmlcopyeditor.cpp:3943 #, c-format msgid "%s is valid" msgstr "" -#: ../src/xmlcopyeditor.cpp:3984 +#: ../src/xmlcopyeditor.cpp:3982 msgid "W3C Schema" msgstr "" -#: ../src/xmlcopyeditor.cpp:3984 +#: ../src/xmlcopyeditor.cpp:3982 msgid "DTD" msgstr "" -#: ../src/xmlcopyeditor.cpp:3985 +#: ../src/xmlcopyeditor.cpp:3983 msgid "Please choose a shema type" msgstr "" -#: ../src/xmlcopyeditor.cpp:3986 +#: ../src/xmlcopyeditor.cpp:3984 msgid "Schema type" msgstr "" -#: ../src/xmlcopyeditor.cpp:4012 +#: ../src/xmlcopyeditor.cpp:4010 msgid "Please select a DTD file" msgstr "" -#: ../src/xmlcopyeditor.cpp:4018 +#: ../src/xmlcopyeditor.cpp:4016 msgid "Converting..." msgstr "" -#: ../src/xmlcopyeditor.cpp:4045 +#: ../src/xmlcopyeditor.cpp:4043 msgid "Enter XPath:" msgstr "" -#: ../src/xmlcopyeditor.cpp:4046 +#: ../src/xmlcopyeditor.cpp:4044 msgid "Evaluate XPath" msgstr "" -#: ../src/xmlcopyeditor.cpp:4067 +#: ../src/xmlcopyeditor.cpp:4065 msgid "Cannot evaluate XPath" msgstr "" -#: ../src/xmlcopyeditor.cpp:4078 +#: ../src/xmlcopyeditor.cpp:4076 msgid "No matching nodes found" msgstr "" -#: ../src/xmlcopyeditor.cpp:4114 +#: ../src/xmlcopyeditor.cpp:4112 #, c-format msgid "Cannot open stylesheet %s" msgstr "" -#: ../src/xmlcopyeditor.cpp:4126 +#: ../src/xmlcopyeditor.cpp:4124 msgid "Select stylesheet" msgstr "" -#: ../src/xmlcopyeditor.cpp:4128 ../src/xmlcopyeditor.cpp:5773 +#: ../src/xmlcopyeditor.cpp:4126 ../src/xmlcopyeditor.cpp:5771 msgid "XSLT stylesheet" msgstr "" -#: ../src/xmlcopyeditor.cpp:4183 +#: ../src/xmlcopyeditor.cpp:4181 msgid "XSL transformation in progress..." msgstr "" -#: ../src/xmlcopyeditor.cpp:4190 +#: ../src/xmlcopyeditor.cpp:4188 msgid "Cannot transform: " msgstr "" -#: ../src/xmlcopyeditor.cpp:4198 +#: ../src/xmlcopyeditor.cpp:4196 msgid "Output document empty" msgstr "" -#: ../src/xmlcopyeditor.cpp:4222 +#: ../src/xmlcopyeditor.cpp:4220 msgid "Pretty-printing in progress..." msgstr "" -#: ../src/xmlcopyeditor.cpp:4232 +#: ../src/xmlcopyeditor.cpp:4230 msgid "Cannot pretty-print: " msgstr "" -#: ../src/xmlcopyeditor.cpp:4243 +#: ../src/xmlcopyeditor.cpp:4241 msgid "Pretty-print unsuccessful: output document empty" msgstr "" -#: ../src/xmlcopyeditor.cpp:4275 +#: ../src/xmlcopyeditor.cpp:4273 msgid "Choose an encoding:" msgstr "" -#: ../src/xmlcopyeditor.cpp:4275 +#: ../src/xmlcopyeditor.cpp:4273 msgid "Encoding" msgstr "" -#: ../src/xmlcopyeditor.cpp:4288 +#: ../src/xmlcopyeditor.cpp:4286 msgid "Cannot set encoding: " msgstr "" -#: ../src/xmlcopyeditor.cpp:4299 +#: ../src/xmlcopyeditor.cpp:4297 msgid "Cannot set encoding (cannot parse temporary file)" msgstr "" -#: ../src/xmlcopyeditor.cpp:4503 +#: ../src/xmlcopyeditor.cpp:4501 #, c-format msgid "Cannot find '%s'" msgstr "" -#: ../src/xmlcopyeditor.cpp:4565 +#: ../src/xmlcopyeditor.cpp:4563 msgid "" "File has been modified by another application.\n" "Do you want to proceed?" msgstr "" -#: ../src/xmlcopyeditor.cpp:4566 +#: ../src/xmlcopyeditor.cpp:4564 msgid "Confirmation" msgstr "" -#: ../src/xmlcopyeditor.cpp:4605 ../src/xmlcopyeditor.cpp:4619 -#: ../src/xmlcopyeditor.cpp:4640 ../src/xmlcopyeditor.cpp:4669 -#: ../src/xmlcopyeditor.cpp:4732 ../src/xmlcopyeditor.cpp:4746 -#: ../src/xmlcopyeditor.cpp:4783 ../src/xmlcopyeditor.cpp:4818 +#: ../src/xmlcopyeditor.cpp:4603 ../src/xmlcopyeditor.cpp:4617 +#: ../src/xmlcopyeditor.cpp:4638 ../src/xmlcopyeditor.cpp:4667 +#: ../src/xmlcopyeditor.cpp:4730 ../src/xmlcopyeditor.cpp:4744 +#: ../src/xmlcopyeditor.cpp:4781 ../src/xmlcopyeditor.cpp:4816 #, c-format msgid "Cannot save %s" msgstr "" -#: ../src/xmlcopyeditor.cpp:4661 +#: ../src/xmlcopyeditor.cpp:4659 #, c-format msgid "%s saved in default encoding UTF-8: unknown encoding %s" msgstr "" -#: ../src/xmlcopyeditor.cpp:4724 +#: ../src/xmlcopyeditor.cpp:4722 #, c-format msgid "%s saved in default encoding UTF-8: conversion to %s failed" msgstr "" -#: ../src/xmlcopyeditor.cpp:4774 +#: ../src/xmlcopyeditor.cpp:4772 msgid "unknown error" msgstr "" -#: ../src/xmlcopyeditor.cpp:4776 +#: ../src/xmlcopyeditor.cpp:4774 #, c-format msgid "Cannot save document in %s: %s (saved in default encoding UTF-8)" msgstr "" -#: ../src/xmlcopyeditor.cpp:4798 +#: ../src/xmlcopyeditor.cpp:4796 msgid "Out of memory: attempt to save in default encoding UTF-8?" msgstr "" -#: ../src/xmlcopyeditor.cpp:4811 +#: ../src/xmlcopyeditor.cpp:4809 #, c-format msgid "%s saved in default encoding UTF-8" msgstr "" -#: ../src/xmlcopyeditor.cpp:4875 +#: ../src/xmlcopyeditor.cpp:4873 msgid "MB" msgstr "" -#: ../src/xmlcopyeditor.cpp:4880 +#: ../src/xmlcopyeditor.cpp:4878 msgid "kB" msgstr "" -#: ../src/xmlcopyeditor.cpp:4893 +#: ../src/xmlcopyeditor.cpp:4883 +msgid "byte" +msgid_plural "bytes" +msgstr[0] "" +msgstr[1] "" + +#: ../src/xmlcopyeditor.cpp:4891 #, c-format msgid "%g %s saved" msgstr "" -#: ../src/xmlcopyeditor.cpp:4913 +#: ../src/xmlcopyeditor.cpp:4911 msgid "&Undo\tCtrl+Z" msgstr "" -#: ../src/xmlcopyeditor.cpp:4913 +#: ../src/xmlcopyeditor.cpp:4911 msgid "Undo" msgstr "" -#: ../src/xmlcopyeditor.cpp:4917 +#: ../src/xmlcopyeditor.cpp:4915 msgid "&Redo\tCtrl+Y" msgstr "" -#: ../src/xmlcopyeditor.cpp:4917 +#: ../src/xmlcopyeditor.cpp:4915 msgid "Redo" msgstr "" -#: ../src/xmlcopyeditor.cpp:4921 +#: ../src/xmlcopyeditor.cpp:4919 msgid "&Cut\tCtrl+X" msgstr "" -#: ../src/xmlcopyeditor.cpp:4921 +#: ../src/xmlcopyeditor.cpp:4919 msgid "Cut" msgstr "" -#: ../src/xmlcopyeditor.cpp:4925 +#: ../src/xmlcopyeditor.cpp:4923 msgid "C&opy\tCtrl+C" msgstr "" -#: ../src/xmlcopyeditor.cpp:4925 +#: ../src/xmlcopyeditor.cpp:4923 msgid "Copy" msgstr "" -#: ../src/xmlcopyeditor.cpp:4929 +#: ../src/xmlcopyeditor.cpp:4927 msgid "&Paste\tCtrl+V" msgstr "" -#: ../src/xmlcopyeditor.cpp:4929 +#: ../src/xmlcopyeditor.cpp:4927 msgid "Paste" msgstr "" -#: ../src/xmlcopyeditor.cpp:4936 +#: ../src/xmlcopyeditor.cpp:4934 msgid "P&aste As New Document" msgstr "" -#: ../src/xmlcopyeditor.cpp:4937 +#: ../src/xmlcopyeditor.cpp:4935 msgid "Paste As New Document" msgstr "" -#: ../src/xmlcopyeditor.cpp:4941 +#: ../src/xmlcopyeditor.cpp:4939 msgid "&Find...\tCtrl+F" msgstr "" -#: ../src/xmlcopyeditor.cpp:4941 +#: ../src/xmlcopyeditor.cpp:4939 msgid "Find..." msgstr "" -#: ../src/xmlcopyeditor.cpp:4945 +#: ../src/xmlcopyeditor.cpp:4943 msgid "F&ind Again\tF3" msgstr "" -#: ../src/xmlcopyeditor.cpp:4945 +#: ../src/xmlcopyeditor.cpp:4943 msgid "Find Again" msgstr "" -#: ../src/xmlcopyeditor.cpp:4949 +#: ../src/xmlcopyeditor.cpp:4947 msgid "&Replace...\tCtrl+R" msgstr "" -#: ../src/xmlcopyeditor.cpp:4949 +#: ../src/xmlcopyeditor.cpp:4947 msgid "Replace..." msgstr "" -#: ../src/xmlcopyeditor.cpp:4956 +#: ../src/xmlcopyeditor.cpp:4954 msgid "&Global Replace...\tCtrl+Shift+R" msgstr "" -#: ../src/xmlcopyeditor.cpp:4957 +#: ../src/xmlcopyeditor.cpp:4955 msgid "Global Replace..." msgstr "" -#: ../src/xmlcopyeditor.cpp:4961 +#: ../src/xmlcopyeditor.cpp:4959 msgid "G&o To...\tCtrl+G" msgstr "" -#: ../src/xmlcopyeditor.cpp:4961 +#: ../src/xmlcopyeditor.cpp:4959 msgid "Go To..." msgstr "" -#: ../src/xmlcopyeditor.cpp:4965 +#: ../src/xmlcopyeditor.cpp:4963 msgid "&Toggle Comment\tCtrl+/" msgstr "" -#: ../src/xmlcopyeditor.cpp:4965 +#: ../src/xmlcopyeditor.cpp:4963 msgid "Toggle Comment" msgstr "" -#: ../src/xmlcopyeditor.cpp:4986 +#: ../src/xmlcopyeditor.cpp:4984 msgid "Pr&eferences..." msgstr "" -#: ../src/xmlcopyeditor.cpp:4986 +#: ../src/xmlcopyeditor.cpp:4984 msgid "Preferences..." msgstr "" -#: ../src/xmlcopyeditor.cpp:4994 +#: ../src/xmlcopyeditor.cpp:4992 msgid "Increase\tCtrl+U" msgstr "" -#: ../src/xmlcopyeditor.cpp:4994 +#: ../src/xmlcopyeditor.cpp:4992 msgid "Increase" msgstr "" -#: ../src/xmlcopyeditor.cpp:4996 +#: ../src/xmlcopyeditor.cpp:4994 msgid "Decrease\tCtrl+D" msgstr "" -#: ../src/xmlcopyeditor.cpp:4996 +#: ../src/xmlcopyeditor.cpp:4994 msgid "Decrease" msgstr "" -#: ../src/xmlcopyeditor.cpp:4998 +#: ../src/xmlcopyeditor.cpp:4996 msgid "Normal\tCtrl+0" msgstr "" -#: ../src/xmlcopyeditor.cpp:4998 +#: ../src/xmlcopyeditor.cpp:4996 msgid "Normal" msgstr "" -#: ../src/xmlcopyeditor.cpp:5003 +#: ../src/xmlcopyeditor.cpp:5001 msgid "&Default" msgstr "" -#: ../src/xmlcopyeditor.cpp:5006 +#: ../src/xmlcopyeditor.cpp:5004 msgid "&Blue background, white text" msgstr "" -#: ../src/xmlcopyeditor.cpp:5007 +#: ../src/xmlcopyeditor.cpp:5005 msgid "Blue background, white text" msgstr "" -#: ../src/xmlcopyeditor.cpp:5010 +#: ../src/xmlcopyeditor.cpp:5008 msgid "&Light" msgstr "" -#: ../src/xmlcopyeditor.cpp:5011 +#: ../src/xmlcopyeditor.cpp:5009 msgid "Light" msgstr "" -#: ../src/xmlcopyeditor.cpp:5014 +#: ../src/xmlcopyeditor.cpp:5012 msgid "&None" msgstr "" -#: ../src/xmlcopyeditor.cpp:5015 +#: ../src/xmlcopyeditor.cpp:5013 msgid "None" msgstr "" @@ -1447,617 +1464,630 @@ msgstr "" #. splitTabMenu->Append ( ID_SPLIT_TAB_LEFT, _ ( "&Left" ), _ ( "Left" )); #. #. use class-wide data member -#: ../src/xmlcopyeditor.cpp:5044 +#: ../src/xmlcopyeditor.cpp:5042 msgid "&Previous Document\tCtrl+PgUp" msgstr "" -#: ../src/xmlcopyeditor.cpp:5044 +#: ../src/xmlcopyeditor.cpp:5042 msgid "Previous Document" msgstr "" -#: ../src/xmlcopyeditor.cpp:5045 +#: ../src/xmlcopyeditor.cpp:5043 msgid "&Next Document\tCtrl+PgDn" msgstr "" -#: ../src/xmlcopyeditor.cpp:5045 +#: ../src/xmlcopyeditor.cpp:5043 msgid "Next Document" msgstr "" #. viewMenu->Append ( wxID_ANY, _ ( "&Split Tab" ), splitTabMenu ); -#: ../src/xmlcopyeditor.cpp:5049 +#: ../src/xmlcopyeditor.cpp:5047 msgid "&Browser\tCtrl+B" msgstr "" -#: ../src/xmlcopyeditor.cpp:5049 ../src/xmlcopyeditor.cpp:5478 -#: ../src/xmlcopyeditor.cpp:5482 +#: ../src/xmlcopyeditor.cpp:5047 ../src/xmlcopyeditor.cpp:5476 +#: ../src/xmlcopyeditor.cpp:5480 msgid "Browser" msgstr "" -#: ../src/xmlcopyeditor.cpp:5053 +#: ../src/xmlcopyeditor.cpp:5051 msgid "&Show Tags and Attributes\tCtrl+T" msgstr "" -#: ../src/xmlcopyeditor.cpp:5053 +#: ../src/xmlcopyeditor.cpp:5051 msgid "Show Tags and Attributes" msgstr "" -#: ../src/xmlcopyeditor.cpp:5056 +#: ../src/xmlcopyeditor.cpp:5054 msgid "&Hide Attributes Only\tCtrl+Shift+A" msgstr "" -#: ../src/xmlcopyeditor.cpp:5056 +#: ../src/xmlcopyeditor.cpp:5054 msgid "Hide Attributes Only" msgstr "" -#: ../src/xmlcopyeditor.cpp:5059 +#: ../src/xmlcopyeditor.cpp:5057 msgid "H&ide Tags and Attributes\tCtrl+Shift+T" msgstr "" -#: ../src/xmlcopyeditor.cpp:5059 +#: ../src/xmlcopyeditor.cpp:5057 msgid "Hide Tags and Attributes" msgstr "" -#: ../src/xmlcopyeditor.cpp:5078 +#: ../src/xmlcopyeditor.cpp:5076 msgid "&Toggle Fold\tCtrl+Alt+T" msgstr "" -#: ../src/xmlcopyeditor.cpp:5078 +#: ../src/xmlcopyeditor.cpp:5076 msgid "Toggle Fold" msgstr "" -#: ../src/xmlcopyeditor.cpp:5080 +#: ../src/xmlcopyeditor.cpp:5078 msgid "&Fold Tags\tCtrl+Shift+F" msgstr "" -#: ../src/xmlcopyeditor.cpp:5080 +#: ../src/xmlcopyeditor.cpp:5078 msgid "Fold Tags" msgstr "" -#: ../src/xmlcopyeditor.cpp:5082 +#: ../src/xmlcopyeditor.cpp:5080 msgid "&Unfold Tags\tCtrl+Shift+U" msgstr "" -#: ../src/xmlcopyeditor.cpp:5085 +#: ../src/xmlcopyeditor.cpp:5083 msgid "&Wrap Words" msgstr "" -#: ../src/xmlcopyeditor.cpp:5087 +#: ../src/xmlcopyeditor.cpp:5085 msgid "&Color Scheme" msgstr "" -#: ../src/xmlcopyeditor.cpp:5088 +#: ../src/xmlcopyeditor.cpp:5086 msgid "&Text Size" msgstr "" -#: ../src/xmlcopyeditor.cpp:5093 +#: ../src/xmlcopyeditor.cpp:5091 msgid "S&how Current Element Pane" msgstr "" -#: ../src/xmlcopyeditor.cpp:5094 +#: ../src/xmlcopyeditor.cpp:5092 msgid "Show Current Element Pane" msgstr "" -#: ../src/xmlcopyeditor.cpp:5098 +#: ../src/xmlcopyeditor.cpp:5096 msgid "Sh&ow Toolbar" msgstr "" -#: ../src/xmlcopyeditor.cpp:5098 +#: ../src/xmlcopyeditor.cpp:5096 msgid "Show Toolbar" msgstr "" -#: ../src/xmlcopyeditor.cpp:5102 +#: ../src/xmlcopyeditor.cpp:5100 msgid "C&lose Message Pane\tAlt+C" msgstr "" -#: ../src/xmlcopyeditor.cpp:5102 +#: ../src/xmlcopyeditor.cpp:5100 msgid "Close Message Pane" msgstr "" -#: ../src/xmlcopyeditor.cpp:5104 +#: ../src/xmlcopyeditor.cpp:5102 msgid "Close Find/&Replace Pane" msgstr "" -#: ../src/xmlcopyeditor.cpp:5104 +#: ../src/xmlcopyeditor.cpp:5102 msgid "Close Find/Replace Pane" msgstr "" -#: ../src/xmlcopyeditor.cpp:5106 +#: ../src/xmlcopyeditor.cpp:5104 msgid "Close Co&mmand Pane" msgstr "" -#: ../src/xmlcopyeditor.cpp:5106 +#: ../src/xmlcopyeditor.cpp:5104 msgid "Close Command Pane" msgstr "" -#: ../src/xmlcopyeditor.cpp:5110 +#: ../src/xmlcopyeditor.cpp:5108 msgid "&Element...\tCtrl+I" msgstr "" -#: ../src/xmlcopyeditor.cpp:5110 +#: ../src/xmlcopyeditor.cpp:5108 msgid "Element..." msgstr "" -#: ../src/xmlcopyeditor.cpp:5111 +#: ../src/xmlcopyeditor.cpp:5109 msgid "&Sibling...\tCtrl+Shift+I" msgstr "" -#: ../src/xmlcopyeditor.cpp:5111 +#: ../src/xmlcopyeditor.cpp:5109 msgid "Sibling..." msgstr "" -#: ../src/xmlcopyeditor.cpp:5112 +#: ../src/xmlcopyeditor.cpp:5110 msgid "&Entity...\tCtrl+E" msgstr "" -#: ../src/xmlcopyeditor.cpp:5112 +#: ../src/xmlcopyeditor.cpp:5110 msgid "Entity..." msgstr "" -#: ../src/xmlcopyeditor.cpp:5114 +#: ../src/xmlcopyeditor.cpp:5112 msgid "&Twin\tCtrl+Enter" msgstr "" -#: ../src/xmlcopyeditor.cpp:5114 +#: ../src/xmlcopyeditor.cpp:5112 msgid "Twin" msgstr "" -#: ../src/xmlcopyeditor.cpp:5116 +#: ../src/xmlcopyeditor.cpp:5114 msgid "S&ymbol..." msgstr "" -#: ../src/xmlcopyeditor.cpp:5116 +#: ../src/xmlcopyeditor.cpp:5114 msgid "Symbol..." msgstr "" -#: ../src/xmlcopyeditor.cpp:5124 +#: ../src/xmlcopyeditor.cpp:5122 msgid "&DTD/XML Schema\tF5" msgstr "" -#: ../src/xmlcopyeditor.cpp:5124 +#: ../src/xmlcopyeditor.cpp:5122 msgid "DTD/XML Schema" msgstr "" -#: ../src/xmlcopyeditor.cpp:5127 +#: ../src/xmlcopyeditor.cpp:5125 msgid "&RELAX NG...\tF6" msgstr "" -#: ../src/xmlcopyeditor.cpp:5127 +#: ../src/xmlcopyeditor.cpp:5125 msgid "RELAX NG..." msgstr "" -#: ../src/xmlcopyeditor.cpp:5130 +#: ../src/xmlcopyeditor.cpp:5128 msgid "&Public DTD..." msgstr "" -#: ../src/xmlcopyeditor.cpp:5130 +#: ../src/xmlcopyeditor.cpp:5128 msgid "Public DTD..." msgstr "" -#: ../src/xmlcopyeditor.cpp:5131 +#: ../src/xmlcopyeditor.cpp:5129 msgid "&System DTD..." msgstr "" -#: ../src/xmlcopyeditor.cpp:5131 +#: ../src/xmlcopyeditor.cpp:5129 msgid "System DTD..." msgstr "" -#: ../src/xmlcopyeditor.cpp:5132 +#: ../src/xmlcopyeditor.cpp:5130 msgid "&XML Schema..." msgstr "" -#: ../src/xmlcopyeditor.cpp:5132 +#: ../src/xmlcopyeditor.cpp:5130 msgid "XML Schema..." msgstr "" -#: ../src/xmlcopyeditor.cpp:5133 +#: ../src/xmlcopyeditor.cpp:5131 msgid "XS< stylesheet..." msgstr "" -#: ../src/xmlcopyeditor.cpp:5133 +#: ../src/xmlcopyeditor.cpp:5131 msgid "XSLT stylesheet..." msgstr "" -#: ../src/xmlcopyeditor.cpp:5149 +#: ../src/xmlcopyeditor.cpp:5147 #, c-format msgid "\tCtrl+%i" msgstr "" -#: ../src/xmlcopyeditor.cpp:5191 +#: ../src/xmlcopyeditor.cpp:5189 msgid "&Check Well-formedness\tF2" msgstr "" -#: ../src/xmlcopyeditor.cpp:5191 ../src/xmlcopyeditor.cpp:5464 -#: ../src/xmlcopyeditor.cpp:5468 +#: ../src/xmlcopyeditor.cpp:5189 ../src/xmlcopyeditor.cpp:5462 +#: ../src/xmlcopyeditor.cpp:5466 msgid "Check Well-formedness" msgstr "" -#: ../src/xmlcopyeditor.cpp:5194 +#: ../src/xmlcopyeditor.cpp:5192 msgid "&Validate" msgstr "" -#: ../src/xmlcopyeditor.cpp:5196 +#: ../src/xmlcopyeditor.cpp:5194 msgid "Create &Schema...\tF10" msgstr "" -#: ../src/xmlcopyeditor.cpp:5197 +#: ../src/xmlcopyeditor.cpp:5195 msgid "Create schema..." msgstr "" -#: ../src/xmlcopyeditor.cpp:5198 ../src/xmlcopyeditor.cpp:5199 +#: ../src/xmlcopyeditor.cpp:5196 ../src/xmlcopyeditor.cpp:5197 msgid "DTD -> Schema..." msgstr "" -#: ../src/xmlcopyeditor.cpp:5203 +#: ../src/xmlcopyeditor.cpp:5201 msgid "&Associate" msgstr "" -#: ../src/xmlcopyeditor.cpp:5206 +#: ../src/xmlcopyeditor.cpp:5204 msgid "&XSL Transform...\tF8" msgstr "" -#: ../src/xmlcopyeditor.cpp:5207 +#: ../src/xmlcopyeditor.cpp:5205 msgid "XSL Transform..." msgstr "" -#: ../src/xmlcopyeditor.cpp:5210 +#: ../src/xmlcopyeditor.cpp:5208 msgid "&Evaluate XPath...\tF9" msgstr "" -#: ../src/xmlcopyeditor.cpp:5211 +#: ../src/xmlcopyeditor.cpp:5209 msgid "Evaluate XPath..." msgstr "" -#: ../src/xmlcopyeditor.cpp:5214 +#: ../src/xmlcopyeditor.cpp:5212 msgid "Copy &The Current XPath" msgstr "" -#: ../src/xmlcopyeditor.cpp:5215 +#: ../src/xmlcopyeditor.cpp:5213 msgid "Copy The Current XPath" msgstr "" -#: ../src/xmlcopyeditor.cpp:5220 +#: ../src/xmlcopyeditor.cpp:5218 msgid "&Pretty-print\tF11" msgstr "" -#: ../src/xmlcopyeditor.cpp:5220 +#: ../src/xmlcopyeditor.cpp:5218 msgid "Pretty-print" msgstr "" -#: ../src/xmlcopyeditor.cpp:5224 +#: ../src/xmlcopyeditor.cpp:5222 msgid "&Lock Tags\tCtrl+L" msgstr "" -#: ../src/xmlcopyeditor.cpp:5225 ../src/xmlcopyeditor.cpp:5492 -#: ../src/xmlcopyeditor.cpp:5495 +#: ../src/xmlcopyeditor.cpp:5223 ../src/xmlcopyeditor.cpp:5490 +#: ../src/xmlcopyeditor.cpp:5493 msgid "Lock Tags" msgstr "" -#: ../src/xmlcopyeditor.cpp:5230 +#: ../src/xmlcopyeditor.cpp:5228 msgid "E&ncoding..." msgstr "" -#: ../src/xmlcopyeditor.cpp:5230 +#: ../src/xmlcopyeditor.cpp:5228 msgid "Encoding..." msgstr "" -#: ../src/xmlcopyeditor.cpp:5239 +#: ../src/xmlcopyeditor.cpp:5237 msgid "&Spelling...\tF7" msgstr "" -#: ../src/xmlcopyeditor.cpp:5240 +#: ../src/xmlcopyeditor.cpp:5238 msgid "Spelling..." msgstr "" -#: ../src/xmlcopyeditor.cpp:5247 +#: ../src/xmlcopyeditor.cpp:5245 msgid "&Style...\tShift+F7" msgstr "" -#: ../src/xmlcopyeditor.cpp:5248 +#: ../src/xmlcopyeditor.cpp:5246 msgid "Style..." msgstr "" -#: ../src/xmlcopyeditor.cpp:5255 +#: ../src/xmlcopyeditor.cpp:5253 msgid "&Word Count" msgstr "" -#: ../src/xmlcopyeditor.cpp:5256 +#: ../src/xmlcopyeditor.cpp:5254 msgid "Word Count" msgstr "" -#: ../src/xmlcopyeditor.cpp:5264 +#: ../src/xmlcopyeditor.cpp:5262 msgid "&Command\tCtrl+Alt+C" msgstr "" -#: ../src/xmlcopyeditor.cpp:5265 +#: ../src/xmlcopyeditor.cpp:5263 msgid "Command" msgstr "" -#: ../src/xmlcopyeditor.cpp:5280 +#: ../src/xmlcopyeditor.cpp:5278 msgid "&Options..." msgstr "" -#: ../src/xmlcopyeditor.cpp:5281 +#: ../src/xmlcopyeditor.cpp:5279 msgid "Options..." msgstr "" -#: ../src/xmlcopyeditor.cpp:5291 +#: ../src/xmlcopyeditor.cpp:5289 msgid "&XML Copy Editor Help\tF1" msgstr "" -#: ../src/xmlcopyeditor.cpp:5291 +#: ../src/xmlcopyeditor.cpp:5289 msgid "Help" msgstr "" -#: ../src/xmlcopyeditor.cpp:5297 +#: ../src/xmlcopyeditor.cpp:5295 msgid "&Home Page" msgstr "" -#: ../src/xmlcopyeditor.cpp:5297 +#: ../src/xmlcopyeditor.cpp:5295 msgid "Home Page" msgstr "" -#: ../src/xmlcopyeditor.cpp:5300 +#: ../src/xmlcopyeditor.cpp:5298 msgid "&Forum" msgstr "" -#: ../src/xmlcopyeditor.cpp:5300 +#: ../src/xmlcopyeditor.cpp:5298 msgid "Forum" msgstr "" -#: ../src/xmlcopyeditor.cpp:5304 +#: ../src/xmlcopyeditor.cpp:5302 msgid "&About XML Copy Editor" msgstr "" -#: ../src/xmlcopyeditor.cpp:5304 +#: ../src/xmlcopyeditor.cpp:5302 msgid "About" msgstr "" -#: ../src/xmlcopyeditor.cpp:5308 +#: ../src/xmlcopyeditor.cpp:5306 msgid "&Browse Source" msgstr "" -#: ../src/xmlcopyeditor.cpp:5308 +#: ../src/xmlcopyeditor.cpp:5306 msgid "Browse Source" msgstr "" -#: ../src/xmlcopyeditor.cpp:5320 +#: ../src/xmlcopyeditor.cpp:5318 msgid "&File" msgstr "" -#: ../src/xmlcopyeditor.cpp:5321 +#: ../src/xmlcopyeditor.cpp:5319 msgid "&Edit" msgstr "" -#: ../src/xmlcopyeditor.cpp:5322 +#: ../src/xmlcopyeditor.cpp:5320 msgid "&View" msgstr "" -#: ../src/xmlcopyeditor.cpp:5323 +#: ../src/xmlcopyeditor.cpp:5321 msgid "&Insert" msgstr "" -#: ../src/xmlcopyeditor.cpp:5324 +#: ../src/xmlcopyeditor.cpp:5322 msgid "&XML" msgstr "" -#: ../src/xmlcopyeditor.cpp:5325 +#: ../src/xmlcopyeditor.cpp:5323 msgid "&Tools" msgstr "" -#: ../src/xmlcopyeditor.cpp:5326 +#: ../src/xmlcopyeditor.cpp:5324 msgid "&Help" msgstr "" -#: ../src/xmlcopyeditor.cpp:5341 +#: ../src/xmlcopyeditor.cpp:5339 msgid "&New...\tCtrl+N" msgstr "" -#: ../src/xmlcopyeditor.cpp:5341 +#: ../src/xmlcopyeditor.cpp:5339 msgid "New..." msgstr "" -#: ../src/xmlcopyeditor.cpp:5344 +#: ../src/xmlcopyeditor.cpp:5342 msgid "&Open...\tCtrl+O" msgstr "" -#: ../src/xmlcopyeditor.cpp:5344 +#: ../src/xmlcopyeditor.cpp:5342 msgid "Open..." msgstr "" -#: ../src/xmlcopyeditor.cpp:5348 +#: ../src/xmlcopyeditor.cpp:5346 msgid "O&pen Large Document...\tCtrl+Shift+O" msgstr "" -#: ../src/xmlcopyeditor.cpp:5348 +#: ../src/xmlcopyeditor.cpp:5346 msgid "Open Large Document..." msgstr "" -#: ../src/xmlcopyeditor.cpp:5352 +#: ../src/xmlcopyeditor.cpp:5350 msgid "&Close\tCtrl+W" msgstr "" -#: ../src/xmlcopyeditor.cpp:5355 +#: ../src/xmlcopyeditor.cpp:5353 msgid "C&lose All" msgstr "" -#: ../src/xmlcopyeditor.cpp:5355 +#: ../src/xmlcopyeditor.cpp:5353 msgid "Close All" msgstr "" -#: ../src/xmlcopyeditor.cpp:5358 +#: ../src/xmlcopyeditor.cpp:5356 msgid "&Save\tCtrl+S" msgstr "" -#: ../src/xmlcopyeditor.cpp:5358 ../src/xmlcopyeditor.cpp:5449 -#: ../src/xmlcopyeditor.cpp:5453 +#: ../src/xmlcopyeditor.cpp:5356 ../src/xmlcopyeditor.cpp:5447 +#: ../src/xmlcopyeditor.cpp:5451 msgid "Save" msgstr "" -#: ../src/xmlcopyeditor.cpp:5361 +#: ../src/xmlcopyeditor.cpp:5359 msgid "S&ave As...\tF12" msgstr "" -#: ../src/xmlcopyeditor.cpp:5361 +#: ../src/xmlcopyeditor.cpp:5359 msgid "Save As..." msgstr "" -#: ../src/xmlcopyeditor.cpp:5365 +#: ../src/xmlcopyeditor.cpp:5363 msgid "&DAISY Export..." msgstr "" -#: ../src/xmlcopyeditor.cpp:5365 +#: ../src/xmlcopyeditor.cpp:5363 msgid "DAISY Export..." msgstr "" -#: ../src/xmlcopyeditor.cpp:5369 +#: ../src/xmlcopyeditor.cpp:5367 msgid "&Reload" msgstr "" -#: ../src/xmlcopyeditor.cpp:5369 +#: ../src/xmlcopyeditor.cpp:5367 msgid "Reload" msgstr "" -#: ../src/xmlcopyeditor.cpp:5372 +#: ../src/xmlcopyeditor.cpp:5370 msgid "&Revert" msgstr "" -#: ../src/xmlcopyeditor.cpp:5372 +#: ../src/xmlcopyeditor.cpp:5370 msgid "Revert" msgstr "" -#: ../src/xmlcopyeditor.cpp:5375 +#: ../src/xmlcopyeditor.cpp:5373 msgid "Pa&ge Setup..." msgstr "" -#: ../src/xmlcopyeditor.cpp:5375 +#: ../src/xmlcopyeditor.cpp:5373 msgid "Page Setup..." msgstr "" -#: ../src/xmlcopyeditor.cpp:5378 +#: ../src/xmlcopyeditor.cpp:5376 msgid "Pr&int Preview..." msgstr "" -#: ../src/xmlcopyeditor.cpp:5378 +#: ../src/xmlcopyeditor.cpp:5376 msgid "Print Preview..." msgstr "" -#: ../src/xmlcopyeditor.cpp:5381 +#: ../src/xmlcopyeditor.cpp:5379 msgid "Pri&nt...\tCtrl+P" msgstr "" -#: ../src/xmlcopyeditor.cpp:5381 +#: ../src/xmlcopyeditor.cpp:5379 msgid "Print..." msgstr "" -#: ../src/xmlcopyeditor.cpp:5385 +#: ../src/xmlcopyeditor.cpp:5383 msgid "I&mport Microsoft Word Document..." msgstr "" -#: ../src/xmlcopyeditor.cpp:5389 +#: ../src/xmlcopyeditor.cpp:5387 msgid "Expor&t Microsoft Word Document..." msgstr "" -#: ../src/xmlcopyeditor.cpp:5393 +#: ../src/xmlcopyeditor.cpp:5391 msgid "E&xit" msgstr "" -#: ../src/xmlcopyeditor.cpp:5393 +#: ../src/xmlcopyeditor.cpp:5391 msgid "Exit" msgstr "" -#: ../src/xmlcopyeditor.cpp:5439 ../src/xmlcopyeditor.cpp:5441 +#: ../src/xmlcopyeditor.cpp:5437 ../src/xmlcopyeditor.cpp:5439 msgid "New" msgstr "" -#: ../src/xmlcopyeditor.cpp:5457 ../src/xmlcopyeditor.cpp:5461 +#: ../src/xmlcopyeditor.cpp:5455 ../src/xmlcopyeditor.cpp:5459 msgid "Print" msgstr "" -#: ../src/xmlcopyeditor.cpp:5471 ../src/xmlcopyeditor.cpp:5475 +#: ../src/xmlcopyeditor.cpp:5469 ../src/xmlcopyeditor.cpp:5473 msgid "Validate" msgstr "" -#: ../src/xmlcopyeditor.cpp:5535 +#: ../src/xmlcopyeditor.cpp:5533 msgid "Information" msgstr "" -#: ../src/xmlcopyeditor.cpp:5541 +#: ../src/xmlcopyeditor.cpp:5539 msgid "Stopped" msgstr "" -#: ../src/xmlcopyeditor.cpp:5544 +#: ../src/xmlcopyeditor.cpp:5542 msgid "Question" msgstr "" -#: ../src/xmlcopyeditor.cpp:5547 +#: ../src/xmlcopyeditor.cpp:5545 msgid "Message" msgstr "" -#: ../src/xmlcopyeditor.cpp:5615 +#: ../src/xmlcopyeditor.cpp:5613 #, c-format msgid "%s is %s" msgstr "" -#: ../src/xmlcopyeditor.cpp:5640 +#: ../src/xmlcopyeditor.cpp:5638 msgid "Document has been modified: save or discard changes" msgstr "" -#: ../src/xmlcopyeditor.cpp:5703 +#: ../src/xmlcopyeditor.cpp:5701 msgid "Encoding should be one of " msgstr "" -#: ../src/xmlcopyeditor.cpp:5754 +#: ../src/xmlcopyeditor.cpp:5752 msgid "Public DTD" msgstr "" -#: ../src/xmlcopyeditor.cpp:5761 +#: ../src/xmlcopyeditor.cpp:5759 msgid "System DTD" msgstr "" -#: ../src/xmlcopyeditor.cpp:5767 +#: ../src/xmlcopyeditor.cpp:5765 msgid "XML Schema" msgstr "" -#: ../src/xmlcopyeditor.cpp:5791 +#: ../src/xmlcopyeditor.cpp:5789 #, c-format msgid "Cannot associate %s: %s" msgstr "" -#: ../src/xmlcopyeditor.cpp:5798 +#: ../src/xmlcopyeditor.cpp:5796 #, c-format msgid "Associate %s" msgstr "" -#: ../src/xmlcopyeditor.cpp:5806 +#: ../src/xmlcopyeditor.cpp:5804 msgid "Choose a public identifier:" msgstr "" -#: ../src/xmlcopyeditor.cpp:5926 +#: ../src/xmlcopyeditor.cpp:5924 #, c-format msgid "Cannot count words: %s" msgstr "" -#: ../src/xmlcopyeditor.cpp:6074 +#: ../src/xmlcopyeditor.cpp:5932 +#, c-format +msgid "%s contains %i word" +msgid_plural "%s contains %i words" +msgstr[0] "" +msgstr[1] "" + +#: ../src/xmlcopyeditor.cpp:6072 msgid "The current XPath is empty." msgstr "" -#: ../src/xmlcopyeditor.cpp:6084 +#: ../src/xmlcopyeditor.cpp:6082 #, c-format msgid "The current XPath has been copied to the clipboard:[br][b]%s[/b]" msgstr "" -#: ../src/xmlcopyeditor.cpp:6092 +#: ../src/xmlcopyeditor.cpp:6090 #, c-format msgid "Failed to copy the current XPath to the clipboard:[br][b]%s[/b]" msgstr "" -#: ../src/xmlcopyeditor.cpp:6208 +#: ../src/xmlcopyeditor.cpp:6202 +msgid "Invalid path: " +msgid_plural "Invalid paths: " +msgstr[0] "" +msgstr[1] "" + +#: ../src/xmlcopyeditor.cpp:6206 msgid "" "To change the application directory setting, click Tools menu -> Options... " "after XML Copy Editor starts up." msgstr "" -#: ../src/xmlcopyeditor.cpp:6211 +#: ../src/xmlcopyeditor.cpp:6209 msgid "" "To change the application directory setting, click Edit menu -> " "Preferences... after XML Copy Editor starts up." diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo index 305b183..466b89c 100644 Binary files a/po/zh_CN.gmo and b/po/zh_CN.gmo differ diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo index df087af..08a7496 100644 Binary files a/po/zh_TW.gmo and b/po/zh_TW.gmo differ diff --git a/src/.cproject b/src/.cproject index 0acb74e..69b886e 100644 --- a/src/.cproject +++ b/src/.cproject @@ -1,1085 +1,1219 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/.settings/language.settings.xml b/src/.settings/language.settings.xml deleted file mode 100644 index 2a608ba..0000000 --- a/src/.settings/language.settings.xml +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/xmlcopyeditor.iss b/src/xmlcopyeditor.iss index eed0014..58fe115 100644 --- a/src/xmlcopyeditor.iss +++ b/src/xmlcopyeditor.iss @@ -1,5 +1,5 @@ ; -; Copyright 2012-2014 Zane U. Ji. +; Copyright 2012-2020 Zane U. Ji. ; ; This file is part of Xml Copy Editor. ; @@ -18,13 +18,26 @@ ; Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ; +#define OSArchitecture "x64" +;#define OSArchitecture "x86" + #define MyAppName "XML Copy Editor" -#define MyAppVersion GetFileVersion(".\ReleaseWx28-x86\XmlCopyEditor.exe") #define MyAppPublisher "Zane U. Ji" #define MyAppURL "https://sourceforge.net/projects/xml-copy-editor/" -#define MyAppDir32 "ReleaseWx28-x86" #define MyAppExeName "xmlcopyeditor.exe" -#define MinGW32 "D:\MinGW32" +#if OSArchitecture == "x64" + #define MyAppVersion GetFileVersion(".\ReleaseWx-x64\XmlCopyEditor.exe") + #define MyAppDir "ReleaseWx-x64" + #define MinGW "D:\msys64\mingw64" + #define GccExceptionHandling "seh" + #define DllNameSuffix "-x64" +#else + #define MyAppVersion GetFileVersion(".\ReleaseWx-x86\XmlCopyEditor.exe") + #define MyAppDir "ReleaseWx-x86" + #define MinGW "D:\msys64\mingw32" + #define GccExceptionHandling "dw2" + #define DllNameSuffix "" +#endif [Setup] ; NOTE: The value of AppId uniquely identifies this application. @@ -45,9 +58,18 @@ LicenseFile=.\copying\xmlcopyeditor\copying.txt ;SetupIconFile=.\res\appicon.ico Compression=lzma SolidCompression=yes -PrivilegesRequired=none +PrivilegesRequired=lowest +PrivilegesRequiredOverridesAllowed=dialog +#if "x64" == OSArchitecture + ; "ArchitecturesInstallIn64BitMode=x64" requests that the install be + ; done in "64-bit mode" on x64, meaning it should use the native + ; 64-bit Program Files directory and the 64-bit view of the registry. + ; On all other architectures it will install in "32-bit mode". + ArchitecturesInstallIn64BitMode=x64 + ArchitecturesAllowed=x64 +#endif OutputDir=.. -OutputBaseFilename=xmlcopyeditor-{#MyAppVersion}-x86-install +OutputBaseFilename=xmlcopyeditor-{#MyAppVersion}-{#OSArchitecture}-install [Languages] Name: "english"; MessagesFile: "compiler:Default.isl" @@ -92,21 +114,33 @@ Root: HKCR; Subkey: ".xlf"; ValueType: string; ValueData: "Software\SourceForge [Files] ; NOTE: Don't use "Flags: ignoreversion" on any shared system files -Source: ".\{#MyAppDir32}\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#MinGW32}\bin\libgcc_s_sjlj-1.dll"; DestDir: "{app}" -Source: "{#MinGW32}\bin\libstdc++-6.dll"; DestDir: "{app}" -Source: "{#MinGW32}\bin\libwinpthread-1.dll"; DestDir: "{app}" -Source: "{#MinGW32}\i686-w64-mingw32\bin\libaspell-15.dll"; DestDir: "{app}" -Source: "{#MinGW32}\i686-w64-mingw32\bin\libcurl-4.dll"; DestDir: "{app}" -Source: "{#MinGW32}\i686-w64-mingw32\bin\libeay32.dll"; DestDir: "{app}" -Source: "{#MinGW32}\i686-w64-mingw32\bin\libexpat-1.dll"; DestDir: "{app}" -Source: "{#MinGW32}\i686-w64-mingw32\bin\libiconv-2.dll"; DestDir: "{app}" -Source: "{#MinGW32}\i686-w64-mingw32\bin\libpcre-1.dll"; DestDir: "{app}" -Source: "{#MinGW32}\i686-w64-mingw32\bin\libxml2-2.dll"; DestDir: "{app}" -Source: "{#MinGW32}\i686-w64-mingw32\bin\libxslt-1.dll"; DestDir: "{app}" -Source: "{#MinGW32}\i686-w64-mingw32\bin\ssleay32.dll"; DestDir: "{app}" -Source: "{#MinGW32}\i686-w64-mingw32\bin\zlib1.dll"; DestDir: "{app}" -Source: "{#MinGW32}\i686-w64-mingw32\bin\curl-ca-bundle.crt"; DestDir: "{app}"; Flags: ignoreversion +Source: ".\{#MyAppDir}\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion +Source: "{#MinGW}\bin\libaspell-15.dll"; DestDir: "{app}" +Source: "{#MinGW}\bin\libbrotlicommon.dll"; DestDir: "{app}" +Source: "{#MinGW}\bin\libbrotlidec.dll"; DestDir: "{app}" +Source: "{#MinGW}\bin\libcrypto-1_1{#DllNameSuffix}.dll"; DestDir: "{app}" +Source: "{#MinGW}\bin\libcurl-4.dll"; DestDir: "{app}" +Source: "{#MinGW}\bin\libexpat-1.dll"; DestDir: "{app}" +Source: "{#MinGW}\bin\libgcc_s_{#GccExceptionHandling}-1.dll"; DestDir: "{app}" +Source: "{#MinGW}\bin\libiconv-2.dll"; DestDir: "{app}" +Source: "{#MinGW}\bin\libicudt67.dll"; DestDir: "{app}" +Source: "{#MinGW}\bin\libicuuc67.dll"; DestDir: "{app}" +Source: "{#MinGW}\bin\libidn2-0.dll"; DestDir: "{app}" +Source: "{#MinGW}\bin\libintl-8.dll"; DestDir: "{app}" +Source: "{#MinGW}\bin\liblzma-5.dll"; DestDir: "{app}" +Source: "{#MinGW}\bin\libnghttp2-14.dll"; DestDir: "{app}" +Source: "{#MinGW}\bin\libpcre-1.dll"; DestDir: "{app}" +Source: "{#MinGW}\bin\libpsl-5.dll"; DestDir: "{app}" +Source: "{#MinGW}\bin\libssh2-1.dll"; DestDir: "{app}" +Source: "{#MinGW}\bin\libssl-1_1{#DllNameSuffix}.dll"; DestDir: "{app}" +Source: "{#MinGW}\bin\libstdc++-6.dll"; DestDir: "{app}" +Source: "{#MinGW}\bin\libunistring-2.dll"; DestDir: "{app}" +Source: "{#MinGW}\bin\libwinpthread-1.dll"; DestDir: "{app}" +Source: "{#MinGW}\bin\libxerces-c-3-2.dll"; DestDir: "{app}" +Source: "{#MinGW}\bin\libxml2-2.dll"; DestDir: "{app}" +Source: "{#MinGW}\bin\libxslt-1.dll"; DestDir: "{app}" +Source: "{#MinGW}\bin\zlib1.dll"; DestDir: "{app}" +Source: "{#MinGW}\ssl\certs/ca-bundle.trust.crt"; DestDir: "{app}"; DestName: "curl-ca-bundle.crt"; Flags: ignoreversion Source: ".\aspell\*"; DestDir: "{app}\aspell"; Flags: ignoreversion recursesubdirs createallsubdirs Source: ".\bin\*"; DestDir: "{app}\bin"; Flags: ignoreversion recursesubdirs createallsubdirs Source: ".\catalog\*"; DestDir: "{app}\catalog"; Flags: ignoreversion recursesubdirs createallsubdirs @@ -184,7 +218,7 @@ end; function IsAdmin(): Boolean; begin - Result := IsAdminLoggedOn or IsPowerUserLoggedOn; + Result := IsAdminInstallMode or IsPowerUserLoggedOn; end; function DefDirRoot(Param: String): String; diff --git a/src/xmlcopyeditor64.iss b/src/xmlcopyeditor64.iss deleted file mode 100644 index 393845a..0000000 --- a/src/xmlcopyeditor64.iss +++ /dev/null @@ -1,202 +0,0 @@ -; -; Copyright 2014 Zane U. Ji. -; -; This file is part of Xml Copy Editor. -; -; Xml Copy Editor is free software; you can redistribute it and/or -; modify it under the terms of the GNU General Public License -; as published by the Free Software Foundation; either version 2 -; of the License, or (at your option) any later version. -; -; Xml Copy Editor is distributed in the hope that it will be useful, -; but WITHOUT ANY WARRANTY; without even the implied warranty of -; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -; GNU General Public License for more details. -; -; You should have received a copy of the GNU General Public License -; along with Xml Copy Editor; if not, write to the Free Software -; Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -; - -#define MyAppName "XML Copy Editor" -#define MyAppVersion GetFileVersion(".\ReleaseWx28-x64\XmlCopyEditor.exe") -#define MyAppPublisher "Zane U. Ji" -#define MyAppURL "https://sourceforge.net/projects/xml-copy-editor/" -#define MyAppDir64 "ReleaseWx28-x64" -#define MyAppExeName "xmlcopyeditor.exe" -#define MinGW64 "D:\MinGW64" - -[Setup] -; NOTE: The value of AppId uniquely identifies this application. -; Do not use the same AppId value in installers for other applications. -; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) -AppId={#MyAppName} -AppName={#MyAppName} -AppVersion={#MyAppVersion} -;AppVerName={#MyAppName} {#MyAppVersion} -AppPublisher={#MyAppPublisher} -AppPublisherURL={#MyAppURL} -AppSupportURL={#MyAppURL} -AppUpdatesURL={#MyAppURL} -DefaultDirName={code:DefDirRoot}\{#MyAppName} -DefaultGroupName={#MyAppName} -AllowNoIcons=yes -LicenseFile=.\copying\xmlcopyeditor\copying.txt -;SetupIconFile=.\res\appicon.ico -Compression=lzma -SolidCompression=yes -PrivilegesRequired=none -; "ArchitecturesInstallIn64BitMode=x64" requests that the install be -; done in "64-bit mode" on x64, meaning it should use the native -; 64-bit Program Files directory and the 64-bit view of the registry. -; On all other architectures it will install in "32-bit mode". -ArchitecturesInstallIn64BitMode=x64 -ArchitecturesAllowed=x64 -OutputDir=.. -OutputBaseFilename=xmlcopyeditor-{#MyAppVersion}-x64-install - -[Languages] -Name: "english"; MessagesFile: "compiler:Default.isl" - -[Tasks] -Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked -Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked; OnlyBelowVersion: 0,6.1 -Name: "disable_registry"; Description: "Install without administrator privileges"; GroupDescription: "Other tasks"; Flags: unchecked exclusive -Name: "create_registry_entry"; Description: "Full desktop installation"; GroupDescription: "Other tasks"; Flags: exclusive; Check: IsAdmin -Name: "create_registry_entry\main"; Description: "Create Windows registry entry" -Name: "create_registry_entry\associate_xml"; Description: "Associate XML documents (*.xml)" -Name: "create_registry_entry\associate_dtd"; Description: "Associate DTDs (*.dtd)" -Name: "create_registry_entry\associate_ent"; Description: "Associate entity sets (*.ent)" -Name: "create_registry_entry\associate_rss"; Description: "Associate RSS (*.rss)" -Name: "create_registry_entry\associate_xsl"; Description: "Associate XSL stylesheets (*.xsl)" -Name: "create_registry_entry\associate_xsd"; Description: "Associate XML Schema definitions (*.xsd)" -Name: "create_registry_entry\associate_rng"; Description: "Associate RELEAX NG grammars (*.rng)" -Name: "create_registry_entry\associate_rnc"; Description: "Associate compact RELAX NG grammars (*.rnc)" -Name: "create_registry_entry\associate_lzx"; Description: "Associate OpenLaszlo (*.lzx)" -Name: "create_registry_entry\associate_xtm"; Description: "Associate XML Topic Maps (*.xtm, *xtmm)" -Name: "create_registry_entry\associate_xlf"; Description: "Associate XLIFF documents (*.xlf)" - -[Registry] -Root: HKCR; Subkey: "Software\SourceForge Project"; Flags: uninsdeletekeyifempty; Tasks: create_registry_entry -Root: HKCR; Subkey: "Software\SourceForge Project\XML Copy Editor"; Flags: uninsdeletekey; Tasks: create_registry_entry -Root: HKCR; Subkey: "Software\SourceForge Project\XML Copy Editor\DefaultIcon"; ValueType: string; ValueData: "{app}\{#MyAppExeName},1"; Tasks: create_registry_entry -Root: HKCR; Subkey: "Software\SourceForge Project\XML Copy Editor\shell\open\command"; ValueType: string; ValueData: """{app}\{#MyAppExeName}"" ""%1"""; Tasks: create_registry_entry -Root: HKLM; Subkey: "SOFTWARE\SourceForge Project"; Flags: uninsdeletekeyifempty; Tasks: create_registry_entry\main -Root: HKLM; Subkey: "SOFTWARE\SourceForge Project\XML Copy Editor"; Flags: uninsdeletekey; Tasks: create_registry_entry\main -Root: HKLM; Subkey: "SOFTWARE\SourceForge Project\XML Copy Editor"; ValueType: string; ValueName: "InstallPath"; ValueData: "{app}"; Tasks: create_registry_entry\main -Root: HKCR; Subkey: ".xml"; ValueType: string; ValueData: "Software\SourceForge Project\XML Copy Editor"; Flags: uninsdeletevalue; Tasks: create_registry_entry\associate_xml -Root: HKCR; Subkey: ".dtd"; ValueType: string; ValueData: "Software\SourceForge Project\XML Copy Editor"; Flags: uninsdeletevalue; Tasks: create_registry_entry\associate_dtd -Root: HKCR; Subkey: ".ent"; ValueType: string; ValueData: "Software\SourceForge Project\XML Copy Editor"; Flags: uninsdeletevalue; Tasks: create_registry_entry\associate_ent -Root: HKCR; Subkey: ".rss"; ValueType: string; ValueData: "Software\SourceForge Project\XML Copy Editor"; Flags: uninsdeletevalue; Tasks: create_registry_entry\associate_rss -Root: HKCR; Subkey: ".xsl"; ValueType: string; ValueData: "Software\SourceForge Project\XML Copy Editor"; Flags: uninsdeletevalue; Tasks: create_registry_entry\associate_xsl -Root: HKCR; Subkey: ".xsd"; ValueType: string; ValueData: "Software\SourceForge Project\XML Copy Editor"; Flags: uninsdeletevalue; Tasks: create_registry_entry\associate_xsd -Root: HKCR; Subkey: ".rng"; ValueType: string; ValueData: "Software\SourceForge Project\XML Copy Editor"; Flags: uninsdeletevalue; Tasks: create_registry_entry\associate_rng -Root: HKCR; Subkey: ".rnc"; ValueType: string; ValueData: "Software\SourceForge Project\XML Copy Editor"; Flags: uninsdeletevalue; Tasks: create_registry_entry\associate_rnc -Root: HKCR; Subkey: ".lzx"; ValueType: string; ValueData: "Software\SourceForge Project\XML Copy Editor"; Flags: uninsdeletevalue; Tasks: create_registry_entry\associate_lzx -Root: HKCR; Subkey: ".xtm"; ValueType: string; ValueData: "Software\SourceForge Project\XML Copy Editor"; Flags: uninsdeletevalue; Tasks: create_registry_entry\associate_xtm -Root: HKCR; Subkey: ".xlf"; ValueType: string; ValueData: "Software\SourceForge Project\XML Copy Editor"; Flags: uninsdeletevalue; Tasks: create_registry_entry\associate_xlf - -[Files] -; NOTE: Don't use "Flags: ignoreversion" on any shared system files -Source: ".\{#MyAppDir64}\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#MinGW64}\bin\libgcc_s_seh-1.dll"; DestDir: "{app}" -Source: "{#MinGW64}\bin\libstdc++-6.dll"; DestDir: "{app}" -Source: "{#MinGW64}\bin\libwinpthread-1.dll"; DestDir: "{app}" -Source: "{#MinGW64}\x86_64-w64-mingw32\bin\libaspell-15.dll"; DestDir: "{app}" -Source: "{#MinGW64}\x86_64-w64-mingw32\bin\libcurl-4.dll"; DestDir: "{app}" -Source: "{#MinGW64}\x86_64-w64-mingw32\bin\libeay32.dll"; DestDir: "{app}" -Source: "{#MinGW64}\x86_64-w64-mingw32\bin\libexpat-1.dll"; DestDir: "{app}" -Source: "{#MinGW64}\x86_64-w64-mingw32\bin\libiconv-2.dll"; DestDir: "{app}" -Source: "{#MinGW64}\x86_64-w64-mingw32\bin\libpcre-1.dll"; DestDir: "{app}" -Source: "{#MinGW64}\x86_64-w64-mingw32\bin\libxml2-2.dll"; DestDir: "{app}" -Source: "{#MinGW64}\x86_64-w64-mingw32\bin\libxslt-1.dll"; DestDir: "{app}" -Source: "{#MinGW64}\x86_64-w64-mingw32\bin\ssleay32.dll"; DestDir: "{app}" -Source: "{#MinGW64}\x86_64-w64-mingw32\bin\zlib1.dll"; DestDir: "{app}" -Source: "{#MinGW64}\x86_64-w64-mingw32\bin\curl-ca-bundle.crt"; DestDir: "{app}"; Flags: ignoreversion -Source: ".\aspell\*"; DestDir: "{app}\aspell"; Flags: ignoreversion recursesubdirs createallsubdirs -Source: ".\bin\*"; DestDir: "{app}\bin"; Flags: ignoreversion recursesubdirs createallsubdirs -Source: ".\catalog\*"; DestDir: "{app}\catalog"; Flags: ignoreversion recursesubdirs createallsubdirs -Source: ".\copying\*"; DestDir: "{app}\copying"; Flags: ignoreversion recursesubdirs createallsubdirs -Source: ".\dtd\*"; DestDir: "{app}\dtd"; Flags: ignoreversion recursesubdirs createallsubdirs -Source: ".\help\xmlcopyeditor.chm"; DestDir: "{app}\help"; Flags: recursesubdirs createallsubdirs -Source: ".\png\*png"; DestDir: "{app}\png"; Flags: ignoreversion recursesubdirs createallsubdirs -Source: "..\po\ca.gmo"; DestDir: "{app}\po\ca"; DestName: "xmlcopyeditor.mo"; Flags: ignoreversion -Source: "..\po\de.gmo"; DestDir: "{app}\po\de"; DestName: "xmlcopyeditor.mo"; Flags: ignoreversion -Source: "..\po\en_US.gmo"; DestDir: "{app}\po\en_US"; DestName: "xmlcopyeditor.mo"; Flags: ignoreversion -Source: "..\po\es.gmo"; DestDir: "{app}\po\es"; DestName: "xmlcopyeditor.mo"; Flags: ignoreversion -Source: "..\po\fr.gmo"; DestDir: "{app}\po\fr"; DestName: "xmlcopyeditor.mo"; Flags: ignoreversion -Source: "..\po\it.gmo"; DestDir: "{app}\po\it"; DestName: "xmlcopyeditor.mo"; Flags: ignoreversion -Source: "..\po\km.gmo"; DestDir: "{app}\po\km"; DestName: "xmlcopyeditor.mo"; Flags: ignoreversion -Source: "..\po\nl.gmo"; DestDir: "{app}\po\nl"; DestName: "xmlcopyeditor.mo"; Flags: ignoreversion -Source: "..\po\ru.gmo"; DestDir: "{app}\po\ru"; DestName: "xmlcopyeditor.mo"; Flags: ignoreversion -Source: "..\po\sk.gmo"; DestDir: "{app}\po\sk"; DestName: "xmlcopyeditor.mo"; Flags: ignoreversion -Source: "..\po\sv.gmo"; DestDir: "{app}\po\sv"; DestName: "xmlcopyeditor.mo"; Flags: ignoreversion -Source: "..\po\uk_UA.gmo"; DestDir: "{app}\po\uk_UA"; DestName: "xmlcopyeditor.mo"; Flags: ignoreversion -Source: "..\po\zh_CN.gmo"; DestDir: "{app}\po\zh_CN"; DestName: "xmlcopyeditor.mo"; Flags: ignoreversion -Source: "..\po\zh_TW.gmo"; DestDir: "{app}\po\zh_TW"; DestName: "xmlcopyeditor.mo"; Flags: ignoreversion -Source: "..\po\*.png"; DestDir: "{app}" -Source: "..\po\translate.txt"; DestDir: "{app}" -Source: ".\rng\*"; DestDir: "{app}\rng"; Flags: ignoreversion recursesubdirs createallsubdirs -Source: ".\rulesets\*"; DestDir: "{app}\rulesets"; Flags: ignoreversion recursesubdirs createallsubdirs -Source: ".\templates\*"; DestDir: "{app}\templates"; Flags: ignoreversion recursesubdirs createallsubdirs -Source: ".\xsl\*"; DestDir: "{app}\xsl"; Flags: ignoreversion recursesubdirs createallsubdirs - -[Icons] -Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}" -Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}" -Name: "{group}\XML Copy Editor Help"; Filename: "{app}\help\xmlcopyeditor.chm" -Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon; Check: IsAdmin -Name: "{userdesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon; Check: not IsAdmin -Name: "{commonappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: quicklaunchicon; Check: IsAdmin -Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: quicklaunchicon; Check: not IsAdmin - -[Run] -Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent - -[Code] -function GetUninstallString(): String; -var - sUnInstPath: String; - sUnInstallString: String; -begin - sUnInstPath := ExpandConstant('Software\Microsoft\Windows\CurrentVersion\Uninstall\{#MyAppName}_is1'); - sUnInstallString := ''; - if RegQueryStringValue(HKLM, sUnInstPath, 'UninstallString', sUnInstallString) then - else if RegQueryStringValue(HKCU, sUnInstPath, 'UninstallString', sUnInstallString) then - else if Is64BitInstallMode then begin - sUnInstPath := ExpandConstant('Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\{#MyAppName}_is1'); - if not RegQueryStringValue(HKLM, sUnInstPath, 'UninstallString', sUnInstallString) then - RegQueryStringValue(HKCU, sUnInstPath, 'UninstallString', sUnInstallString); - end; - Result := sUnInstallString; -end; - -// http://stackoverflow.com/questions/2000296/innosetup-how-to-automatically-uninstall-previous-installed-version -procedure CurStepChanged(CurStep: TSetupStep); -var - iResult: Integer; - sUninstall: String; -begin - if (CurStep = ssInstall) then begin - sUninstall := GetUninstallString(); - if sUninstall <> '' then begin - sUninstall := RemoveQuotes(sUnInstall); - //iResult := MsgBox('Warning: Old Version will be removed!', mbInformation, MB_OKCANCEL); - //if iResult = IDOK then - Exec(sUninstall, '/SILENT /NORESTART /SUPPRESSMSGBOXES','', SW_SHOWNORMAL, ewWaitUntilTerminated, iResult); - end; - end; -end; - -function IsAdmin(): Boolean; -begin - Result := IsAdminLoggedOn or IsPowerUserLoggedOn; -end; - -function DefDirRoot(Param: String): String; -begin - if not IsAdmin then - Result := ExpandConstant('{localappdata}') - else - Result := ExpandConstant('{pf}') -end; \ No newline at end of file