diff --git a/ChangeLog b/ChangeLog index 0dbec0f..161848b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2020-05-09 14:33 remi 0.3.4 + * libxmldiff 0.2.9 + * vs2019 & vcpkg build + 2019-04-22 14:33 remi 0.3.4beta * libxmldiff 0.2.9beta * Add new parameters for special nodes diff --git a/build/debian/changelog b/build/debian/changelog index 906aa50..50b1da6 100644 --- a/build/debian/changelog +++ b/build/debian/changelog @@ -1,3 +1,9 @@ +xmltreenav (0.3.4ppa3) focal; urgency=low + + * Release 0.3.4 ; see Changelog + + -- Remi Peyronnet Sat, 9 May 2020 20:55:00 +0000 + xmltreenav (0.3.3) stable; urgency=low * Release 0.3.3 ; see Changelog diff --git a/build/debian/control b/build/debian/control index 8990ade..8000116 100644 --- a/build/debian/control +++ b/build/debian/control @@ -1,14 +1,14 @@ Source: xmltreenav Section: contrib/text Priority: optional -Maintainer: Remi Peyronnet +Maintainer: Remi Peyronnet Standards-Version: 2.4.1.2 -Build-Depends: pkg-config, libxml2-dev, libxslt-dev, libxmldiff, libwxgtk3.0-dev, zip +Build-Depends: pkg-config, libxml2-dev, libxslt-dev, libxmldiff, libwxgtk3.0-gtk3-dev, zip, libtool, autotools-dev, automake, autoconf # Pour Ubuntu : libwxgtk3.0-0v5 / pour debian : libwxgtk3.0 Package: xmltreenav Architecture: any -Depends: libc6, libxml2, libxslt1.1, libxmldiff, libwxgtk3.0-0v5 +Depends: libc6, libxml2, libxslt1.1, libxmldiff, libwxgtk3.0-gtk3-0v5 Description: This is a XML viewer specially designed for diffing XML files. xmlTreeNav includes diff functionnalities of libxmldiff, and provides a graphical display of the differences. It also have several useful functions, diff --git a/build/vc2017/xmlTreeNav.sln b/build/vc2017/xmlTreeNav.sln new file mode 100644 index 0000000..3b73702 --- /dev/null +++ b/build/vc2017/xmlTreeNav.sln @@ -0,0 +1,34 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.28307.1062 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmlTreeNav", "xmlTreeNav.vcxproj", "{4F231D63-EFF7-5077-BBC9-A257EA09085E}" + ProjectSection(ProjectDependencies) = postProject + {85888AE5-2AF6-8B58-3801-011A3BF73764} = {85888AE5-2AF6-8B58-3801-011A3BF73764} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxmldiff", "..\..\..\libxmldiff\build\vc2017\libxmldiff.vcxproj", "{85888AE5-2AF6-8B58-3801-011A3BF73764}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {4F231D63-EFF7-5077-BBC9-A257EA09085E}.Debug|Win32.ActiveCfg = Debug|Win32 + {4F231D63-EFF7-5077-BBC9-A257EA09085E}.Debug|Win32.Build.0 = Debug|Win32 + {4F231D63-EFF7-5077-BBC9-A257EA09085E}.Release|Win32.ActiveCfg = Release|Win32 + {4F231D63-EFF7-5077-BBC9-A257EA09085E}.Release|Win32.Build.0 = Release|Win32 + {85888AE5-2AF6-8B58-3801-011A3BF73764}.Debug|Win32.ActiveCfg = Debug|Win32 + {85888AE5-2AF6-8B58-3801-011A3BF73764}.Debug|Win32.Build.0 = Debug|Win32 + {85888AE5-2AF6-8B58-3801-011A3BF73764}.Release|Win32.ActiveCfg = Release|Win32 + {85888AE5-2AF6-8B58-3801-011A3BF73764}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {341CF4CA-D3AF-440C-BE94-2FBD6C27D5BD} + EndGlobalSection +EndGlobal diff --git a/build/vc2017/xmlTreeNav.vcxproj b/build/vc2017/xmlTreeNav.vcxproj new file mode 100644 index 0000000..91e87d0 --- /dev/null +++ b/build/vc2017/xmlTreeNav.vcxproj @@ -0,0 +1,138 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + Win32Proj + {4F231D63-EFF7-5077-BBC9-A257EA09085E} + Svn + Svn + Svn + SubversionScc + 10.0.17763.0 + + + + Application + true + v141 + + + Application + false + false + v141 + + + + + + + + + + + + + true + $(SolutionDir)\..\..\lib;$(SolutionDir)\..\..\..\libxmldiff;$(IncludePath) + $(SolutionDir)\..\..\bin;D:\Util\Prog\VSLibs\lib;$(LibraryPath) + + + true + $(SolutionDir)\..\..\lib;$(SolutionDir)\..\..\..\libxmldiff;$(IncludePath) + $(ReferencePath) + $(SolutionDir)\..\..\bin;D:\Util\Prog\VSLibs\lib;$(LibraryPath) + $(SolutionDir)\..\..\bin\ + + + + WIN32;_DEBUG;_WINDOWS;WINVER=0x0400;_MT;_UNICODE;__WXMSW__;wxUSE_GUI=1;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) + MultiThreadedDebug + Level3 + ProgramDatabase + Disabled + true + + + MachineX86 + true + Windows + libcmtd.lib;libcpmtd.lib;libxmldiff.lib;iconv_a.lib;wxmsw30ud_core.lib;wxbase30ud.lib;comctl32.lib;rpcrt4.lib;winmm.lib;advapi32.lib;wsock32.lib;wxpngd.lib;wxzlibd.lib;wxjpegd.lib;wxtiffd.lib;libxml2_a.lib;libxslt_a.lib;libexslt_a.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;%(AdditionalDependencies) + msvcrt.lib;msvcrtd.lib;%(IgnoreSpecificDefaultLibraries) + + + + + WIN32;_WINDOWS;WINVER=0x0400;_MT;_UNICODE;__WXMSW__;wxUSE_GUI=1;%(PreprocessorDefinitions) + MultiThreaded + ProgramDatabase + true + + + MachineX86 + true + Windows + true + true + libcmt.lib;libcpmt.lib;libxmldiff.lib;iconv_a.lib;wxmsw31u_core.lib;wxbase31u.lib;wxmsw31u_html.lib;wxmsw31u_adv.lib;comctl32.lib;rpcrt4.lib;winmm.lib;advapi32.lib;wsock32.lib;wxpng.lib;wxzlib.lib;wxjpeg.lib;wxtiff.lib;libxml2_a.lib;libxslt_a.lib;libexslt_a.lib;zlib.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib + msvcrt.lib + false + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/build/vc2017/xmlTreeNav.vcxproj.filters b/build/vc2017/xmlTreeNav.vcxproj.filters new file mode 100644 index 0000000..581a4df --- /dev/null +++ b/build/vc2017/xmlTreeNav.vcxproj.filters @@ -0,0 +1,116 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + {a2f2007f-ecb4-4e9c-b227-ef059f7c98a9} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Source Files + + + + + Header Files + + + + + Internalization + + + Internalization + + + Internalization + + + Internalization + + + Internalization + + + + + + + Resource Files + + + Resource Files + + + + + + + + + \ No newline at end of file diff --git a/build/vc2019/clean.bat b/build/vc2019/clean.bat new file mode 100644 index 0000000..7e265ca --- /dev/null +++ b/build/vc2019/clean.bat @@ -0,0 +1,7 @@ +rmdir /s / q .vs +for /d %%G in ("Debug*") do rd /s /q "%%~G" +for /d %%G in ("Release*") do rd /s /q "%%~G" +del /q ..\..\bin\*.ilk +del /q ..\..\bin\*.pdb +del /q ..\..\bin\*.bsc +pause \ No newline at end of file diff --git a/build/vc2019/xmlTreeNav.sln b/build/vc2019/xmlTreeNav.sln new file mode 100644 index 0000000..130d2df --- /dev/null +++ b/build/vc2019/xmlTreeNav.sln @@ -0,0 +1,34 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.28307.1062 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmlTreeNav", "xmlTreeNav.vcxproj", "{4F231D63-EFF7-5077-BBC9-A257EA09085E}" + ProjectSection(ProjectDependencies) = postProject + {85888AE5-2AF6-8B58-3801-011A3BF73764} = {85888AE5-2AF6-8B58-3801-011A3BF73764} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxmldiff", "..\..\..\libxmldiff\build\vc2019\libxmldiff.vcxproj", "{85888AE5-2AF6-8B58-3801-011A3BF73764}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {4F231D63-EFF7-5077-BBC9-A257EA09085E}.Debug|Win32.ActiveCfg = Debug|Win32 + {4F231D63-EFF7-5077-BBC9-A257EA09085E}.Debug|Win32.Build.0 = Debug|Win32 + {4F231D63-EFF7-5077-BBC9-A257EA09085E}.Release|Win32.ActiveCfg = Release|Win32 + {4F231D63-EFF7-5077-BBC9-A257EA09085E}.Release|Win32.Build.0 = Release|Win32 + {85888AE5-2AF6-8B58-3801-011A3BF73764}.Debug|Win32.ActiveCfg = Debug|Win32 + {85888AE5-2AF6-8B58-3801-011A3BF73764}.Debug|Win32.Build.0 = Debug|Win32 + {85888AE5-2AF6-8B58-3801-011A3BF73764}.Release|Win32.ActiveCfg = Release|Win32 + {85888AE5-2AF6-8B58-3801-011A3BF73764}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {341CF4CA-D3AF-440C-BE94-2FBD6C27D5BD} + EndGlobalSection +EndGlobal diff --git a/build/vc2019/xmlTreeNav.vcxproj b/build/vc2019/xmlTreeNav.vcxproj new file mode 100644 index 0000000..f26001d --- /dev/null +++ b/build/vc2019/xmlTreeNav.vcxproj @@ -0,0 +1,136 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + Win32Proj + {4F231D63-EFF7-5077-BBC9-A257EA09085E} + 10.0 + x86-windows-static + x64-windows-static + + + + Application + true + v142 + + + Application + false + false + v142 + + + + + + + + + + + + + true + $(SolutionDir)\..\..\lib;$(SolutionDir)\..\..\..\libxmldiff;$(IncludePath) + $(SolutionDir)\..\..\bin;D:\Util\Prog\VSLibs\lib;$(LibraryPath) + + + true + $(SolutionDir)\..\..\lib;$(SolutionDir)\..\..\..\libxmldiff;$(IncludePath) + $(ReferencePath) + $(SolutionDir)\..\..\bin;D:\Util\Prog\VSLibs\lib;$(LibraryPath) + $(SolutionDir)\..\..\bin\ + + + + WIN32;_DEBUG;_WINDOWS;WINVER=0x0400;_MT;_UNICODE;__WXMSW__;wxUSE_GUI=1;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) + MultiThreadedDebug + Level3 + ProgramDatabase + Disabled + true + + + MachineX86 + true + Windows + libcmtd.lib;libcpmtd.lib;libxmldiff.lib;libxml2.lib;libxslt.lib;libexslt.lib;wxbase31ud.lib;wxbase31ud_net.lib;wxbase31ud_xml.lib;wxmsw31ud_richtext.lib;wxmsw31ud_xrc.lib;wxmsw31ud_adv.lib;wxmsw31ud_aui.lib;wxmsw31ud_core.lib;wxmsw31ud_gl.lib;wxmsw31ud_html.lib;wxmsw31ud_media.lib;wxmsw31ud_qa.lib;zlibd.lib;expat.lib;jpegd.lib;libpng16d.lib;wxregexud.lib;tiffd.lib;odbc32.lib;odbccp32.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;%(AdditionalDependencies) + msvcrt.lib;msvcrtd.lib;%(IgnoreSpecificDefaultLibraries) + + + + + WIN32;_WINDOWS;WINVER=0x0400;_MT;_UNICODE;__WXMSW__;wxUSE_GUI=1;%(PreprocessorDefinitions) + MultiThreaded + ProgramDatabase + true + + + MachineX86 + true + Windows + true + true + libcmt.lib;libcpmt.lib;libxmldiff.lib;libxml2.lib;libxslt.lib;libexslt.lib;wxbase31u.lib;wxbase31u_net.lib;wxbase31u_xml.lib;wxmsw31u_richtext.lib;wxmsw31u_xrc.lib;wxmsw31u_adv.lib;wxmsw31u_aui.lib;wxmsw31u_core.lib;wxmsw31u_gl.lib;wxmsw31u_html.lib;wxmsw31u_media.lib;wxmsw31u_qa.lib;zlib.lib;expat.lib;jpeg.lib;libpng16.lib;wxregexu.lib;tiff.lib;odbc32.lib;odbccp32.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib; + msvcrt.lib + false + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/build/vc2019/xmlTreeNav.vcxproj.filters b/build/vc2019/xmlTreeNav.vcxproj.filters new file mode 100644 index 0000000..581a4df --- /dev/null +++ b/build/vc2019/xmlTreeNav.vcxproj.filters @@ -0,0 +1,116 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + {a2f2007f-ecb4-4e9c-b227-ef059f7c98a9} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Source Files + + + + + Header Files + + + + + Internalization + + + Internalization + + + Internalization + + + Internalization + + + Internalization + + + + + + + Resource Files + + + Resource Files + + + + + + + + + \ No newline at end of file diff --git a/build/win32/XmlTreeNav.iss b/build/win32/XmlTreeNav.iss index b2cbd8b..cbb5f06 100644 --- a/build/win32/XmlTreeNav.iss +++ b/build/win32/XmlTreeNav.iss @@ -6,19 +6,21 @@ [Setup] AppName={#AppName} AppPublisher=Remi Peyronnet -AppVersion=0.3.4beta +AppVersion=0.3.4 ;AppVerName=xmlTreeNav 0.3.2 AppPublisherURL=http://www.lprp.fr/soft/xml/xmltreenav/xmltreenav_en.php3 AppSupportURL=http://www.lprp.fr/soft/xml/xmltreenav/xmltreenav_en.php3 AppUpdatesURL=http://www.lprp.fr/soft/xml/xmltreenav/xmltreenav_en.php3 -DefaultDirName={pf}\{#AppName} +DefaultDirName={autopf}\{#AppName} DefaultGroupName={#AppName} AllowNoIcons=true -; DisableProgramGroupPage=yes +DisableProgramGroupPage=yes OutputBaseFilename=xmltreenav_setup OutputDir=..\..\distrib\ ShowLanguageDialog=yes AlwaysShowGroupOnReadyPage=True +PrivilegesRequired=lowest +PrivilegesRequiredOverridesAllowed=dialog [Files] Source: ..\..\bin\xmlTreeNav.exe; DestDir: {app}; Flags: ignoreversion @@ -29,17 +31,11 @@ Source: ..\..\bin\config.xml; DestDir: {app}; Flags: ignoreversion Source: ..\..\bin\xmltreenav.htb; DestDir: {app}; Flags: ignoreversion Source: ..\..\bin\filter-added-removed-or-equal.xsl; DestDir: {app}; Flags: ignoreversion Source: ..\..\..\libxmldiff\bin\xmldiff.exe; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\libxmldiff\bin\libxmldiff.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\libxmldiff\bin\libxml2.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\libxmldiff\bin\libxslt.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\libxmldiff\bin\libexslt.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\libxmldiff\bin\iconv.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\libxmldiff\bin\zlib1.dll; DestDir: {app}; Flags: ignoreversion ; NOTE: Don't use "Flags: ignoreversion" on any shared system files [Icons] ;Name: {userprograms}\xmlTreeNav; Filename: {app}\xmlTreeNav.exe; WorkingDir: {app} -Name: {group}\{#AppName}; Filename: {app}\xmlTreeNav.exe; WorkingDir: {app} +Name: {autoprograms}\{#AppName}; Filename: {app}\xmlTreeNav.exe; WorkingDir: {app} [Run] Filename: {app}\xmlTreeNav.exe; Description: {cm:LaunchProgram, {#AppName}}; Flags: nowait postinstall skipifsilent diff --git a/configure b/configure index 5ae2901..450c3c7 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for xmlTreeNav 0.3.4beta. +# Generated by GNU Autoconf 2.69 for xmlTreeNav 0.3.4. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -577,8 +577,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='xmlTreeNav' PACKAGE_TARNAME='xmltreenav' -PACKAGE_VERSION='0.3.4beta' -PACKAGE_STRING='xmlTreeNav 0.3.4beta' +PACKAGE_VERSION='0.3.4' +PACKAGE_STRING='xmlTreeNav 0.3.4' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -742,6 +742,7 @@ with_wx_exec_prefix with_xml_prefix with_xml_exec_prefix enable_xmltest +enable_debug enable_nls with_gnu_ld enable_rpath @@ -1317,7 +1318,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xmlTreeNav 0.3.4beta to adapt to many kinds of systems. +\`configure' configures xmlTreeNav 0.3.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1388,7 +1389,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xmlTreeNav 0.3.4beta:";; + short | recursive ) echo "Configuration of xmlTreeNav 0.3.4:";; esac cat <<\_ACEOF @@ -1403,6 +1404,7 @@ Optional Features: --disable-dependency-tracking speeds up one-time build --disable-xmltest Do not try to compile and run a test LIBXML program + --enable-debug Turn on debugging --disable-nls do not use Native Language Support --disable-rpath do not hardcode runtime library paths @@ -1513,7 +1515,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xmlTreeNav configure 0.3.4beta +xmlTreeNav configure 0.3.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1731,7 +1733,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xmlTreeNav $as_me 0.3.4beta, which was +It was created by xmlTreeNav $as_me 0.3.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2596,7 +2598,7 @@ fi # Define the identity of the package. PACKAGE='xmltreenav' - VERSION='0.3.4beta' + VERSION='0.3.4' cat >>confdefs.h <<_ACEOF @@ -5198,6 +5200,21 @@ $as_echo "yes" >&6; } fi +# Check whether --enable-debug was given. +if test "${enable_debug+set}" = set; then : + enableval=$enable_debug; case "${enableval}" in + yes) + DEBUGG="-g -H -fomit-frame-pointer -DDEBUG" + WXDEBUG="--debug" + ;; + no) debug=false ;; + *) as_fn_error $? "bad value ${enableval} for --enable-debug" "$LINENO" 5 ;; +esac +else + debug=false +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 $as_echo_n "checking for a sed that does not truncate output... " >&6; } if ${ac_cv_path_SED+:} false; then : @@ -7651,10 +7668,10 @@ $as_echo "yes" >&6; } fi DEBUG="-g -H " -LIBS="$DEBUG $LIBS $WX_LIBS $XML_LIBS $libxmldiff_LIBS" -CXXFLAGS="$DEBUG $CXXFLAGS $WX_CXXFLAGS $XML_CXXFLAGS $libxmldiff_CXXFLAGS" -CPPFLAGS="$DEBUG $CPPFLAGS $WX_CPPFLAGS $XML_CPPFLAGS $libxmldiff_CPPFLAGS" -CFLAGS="$DEBUG $CFLAGS $WX_CFLAGS $XML_CFLAGS $libxmldiff_CFLAGS" +LIBS="$DEBUGG $LIBS $WX_LIBS $XML_LIBS $libxmldiff_LIBS" +CXXFLAGS="$DEBUGG $CXXFLAGS $WX_CXXFLAGS $XML_CXXFLAGS $libxmldiff_CXXFLAGS" +CPPFLAGS="$DEBUGG $CPPFLAGS $WX_CPPFLAGS $XML_CPPFLAGS $libxmldiff_CPPFLAGS" +CFLAGS="$DEBUGG $CFLAGS $WX_CFLAGS $XML_CFLAGS $libxmldiff_CFLAGS" ac_config_files="$ac_config_files Makefile src/Makefile lib/Makefile lib/wxmisc/Makefile po/Makefile.in doc/Makefile doc/use/Makefile resources/Makefile resources/xpm/Makefile resources/treeicons/Makefile" @@ -8228,7 +8245,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xmlTreeNav $as_me 0.3.4beta, which was +This file was extended by xmlTreeNav $as_me 0.3.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8285,7 +8302,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -xmlTreeNav config.status 0.3.4beta +xmlTreeNav config.status 0.3.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 4b3a916..ec75cb7 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT(xmlTreeNav,0.3.4beta) +AC_INIT(xmlTreeNav,0.3.4) AC_CONFIG_SRCDIR([configure.ac]) AM_INIT_AUTOMAKE AC_PROG_CC @@ -35,6 +35,17 @@ PKG_CHECK_MODULES(LIBXMLDIFF, libxmldiff >= 0.1, ) +AC_ARG_ENABLE(debug, +[ --enable-debug Turn on debugging], +[case "${enableval}" in + yes) + DEBUGG="-g -H -fomit-frame-pointer -DDEBUG" + WXDEBUG="--debug" + ;; + no) debug=false ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-debug) ;; +esac],[debug=false]) + dnl Internationalization AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT_VERSION([0.19.8]) @@ -43,10 +54,10 @@ dnl libxmldiff pkg-config PKG_CHECK_MODULES([libxmldiff], [libxmldiff >= 0.2.0]) DEBUG="-g -H " -LIBS="$DEBUG $LIBS $WX_LIBS $XML_LIBS $libxmldiff_LIBS" -CXXFLAGS="$DEBUG $CXXFLAGS $WX_CXXFLAGS $XML_CXXFLAGS $libxmldiff_CXXFLAGS" -CPPFLAGS="$DEBUG $CPPFLAGS $WX_CPPFLAGS $XML_CPPFLAGS $libxmldiff_CPPFLAGS" -CFLAGS="$DEBUG $CFLAGS $WX_CFLAGS $XML_CFLAGS $libxmldiff_CFLAGS" +LIBS="$DEBUGG $LIBS $WX_LIBS $XML_LIBS $libxmldiff_LIBS" +CXXFLAGS="$DEBUGG $CXXFLAGS $WX_CXXFLAGS $XML_CXXFLAGS $libxmldiff_CXXFLAGS" +CPPFLAGS="$DEBUGG $CPPFLAGS $WX_CPPFLAGS $XML_CPPFLAGS $libxmldiff_CPPFLAGS" +CFLAGS="$DEBUGG $CFLAGS $WX_CFLAGS $XML_CFLAGS $libxmldiff_CFLAGS" AC_CONFIG_FILES([ \ Makefile \ diff --git a/po/fr.po b/po/fr.po index 896885c..0402201 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: xmlTreeNav\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-03-29 21:50+0200\n" -"PO-Revision-Date: 2020-03-29 21:54+0200\n" +"Report-Msgid-Bugs-To: remi+xmltreenav@via.ecp.fr\n" +"POT-Creation-Date: 2020-05-09 19:41+0200\n" +"PO-Revision-Date: 2020-05-09 19:33+0200\n" "Last-Translator: Rémi Peyronnet \n" "Language-Team: French \n" "Language: fr\n" @@ -17,103 +17,156 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-SourceCharset: iso-8859-1\n" -"X-Generator: Poedit 2.2.4\n" +"X-Generator: Poedit 2.3\n" -#: ../src/xtnApp.cpp:64 +#: lib/wxmisc/ConfigDialog.cpp:71 +msgid "Apply" +msgstr "Appliquer" + +#: lib/wxmisc/ConfigDialog.cpp:72 +msgid "Cancel" +msgstr "Annuler" + +#: src/xtnApp.cpp:64 msgid "XSLT Local Display File to use" msgstr "Aperçu XSLT à utiliser" -#: ../src/xtnApp.cpp:65 +#: src/xtnApp.cpp:65 msgid "XSLT HTML Display File to use" msgstr "Aperçu XSLT HTML à utiliser" -#: ../src/xtnApp.cpp:66 +#: src/xtnApp.cpp:66 msgid "Config File to use" msgstr "Fichier de configuration à utiliser" -#: ../src/xtnApp.cpp:67 +#: src/xtnApp.cpp:67 msgid "XML File to open" msgstr "Fichier XML à ouvrir" -#: ../src/xtnDialogDiffCurrent.cpp:11 +#: src/xtnApp.h:30 +msgid "Performs efficient XML tree navigation and diff XML files." +msgstr "" +"Permet de naviguer efficacement dans les fichiers XML\n" +"et une comparaison facile entre deux fichiers XML." + +#: src/xtnApp.h:31 +#, c-format +msgid "" +"%s %s\n" +"libxmldiff %s\n" +"\n" +"(c) 2004-2020 - Remi Peyronnet\n" +"http://www.lprp.fr" +msgstr "" +"%s %s\n" +"libxmldiff %s\n" +"\n" +"© 2004-2020 - Rémi Peyronnet\n" +"http://www.lprp.fr" + +#: src/xtnApp.h:32 +msgid " (c) 2004 - Remi Peyronnet - http://www.lprp.fr" +msgstr " (c) 2004 - Rémi Peyronnet - http://www.lprp.fr" + +#: src/xtnApp.h:42 +msgid "XML Files (*.xml)|*.xml|All files (*.*)|*.*" +msgstr "Fichiers XML (*.xml)|*.xml|Tous les fichiers (*.*)|*.*" + +#: src/xtnApp.h:43 +msgid "XSL Files (*.xsl;*.xslt)|*.xsl;*.xslt|All files (*.*)|*.*" +msgstr "Fichiers XSL -*.xsl;*.xslt)|*.xsl;*.xslt|Tous les fichiers (*.*)|*.*" + +#: src/xtnApp.h:52 src/xtnApp.h:55 +msgid "" +"This function is not yet implemented, \n" +"or is being developped.\n" +msgstr "" +"Cette fonction n'est pas pour l'instant développée, \n" +"ou est en cours de développement.\n" + +#: src/xtnApp.h:52 src/xtnApp.h:55 +msgid "Function not implemented." +msgstr "Fonction non développée." + +#: src/xtnDialogDiffCurrent.cpp:11 msgid "Diff Options" msgstr "Options de comparaison" -#: ../src/xtnDialogDiffCurrent.cpp:12 +#: src/xtnDialogDiffCurrent.cpp:12 msgid "xmlDiff current file" msgstr "Compare le fichier XML avec celui en cours" -#: ../src/xtnDialogDiffCurrent.cpp:13 +#: src/xtnDialogDiffCurrent.cpp:13 msgid "With " msgstr "Avec " -#: ../src/xtnDialogDiffCurrent.cpp:15 ../src/xtnDialogDiffDual.cpp:17 -#: ../src/xtnDialogDiffDual.cpp:20 +#: src/xtnDialogDiffCurrent.cpp:15 src/xtnDialogDiffDual.cpp:17 +#: src/xtnDialogDiffDual.cpp:20 msgid "..." msgstr "..." -#: ../src/xtnDialogDiffCurrent.cpp:16 +#: src/xtnDialogDiffCurrent.cpp:16 msgid "...as Before file" msgstr "... comme fichier Avant" -#: ../src/xtnDialogDiffCurrent.cpp:17 +#: src/xtnDialogDiffCurrent.cpp:17 msgid "... as After file" msgstr "... comme fichier Après" -#: ../src/xtnDialogDiffCurrent.cpp:18 ../src/xtnDialogDiffDual.cpp:21 +#: src/xtnDialogDiffCurrent.cpp:18 src/xtnDialogDiffDual.cpp:21 msgid "Identifiers " msgstr "Identifiants " -#: ../src/xtnDialogDiffCurrent.cpp:19 ../src/xtnDialogDiffDual.cpp:22 -#: ../src/xtnFrame.cpp:167 +#: src/xtnDialogDiffCurrent.cpp:19 src/xtnDialogDiffDual.cpp:22 +#: src/xtnFrame.cpp:167 msgid "@id,@value" msgstr "@id,@value" -#: ../src/xtnDialogDiffCurrent.cpp:20 ../src/xtnDialogDiffDual.cpp:23 -#: ../src/xtnFrame.cpp:168 +#: src/xtnDialogDiffCurrent.cpp:20 src/xtnDialogDiffDual.cpp:23 +#: src/xtnFrame.cpp:168 msgid "Ignore Tags" msgstr "Ignorer les Noeuds" -#: ../src/xtnDialogDiffCurrent.cpp:21 ../src/xtnDialogDiffDual.cpp:24 -#: ../src/xtnFrame.cpp:168 +#: src/xtnDialogDiffCurrent.cpp:21 src/xtnDialogDiffDual.cpp:24 +#: src/xtnFrame.cpp:168 msgid "@ignore-attr,ignore-tag" msgstr "@ignore-attr,ignore-tag" -#: ../src/xtnDialogDiffCurrent.cpp:22 ../src/xtnDialogDiffDual.cpp:25 -#: ../src/xtnFrame.cpp:169 +#: src/xtnDialogDiffCurrent.cpp:22 src/xtnDialogDiffDual.cpp:25 +#: src/xtnFrame.cpp:169 msgid "Add before values" msgstr "Ajout des valeurs précédentes" -#: ../src/xtnDialogDiffCurrent.cpp:23 ../src/xtnDialogDiffDual.cpp:26 +#: src/xtnDialogDiffCurrent.cpp:23 src/xtnDialogDiffDual.cpp:26 msgid "Separator " msgstr "Séparateur " -#: ../src/xtnDialogDiffCurrent.cpp:24 ../src/xtnDialogDiffDual.cpp:27 -#: ../src/xtnFrame.cpp:170 +#: src/xtnDialogDiffCurrent.cpp:24 src/xtnDialogDiffDual.cpp:27 +#: src/xtnFrame.cpp:170 msgid "|" msgstr "|" -#: ../src/xtnDialogDiffCurrent.cpp:25 ../src/xtnDialogDiffDual.cpp:28 +#: src/xtnDialogDiffCurrent.cpp:25 src/xtnDialogDiffDual.cpp:28 msgid "Tag Childs" msgstr "Marque les noeuds fils" -#: ../src/xtnDialogDiffCurrent.cpp:26 ../src/xtnDialogDiffDual.cpp:29 +#: src/xtnDialogDiffCurrent.cpp:26 src/xtnDialogDiffDual.cpp:29 msgid "&Diff !" msgstr "&Comparer !" -#: ../src/xtnDialogDiffCurrent.cpp:27 ../src/xtnDialogDiffDual.cpp:30 +#: src/xtnDialogDiffCurrent.cpp:27 src/xtnDialogDiffDual.cpp:30 msgid "&Cancel" msgstr "&Annuler" -#: ../src/xtnDialogDiffCurrent.cpp:40 ../src/xtnFrame.cpp:721 +#: src/xtnDialogDiffCurrent.cpp:40 src/xtnFrame.cpp:721 msgid "Diff to current XML File" msgstr "Compare avec le fichier XML en cours" -#: ../src/xtnDialogDiffCurrent.cpp:42 ../src/xtnDialogDiffDual.cpp:44 +#: src/xtnDialogDiffCurrent.cpp:42 src/xtnDialogDiffDual.cpp:44 msgid "Diff the currently opened XML file with this file." msgstr "Compare le fichier XML actuellement ouvert avec ce fichier." -#: ../src/xtnDialogDiffCurrent.cpp:45 +#: src/xtnDialogDiffCurrent.cpp:45 msgid "" "Use the file specified above as before file, and the currently opened file " "as after file." @@ -121,7 +174,7 @@ msgstr "" "Utilise le fichier spécifié ci-dessous comme fichier Avant, et le fichier " "actuellement ouvert comme fichier Après." -#: ../src/xtnDialogDiffCurrent.cpp:47 +#: src/xtnDialogDiffCurrent.cpp:47 msgid "" "Use the file specified above as after file, and the currently opened file as " "before file." @@ -129,7 +182,7 @@ msgstr "" "Utilise le fichier spécifié ci--dessous comme fichier Après, et le fichier " "actuellement ouvert comme fichier Avant." -#: ../src/xtnDialogDiffCurrent.cpp:48 ../src/xtnDialogDiffDual.cpp:48 +#: src/xtnDialogDiffCurrent.cpp:48 src/xtnDialogDiffDual.cpp:48 msgid "" "Use these items as identifiers. (List of items separated by comma, " "attributes must be prefixed by @, and '.' can be used for the text)" @@ -138,11 +191,11 @@ msgstr "" "virgules, les attributs doivent être préfixés par @, et '.' désigne le texte " "du noeud)" -#: ../src/xtnDialogDiffCurrent.cpp:49 ../src/xtnDialogDiffDual.cpp:49 +#: src/xtnDialogDiffCurrent.cpp:49 src/xtnDialogDiffDual.cpp:49 msgid "Differences on these items will be ignored" msgstr "Les différences sur ces éléments seront ignorées" -#: ../src/xtnDialogDiffCurrent.cpp:50 ../src/xtnDialogDiffDual.cpp:50 +#: src/xtnDialogDiffCurrent.cpp:50 src/xtnDialogDiffDual.cpp:50 msgid "" "If checked, when a difference occurs, the output file will contain \"before " "value after value\"" @@ -150,455 +203,454 @@ msgstr "" "Lorsque cette option est cochée, en cas de différence, le fichier de sortie " "contiendra " -#: ../src/xtnDialogDiffCurrent.cpp:52 ../src/xtnDialogDiffDual.cpp:52 +#: src/xtnDialogDiffCurrent.cpp:52 src/xtnDialogDiffDual.cpp:52 msgid "Text to separate before and after values" msgstr "Texte séparant les valeurs Avant et Après" -#: ../src/xtnDialogDiffCurrent.cpp:53 ../src/xtnDialogDiffDual.cpp:53 +#: src/xtnDialogDiffCurrent.cpp:53 src/xtnDialogDiffDual.cpp:53 msgid "Recursively tag childs of added or deleted nodes." msgstr "Marque les noeuds fils des noeuds ajoutés ou supprimés." -#: ../src/xtnDialogDiffCurrent.cpp:127 ../src/xtnDialogDiffDual.cpp:178 -#: ../src/xtnDialogDiffDual.cpp:195 ../src/xtnFrame.cpp:291 -#: ../src/xtnFrame.cpp:572 +#: src/xtnDialogDiffCurrent.cpp:127 src/xtnDialogDiffDual.cpp:178 +#: src/xtnDialogDiffDual.cpp:195 src/xtnFrame.cpp:291 src/xtnFrame.cpp:572 msgid "Open a file" msgstr "Ouvrir un fichier" -#: ../src/xtnDialogDiffDual.cpp:14 +#: src/xtnDialogDiffDual.cpp:14 msgid "xmlDiff two files" msgstr "Compare deux fichiers XML" -#: ../src/xtnDialogDiffDual.cpp:15 +#: src/xtnDialogDiffDual.cpp:15 msgid "Before" msgstr "Avant" -#: ../src/xtnDialogDiffDual.cpp:18 +#: src/xtnDialogDiffDual.cpp:18 msgid "After" msgstr "Après" -#: ../src/xtnDialogDiffDual.cpp:42 +#: src/xtnDialogDiffDual.cpp:42 msgid "Diff Two XML Files" msgstr "Compare deux fichiers XML" -#: ../src/xtnFrame.cpp:130 ../src/xtnFrame.cpp:164 +#: src/xtnFrame.cpp:130 src/xtnFrame.cpp:164 msgid "config.xml" msgstr "config.xml" -#: ../src/xtnFrame.cpp:155 +#: src/xtnFrame.cpp:155 msgid "Preferences" msgstr "Préférences" -#: ../src/xtnFrame.cpp:157 ../src/xtnFrame.cpp:158 ../src/xtnFrame.cpp:159 +#: src/xtnFrame.cpp:157 src/xtnFrame.cpp:158 src/xtnFrame.cpp:159 msgid "XML" msgstr "XML" -#: ../src/xtnFrame.cpp:157 +#: src/xtnFrame.cpp:157 msgid "Clean Text" msgstr "Nettoyage du texte" -#: ../src/xtnFrame.cpp:158 +#: src/xtnFrame.cpp:158 msgid "Enforce Cleaning" msgstr "Force le nettoyage" -#: ../src/xtnFrame.cpp:159 +#: src/xtnFrame.cpp:159 msgid "Pretty Print on Save" msgstr "Sauvegarde un XML indenté" -#: ../src/xtnFrame.cpp:161 ../src/xtnFrame.cpp:162 +#: src/xtnFrame.cpp:161 src/xtnFrame.cpp:162 msgid "Engine" msgstr "Moteur" -#: ../src/xtnFrame.cpp:161 +#: src/xtnFrame.cpp:161 msgid "Optimize Memory usage" msgstr "Optimise l'utilisation mémoire" -#: ../src/xtnFrame.cpp:162 +#: src/xtnFrame.cpp:162 msgid "Use EXSLT" msgstr "Permettre EXSLT" -#: ../src/xtnFrame.cpp:164 ../src/xtnFrame.cpp:165 +#: src/xtnFrame.cpp:164 src/xtnFrame.cpp:165 msgid "Config" msgstr "Configuration" -#: ../src/xtnFrame.cpp:164 +#: src/xtnFrame.cpp:164 msgid "Configuration File" msgstr "Fichier de configuration" -#: ../src/xtnFrame.cpp:165 +#: src/xtnFrame.cpp:165 msgid "Search Size" msgstr "Taille de la recherche" -#: ../src/xtnFrame.cpp:165 +#: src/xtnFrame.cpp:165 msgid "250" msgstr "250" -#: ../src/xtnFrame.cpp:167 ../src/xtnFrame.cpp:168 ../src/xtnFrame.cpp:169 -#: ../src/xtnFrame.cpp:170 ../src/xtnFrame.cpp:171 ../src/xtnFrame.cpp:173 -#: ../src/xtnFrame.cpp:174 +#: src/xtnFrame.cpp:167 src/xtnFrame.cpp:168 src/xtnFrame.cpp:169 +#: src/xtnFrame.cpp:170 src/xtnFrame.cpp:171 src/xtnFrame.cpp:173 +#: src/xtnFrame.cpp:174 msgid "Diff Defaults" msgstr "Par défaut" -#: ../src/xtnFrame.cpp:167 +#: src/xtnFrame.cpp:167 msgid "Identifiers" msgstr "Identifiants" -#: ../src/xtnFrame.cpp:170 +#: src/xtnFrame.cpp:170 msgid "Separator" msgstr "Séparateur" -#: ../src/xtnFrame.cpp:171 +#: src/xtnFrame.cpp:171 msgid "Tag childs" msgstr "Marque les noeuds fils" -#: ../src/xtnFrame.cpp:173 +#: src/xtnFrame.cpp:173 msgid "Special Node Ids" msgstr "Utiliser le contenu comme identifiant des nœuds spéciaux" -#: ../src/xtnFrame.cpp:174 +#: src/xtnFrame.cpp:174 msgid "Special Nodes Before Value" msgstr "Afficher les valeurs précédentes des nœuds spéciaux" -#: ../src/xtnFrame.cpp:236 +#: src/xtnFrame.cpp:236 msgid "&Open..." msgstr "&Ouvrir..." -#: ../src/xtnFrame.cpp:236 +#: src/xtnFrame.cpp:236 msgid "Open a file." msgstr "Ouvre un fichier" -#: ../src/xtnFrame.cpp:237 +#: src/xtnFrame.cpp:237 msgid "&Open and Diff..." msgstr "Ouvrir et &Comparer..." -#: ../src/xtnFrame.cpp:237 +#: src/xtnFrame.cpp:237 msgid "Open and diff two XML files." msgstr "Ouvre deux fichiers et les compare entre eux." -#: ../src/xtnFrame.cpp:238 +#: src/xtnFrame.cpp:238 msgid "&Save" msgstr "&Enregistre" -#: ../src/xtnFrame.cpp:238 +#: src/xtnFrame.cpp:238 msgid "Save the current file." msgstr "Enregistre le fichier en cours" -#: ../src/xtnFrame.cpp:239 +#: src/xtnFrame.cpp:239 msgid "&Save as..." msgstr "En®istre sous..." -#: ../src/xtnFrame.cpp:239 +#: src/xtnFrame.cpp:239 msgid "Save the current file under another name." msgstr "Enregistre le fichier courant sous un autre nom." -#: ../src/xtnFrame.cpp:240 +#: src/xtnFrame.cpp:240 msgid "&Reload" msgstr "Re&charge" -#: ../src/xtnFrame.cpp:240 +#: src/xtnFrame.cpp:240 msgid "Reload original file." msgstr "Recharge le fichier tel qu'il était lors du dernier enregistrement." -#: ../src/xtnFrame.cpp:242 +#: src/xtnFrame.cpp:242 msgid "&Preferences" msgstr "&Préférences" -#: ../src/xtnFrame.cpp:242 +#: src/xtnFrame.cpp:242 msgid "Define application's settings." msgstr "Définit les réglages de l'application." -#: ../src/xtnFrame.cpp:244 +#: src/xtnFrame.cpp:244 msgid "&Quit" msgstr "&Quitter" -#: ../src/xtnFrame.cpp:244 +#: src/xtnFrame.cpp:244 msgid "Quit the application." msgstr "Quitte l'application." -#: ../src/xtnFrame.cpp:245 +#: src/xtnFrame.cpp:245 msgid "&File" msgstr "&Fichier" -#: ../src/xtnFrame.cpp:248 +#: src/xtnFrame.cpp:248 msgid "&Copy" msgstr "&Copier" -#: ../src/xtnFrame.cpp:248 +#: src/xtnFrame.cpp:248 msgid "Copy current node to clipboard." msgstr "Copier le noeud en cours dans le presse-papier." -#: ../src/xtnFrame.cpp:249 +#: src/xtnFrame.cpp:249 msgid "&Paste" msgstr "&Coller" -#: ../src/xtnFrame.cpp:249 +#: src/xtnFrame.cpp:249 msgid "Paste to file." msgstr "Coller le fichier" -#: ../src/xtnFrame.cpp:251 +#: src/xtnFrame.cpp:251 msgid "&Search..." msgstr "&Recherche" -#: ../src/xtnFrame.cpp:251 +#: src/xtnFrame.cpp:251 msgid "Search nodes with XPath expression." msgstr "Recherche selon une expression XPath" -#: ../src/xtnFrame.cpp:252 +#: src/xtnFrame.cpp:252 msgid "&Next" msgstr "&Suivant" -#: ../src/xtnFrame.cpp:252 +#: src/xtnFrame.cpp:252 msgid "Next node of the previous search." msgstr "Affiche le prochain résultat de la dernière recherche." -#: ../src/xtnFrame.cpp:254 +#: src/xtnFrame.cpp:254 msgid "&Expand All" msgstr "Tout d&éplier" -#: ../src/xtnFrame.cpp:254 +#: src/xtnFrame.cpp:254 msgid "Expand all nodes of selected item." msgstr "Déplie tous les nœuds de l'élément sélectionné." -#: ../src/xtnFrame.cpp:255 +#: src/xtnFrame.cpp:255 msgid "Co&llapse All" msgstr "Tout rep&lier" -#: ../src/xtnFrame.cpp:255 +#: src/xtnFrame.cpp:255 msgid "Collapse all nodes of selected item." msgstr "Replie tous les nœuds de l'élément sélectionné." -#: ../src/xtnFrame.cpp:256 +#: src/xtnFrame.cpp:256 msgid "&Edit" msgstr "&Edition" -#: ../src/xtnFrame.cpp:259 +#: src/xtnFrame.cpp:259 msgid "&Normal" msgstr "Standard" -#: ../src/xtnFrame.cpp:259 +#: src/xtnFrame.cpp:259 msgid "Normal display, with attributes and text inline." msgstr "Affichage standard" -#: ../src/xtnFrame.cpp:260 +#: src/xtnFrame.cpp:260 msgid "&Texts" msgstr "&Textes" -#: ../src/xtnFrame.cpp:260 +#: src/xtnFrame.cpp:260 msgid "Display with attributes inline, and texts as elements." msgstr "Affiche les textes comme des élements" -#: ../src/xtnFrame.cpp:261 +#: src/xtnFrame.cpp:261 msgid "&Full" msgstr "&Tous éléments" -#: ../src/xtnFrame.cpp:261 +#: src/xtnFrame.cpp:261 msgid "Display everything as elements." msgstr "Affiche attributs et textes comme des éléments" -#: ../src/xtnFrame.cpp:262 +#: src/xtnFrame.cpp:262 msgid "&Open Local XSLT Display..." msgstr "Aperçu XSLT..." -#: ../src/xtnFrame.cpp:262 +#: src/xtnFrame.cpp:262 msgid "Open a XSLT Local Display file." msgstr "Ouvre un fichier XSLT pour afficher un aperçu de chaque noeud." -#: ../src/xtnFrame.cpp:263 +#: src/xtnFrame.cpp:263 msgid "&Open HTML XSLT Display..." msgstr "Aperçu XSLT HTML..." -#: ../src/xtnFrame.cpp:263 +#: src/xtnFrame.cpp:263 msgid "Open a XSLT HTML Display file." msgstr "Ouvre un fichier XSLT pour afficher un aperçu HTML de chaque noeud." -#: ../src/xtnFrame.cpp:266 +#: src/xtnFrame.cpp:266 msgid "&Display" msgstr "&Affichage" -#: ../src/xtnFrame.cpp:269 +#: src/xtnFrame.cpp:269 msgid "&Diff to..." msgstr "&Compare à ..." -#: ../src/xtnFrame.cpp:269 +#: src/xtnFrame.cpp:269 msgid "Diff current XML file to another file." msgstr "Compare le fichier XML actuellement ouvert avec ce fichier." -#: ../src/xtnFrame.cpp:271 +#: src/xtnFrame.cpp:271 msgid "&Show differences" msgstr "&Montre les différences" -#: ../src/xtnFrame.cpp:271 +#: src/xtnFrame.cpp:271 msgid "Highlight differents elements." msgstr "Affiche des icônes pour symboliser les différences." -#: ../src/xtnFrame.cpp:273 +#: src/xtnFrame.cpp:273 msgid "Show &only differences" msgstr "&Uniquement les différences" -#: ../src/xtnFrame.cpp:273 +#: src/xtnFrame.cpp:273 msgid "Show only elements with differences." msgstr "Montre uniquement les éléments différents." -#: ../src/xtnFrame.cpp:274 +#: src/xtnFrame.cpp:274 msgid "&Diff" msgstr "&Comparaison" -#: ../src/xtnFrame.cpp:277 +#: src/xtnFrame.cpp:277 msgid "Help..." msgstr "&Aide..." -#: ../src/xtnFrame.cpp:277 +#: src/xtnFrame.cpp:277 msgid "Main help file." msgstr "Ouvre le fichier d'aide" -#: ../src/xtnFrame.cpp:279 +#: src/xtnFrame.cpp:279 msgid "Diff &icon's significations..." msgstr "Légende des icônes..." -#: ../src/xtnFrame.cpp:279 +#: src/xtnFrame.cpp:279 msgid "Explains diff icons." msgstr "" "Explique les différentes icônes possibles et notamment concernant les " "statuts de différence XML" -#: ../src/xtnFrame.cpp:280 +#: src/xtnFrame.cpp:280 msgid "Quick &XPath reference..." msgstr "Aide sur &XPath..." -#: ../src/xtnFrame.cpp:280 +#: src/xtnFrame.cpp:280 msgid "XPath reference URLs." msgstr "Aide XPath" -#: ../src/xtnFrame.cpp:282 +#: src/xtnFrame.cpp:282 msgid "&About..." msgstr "&A Propos..." -#: ../src/xtnFrame.cpp:282 +#: src/xtnFrame.cpp:282 msgid "About this application." msgstr "A Propos de cette application." -#: ../src/xtnFrame.cpp:283 +#: src/xtnFrame.cpp:283 msgid "&Help" msgstr "&Aide" -#: ../src/xtnFrame.cpp:291 +#: src/xtnFrame.cpp:291 msgid "Open" msgstr "Ouvrir" -#: ../src/xtnFrame.cpp:292 +#: src/xtnFrame.cpp:292 msgid "Open XSLT" msgstr "Ouvrir un fichier XSLT" -#: ../src/xtnFrame.cpp:292 +#: src/xtnFrame.cpp:292 msgid "Open a XSLT display file" msgstr "Ouvrir un fichier XSLT d'aperçu" -#: ../src/xtnFrame.cpp:293 +#: src/xtnFrame.cpp:293 msgid "Save" msgstr "Enregistre" -#: ../src/xtnFrame.cpp:293 +#: src/xtnFrame.cpp:293 msgid "Save the current file" msgstr "Enregistre le fichier en cours" -#: ../src/xtnFrame.cpp:294 +#: src/xtnFrame.cpp:294 msgid "Reload" msgstr "Ré-ouvre" -#: ../src/xtnFrame.cpp:294 +#: src/xtnFrame.cpp:294 msgid "Reload original file" msgstr "Ré-ouvre le fichier tel qu'il l'était lors du dernier enregistrement" -#: ../src/xtnFrame.cpp:296 ../src/xtnFrame.cpp:872 +#: src/xtnFrame.cpp:296 src/xtnFrame.cpp:872 msgid "XPath Expression" msgstr "Expression XPath " -#: ../src/xtnFrame.cpp:297 +#: src/xtnFrame.cpp:297 msgid "Search" msgstr "Recherche" -#: ../src/xtnFrame.cpp:297 +#: src/xtnFrame.cpp:297 msgid "Search." msgstr "Recherche" -#: ../src/xtnFrame.cpp:334 +#: src/xtnFrame.cpp:334 msgid "Ready" msgstr "Prêt." -#: ../src/xtnFrame.cpp:433 +#: src/xtnFrame.cpp:433 msgid "french translation" msgstr "traduction française" -#: ../src/xtnFrame.cpp:434 +#: src/xtnFrame.cpp:434 msgid "italian translation" msgstr "traduction italienne" -#: ../src/xtnFrame.cpp:443 +#: src/xtnFrame.cpp:443 msgid "Significations of the diff icons" msgstr "Signification des icônes" -#: ../src/xtnFrame.cpp:444 +#: src/xtnFrame.cpp:444 msgid "Ok" msgstr "Ok" -#: ../src/xtnFrame.cpp:457 +#: src/xtnFrame.cpp:457 msgid "Diff status" msgstr "Etat de comparaison" -#: ../src/xtnFrame.cpp:462 +#: src/xtnFrame.cpp:462 msgid "is added in the second file (not present in the first)" msgstr "est ajouté dans le second fichier (absent dans le premier)" -#: ../src/xtnFrame.cpp:463 +#: src/xtnFrame.cpp:463 msgid "is removed in the second file (present in the first)" msgstr "est supprimé dans le second fichier (présent dans le premier)" -#: ../src/xtnFrame.cpp:464 +#: src/xtnFrame.cpp:464 msgid "has different values in the two files (modified)" msgstr "a des valeurs différentes dans les deux fichiers (modifié)" -#: ../src/xtnFrame.cpp:465 +#: src/xtnFrame.cpp:465 msgid "is a node with no differences, but differences exist on children nodes" msgstr "" "est un noeud qui n'est pas modifié lui-même, mais qui a des noeuds fils avec " "des différences" -#: ../src/xtnFrame.cpp:467 +#: src/xtnFrame.cpp:467 msgid "XML Elements" msgstr "Elements XML" -#: ../src/xtnFrame.cpp:472 +#: src/xtnFrame.cpp:472 msgid "is a standard Element (with no differences)" msgstr "est un élément XML classique (sans différences)" -#: ../src/xtnFrame.cpp:473 +#: src/xtnFrame.cpp:473 msgid "is a Text item (when displayed as nodes)" msgstr "est un élément Texte (lorsqu'affichés en tant que noeuds)" -#: ../src/xtnFrame.cpp:474 +#: src/xtnFrame.cpp:474 msgid "is an Attribute item (when displayed as nodes)" msgstr "est un attribut (lorsqu'affiché en noeud)" -#: ../src/xtnFrame.cpp:475 +#: src/xtnFrame.cpp:475 msgid "is a Comment node (when texts are displayed as nodes)" msgstr "est un commentaire (lorsqu'affiché en noeuds)" -#: ../src/xtnFrame.cpp:476 +#: src/xtnFrame.cpp:476 msgid "is the Root element of the XML File (may be hidden)" msgstr "est la racine XML du fichier (souvent masqué)" -#: ../src/xtnFrame.cpp:477 +#: src/xtnFrame.cpp:477 msgid "is an other type of node" msgstr "est un autre type de noeud" -#: ../src/xtnFrame.cpp:496 +#: src/xtnFrame.cpp:496 msgid "help_en.html" msgstr "help_en.html" -#: ../src/xtnFrame.cpp:526 +#: src/xtnFrame.cpp:526 msgid "XPath Help" msgstr "Aide XPath" -#: ../src/xtnFrame.cpp:533 +#: src/xtnFrame.cpp:533 msgid "" "Simple XPath search expression :
- * : all " "childen nodes
- //* : all nodes of the document
- " @@ -637,212 +689,149 @@ msgstr "" "xpath/'>Tutoriel Path [en]
- Tutoriel XPath (w3schools) [en]
" -#: ../src/xtnFrame.cpp:557 +#: src/xtnFrame.cpp:557 msgid "OK" msgstr "OK" -#: ../src/xtnFrame.cpp:595 ../src/xtnFrame.cpp:616 +#: src/xtnFrame.cpp:595 src/xtnFrame.cpp:616 msgid "No file to save" msgstr "Aucun fichier à enregistrer" -#: ../src/xtnFrame.cpp:606 +#: src/xtnFrame.cpp:606 msgid "Save a file" msgstr "Enregistre le fichier" -#: ../src/xtnFrame.cpp:663 +#: src/xtnFrame.cpp:663 msgid "Open a Local Display XSLT file" msgstr "Ouvre un fichier XSLT d'aperçu" -#: ../src/xtnFrame.cpp:675 +#: src/xtnFrame.cpp:675 msgid "Open a HTML Display XSLT file" msgstr "Ouvre un fichier XSLT d'aperçu HTML" -#: ../src/xtnFrame.cpp:704 +#: src/xtnFrame.cpp:704 msgid "Diff two XML File" msgstr "Compare deux fichiers XML" -#: ../src/xtnFrame.cpp:760 +#: src/xtnFrame.cpp:760 msgid "Unexpected error while getting the string." msgstr "Erreur inattendue lors de la récupération du message." -#: ../src/xtnFrame.cpp:881 +#: src/xtnFrame.cpp:881 msgid "XPath Expression search :" msgstr "Expression XPath à chercher : " -#: ../src/xtnFrame.cpp:881 +#: src/xtnFrame.cpp:881 msgid "XPath Search" msgstr "Recherche XPath" -#: ../src/xtnFrame.cpp:935 +#: src/xtnFrame.cpp:935 msgid "&Custom Displays" msgstr "&Affichages personnalisés" -#: ../src/xtnFrame.cpp:935 +#: src/xtnFrame.cpp:935 msgid "List of custom display in your configuration file." msgstr "Liste des affichages personnalisés dans votre fichier de configuration" -#: ../src/xtnFrame.cpp:957 +#: src/xtnFrame.cpp:957 #, c-format msgid "Open Local XSLT Display with file %s" msgstr "Ouvre un fichier XSLT avec le fichier %s" -#: ../src/xtnFrame.cpp:967 +#: src/xtnFrame.cpp:967 #, c-format msgid "Open HTML XSLT Display with file %s" msgstr "Ouvre un fichier XSLT avec le fichier %s" -#: ../src/xtnFrame.cpp:1037 ../src/xtnXmlTree.cpp:180 ../src/xtnXmlTree.cpp:244 +#: src/xtnFrame.cpp:1037 src/xtnXmlTree.cpp:180 src/xtnXmlTree.cpp:244 #, c-format msgid "Error while Loading the file %s" msgstr "Erreur lors du chargement du fichier %s" -#: ../src/xtnXmlTree.cpp:113 +#: src/xtnXmlTree.cpp:113 #, c-format msgid "Parsing Before file OK : %ld nodes" msgstr "Lecture du fichier Avant OK : %ld noeuds" -#: ../src/xtnXmlTree.cpp:118 +#: src/xtnXmlTree.cpp:118 #, c-format msgid "Parsing After file OK : %ld nodes" msgstr "Lecture du fichier Après OK : %ld noeuds" -#: ../src/xtnXmlTree.cpp:121 +#: src/xtnXmlTree.cpp:121 #, c-format msgid "Diff OK : %ld nodes processed" msgstr "Comparaison OK : %ld noeuds traités" -#: ../src/xtnXmlTree.cpp:124 +#: src/xtnXmlTree.cpp:124 #, c-format msgid "Diff in progress... (%d%%)" msgstr "Comparaison en cours... (%d%%)" -#: ../src/xtnXmlTree.cpp:125 +#: src/xtnXmlTree.cpp:125 #, c-format msgid "%d%%" msgstr "%d%%" -#: ../src/xtnXmlTree.cpp:185 +#: src/xtnXmlTree.cpp:185 msgid "Unable to instanciate stuctures, probably due to a memory problem" msgstr "Impossible de créer une structure, sans doute faute de mémoire." -#: ../src/xtnXmlTree.cpp:276 +#: src/xtnXmlTree.cpp:276 msgid "Error while diffing the files." msgstr "Erreur lors de la comparaison des fichiers" -#: ../src/xtnXmlTree.cpp:634 +#: src/xtnXmlTree.cpp:634 msgid "Invalid selected node." msgstr "Noeud sélectionné invalide." -#: ../src/xtnXmlTree.cpp:641 +#: src/xtnXmlTree.cpp:641 msgid "Unable to create the structure. Memory may be full." msgstr "Impossible de créer une structure. Mémoire sans doute pleine." -#: ../src/xtnXmlTree.cpp:654 +#: src/xtnXmlTree.cpp:654 msgid "XPath query error." msgstr "Erreur lors de la requête XPath" -#: ../src/xtnXmlTree.cpp:672 +#: src/xtnXmlTree.cpp:672 #, c-format msgid "Node %d of %d found (%s)" msgstr "Noeud %d sur %d noeuds trouvés (%s)." -#: ../src/xtnXmlTree.cpp:676 +#: src/xtnXmlTree.cpp:676 msgid "No nodes found : " msgstr "Aucun noeud trouvé : " -#: ../src/xtnApp.h:30 -msgid "Performs efficient XML tree navigation and diff XML files." -msgstr "" -"Permet de naviguer efficacement dans les fichiers XML\n" -"et une comparaison facile entre deux fichiers XML." - -#: ../src/xtnApp.h:31 -#, c-format -msgid "" -"%s %s\n" -"libxmldiff %s\n" -"\n" -"(c) 2004-2016 - Remi Peyronnet\n" -"http://www.lprp.fr" -msgstr "" -"%s %s\n" -"libxmldiff %s\n" -"\n" -"© 2004-2016 - Rémi Peyronnet\n" -"http://www.lprp.fr" - -#: ../src/xtnApp.h:32 -msgid " (c) 2004 - Remi Peyronnet - http://www.lprp.fr" -msgstr " (c) 2004 - Rémi Peyronnet - http://www.lprp.fr" - -#: ../src/xtnApp.h:42 -msgid "XML Files (*.xml)|*.xml|All files (*.*)|*.*" -msgstr "Fichiers XML (*.xml)|*.xml|Tous les fichiers (*.*)|*.*" - -#: ../src/xtnApp.h:43 -msgid "XSL Files (*.xsl;*.xslt)|*.xsl;*.xslt|All files (*.*)|*.*" -msgstr "Fichiers XSL -*.xsl;*.xslt)|*.xsl;*.xslt|Tous les fichiers (*.*)|*.*" - -#: ../src/xtnApp.h:52 ../src/xtnApp.h:55 -msgid "" -"This function is not yet implemented, \n" -"or is being developped.\n" -msgstr "" -"Cette fonction n'est pas pour l'instant développée, \n" -"ou est en cours de développement.\n" - -#: ../src/xtnApp.h:52 ../src/xtnApp.h:55 -msgid "Function not implemented." -msgstr "Fonction non développée." - -#: ../lib/wxmisc/ConfigDialog.cpp:71 -msgid "Apply" -msgstr "Appliquer" - -#: ../lib/wxmisc/ConfigDialog.cpp:72 -msgid "Cancel" -msgstr "Annuler" - -#: ../po/extra-strings.cpp:3 -#, c-format -msgid "About %s" -msgstr "A propos de %s" +#~ msgid "About %s" +#~ msgstr "A propos de %s" -#: ../po/extra-strings.cpp:4 -msgid "Translators" -msgstr "Traducteurs" +#~ msgid "Translators" +#~ msgstr "Traducteurs" -#: ../po/extra-strings.cpp:7 -msgid "Display only added, removed or equal" -msgstr "Afficher seulement ajouté, enlevé ou égal" +#~ msgid "Display only added, removed or equal" +#~ msgstr "Afficher seulement ajouté, enlevé ou égal" -#: ../po/extra-strings.cpp:9 -msgid "All Nodes" -msgstr "Tous les nœuds" +#~ msgid "All Nodes" +#~ msgstr "Tous les nœuds" -#: ../po/extra-strings.cpp:10 -msgid "All Nodes named nodeName" -msgstr "Tous les nœuds nodeName" +#~ msgid "All Nodes named nodeName" +#~ msgstr "Tous les nœuds nodeName" -#: ../po/extra-strings.cpp:11 -msgid "All Nodes named nodeName with parent parent" -msgstr "Tous les nœuds nodeName ayant comme père parent" +#~ msgid "All Nodes named nodeName with parent parent" +#~ msgstr "Tous les nœuds nodeName ayant comme père parent" -#: ../po/extra-strings.cpp:12 -msgid "All Nodes with attribute named attributeName" -msgstr "Tous les nœuds ayant un attribut attributeName" +#~ msgid "All Nodes with attribute named attributeName" +#~ msgstr "Tous les nœuds ayant un attribut attributeName" -#: ../po/extra-strings.cpp:13 -msgid "All Nodes with attribute named attributeName with value toto" -msgstr "Tous les nœuds avec un attribut attributeName ayant comme valeur toto" +#~ msgid "All Nodes with attribute named attributeName with value toto" +#~ msgstr "" +#~ "Tous les nœuds avec un attribut attributeName ayant comme valeur toto" -#: ../po/extra-strings.cpp:14 -msgid "All Nodes with content text toto" -msgstr "Tous les nœuds dont le contenu est le texte toto" +#~ msgid "All Nodes with content text toto" +#~ msgstr "Tous les nœuds dont le contenu est le texte toto" -#: ../po/extra-strings.cpp:15 -msgid "Added Nodes" -msgstr "Nœuds ajoutés" +#~ msgid "Added Nodes" +#~ msgstr "Nœuds ajoutés" #~ msgid "%ld%%" #~ msgstr "%ld%%" diff --git a/po/it.po b/po/it.po index 6e03c83..4f3357f 100644 --- a/po/it.po +++ b/po/it.po @@ -1,9 +1,9 @@ msgid "" msgstr "" "Project-Id-Version: xmlTreeNav 0.3.4 (translation v. 17.01.2017)\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-22 15:36+0200\n" -"PO-Revision-Date: 2017-01-17 10:26+0100\n" +"Report-Msgid-Bugs-To: remi+xmltreenav@via.ecp.fr\n" +"POT-Creation-Date: 2020-05-09 19:41+0200\n" +"PO-Revision-Date: 2020-05-09 19:33+0200\n" "Last-Translator: bovirus <@bovirus@gmail.com>\n" "Language-Team: Italian \n" "Language: it\n" @@ -11,103 +11,156 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-SourceCharset: UTF-8\n" -"X-Generator: Poedit 2.0beta2\n" +"X-Generator: Poedit 2.3\n" -#: ../src/xtnApp.cpp:64 +#: lib/wxmisc/ConfigDialog.cpp:71 +msgid "Apply" +msgstr "OK" + +#: lib/wxmisc/ConfigDialog.cpp:72 +msgid "Cancel" +msgstr "Annulla" + +#: src/xtnApp.cpp:64 msgid "XSLT Local Display File to use" msgstr "File locale XSLT visualizzazione da usare" -#: ../src/xtnApp.cpp:65 +#: src/xtnApp.cpp:65 msgid "XSLT HTML Display File to use" msgstr "File locale XSLT HTML visualizzazione da usare" -#: ../src/xtnApp.cpp:66 +#: src/xtnApp.cpp:66 msgid "Config File to use" msgstr "File configurazione da usare" -#: ../src/xtnApp.cpp:67 +#: src/xtnApp.cpp:67 msgid "XML File to open" msgstr "File XML da aprire" -#: ../src/xtnDialogDiffCurrent.cpp:11 +#: src/xtnApp.h:30 +msgid "Performs efficient XML tree navigation and diff XML files." +msgstr "" +"Permette una veloce navigazione nella struttura dei file XML e la loro " +"comparazione" + +#: src/xtnApp.h:31 +#, c-format +msgid "" +"%s %s\n" +"libxmldiff %s\n" +"\n" +"(c) 2004-2020 - Remi Peyronnet\n" +"http://www.lprp.fr" +msgstr "" +"%s %s\n" +"libxmldiff %s\n" +"\n" +"(c) 2004-2020 - Remi Peyronnet\n" +"http://www.lprp.fr" + +#: src/xtnApp.h:32 +msgid " (c) 2004 - Remi Peyronnet - http://www.lprp.fr" +msgstr " (c) 2016 - Remi Peyronnet - http://www.lprp.fr" + +#: src/xtnApp.h:42 +msgid "XML Files (*.xml)|*.xml|All files (*.*)|*.*" +msgstr "File XML (*.xml)|*.xml|Tutti file (*.*)|*.*" + +#: src/xtnApp.h:43 +msgid "XSL Files (*.xsl;*.xslt)|*.xsl;*.xslt|All files (*.*)|*.*" +msgstr "File XSL (*.xsl;*.xslt)|*.xsl;*.xslt|Tutti i file (*.*)|*.*" + +#: src/xtnApp.h:52 src/xtnApp.h:55 +msgid "" +"This function is not yet implemented, \n" +"or is being developped.\n" +msgstr "" +"Questa funzione non è ancora implementata,\n" +"o è in sviluppo.\n" + +#: src/xtnApp.h:52 src/xtnApp.h:55 +msgid "Function not implemented." +msgstr "Funzione non implementata" + +#: src/xtnDialogDiffCurrent.cpp:11 msgid "Diff Options" msgstr "Opzioni comparazione" -#: ../src/xtnDialogDiffCurrent.cpp:12 +#: src/xtnDialogDiffCurrent.cpp:12 msgid "xmlDiff current file" msgstr "Compara il file XML aperto con questo file" -#: ../src/xtnDialogDiffCurrent.cpp:13 +#: src/xtnDialogDiffCurrent.cpp:13 msgid "With " msgstr "Con" -#: ../src/xtnDialogDiffCurrent.cpp:15 ../src/xtnDialogDiffDual.cpp:17 -#: ../src/xtnDialogDiffDual.cpp:20 +#: src/xtnDialogDiffCurrent.cpp:15 src/xtnDialogDiffDual.cpp:17 +#: src/xtnDialogDiffDual.cpp:20 msgid "..." msgstr "..." -#: ../src/xtnDialogDiffCurrent.cpp:16 +#: src/xtnDialogDiffCurrent.cpp:16 msgid "...as Before file" msgstr "come 1. file" -#: ../src/xtnDialogDiffCurrent.cpp:17 +#: src/xtnDialogDiffCurrent.cpp:17 msgid "... as After file" msgstr "come 2. file" -#: ../src/xtnDialogDiffCurrent.cpp:18 ../src/xtnDialogDiffDual.cpp:21 +#: src/xtnDialogDiffCurrent.cpp:18 src/xtnDialogDiffDual.cpp:21 msgid "Identifiers " msgstr "Identificatori" -#: ../src/xtnDialogDiffCurrent.cpp:19 ../src/xtnDialogDiffDual.cpp:22 -#: ../src/xtnFrame.cpp:167 +#: src/xtnDialogDiffCurrent.cpp:19 src/xtnDialogDiffDual.cpp:22 +#: src/xtnFrame.cpp:167 msgid "@id,@value" msgstr "@id,@value" -#: ../src/xtnDialogDiffCurrent.cpp:20 ../src/xtnDialogDiffDual.cpp:23 -#: ../src/xtnFrame.cpp:168 +#: src/xtnDialogDiffCurrent.cpp:20 src/xtnDialogDiffDual.cpp:23 +#: src/xtnFrame.cpp:168 msgid "Ignore Tags" msgstr "Ignora tag" -#: ../src/xtnDialogDiffCurrent.cpp:21 ../src/xtnDialogDiffDual.cpp:24 -#: ../src/xtnFrame.cpp:168 +#: src/xtnDialogDiffCurrent.cpp:21 src/xtnDialogDiffDual.cpp:24 +#: src/xtnFrame.cpp:168 msgid "@ignore-attr,ignore-tag" msgstr "@ignore-attr,ignore-tag" -#: ../src/xtnDialogDiffCurrent.cpp:22 ../src/xtnDialogDiffDual.cpp:25 -#: ../src/xtnFrame.cpp:169 +#: src/xtnDialogDiffCurrent.cpp:22 src/xtnDialogDiffDual.cpp:25 +#: src/xtnFrame.cpp:169 msgid "Add before values" msgstr "Aggiungi prima del valore" -#: ../src/xtnDialogDiffCurrent.cpp:23 ../src/xtnDialogDiffDual.cpp:26 +#: src/xtnDialogDiffCurrent.cpp:23 src/xtnDialogDiffDual.cpp:26 msgid "Separator " msgstr "Separatore" -#: ../src/xtnDialogDiffCurrent.cpp:24 ../src/xtnDialogDiffDual.cpp:27 -#: ../src/xtnFrame.cpp:170 +#: src/xtnDialogDiffCurrent.cpp:24 src/xtnDialogDiffDual.cpp:27 +#: src/xtnFrame.cpp:170 msgid "|" msgstr "|" -#: ../src/xtnDialogDiffCurrent.cpp:25 ../src/xtnDialogDiffDual.cpp:28 +#: src/xtnDialogDiffCurrent.cpp:25 src/xtnDialogDiffDual.cpp:28 msgid "Tag Childs" msgstr "Tag relativi" -#: ../src/xtnDialogDiffCurrent.cpp:26 ../src/xtnDialogDiffDual.cpp:29 +#: src/xtnDialogDiffCurrent.cpp:26 src/xtnDialogDiffDual.cpp:29 msgid "&Diff !" msgstr "&Compara!" -#: ../src/xtnDialogDiffCurrent.cpp:27 ../src/xtnDialogDiffDual.cpp:30 +#: src/xtnDialogDiffCurrent.cpp:27 src/xtnDialogDiffDual.cpp:30 msgid "&Cancel" msgstr "&Annulla" -#: ../src/xtnDialogDiffCurrent.cpp:40 ../src/xtnFrame.cpp:721 +#: src/xtnDialogDiffCurrent.cpp:40 src/xtnFrame.cpp:721 msgid "Diff to current XML File" msgstr "Compara con il file XML attuale" -#: ../src/xtnDialogDiffCurrent.cpp:42 ../src/xtnDialogDiffDual.cpp:44 +#: src/xtnDialogDiffCurrent.cpp:42 src/xtnDialogDiffDual.cpp:44 msgid "Diff the currently opened XML file with this file." msgstr "Compara il file XML aperto con questo file" -#: ../src/xtnDialogDiffCurrent.cpp:45 +#: src/xtnDialogDiffCurrent.cpp:45 msgid "" "Use the file specified above as before file, and the currently opened file " "as after file." @@ -115,7 +168,7 @@ msgstr "" "Usa il file specificato sopra come primo file, e il file attualmente aperto " "come secondo file." -#: ../src/xtnDialogDiffCurrent.cpp:47 +#: src/xtnDialogDiffCurrent.cpp:47 msgid "" "Use the file specified above as after file, and the currently opened file as " "before file." @@ -123,7 +176,7 @@ msgstr "" "Usa il file specificato sopra come secondo file, e il file attualmente " "aperto come primo file." -#: ../src/xtnDialogDiffCurrent.cpp:48 ../src/xtnDialogDiffDual.cpp:48 +#: src/xtnDialogDiffCurrent.cpp:48 src/xtnDialogDiffDual.cpp:48 msgid "" "Use these items as identifiers. (List of items separated by comma, " "attributes must be prefixed by @, and '.' can be used for the text)" @@ -132,11 +185,11 @@ msgstr "" "virgola, gli attributi devono essere prefissati da @, e '.' possono essere " "usati per il testo)" -#: ../src/xtnDialogDiffCurrent.cpp:49 ../src/xtnDialogDiffDual.cpp:49 +#: src/xtnDialogDiffCurrent.cpp:49 src/xtnDialogDiffDual.cpp:49 msgid "Differences on these items will be ignored" msgstr "Le differenze di questi elementi verranno ignorate" -#: ../src/xtnDialogDiffCurrent.cpp:50 ../src/xtnDialogDiffDual.cpp:50 +#: src/xtnDialogDiffCurrent.cpp:50 src/xtnDialogDiffDual.cpp:50 msgid "" "If checked, when a difference occurs, the output file will contain \"before " "value after value\"" @@ -144,451 +197,450 @@ msgstr "" "Se selezionata, quando c'è una differenza, il file destinazione conterrà " "\"valore precedente valore successivo\"" -#: ../src/xtnDialogDiffCurrent.cpp:52 ../src/xtnDialogDiffDual.cpp:52 +#: src/xtnDialogDiffCurrent.cpp:52 src/xtnDialogDiffDual.cpp:52 msgid "Text to separate before and after values" msgstr "Testo di sperazione prima e dopo i valori" -#: ../src/xtnDialogDiffCurrent.cpp:53 ../src/xtnDialogDiffDual.cpp:53 +#: src/xtnDialogDiffCurrent.cpp:53 src/xtnDialogDiffDual.cpp:53 msgid "Recursively tag childs of added or deleted nodes." msgstr "Tag relativi ricorsivi dei nodi aggiunti o eliminati" -#: ../src/xtnDialogDiffCurrent.cpp:127 ../src/xtnDialogDiffDual.cpp:178 -#: ../src/xtnDialogDiffDual.cpp:195 ../src/xtnFrame.cpp:291 -#: ../src/xtnFrame.cpp:572 +#: src/xtnDialogDiffCurrent.cpp:127 src/xtnDialogDiffDual.cpp:178 +#: src/xtnDialogDiffDual.cpp:195 src/xtnFrame.cpp:291 src/xtnFrame.cpp:572 msgid "Open a file" msgstr "Apri un file" -#: ../src/xtnDialogDiffDual.cpp:14 +#: src/xtnDialogDiffDual.cpp:14 msgid "xmlDiff two files" msgstr "Comparazione di due file XML" -#: ../src/xtnDialogDiffDual.cpp:15 +#: src/xtnDialogDiffDual.cpp:15 msgid "Before" msgstr "1. file" -#: ../src/xtnDialogDiffDual.cpp:18 +#: src/xtnDialogDiffDual.cpp:18 msgid "After" msgstr "2. file" -#: ../src/xtnDialogDiffDual.cpp:42 +#: src/xtnDialogDiffDual.cpp:42 msgid "Diff Two XML Files" msgstr "Comparazione di due file XML" -#: ../src/xtnFrame.cpp:130 ../src/xtnFrame.cpp:164 +#: src/xtnFrame.cpp:130 src/xtnFrame.cpp:164 msgid "config.xml" msgstr "config.xml" -#: ../src/xtnFrame.cpp:155 +#: src/xtnFrame.cpp:155 msgid "Preferences" msgstr "Impostazioni" -#: ../src/xtnFrame.cpp:157 ../src/xtnFrame.cpp:158 ../src/xtnFrame.cpp:159 +#: src/xtnFrame.cpp:157 src/xtnFrame.cpp:158 src/xtnFrame.cpp:159 msgid "XML" msgstr "XML" -#: ../src/xtnFrame.cpp:157 +#: src/xtnFrame.cpp:157 msgid "Clean Text" msgstr "Azzeramento testo" -#: ../src/xtnFrame.cpp:158 +#: src/xtnFrame.cpp:158 msgid "Enforce Cleaning" msgstr "Pulizia forzata" -#: ../src/xtnFrame.cpp:159 +#: src/xtnFrame.cpp:159 msgid "Pretty Print on Save" msgstr "Stampa veloce al salvataggio" -#: ../src/xtnFrame.cpp:161 ../src/xtnFrame.cpp:162 +#: src/xtnFrame.cpp:161 src/xtnFrame.cpp:162 msgid "Engine" msgstr "Motore" -#: ../src/xtnFrame.cpp:161 +#: src/xtnFrame.cpp:161 msgid "Optimize Memory usage" msgstr "Otttimizza uso memoria" -#: ../src/xtnFrame.cpp:162 +#: src/xtnFrame.cpp:162 msgid "Use EXSLT" msgstr "Usa EXSLT" -#: ../src/xtnFrame.cpp:164 ../src/xtnFrame.cpp:165 +#: src/xtnFrame.cpp:164 src/xtnFrame.cpp:165 msgid "Config" msgstr "Varie" -#: ../src/xtnFrame.cpp:164 +#: src/xtnFrame.cpp:164 msgid "Configuration File" msgstr "File configurazione" -#: ../src/xtnFrame.cpp:165 +#: src/xtnFrame.cpp:165 msgid "Search Size" msgstr "Dimensione ricerca" -#: ../src/xtnFrame.cpp:165 +#: src/xtnFrame.cpp:165 msgid "250" msgstr "250" -#: ../src/xtnFrame.cpp:167 ../src/xtnFrame.cpp:168 ../src/xtnFrame.cpp:169 -#: ../src/xtnFrame.cpp:170 ../src/xtnFrame.cpp:171 ../src/xtnFrame.cpp:173 -#: ../src/xtnFrame.cpp:174 +#: src/xtnFrame.cpp:167 src/xtnFrame.cpp:168 src/xtnFrame.cpp:169 +#: src/xtnFrame.cpp:170 src/xtnFrame.cpp:171 src/xtnFrame.cpp:173 +#: src/xtnFrame.cpp:174 msgid "Diff Defaults" msgstr "Predefeniti differenze" -#: ../src/xtnFrame.cpp:167 +#: src/xtnFrame.cpp:167 msgid "Identifiers" msgstr "Identificatori" -#: ../src/xtnFrame.cpp:170 +#: src/xtnFrame.cpp:170 msgid "Separator" msgstr "Separatore" -#: ../src/xtnFrame.cpp:171 +#: src/xtnFrame.cpp:171 msgid "Tag childs" msgstr "Tag figli" -#: ../src/xtnFrame.cpp:173 +#: src/xtnFrame.cpp:173 msgid "Special Node Ids" msgstr "" -#: ../src/xtnFrame.cpp:174 +#: src/xtnFrame.cpp:174 msgid "Special Nodes Before Value" msgstr "" -#: ../src/xtnFrame.cpp:236 +#: src/xtnFrame.cpp:236 msgid "&Open..." msgstr "&Apri..." -#: ../src/xtnFrame.cpp:236 +#: src/xtnFrame.cpp:236 msgid "Open a file." msgstr "Apri un file" -#: ../src/xtnFrame.cpp:237 +#: src/xtnFrame.cpp:237 msgid "&Open and Diff..." msgstr "Apri e c&ompara..." -#: ../src/xtnFrame.cpp:237 +#: src/xtnFrame.cpp:237 msgid "Open and diff two XML files." msgstr "Apri e compara due file XML" -#: ../src/xtnFrame.cpp:238 +#: src/xtnFrame.cpp:238 msgid "&Save" msgstr "&Salva" -#: ../src/xtnFrame.cpp:238 +#: src/xtnFrame.cpp:238 msgid "Save the current file." msgstr "Salva il file attuale" -#: ../src/xtnFrame.cpp:239 +#: src/xtnFrame.cpp:239 msgid "&Save as..." msgstr "&Salva come..." -#: ../src/xtnFrame.cpp:239 +#: src/xtnFrame.cpp:239 msgid "Save the current file under another name." msgstr "Salva il file attuale con un nome diverso" -#: ../src/xtnFrame.cpp:240 +#: src/xtnFrame.cpp:240 msgid "&Reload" msgstr "&Ricarica file" -#: ../src/xtnFrame.cpp:240 +#: src/xtnFrame.cpp:240 msgid "Reload original file." msgstr "Ricarica il file originale" -#: ../src/xtnFrame.cpp:242 +#: src/xtnFrame.cpp:242 msgid "&Preferences" msgstr "&Impostazioni" -#: ../src/xtnFrame.cpp:242 +#: src/xtnFrame.cpp:242 msgid "Define application's settings." msgstr "Configura le impostazioni dell'applicazione" -#: ../src/xtnFrame.cpp:244 +#: src/xtnFrame.cpp:244 msgid "&Quit" msgstr "&Esci" -#: ../src/xtnFrame.cpp:244 +#: src/xtnFrame.cpp:244 msgid "Quit the application." msgstr "Esci dall'applicazione" -#: ../src/xtnFrame.cpp:245 +#: src/xtnFrame.cpp:245 msgid "&File" msgstr "&File" -#: ../src/xtnFrame.cpp:248 +#: src/xtnFrame.cpp:248 msgid "&Copy" msgstr "&Copia" -#: ../src/xtnFrame.cpp:248 +#: src/xtnFrame.cpp:248 msgid "Copy current node to clipboard." msgstr "Copie il nodo attuale negli Appunti" -#: ../src/xtnFrame.cpp:249 +#: src/xtnFrame.cpp:249 msgid "&Paste" msgstr "&Incolla" -#: ../src/xtnFrame.cpp:249 +#: src/xtnFrame.cpp:249 msgid "Paste to file." msgstr "Incolla nel file" -#: ../src/xtnFrame.cpp:251 +#: src/xtnFrame.cpp:251 msgid "&Search..." msgstr "&Cerca..." -#: ../src/xtnFrame.cpp:251 +#: src/xtnFrame.cpp:251 msgid "Search nodes with XPath expression." msgstr "Cerca nodi con espressione XPath" -#: ../src/xtnFrame.cpp:252 +#: src/xtnFrame.cpp:252 msgid "&Next" msgstr "&Successivo" -#: ../src/xtnFrame.cpp:252 +#: src/xtnFrame.cpp:252 msgid "Next node of the previous search." msgstr "Nodo successivo della ricerca precedente" -#: ../src/xtnFrame.cpp:254 +#: src/xtnFrame.cpp:254 msgid "&Expand All" msgstr "&Espandi tutto" -#: ../src/xtnFrame.cpp:254 +#: src/xtnFrame.cpp:254 msgid "Expand all nodes of selected item." msgstr "Espande tutti i nodi degli elementi selezionati" -#: ../src/xtnFrame.cpp:255 +#: src/xtnFrame.cpp:255 msgid "Co&llapse All" msgstr "&Riduci tutto" -#: ../src/xtnFrame.cpp:255 +#: src/xtnFrame.cpp:255 msgid "Collapse all nodes of selected item." msgstr "Riduce tutti i nodi degli elementi selezionati" -#: ../src/xtnFrame.cpp:256 +#: src/xtnFrame.cpp:256 msgid "&Edit" msgstr "&Modifica" -#: ../src/xtnFrame.cpp:259 +#: src/xtnFrame.cpp:259 msgid "&Normal" msgstr "Visualizzazione &normale" -#: ../src/xtnFrame.cpp:259 +#: src/xtnFrame.cpp:259 msgid "Normal display, with attributes and text inline." msgstr "Visualizzazione normale, con attributi e testo in linea" -#: ../src/xtnFrame.cpp:260 +#: src/xtnFrame.cpp:260 msgid "&Texts" msgstr "Visualizza solo &testo" -#: ../src/xtnFrame.cpp:260 +#: src/xtnFrame.cpp:260 msgid "Display with attributes inline, and texts as elements." msgstr "Visualizza con attributi relativi, e testo come elementi" -#: ../src/xtnFrame.cpp:261 +#: src/xtnFrame.cpp:261 msgid "&Full" msgstr "Visualizza &tutti gli elementi" -#: ../src/xtnFrame.cpp:261 +#: src/xtnFrame.cpp:261 msgid "Display everything as elements." msgstr "Visualizza qualasiasi cosa come elemento" -#: ../src/xtnFrame.cpp:262 +#: src/xtnFrame.cpp:262 msgid "&Open Local XSLT Display..." msgstr "&Apri file locale XSLT HTML..." -#: ../src/xtnFrame.cpp:262 +#: src/xtnFrame.cpp:262 msgid "Open a XSLT Local Display file." msgstr "Apri un file locale visualizzazione XSLT" -#: ../src/xtnFrame.cpp:263 +#: src/xtnFrame.cpp:263 msgid "&Open HTML XSLT Display..." msgstr "&Apri visualizzazione XSLT HTML..." -#: ../src/xtnFrame.cpp:263 +#: src/xtnFrame.cpp:263 msgid "Open a XSLT HTML Display file." msgstr "Apri un file visualizzazione XSLT HTML" -#: ../src/xtnFrame.cpp:266 +#: src/xtnFrame.cpp:266 msgid "&Display" msgstr "&Visualizza" -#: ../src/xtnFrame.cpp:269 +#: src/xtnFrame.cpp:269 msgid "&Diff to..." msgstr "&Compara con il file..." -#: ../src/xtnFrame.cpp:269 +#: src/xtnFrame.cpp:269 msgid "Diff current XML file to another file." msgstr "Compara il file XML attuale con un altro file" -#: ../src/xtnFrame.cpp:271 +#: src/xtnFrame.cpp:271 msgid "&Show differences" msgstr "Vi&sualizza differenze" -#: ../src/xtnFrame.cpp:271 +#: src/xtnFrame.cpp:271 msgid "Highlight differents elements." msgstr "Evidenzia elementi differenti" -#: ../src/xtnFrame.cpp:273 +#: src/xtnFrame.cpp:273 msgid "Show &only differences" msgstr "Visualizza s&olo le differenze" -#: ../src/xtnFrame.cpp:273 +#: src/xtnFrame.cpp:273 msgid "Show only elements with differences." msgstr "Visualizza solo elementi differenti" -#: ../src/xtnFrame.cpp:274 +#: src/xtnFrame.cpp:274 msgid "&Diff" msgstr "&Compara" -#: ../src/xtnFrame.cpp:277 +#: src/xtnFrame.cpp:277 msgid "Help..." msgstr "Guida in linea..." -#: ../src/xtnFrame.cpp:277 +#: src/xtnFrame.cpp:277 msgid "Main help file." msgstr "File principale Guida in linea" -#: ../src/xtnFrame.cpp:279 +#: src/xtnFrame.cpp:279 msgid "Diff &icon's significations..." msgstr "Significato icone differenze..." -#: ../src/xtnFrame.cpp:279 +#: src/xtnFrame.cpp:279 msgid "Explains diff icons." msgstr "Visualizza significato icone differenze" -#: ../src/xtnFrame.cpp:280 +#: src/xtnFrame.cpp:280 msgid "Quick &XPath reference..." msgstr "Guida in linea rapida &XPath..." -#: ../src/xtnFrame.cpp:280 +#: src/xtnFrame.cpp:280 msgid "XPath reference URLs." msgstr "URL riferimento XPath" -#: ../src/xtnFrame.cpp:282 +#: src/xtnFrame.cpp:282 msgid "&About..." msgstr "&Info sul programma" -#: ../src/xtnFrame.cpp:282 +#: src/xtnFrame.cpp:282 msgid "About this application." msgstr "Info su questo programma" -#: ../src/xtnFrame.cpp:283 +#: src/xtnFrame.cpp:283 msgid "&Help" msgstr "&Guida in linea" -#: ../src/xtnFrame.cpp:291 +#: src/xtnFrame.cpp:291 msgid "Open" msgstr "Apri" -#: ../src/xtnFrame.cpp:292 +#: src/xtnFrame.cpp:292 msgid "Open XSLT" msgstr "Apri XSLT" -#: ../src/xtnFrame.cpp:292 +#: src/xtnFrame.cpp:292 msgid "Open a XSLT display file" msgstr "Apri un file visualizzazione XSLT" -#: ../src/xtnFrame.cpp:293 +#: src/xtnFrame.cpp:293 msgid "Save" msgstr "Salva" -#: ../src/xtnFrame.cpp:293 +#: src/xtnFrame.cpp:293 msgid "Save the current file" msgstr "Salva il file attuale" -#: ../src/xtnFrame.cpp:294 +#: src/xtnFrame.cpp:294 msgid "Reload" msgstr "Ricarica file" -#: ../src/xtnFrame.cpp:294 +#: src/xtnFrame.cpp:294 msgid "Reload original file" msgstr "Ricarica il file originale" -#: ../src/xtnFrame.cpp:296 ../src/xtnFrame.cpp:872 +#: src/xtnFrame.cpp:296 src/xtnFrame.cpp:872 msgid "XPath Expression" msgstr "Espressione XPath" -#: ../src/xtnFrame.cpp:297 +#: src/xtnFrame.cpp:297 msgid "Search" msgstr "Cerca" -#: ../src/xtnFrame.cpp:297 +#: src/xtnFrame.cpp:297 msgid "Search." msgstr "Cerca" -#: ../src/xtnFrame.cpp:334 +#: src/xtnFrame.cpp:334 msgid "Ready" msgstr "Pronto" -#: ../src/xtnFrame.cpp:433 +#: src/xtnFrame.cpp:433 msgid "french translation" msgstr "traduzione francese" -#: ../src/xtnFrame.cpp:434 +#: src/xtnFrame.cpp:434 msgid "italian translation" msgstr "traduzione italiana" -#: ../src/xtnFrame.cpp:443 +#: src/xtnFrame.cpp:443 msgid "Significations of the diff icons" msgstr "Significato icone delle differenze" -#: ../src/xtnFrame.cpp:444 +#: src/xtnFrame.cpp:444 msgid "Ok" msgstr "OK" -#: ../src/xtnFrame.cpp:457 +#: src/xtnFrame.cpp:457 msgid "Diff status" msgstr "Stato differenze" -#: ../src/xtnFrame.cpp:462 +#: src/xtnFrame.cpp:462 msgid "is added in the second file (not present in the first)" msgstr "è presente solo nel secondo file (non è presente nel primo)" -#: ../src/xtnFrame.cpp:463 +#: src/xtnFrame.cpp:463 msgid "is removed in the second file (present in the first)" msgstr "non è presente nel secondo file (è presente solo nel primo)" -#: ../src/xtnFrame.cpp:464 +#: src/xtnFrame.cpp:464 msgid "has different values in the two files (modified)" msgstr "hanno differenti valori nei due file (modificati)" -#: ../src/xtnFrame.cpp:465 +#: src/xtnFrame.cpp:465 msgid "is a node with no differences, but differences exist on children nodes" msgstr "è un nodo senza differenze, la differenza esiste nel nodo figlio" -#: ../src/xtnFrame.cpp:467 +#: src/xtnFrame.cpp:467 msgid "XML Elements" msgstr "Elementi XML" -#: ../src/xtnFrame.cpp:472 +#: src/xtnFrame.cpp:472 msgid "is a standard Element (with no differences)" msgstr "è un elemento standard (senza differenze)" -#: ../src/xtnFrame.cpp:473 +#: src/xtnFrame.cpp:473 msgid "is a Text item (when displayed as nodes)" msgstr "è un elementoi testo (quando sono visualizzati come nodi)" -#: ../src/xtnFrame.cpp:474 +#: src/xtnFrame.cpp:474 msgid "is an Attribute item (when displayed as nodes)" msgstr "è un elemento attributo (quando sono visualizzati come nodi)" -#: ../src/xtnFrame.cpp:475 +#: src/xtnFrame.cpp:475 msgid "is a Comment node (when texts are displayed as nodes)" msgstr "è un nodo commento (quando i testi sono visualizzati come nodi)" -#: ../src/xtnFrame.cpp:476 +#: src/xtnFrame.cpp:476 msgid "is the Root element of the XML File (may be hidden)" msgstr "è l'elemento principale del file XML (può essere nascosto)" -#: ../src/xtnFrame.cpp:477 +#: src/xtnFrame.cpp:477 msgid "is an other type of node" msgstr "è un altro tipo di nodo" -#: ../src/xtnFrame.cpp:496 +#: src/xtnFrame.cpp:496 msgid "help_en.html" msgstr "help_en.html" -#: ../src/xtnFrame.cpp:526 +#: src/xtnFrame.cpp:526 msgid "XPath Help" msgstr "Guida in linea XPath" -#: ../src/xtnFrame.cpp:533 +#: src/xtnFrame.cpp:533 msgid "" "Simple XPath search expression :
- * : all " "childen nodes
- //* : all nodes of the document
- " @@ -629,212 +681,147 @@ msgstr "" "Tutorial XPath " "(w3schools) [en]
" -#: ../src/xtnFrame.cpp:557 +#: src/xtnFrame.cpp:557 msgid "OK" msgstr "OK" -#: ../src/xtnFrame.cpp:595 ../src/xtnFrame.cpp:616 +#: src/xtnFrame.cpp:595 src/xtnFrame.cpp:616 msgid "No file to save" msgstr "Nessun file da salvare" -#: ../src/xtnFrame.cpp:606 +#: src/xtnFrame.cpp:606 msgid "Save a file" msgstr "Salva in un file" -#: ../src/xtnFrame.cpp:663 +#: src/xtnFrame.cpp:663 msgid "Open a Local Display XSLT file" msgstr "Apri un file locale visualizzazione XSLT" -#: ../src/xtnFrame.cpp:675 +#: src/xtnFrame.cpp:675 msgid "Open a HTML Display XSLT file" msgstr "Apri un file visualizzazione XSLT HTML" -#: ../src/xtnFrame.cpp:704 +#: src/xtnFrame.cpp:704 msgid "Diff two XML File" msgstr "Comparazione di due file XML" -#: ../src/xtnFrame.cpp:760 +#: src/xtnFrame.cpp:760 msgid "Unexpected error while getting the string." msgstr "Errore inaspettato durante l'ottenimento stringa" -#: ../src/xtnFrame.cpp:881 +#: src/xtnFrame.cpp:881 msgid "XPath Expression search :" msgstr "Espressione XPath da cercare:" -#: ../src/xtnFrame.cpp:881 +#: src/xtnFrame.cpp:881 msgid "XPath Search" msgstr "Ricerca XPath" -#: ../src/xtnFrame.cpp:935 +#: src/xtnFrame.cpp:935 msgid "&Custom Displays" msgstr "&Visualizzazione personalizzata" -#: ../src/xtnFrame.cpp:935 +#: src/xtnFrame.cpp:935 msgid "List of custom display in your configuration file." msgstr "Elementi visualizzazione personalizzata nel file configurazione" -#: ../src/xtnFrame.cpp:957 +#: src/xtnFrame.cpp:957 #, c-format msgid "Open Local XSLT Display with file %s" msgstr "Apri il file locale XSLT con il file %s" -#: ../src/xtnFrame.cpp:967 +#: src/xtnFrame.cpp:967 #, c-format msgid "Open HTML XSLT Display with file %s" msgstr "Apri visualizzazione XSLT HTML con il file %s" -#: ../src/xtnFrame.cpp:1037 ../src/xtnXmlTree.cpp:180 -#: ../src/xtnXmlTree.cpp:244 +#: src/xtnFrame.cpp:1037 src/xtnXmlTree.cpp:180 src/xtnXmlTree.cpp:244 #, c-format msgid "Error while Loading the file %s" msgstr "Errore durante il caricamento del file %s" -#: ../src/xtnXmlTree.cpp:113 +#: src/xtnXmlTree.cpp:113 #, c-format msgid "Parsing Before file OK : %ld nodes" msgstr "Analisi prima dell'OK file : %ld nodi" -#: ../src/xtnXmlTree.cpp:118 +#: src/xtnXmlTree.cpp:118 #, c-format msgid "Parsing After file OK : %ld nodes" msgstr "Analisi dopo OK file : %ld nodi" -#: ../src/xtnXmlTree.cpp:121 +#: src/xtnXmlTree.cpp:121 #, c-format msgid "Diff OK : %ld nodes processed" msgstr "Comparazione OK : %ld nodi elaborati" -#: ../src/xtnXmlTree.cpp:124 +#: src/xtnXmlTree.cpp:124 #, c-format msgid "Diff in progress... (%d%%)" msgstr "Comparazione... (%d%%)" -#: ../src/xtnXmlTree.cpp:125 +#: src/xtnXmlTree.cpp:125 #, c-format msgid "%d%%" msgstr "%d%%" -#: ../src/xtnXmlTree.cpp:185 +#: src/xtnXmlTree.cpp:185 msgid "Unable to instanciate stuctures, probably due to a memory problem" msgstr "" "Impossibile creare la struttura, probabilmente a causa di problemi di " "memoria." -#: ../src/xtnXmlTree.cpp:276 +#: src/xtnXmlTree.cpp:276 msgid "Error while diffing the files." msgstr "Errore durante la comparazione dei file" -#: ../src/xtnXmlTree.cpp:634 +#: src/xtnXmlTree.cpp:634 msgid "Invalid selected node." msgstr "Nodo selezione non valido" -#: ../src/xtnXmlTree.cpp:641 +#: src/xtnXmlTree.cpp:641 msgid "Unable to create the structure. Memory may be full." msgstr "Impossibile creare la struttura. La memoria potrebbe essere esaurita." -#: ../src/xtnXmlTree.cpp:654 +#: src/xtnXmlTree.cpp:654 msgid "XPath query error." msgstr "Errore richiesta Xpath." -#: ../src/xtnXmlTree.cpp:672 +#: src/xtnXmlTree.cpp:672 #, c-format msgid "Node %d of %d found (%s)" msgstr "Trovati nodo %d di %d nodi (%s)." -#: ../src/xtnXmlTree.cpp:676 +#: src/xtnXmlTree.cpp:676 msgid "No nodes found : " msgstr "Nessun nodo trovato:" -#: ../src/xtnApp.h:30 -msgid "Performs efficient XML tree navigation and diff XML files." -msgstr "" -"Permette una veloce navigazione nella struttura dei file XML e la loro " -"comparazione" - -#: ../src/xtnApp.h:31 -#, c-format -msgid "" -"%s %s\n" -"libxmldiff %s\n" -"\n" -"(c) 2004-2016 - Remi Peyronnet\n" -"http://www.lprp.fr" -msgstr "" -"%s %s\n" -"libxmldiff %s\n" -"\n" -"(c) 2004-2016 - Remi Peyronnet\n" -"http://www.lprp.fr" - -#: ../src/xtnApp.h:32 -msgid " (c) 2004 - Remi Peyronnet - http://www.lprp.fr" -msgstr " (c) 2016 - Remi Peyronnet - http://www.lprp.fr" - -#: ../src/xtnApp.h:42 -msgid "XML Files (*.xml)|*.xml|All files (*.*)|*.*" -msgstr "File XML (*.xml)|*.xml|Tutti file (*.*)|*.*" - -#: ../src/xtnApp.h:43 -msgid "XSL Files (*.xsl;*.xslt)|*.xsl;*.xslt|All files (*.*)|*.*" -msgstr "File XSL (*.xsl;*.xslt)|*.xsl;*.xslt|Tutti i file (*.*)|*.*" - -#: ../src/xtnApp.h:52 ../src/xtnApp.h:55 -msgid "" -"This function is not yet implemented, \n" -"or is being developped.\n" -msgstr "" -"Questa funzione non è ancora implementata,\n" -"o è in sviluppo.\n" - -#: ../src/xtnApp.h:52 ../src/xtnApp.h:55 -msgid "Function not implemented." -msgstr "Funzione non implementata" - -#: ../lib/wxmisc/ConfigDialog.cpp:71 -msgid "Apply" -msgstr "OK" - -#: ../lib/wxmisc/ConfigDialog.cpp:72 -msgid "Cancel" -msgstr "Annulla" - -#: ../po/extra-strings.cpp:3 -#, c-format -msgid "About %s" -msgstr "Informazioni su %s" +#~ msgid "About %s" +#~ msgstr "Informazioni su %s" -#: ../po/extra-strings.cpp:4 -msgid "Translators" -msgstr "Traduttori" +#~ msgid "Translators" +#~ msgstr "Traduttori" -#: ../po/extra-strings.cpp:7 -msgid "Display only added, removed or equal" -msgstr "Visualizza solo aggiunte, rimosse o identiche" +#~ msgid "Display only added, removed or equal" +#~ msgstr "Visualizza solo aggiunte, rimosse o identiche" -#: ../po/extra-strings.cpp:9 -msgid "All Nodes" -msgstr "Tutti i nodi" +#~ msgid "All Nodes" +#~ msgstr "Tutti i nodi" -#: ../po/extra-strings.cpp:10 -msgid "All Nodes named nodeName" -msgstr "Tutti i nodi nominati NomeNodo" +#~ msgid "All Nodes named nodeName" +#~ msgstr "Tutti i nodi nominati NomeNodo" -#: ../po/extra-strings.cpp:11 -msgid "All Nodes named nodeName with parent parent" -msgstr "Tutti i nomi nominati NomeNodo con genitori" +#~ msgid "All Nodes named nodeName with parent parent" +#~ msgstr "Tutti i nomi nominati NomeNodo con genitori" -#: ../po/extra-strings.cpp:12 -msgid "All Nodes with attribute named attributeName" -msgstr "Tutti i nodi con attributo NomeAttributo" +#~ msgid "All Nodes with attribute named attributeName" +#~ msgstr "Tutti i nodi con attributo NomeAttributo" -#: ../po/extra-strings.cpp:13 -msgid "All Nodes with attribute named attributeName with value toto" -msgstr "Tutti i nodi con attributo NomeAttributo con valore xxxx" +#~ msgid "All Nodes with attribute named attributeName with value toto" +#~ msgstr "Tutti i nodi con attributo NomeAttributo con valore xxxx" -#: ../po/extra-strings.cpp:14 -msgid "All Nodes with content text toto" -msgstr "Tutti i nodi contenteti il testo xxxx" +#~ msgid "All Nodes with content text toto" +#~ msgstr "Tutti i nodi contenteti il testo xxxx" -#: ../po/extra-strings.cpp:15 -msgid "Added Nodes" -msgstr "Nodi aggiunti" +#~ msgid "Added Nodes" +#~ msgstr "Nodi aggiunti" diff --git a/po/po_build.bat b/po/po_build.bat index ba8d709..f2e65ef 100644 --- a/po/po_build.bat +++ b/po/po_build.bat @@ -1,3 +1,4 @@ +SET PATH=D:\Util\Prog\GetText\bin;%PATH% REM template copy xmlTreeNav.pot ..\bin\lang\xmlTreeNav.pot diff --git a/po/po_update.bat b/po/po_update.bat index a424819..be21f15 100644 --- a/po/po_update.bat +++ b/po/po_update.bat @@ -1,3 +1,5 @@ +SET PATH=D:\Util\Prog\GetText\bin;%PATH% + REM Update from code xgettext.exe -o xmlTreeNav.pot --c++ --keyword=_ --from-code=ISO-8859-1 ../src/*.cpp ../src/*.h ../lib/wxmisc/*.cpp ../lib/wxmisc/*.h ../po/extra-strings.cpp REM Merge files diff --git a/po/xmlTreeNav.pot b/po/xmlTreeNav.pot index f7b775b..4390422 100644 --- a/po/xmlTreeNav.pot +++ b/po/xmlTreeNav.pot @@ -8,11 +8,10 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-03-29 21:50+0200\n" +"POT-Creation-Date: 2020-05-09 19:32+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" @@ -589,8 +588,8 @@ msgid "" "childen nodes
- //* : all nodes of the document
- " "//mynode : all nodes of the document named mynode
- //parent/mynode : all nodes of the document named " -"mynode and a parent parent
- //" -"*[@myattr] : all nodes of the document with an attribute named " +"mynode and a parent parent
- //*" +"[@myattr] : all nodes of the document with an attribute named " "myattr
- //*[@myattr='toto'] : all nodes of " "the document with an attribute named myattr with value " "toto
- //*[text()='toto'] : all nodes of the " @@ -729,7 +728,7 @@ msgid "" "%s %s\n" "libxmldiff %s\n" "\n" -"(c) 2004-2016 - Remi Peyronnet\n" +"(c) 2004-2020 - Remi Peyronnet\n" "http://www.lprp.fr" msgstr "" diff --git a/src/xtnApp.h b/src/xtnApp.h index b3fdf6a..0750c7a 100644 --- a/src/xtnApp.h +++ b/src/xtnApp.h @@ -24,11 +24,11 @@ * ************************************************************************** */ #define XTN_NAME wxT("xmlTreeNav") -#define XTN_VERSION wxT("v0.3.4beta") -#define XTN_COPYRIGHT wxT("(c) 2004-2019 - Remi Peyronnet") +#define XTN_VERSION wxT("v0.3.4") +#define XTN_COPYRIGHT wxT("(c) 2004-2020 - Remi Peyronnet") #define XTN_WEBSITE wxT("http://www.lprp.fr") #define XTN_APP_DESCRIPTION _("Performs efficient XML tree navigation and diff XML files.") -#define XTN_ABOUT _("%s %s\nlibxmldiff %s\n\n(c) 2004-2016 - Remi Peyronnet\nhttp://www.lprp.fr") +#define XTN_ABOUT _("%s %s\nlibxmldiff %s\n\n(c) 2004-2020 - Remi Peyronnet\nhttp://www.lprp.fr") #define XTN_ABOUT_CMDLINE _(" (c) 2004 - Remi Peyronnet - http://www.lprp.fr") /*