--- wxwidgets2.6-2.6.3.2.2.orig/configure +++ wxwidgets2.6-2.6.3.2.2/configure @@ -45090,7 +45090,7 @@ ;; powerpc-apple-macos* | \ - *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-k*bsd*-gnu | \ + *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-gnu* | *-*-k*bsd*-gnu | \ *-*-sunos4* | \ *-*-osf* | \ *-*-dgux5* | \ @@ -45132,7 +45132,7 @@ SONAME_FLAG= case "${BAKEFILE_HOST}" in - *-*-linux* | *-*-freebsd* | *-*-k*bsd*-gnu ) + *-*-linux* | *-*-freebsd* | *-*-gnu* | *-*-k*bsd*-gnu ) SONAME_FLAG="-Wl,-soname," USE_SOVERSION=1 USE_SOVERLINUX=1 --- wxwidgets2.6-2.6.3.2.2.orig/src/unix/utilsunx.cpp +++ wxwidgets2.6-2.6.3.2.2/src/unix/utilsunx.cpp @@ -477,7 +477,7 @@ while (argv[mb_argc]) { - wxWX2MBbuf mb_arg = wxConvertWX2MB(argv[mb_argc]); + wxWX2MBbuf mb_arg = wxSafeConvertWX2MB(argv[mb_argc]); mb_argv[mb_argc] = strdup(mb_arg); mb_argc++; } @@ -728,7 +728,7 @@ } if ((ptr = wxGetenv(wxT("USER"))) != NULL || (ptr = wxGetenv(wxT("LOGNAME"))) != NULL) { - who = getpwnam(wxConvertWX2MB(ptr)); + who = getpwnam(wxSafeConvertWX2MB(ptr)); } // We now make sure the the user exists! @@ -742,7 +742,7 @@ who = getpwnam (user.mb_str()); } - return wxConvertMB2WX(who ? who->pw_dir : 0); + return wxSafeConvertMB2WX(who ? who->pw_dir : 0); } // ---------------------------------------------------------------------------- @@ -764,7 +764,7 @@ bool ok = uname(&uts) != -1; if ( ok ) { - wxStrncpy(buf, wxConvertMB2WX(uts.nodename), sz - 1); + wxStrncpy(buf, wxSafeConvertMB2WX(uts.nodename), sz - 1); buf[sz] = wxT('\0'); } #elif defined(HAVE_GETHOSTNAME) @@ -810,7 +810,7 @@ { if ( !wxStrchr(buf, wxT('.')) ) { - struct hostent *host = gethostbyname(wxConvertWX2MB(buf)); + struct hostent *host = gethostbyname(wxSafeConvertWX2MB(buf)); if ( !host ) { wxLogSysError(_("Cannot get the official hostname")); @@ -820,7 +820,7 @@ else { // the canonical name - wxStrncpy(buf, wxConvertMB2WX(host->h_name), sz); + wxStrncpy(buf, wxSafeConvertMB2WX(host->h_name), sz); } } //else: it's already a FQDN (BSD behaves this way) @@ -836,7 +836,7 @@ *buf = wxT('\0'); if ((who = getpwuid(getuid ())) != NULL) { - wxStrncpy (buf, wxConvertMB2WX(who->pw_name), sz - 1); + wxStrncpy (buf, wxSafeConvertMB2WX(who->pw_name), sz - 1); return true; } @@ -855,9 +855,9 @@ char *comma = strchr(who->pw_gecos, ','); if (comma) *comma = '\0'; // cut off non-name comment fields - wxStrncpy (buf, wxConvertMB2WX(who->pw_gecos), sz - 1); + wxStrncpy (buf, wxSafeConvertMB2WX(who->pw_gecos), sz - 1); #else // !HAVE_PW_GECOS - wxStrncpy (buf, wxConvertMB2WX(who->pw_name), sz - 1); + wxStrncpy (buf, wxSafeConvertMB2WX(who->pw_name), sz - 1); #endif // HAVE_PW_GECOS/!HAVE_PW_GECOS return true; } --- wxwidgets2.6-2.6.3.2.2.orig/src/unix/utilsx11.cpp +++ wxwidgets2.6-2.6.3.2.2/src/unix/utilsx11.cpp @@ -536,6 +536,8 @@ case XK_Meta_L: case XK_Meta_R: id = WXK_ALT; break; + case XK_Caps_Lock: + id = WXK_CAPITAL; break; case XK_BackSpace: id = WXK_BACK; break; case XK_Delete: @@ -590,23 +592,23 @@ id = WXK_HELP; break; case XK_KP_Multiply: - id = WXK_MULTIPLY; break; + id = WXK_NUMPAD_MULTIPLY; break; case XK_KP_Add: - id = WXK_ADD; break; + id = WXK_NUMPAD_ADD; break; case XK_KP_Subtract: - id = WXK_SUBTRACT; break; + id = WXK_NUMPAD_SUBTRACT; break; case XK_KP_Divide: - id = WXK_DIVIDE; break; + id = WXK_NUMPAD_DIVIDE; break; case XK_KP_Decimal: - id = WXK_DECIMAL; break; + id = WXK_NUMPAD_DECIMAL; break; case XK_KP_Equal: - id = '='; break; + id = WXK_NUMPAD_EQUAL; break; case XK_KP_Space: - id = ' '; break; + id = WXK_NUMPAD_SPACE; break; case XK_KP_Tab: - id = WXK_TAB; break; + id = WXK_NUMPAD_TAB; break; case XK_KP_Enter: - id = WXK_RETURN; break; + id = WXK_NUMPAD_ENTER; break; case XK_KP_0: id = WXK_NUMPAD0; break; case XK_KP_1: @@ -627,6 +629,24 @@ id = WXK_NUMPAD8; break; case XK_KP_9: id = WXK_NUMPAD9; break; + case XK_KP_Insert: + id = WXK_NUMPAD_INSERT; break; + case XK_KP_End: + id = WXK_NUMPAD_END; break; + case XK_KP_Down: + id = WXK_NUMPAD_DOWN; break; + case XK_KP_Page_Down: + id = WXK_NUMPAD_PAGEDOWN; break; + case XK_KP_Left: + id = WXK_NUMPAD_LEFT; break; + case XK_KP_Right: + id = WXK_NUMPAD_RIGHT; break; + case XK_KP_Home: + id = WXK_NUMPAD_HOME; break; + case XK_KP_Up: + id = WXK_NUMPAD_UP; break; + case XK_KP_Page_Up: + id = WXK_NUMPAD_PAGEUP; break; case XK_F1: id = WXK_F1; break; case XK_F2: @@ -696,6 +716,7 @@ case WXK_SHIFT: keySym = XK_Shift_L; break; case WXK_CONTROL: keySym = XK_Control_L; break; case WXK_ALT: keySym = XK_Meta_L; break; + case WXK_CAPITAL: keySym = XK_Caps_Lock; break; case WXK_MENU : keySym = XK_Menu; break; case WXK_PAUSE: keySym = XK_Pause; break; case WXK_ESCAPE: keySym = XK_Escape; break; @@ -714,21 +735,23 @@ case WXK_INSERT: keySym = XK_Insert; break; case WXK_DELETE: keySym = XK_Delete; break; case WXK_HELP : keySym = XK_Help; break; - case WXK_NUMPAD0: keySym = XK_KP_0; break; - case WXK_NUMPAD1: keySym = XK_KP_1; break; - case WXK_NUMPAD2: keySym = XK_KP_2; break; - case WXK_NUMPAD3: keySym = XK_KP_3; break; - case WXK_NUMPAD4: keySym = XK_KP_4; break; + case WXK_NUMPAD0: keySym = XK_KP_0; break; case WXK_NUMPAD_INSERT: keySym = XK_KP_Insert; break; + case WXK_NUMPAD1: keySym = XK_KP_1; break; case WXK_NUMPAD_END: keySym = XK_KP_End; break; + case WXK_NUMPAD2: keySym = XK_KP_2; break; case WXK_NUMPAD_DOWN: keySym = XK_KP_Down; break; + case WXK_NUMPAD3: keySym = XK_KP_3; break; case WXK_NUMPAD_PAGEDOWN: keySym = XK_KP_Page_Down; break; + case WXK_NUMPAD4: keySym = XK_KP_4; break; case WXK_NUMPAD_LEFT: keySym = XK_KP_Left; break; case WXK_NUMPAD5: keySym = XK_KP_5; break; - case WXK_NUMPAD6: keySym = XK_KP_6; break; - case WXK_NUMPAD7: keySym = XK_KP_7; break; - case WXK_NUMPAD8: keySym = XK_KP_8; break; - case WXK_NUMPAD9: keySym = XK_KP_9; break; - case WXK_MULTIPLY: keySym = XK_KP_Multiply; break; - case WXK_ADD: keySym = XK_KP_Add; break; - case WXK_SUBTRACT: keySym = XK_KP_Subtract; break; - case WXK_DECIMAL: keySym = XK_KP_Decimal; break; - case WXK_DIVIDE: keySym = XK_KP_Divide; break; + case WXK_NUMPAD6: keySym = XK_KP_6; break; case WXK_NUMPAD_RIGHT: keySym = XK_KP_Right; break; + case WXK_NUMPAD7: keySym = XK_KP_7; break; case WXK_NUMPAD_HOME: keySym = XK_KP_Home; break; + case WXK_NUMPAD8: keySym = XK_KP_8; break; case WXK_NUMPAD_UP: keySym = XK_KP_Up; break; + case WXK_NUMPAD9: keySym = XK_KP_9; break; case WXK_NUMPAD_PAGEUP: keySym = XK_KP_Page_Up; break; + case WXK_NUMPAD_DECIMAL: keySym = XK_KP_Decimal; break; case WXK_NUMPAD_DELETE: keySym = XK_KP_Delete; break; + case WXK_NUMPAD_MULTIPLY: keySym = XK_KP_Multiply; break; + case WXK_NUMPAD_ADD: keySym = XK_KP_Add; break; + case WXK_NUMPAD_SUBTRACT: keySym = XK_KP_Subtract; break; + case WXK_NUMPAD_DIVIDE: keySym = XK_KP_Divide; break; + case WXK_NUMPAD_ENTER: keySym = XK_KP_Enter; break; + case WXK_NUMPAD_SEPARATOR: keySym = XK_KP_Separator; break; case WXK_F1: keySym = XK_F1; break; case WXK_F2: keySym = XK_F2; break; case WXK_F3: keySym = XK_F3; break; @@ -793,7 +816,8 @@ if (keyCode == NoSymbol) return false; - for (int i = 0; i < 8; ++i) + if ( IsModifierKey(iKey) ) // If iKey is a modifier key, use a different method + { for (int i = 0; i < 8; ++i) { if ( map->modifiermap[map->max_keypermod * i] == keyCode) { @@ -805,6 +829,15 @@ &iDummy3, &iDummy4, &iDummy5, &iDummy6, &iMask ); XFreeModifiermap(map); return (iMask & iKeyMask) != 0; + } + // From the XLib manual: + // The XQueryKeymap() function returns a bit vector for the logical state of the keyboard, + // where each bit set to 1 indicates that the corresponding key is currently pressed down. + // The vector is represented as 32 bytes. Byte N (from 0) contains the bits for keys 8N to 8N + 7 + // with the least-significant bit in the byte representing key 8N. + char key_vector[32]; + XQueryKeymap(pDisplay, key_vector); + return key_vector[keyCode >> 3] & (1 << (keyCode & 7)); } #endif --- wxwidgets2.6-2.6.3.2.2.orig/src/common/strconv.cpp +++ wxwidgets2.6-2.6.3.2.2/src/common/strconv.cpp @@ -2831,6 +2831,35 @@ wxConvLibcObj; #endif +#if wxUSE_UNICODE + +wxWCharBuffer wxSafeConvertMB2WX(const char *s) +{ + if ( !s ) + return wxWCharBuffer(); + + wxWCharBuffer wbuf(wxConvLibc.cMB2WX(s)); + if ( !wbuf ) + wbuf = wxConvUTF8.cMB2WX(s); + if ( !wbuf ) + wbuf = wxConvISO8859_1.cMB2WX(s); + + return wbuf; +} + +wxCharBuffer wxSafeConvertWX2MB(const wchar_t *ws) +{ + if ( !ws ) + return wxCharBuffer(); + + wxCharBuffer buf(wxConvLibc.cWX2MB(ws)); + if ( !buf ) + buf = wxMBConvUTF8(wxMBConvUTF8::MAP_INVALID_UTF8_TO_OCTAL).cWX2MB(ws); + + return buf; +} + +#endif // wxUSE_UNICODE #else // !wxUSE_WCHAR_T --- wxwidgets2.6-2.6.3.2.2.orig/src/gtk/window.cpp +++ wxwidgets2.6-2.6.3.2.2/src/gtk/window.cpp @@ -3276,7 +3276,7 @@ right_border += default_border->right; top_border += default_border->top; bottom_border += default_border->bottom; - g_free( default_border ); + gtk_border_free( default_border ); } #else left_border = 6; --- wxwidgets2.6-2.6.3.2.2.orig/src/gtk/notebook.cpp +++ wxwidgets2.6-2.6.3.2.2/src/gtk/notebook.cpp @@ -2,7 +2,7 @@ // Name: notebook.cpp // Purpose: // Author: Robert Roebling -// Id: $Id: notebook.cpp,v 1.120.2.2 2006/03/06 02:20:17 MR Exp $ +// Id: $Id: notebook.cpp,v 1.120.2.3 2006/11/14 16:23:20 JS Exp $ // Copyright: (c) 1998 Robert Roebling, Vadim Zeitlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -599,7 +599,6 @@ gtk_widget_ref( client->m_widget ); gtk_widget_unrealize( client->m_widget ); - gtk_widget_unparent( client->m_widget ); // gtk_notebook_remove_page() sends "switch_page" signal with some strange // new page index (when deleting selected page 0, new page is 1 although, --- wxwidgets2.6-2.6.3.2.2.orig/src/gtk/button.cpp +++ wxwidgets2.6-2.6.3.2.2/src/gtk/button.cpp @@ -89,7 +89,7 @@ right_border += default_border->right; top_border += default_border->top; bottom_border += default_border->bottom; - g_free( default_border ); + gtk_border_free( default_border ); } #else left_border = 6; --- wxwidgets2.6-2.6.3.2.2.orig/src/gtk/settings.cpp +++ wxwidgets2.6-2.6.3.2.2/src/gtk/settings.cpp @@ -146,11 +146,22 @@ { GtkTooltips* tooltips = gtk_tooltips_new(); gtk_tooltips_force_window(tooltips); - gtk_widget_ensure_style(tooltips->tip_window); - GdkColor c = tooltips->tip_window->style->bg[GTK_STATE_NORMAL]; - gs_objects.m_colTooltip = wxColor(c.red >> SHIFT, c.green >> SHIFT, c.blue >> SHIFT); - c = tooltips->tip_window->style->fg[GTK_STATE_NORMAL]; - gs_objects.m_colTooltipText = wxColor(c.red >> SHIFT, c.green >> SHIFT, c.blue >> SHIFT); + + // FIXME: In 2.11.6 tip_window is private and always NULL so + // we need to do something different if there is no window. + // See https://sourceforge.net/tracker/index.php?func=detail&aid=1767485&group_id=9863&atid=109863 + if (tooltips->tip_window) + { + gtk_widget_ensure_style(tooltips->tip_window); + GdkColor c = tooltips->tip_window->style->bg[GTK_STATE_NORMAL]; + gs_objects.m_colTooltip = wxColor(c.red >> SHIFT, c.green >> SHIFT, c.blue >> SHIFT); + c = tooltips->tip_window->style->fg[GTK_STATE_NORMAL]; + gs_objects.m_colTooltipText = wxColor(c.red >> SHIFT, c.green >> SHIFT, c.blue >> SHIFT); + } + else + { + gs_objects.m_colTooltipText = wxColour(255, 255, 128); // FIXME + } gtk_object_sink(wx_reinterpret_cast(GtkObject*, tooltips)); } --- wxwidgets2.6-2.6.3.2.2.orig/debian/python-wxtools.menu +++ wxwidgets2.6-2.6.3.2.2/debian/python-wxtools.menu @@ -0,0 +1,7 @@ +?package(python-wxtools):needs="X11" section="Apps/Programming"\ + title="pycrust" command="/usr/bin/pycrust" +?package(python-wxtools):needs="X11" section="Apps/Programming"\ + title="pyshell" command="/usr/bin/pyshell" +?package(python-wxtools):needs="X11" section="Apps/Programming"\ + title="xrced" command="/usr/bin/xrced" + --- wxwidgets2.6-2.6.3.2.2.orig/debian/libwxbase-dbg.prerm +++ wxwidgets2.6-2.6.3.2.2/debian/libwxbase-dbg.prerm @@ -0,0 +1,7 @@ +#! /bin/sh +set -e + +update-alternatives --remove wx-config /usr/lib/wx/config/base-unicode-debug-=V + +#DEBHELPER# + --- wxwidgets2.6-2.6.3.2.2.orig/debian/changelog +++ wxwidgets2.6-2.6.3.2.2/debian/changelog @@ -0,0 +1,907 @@ +wxwidgets2.6 (2.6.3.2.2-3ubuntu2) jaunty; urgency=low + + * No-changes rebuild for Python 2.6 (LP: #335981). + + -- Siegfried-Angel Gevatter Pujals Sat, 28 Feb 2009 21:11:42 +0100 + +wxwidgets2.6 (2.6.3.2.2-3ubuntu1) jaunty; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - debian/rules: set DEBIAN_WX_DEFAULT_VERSION to 2.8. + - debian/rules: add debian/control target to .PHONY in order to regenerate + debian/control from debian/control.in each time. + - debian/python-wxgtk.{postinst, prerm} fix update-alternatives call to + install link in /usr/lib/python*/wx.pth for each supported Python + version. + - debian/control.in: add bc to Build-Depends field. + - debian/control.in: adjust dependencies and conflicts for the + python-wxversion changes that were applied in Ubuntu on wxwidgets2.8 + 2.8.6.1-0ubuntu2 package. + + -- Devid Antonio Filoni Fri, 07 Nov 2008 16:08:31 +0100 + +wxwidgets2.6 (2.6.3.2.2-3) unstable; urgency=low + + * Take the flavour from the changelog, not the top dirname. sbuild has + started doing fun things with renaming that dir, and apparently it's + allowed to. Many thanks to Ana Guerrero for hunting the real cause + for this out, Alexander Reichle-Schmehl for pointing out he'd just + tested and uploaded a fix for this issue with wx2.8, and Matt Kraai + for elaborating on #489077 with a patch. Closes: #483341 + * Reapply a fix reverted in the previous upload. Closes: #445729 + * Drop the Suggests: python-xml, it is obsoleted and/or absorbed now. + Closes: #468620 + * Drop a stray .po file that should have never been where it is in the + first place. + + -- Ron Lee Tue, 09 Sep 2008 20:58:46 +0930 + +wxwidgets2.6 (2.6.3.2.2-2ubuntu5) intrepid; urgency=low + + * debian/python-wxgtk.postinst, + debian/python-wxgtk.prerm, + debian/rules: + - Fix update-alternatives call to install links in + /usr/lib/python2.X/wx.pth for each supported python version, + so that importing wx actually works (lp: #274619). + + -- Emilio Pozuelo Monfort Mon, 13 Oct 2008 14:33:05 +0200 + +wxwidgets2.6 (2.6.3.2.2-2ubuntu4) hardy; urgency=low + + * debian/control.in: set back XS-Python-Version to all so that python + packages depend on python2.5 and not python2.4 (LP: #203266) + + -- Adrien Cunin Mon, 17 Mar 2008 21:17:06 +0100 + +wxwidgets2.6 (2.6.3.2.2-2ubuntu3) hardy; urgency=low + + * Copied the changes of the previous upload from debian/control to + debian/control.in + * debian/control.in: + - Set XS-Python-Version to >= 2.4 (Morten Kjeldgaard) + - Versioned build-dep python-all-{dev,dbg} (>= 2.4) + * debian/rules: added debian/control target to .PHONY so that debian/control + is always re-generated from debian/control.in + + -- Adrien Cunin Sat, 15 Mar 2008 22:29:43 +0100 + +wxwidgets2.6 (2.6.3.2.2-2ubuntu2) hardy; urgency=low + + * removed references to the deprecated and redundant package + python-xml (LP: #199014). + + -- Morten Kjeldgaard Thu, 06 Mar 2008 13:47:07 +0100 + +wxwidgets2.6 (2.6.3.2.2-2ubuntu1) hardy; urgency=low + + * Merge from Debian unstable. (LP: #193658) Remaining Ubuntu changes: + - Add build-dep on bc and ajust debian/control. + - Set DEBIAN_WX_DEFAULT_VERSION to 2.8 in rules. + - Set Ubuntu maintainer address. + - Adjust dependencies and conflicts for the python-wxversion changes, + which were applied in Ubuntu in 2.8.6.1-0ubuntu2. + - src/gtk/notebook.cpp: + + Keep patching it. It should have been fixed in Debian but the patch + from Debian #445729 wasn't really applied. (LP #59138) + + -- Stefan Ebner Tue, 12 Feb 2008 10:35:43 +0100 + +wxwidgets2.6 (2.6.3.2.2-2) unstable; urgency=low + + [ Ron Lee ] + * Fix a prang removing notebook pages. Closes: #445729. + * 'Fix' bashisms in debian/rules. Closes: #459160. + + [ Matthias Klose ] + * Merge the following changes from Ubuntu: + - Fix build failure with python2.5. Closes: #439002. + - Build for all supported python versions. + - Build a python-wxgtk2.6-dbg package. + - Move the wx.pth symlink handled by update-alternatives into + the python-wxversion package; adjust dependencies accordingly. + - Build using debhelper v5. + - Fix build failures with g++-4.2. + - Install wxPython header files in wx2.6-headers. Closes: #326440. + - Remove extra '-' in the index.html symlink destination in rules. + Closes: #374337, #402472, #422306, #436737. + - debian/rules (clean): Be cleaner. Closes: #374176. + - src/gtk/settings.cpp: Patch from upstream SVN (r48002) to stop using + private Gtk API which results in segfaults since Gtk 2.11.6. + https://sourceforge.net/tracker/?func=detail&atid=109863&aid=1767485&group_id=9863 + - Fix for GTK warnings in wxNotebook::DoRemovePage. + - wxPython/config.py: Use the default python cflags. + * Fix build failure on the Hurd. Closes: #458289. + * Make wxGetKeyState() work for non-meta keys too. Closes: #410491. + + -- Matthias Klose Sun, 10 Feb 2008 20:14:20 +0100 + +wxwidgets2.6 (2.6.3.2.2-1ubuntu2) hardy; urgency=low + + * Build for all supported python versions. + * Move the wx.pth symlink handled by update-alternatives into + the python-wxversion package; adjust dependencies accordingly. + * Fix build failure with python2.4. + + -- Matthias Klose Tue, 05 Feb 2008 11:01:51 +0000 + +wxwidgets2.6 (2.6.3.2.2-1ubuntu1) hardy; urgency=low + + * Merge from Debian unstable; remaining Ubuntu changes: + - Add build-dep on bc. + - Bump debhelper compatibility to v5. + - Remove debian/python-version, use pyversions -d. + - Set DEBIAN_WX_DEFAULT_VERSION to 2.8 in rules. + - Build the existing -dbg package for the python-dbg build (unlist + $(package_gtk_dbg_py) from extra_packages in rules. + - Don't let the -dbg package conflict with the normal build, but depend on + it. + - Remove python-wxgtk-dbg installation scripts. + - Remove dh_python calls in rules. + - Install wxPython header files in wx2.6-headers; Ubuntu #2887. + - Remove extra '-' in the index.html symlink destination in rules; + Ubuntu #110335. + - Use const char * instead of char * in wxPython/contrib/stc/gtk/*.cpp to + fix some warnings. + - Move "from __future__ import nested_scopes" to the begin of + wxPython/wx/py/introspect.py. + - Use the default python flags for the wxPython builds in config.py. + - Fix build of src/gtk/settings.cpp. + + -- Loic Minier Wed, 14 Nov 2007 19:28:34 +0100 + +wxwidgets2.6 (2.6.3.2.2-1) unstable; urgency=low + + * Use the right gtk free function. Closes: #441766 + * Fix unsafe unicode handling. Closes: #421632 + * Make debian/rules compatible with old make too. Closes: #369720 + * Updated fr.po, thanks to Guilhelm Panaget. Closes: #392691 + * Merge the python updates. Ack NMU changes. Closes: #374178, #373410 + * Suggest wx-common from the wxbase-dev packages too. + * Drop package description references to font metrics that we no longer + provide or need. + + -- Ron Lee Sun, 30 Sep 2007 02:15:33 +0930 + +wxwidgets2.6 (2.6.3.2.1-1) unstable; urgency=low + + * Split /debian into a diff.gz, ready for a shift to cvs-buildpackage + style maintainance of this one. + + -- Ron Lee Sun, 25 Jun 2006 20:02:39 +0930 + +wxwidgets2.6 (2.6.3.2.1.5ubuntu12) gutsy; urgency=low + + * src/gtk/settings.cpp: + + Fix build... + + -- Sebastian Dröge Fri, 10 Aug 2007 16:08:09 +0200 + +wxwidgets2.6 (2.6.3.2.1.5ubuntu11) gutsy; urgency=low + + * src/gtk/settings.cpp: + + Patch from upstream SVN (r48002) to stop using private Gtk API which + results in segfaults since Gtk 2.11.6. + https://sourceforge.net/tracker/?func=detail&atid=109863&aid=1767485&group_id=9863 + + -- Sebastian Dröge Fri, 10 Aug 2007 13:18:20 +0200 + +wxwidgets2.6 (2.6.3.2.1.5ubuntu10) gutsy; urgency=low + + * src/gtk/{button,window}.cpp: + - Use gtk_border_free() not g_free() when freeing GtkBorder's. + Changes backported from upstream 2.8 branch (LP: #120278). + + -- Matti Lindell Mon, 25 Jun 2007 23:44:39 +0300 + +wxwidgets2.6 (2.6.3.2.1.5ubuntu9) gutsy; urgency=low + + * debian/rules: Set DEBIAN_WX_DEFAULT_VERSION to 2.8. + + -- Matthias Klose Sat, 26 May 2007 18:16:21 +0200 + +wxwidgets2.6 (2.6.3.2.1.5ubuntu8) gutsy; urgency=low + + * Backported wxSafeConvert patch from wxwidgets2.8 (LP: 35375) + + -- Emmet Hikory Fri, 18 May 2007 21:17:31 +0900 + +wxwidgets2.6 (2.6.3.2.1.5ubuntu7) gutsy; urgency=low + + * debian/rules: removed extra '-' in the index.html symlink + destination. Ubuntu #110335. + + -- Phillip Susi Thu, 26 Apr 2007 16:58:13 -0400 + +wxwidgets2.6 (2.6.3.2.1.5ubuntu6) feisty; urgency=low + + * wx2.6-headers: Install wxPython header files. Ubuntu #2887. + + -- Matthias Klose Thu, 1 Mar 2007 14:29:31 +0000 + +wxwidgets2.6 (2.6.3.2.1.5ubuntu5) feisty; urgency=low + + * Build the existing -dbg package for the python-dbg build. + * Remove python-wxgtk-dbg installation scripts. + * debian/rules: Remove dh_python calls. + * debian/control.in: Fix name of python-xml package. Don't let the -dbg + package conflict with the normal build, but depend on it. + * Remove debian/python-version, use pyversions -d. + * Use the default python flags for the wxPython builds. + * Add build dependency on bc. + * Bump debhelper compatibility to v5. + * Set Ubuntu maintainer address. + + -- Matthias Klose Wed, 28 Feb 2007 22:31:31 +0100 + +wxwidgets2.6 (2.6.3.2.1.5ubuntu4) feisty; urgency=low + + * wxPython/wx/py/introspect.py: + move "from __future__ import nested_scopes" to the begin of the file + + -- Michael Bienia Mon, 15 Jan 2007 17:59:40 +0100 + +wxwidgets2.6 (2.6.3.2.1.5ubuntu3) feisty; urgency=low + + * Explicitely set the hard coded python version to 2.5. + * Fix compilation errors with newer gcc. + * Fix 64bit builds with python2.5. + + -- Matthias Klose Sun, 14 Jan 2007 11:04:14 +0000 + +wxwidgets2.6 (2.6.3.2.1.5ubuntu2) feisty; urgency=low + + * Rebuild for python2.5 as the default python version. + + -- Matthias Klose Fri, 12 Jan 2007 13:23:11 +0000 + +wxwidgets2.6 (2.6.3.2.1.5ubuntu1) feisty; urgency=low + + * Fix for GTK warnings in wxNotebook::DoRemovePage + (Closes: LP#59138) + + -- Matti Lindell Wed, 13 Dec 2006 22:35:54 +0200 + +wxwidgets2.6 (2.6.3.2.1.5build1) feisty; urgency=low + + * Rebuild for ldbl128 change on powerpc and sparc. + + -- Matthias Klose Thu, 2 Nov 2006 10:27:55 +0000 + +wxwidgets2.6 (2.6.3.2.1.5) unstable; urgency=medium + + * Non-maintainer upload. + * Set debian/python-version to 2.4. + * Replace =PY with python in debian/control (python-xml was transitionned to + the new policy). + + -- Mohammed Adnène Trojette Tue, 15 Aug 2006 23:44:53 +0200 + +wxwidgets2.6 (2.6.3.2.1.4) unstable; urgency=low + + * Fix 2.6.3.2.1.2, add the build dependency in debian/control.in. + Closes: #382951 + + -- Matthias Klose Mon, 14 Aug 2006 10:21:16 +0000 + +wxwidgets2.6 (2.6.3.2.1.3) unstable; urgency=low + + * NMU. + * Build for python2.4. + + -- Matthias Klose Mon, 14 Aug 2006 02:01:15 +0200 + +wxwidgets2.6 (2.6.3.2.1.2) unstable; urgency=medium + + * Non-maintainer upload. + * Explicitely Build-Depend on python-central. Closes: #381110 + + -- Mohammed Adnène Trojette Sun, 6 Aug 2006 13:00:11 +0200 + +wxwidgets2.6 (2.6.3.2.1.1) unstable; urgency=low + + * NMU (I love this version string for NMU's :-/). + * Convert to updated Python policy. Closes: #373410. + + -- Matthias Klose Sat, 17 Jun 2006 18:25:37 +0200 + +wxwidgets2.6 (2.6.3.2.1) unstable; urgency=low + + * Add 'Replaces' for the wxbase packages when upgrading from + earlier than 2.6.3.2 where they split again. Closes: #365561 + + -- Ron Lee Mon, 1 May 2006 14:02:26 +0930 + +wxwidgets2.6 (2.6.3.2) unstable; urgency=low + + * Next try for an upload candidate. + * Fixes FTBFS on GNU/kFreeBSD. Closes: #327638 + * Update fr.po, thanks to Thomas Huriaux and debian-l10n-french. + Closes: #328966 + * Split wxbase back into its own package, after all these years + and just after I drop it, someone finally has a use for it. + Such is life. Closes: #333944 + * Fixes FTBFS with new make. If this ugly quoting is the tradeoff, + I'm itching to learn of the fabulous benefits... + Ack NMU for this from Kurt Roeckx to keep the amd64 transition + rolling while my x86 build machine was painfully dying. Thanks! + Closes: #350695, #361443 + * New FSF address in copyright file. + * Add an index.html link to the doc contents page. Closes: #328896 + * Fixes declarations for friends, as required by C++, and now gcc4.1. + Closes: #358219 + * Add an unpack_examples script, loosely based on one submitted + by Richard Esplin. Closes: #342761 + * Disable the reserved vtable entries (again, but this time its + optional) to retain compatibility with the existing release + in the distro. + * Update build-deps for xorg7. + + -- Ron Lee Fri, 14 Apr 2006 16:50:24 +0930 + +wxwidgets2.6 (2.6.1.2-0.1) unstable; urgency=low + + * Non-maintainer upload. + * Make it build using the new make. Patch from + Daniel Schepler (Closes: #350695) + + -- Kurt Roeckx Sun, 9 Apr 2006 14:04:34 +0200 + +wxwidgets2.6 (2.6.1.2) unstable; urgency=low + + * Fix the build_options.py created by the in tree build. + Closes: #324960 Thanks. + * Move the wx.pth alternative to its own directory where + it can't mess with anything else. + * Pull in changes to dcclient.cpp and window.cpp from HEAD + mostly for gtk2.8 compatibility, but fixes a couple of + other issues too. + + -- Ron Lee Thu, 25 Aug 2005 18:38:31 +0930 + +wxwidgets2.6 (2.6.1.1.1) unstable; urgency=low + + * Reshuffle the wxPython packages again, to comply better with + the python naming policy and improve support for concurrent + installations. The runtime files are now in python-wxgtk2.6-0, + the version selector in python-wxversion and the ancillary + tools in the python-wxtools package. + + Many thanks to Matthias Klose for patches + and patient prodding to get wxpython into better shape for + version transitions. + + * Collapse the wx-common package into an 'unversioned' one also. + + * On its way back into unstable by popular demand. + + -- Ron Lee Sun, 14 Aug 2005 21:25:34 +0930 + +wxwidgets2.6 (2.6.1.1) experimental; urgency=low + + * 2.6.2 prerelease test -- Pain for the Impatient. + + Be warned, wx2.6 has still not branched off the main + development tree, and the API is still in flux. + + This one is to see what else is wrong. + + * Upload to experimental now the -c2 transition is real. + + -- Ron Lee Thu, 23 Jun 2005 14:08:33 +0930 + +wxwidgets2.6 (2.6.0) unstable; urgency=low + + * 8 ... 9 ... 10. Here it comes, ready or not... + * make install includes archive.h now. Closes: #294998 + + -- Ron Lee Wed, 13 Apr 2005 01:15:05 +0930 + +wxwidgets2.5 (2.5.5.1) unstable; urgency=low + + * Last chance. + * Conflict with wxwin2.4-i18n. Due to inertia, it really + does. Sorry if you are not a gringo and want both 2.4 and + 2.5 apps localised on the same machine. Maybe for 2.6.1. + Bitch upstream if you want it fixed. + * Don't package the static libs anymore for wxGTK. + Blame drepper for encouraging their obsolescence If you dare. + * Trim the configure options to reflect the new defaults. + + -- Ron Lee Mon, 11 Apr 2005 22:43:58 +0930 + +wxwidgets2.5 (2.5.4.0) unstable; urgency=low + + * Experimental snapshot. + * More bakefile bogosity manually patched. Closes: #294998 + * Fix stray conflicts with 2.4. Closes: #287623 + * Fixes lack of version checking in wxPython examples. + Closes: #287772 + * Fixes FTBFS on ppc. Closes: #285186 + * Enable gnomeprint, Closes: #284943 satisfactorily I hope. + + -- Ron Lee Sun, 13 Feb 2005 16:52:38 +1030 + +wxwidgets2.5 (2.5.3.3) unstable; urgency=low + + * Experimental snapshot. + + -- Ron Lee Tue, 8 Feb 2005 12:30:45 +1030 + +wxwidgets2.5 (2.5.3.2) unstable; urgency=low + + * This time, really now. + A snapshot that is actually ready for wider release. + Thanks to all who've been patient. We know who you are. + * Update path to wxPython site-packages, build them with + --no_rpath since we will install the in tree build. + + -- Ron Lee Thu, 11 Nov 2004 11:01:00 +1030 + +wxwidgets2.5 (2.5.3.1) unstable; urgency=low + + * Functioning concurrent installs for both the C++ libs + and wxPython along with legacy support for existing 2.4 + users mean we can now safely introduce this release to + unstable without an adverse effect on existing users. + + -- Ron Lee Sun, 31 Oct 2004 15:54:46 +1030 + +wxwidgets2.5 (2.5.3.0) experimental; urgency=low + + * Experimental prerelease. + + -- Ron Lee Wed, 22 Sep 2004 03:29:56 +0930 + +wxwidgets2.5 (2.5.2.3) experimental; urgency=low + + * Greatly improved concurrent installs. We can now install + a much wider range of builds without conflicting and select + between them without the need to go changing symlinks or + the suite of applications you have installed. + * Contrib is dead. Long live contrib. + Better multi-library builds have made contrib more or less + obsolete. This is the big crunch before the boom. Everything + useful out of contrib has been moved back into the main package. + Later we will split many out again along the lines of shared + dependencies, so a minimal wx install really can remain minimal + without losing any future potential. + + -- Ron Lee Sat, 18 Sep 2004 00:59:01 +0930 + +wxwidgets2.5 (2.5.1.1) experimental; urgency=low + + * The s/ndow/dget/g release. + * Yes, the name has changed and the terrorists have won again. + Having a name too similar to Lindows apparently makes us a + liability to the illusion their assailants will want to project + in court. Eleven or so years of unbroken, unquestioned usage + was not nearly so interesting to these people as the fact we + were a soft target and easy to deprive of due process. + * wxGTK is now built with gtk2 and unicode support. + * wxBase is no longer a separate package, it is built with the + GUI libs which now depend on it. We might split it out again + one day if there is a need for that. + * Added support for GNU/K*BSD (thanks again to Robert Millan). + * Non-core functionality is now provided by separate libraries + rather than simply being built into a single behemoth unit. + Of course, given the way these things work, almost none of + them are actually smaller, and the load time is unlikely to + improve either, but the logical separation may be beneficial. + * Removed many elements of the build scripts that are no longer + required due to improvements and changes elsewhere. + * Added README.examples for people who think these are packaged + as demos instead of as extended documentation. + + -- Ron Lee Fri, 27 Feb 2004 17:00:29 +1030 + +wxwindows2.5 (2.5.0) unstable; urgency=low + + * New beginnings. Back to development flavored chaos again. + + -- Ron Lee Thu, 19 Dec 2002 01:08:50 -0800 + +wxwindows2.4 (2.4.2.6) unstable; urgency=high + + * High urgency so as not to reset the shotclock for getting wx and + its deps moving into testing. All changes since the last release + are superficial. + * Reapply HURD/K*BSD patch fragment that should not have been reverted. + Closes: #217726 (Make a wish, the third time is lucky so I'm told.) + * Updated .po files. + + -- Ron Lee Mon, 2 Aug 2004 14:50:07 +0930 + +wxwindows2.4 (2.4.2.5) unstable; urgency=medium + + * Medium urgency to keep things moving for the libtiff fudge. + * Switch to dhv4, libtiff4. + * Fix menu quoting. + * Whittled down on some of the build config scripts that weren't + really earning their weight. + * Check for DISTCC_HOSTS and set the number of make -j jobs according + to the number of hosts it contains. + * Purge the .pyc from site-packages/wx too. They are generated on + site at install time. + * Includes type correctness fix for 64bit arch's. Closes: #197661 + * Merged patches from Robert Millan for HURD/K*BSD support back from + cvs head. Closes: #217726 + * Store the python version we preconfigure virgin source with, then + people don't need the default python package installed to build + from source, just the packages declared in the build-deps. Fix + the -python postinst to use this when byte compiling too. + Closes: #259128 (and fixes #258529) + * Added README.examples to explain that these examples are extended + documentation for coders, rather than trial apps for users. + Closes: #212894 + * Dropped the examples from the demos subdir, the samples cover a lot + more ground than they used to and are generally more up to date, + it's also no longer hard to find a broad range of real applications + with source. Provided more external pointers in the README. + Closes: #258530 after discussion with the submitter. This is a bit + less c++ for your python, but I'm not convinced yet that either half + is such a burden on the other as to warrant an extra package here + at this stage. + * Fix linking of wxgtk_gl to include the proper dependency on wxgtk. + Remove suggestion of libgl1, by declaring the full library dependency + we now automatically insist on it. Closes: #262027 + * Include wxrc and wxrcedit in contrib-dev. Added a simple man page + and a menu entry for wxrcedit. Closes: #261811 + * Update gl sample makefiles to use --gl-libs. Thanks to Rich Walker + for picking this up. Closes: #246169 + * Enable the building of a libwxgtk-dbg-python package, but do not + build and upload it by default at this stage. Closes: #220568 + * Does not fix #239782, sorry. + + -- Ron Lee Wed, 28 Jul 2004 03:21:42 +0930 + +wxwindows2.4 (2.4.2.4) unstable; urgency=low + + * Modified build scripts to use pythonX.Y instead of python(>=X.Y) + * Removed bogus hard coded python2.2-xml. Closes: #216182 + * Enabled iostream support despite my opinion of this c++ 'feature'. + Closes: #211050 + * Event handling for menus with bitmaps fixed. Closes: #214788 + * Includes fixes for wxHTTP and wxURL parsing. Closes: #211023, #213600 + + -- Ron Lee Sat, 25 Oct 2003 13:48:07 +0930 + +wxwindows2.4 (2.4.1.2) unstable; urgency=low + + * New stable release. Closes: #198622 + * Ack python NMU changes, Thanks Josselin! + * Hurd support added to configure. Closes: #191581 + * Fixes ctrl-tab problem with pyslsk. Closes: #187923 + * Fixed configure for autoconf 2.57-3. Closes: #190755 + * Added conflict/replace for -doc. Closes: #202242 + + -- Ron Lee Fri, 22 Aug 2003 15:59:12 +0930 + +wxwindows2.4 (2.4.0.8-0.1) unstable; urgency=low + + * NMU for python transition. + * Build-depend and depend on python 2.3 (closes: #204737). + + -- Josselin Mouette Wed, 13 Aug 2003 22:21:48 +0200 + +wxwindows2.4 (2.4.0.9) unstable; urgency=low + + * Updated package sections to suit the new taxonomy. + * No public release of this version. + + -- Ron Lee Sat, 19 Apr 2003 20:13:39 -0700 + +wxwindows2.4 (2.4.0.8) unstable; urgency=low + + * The "I wish people would read the existing discussion about new releases + before posting 'reminder' bugs" release. Closes: #189144 + * Moved back to using png2. gtk1 forces that on anything using it and + gtk2 support is still too flakey both in wx and dependent apps for + us to entertain it in a stable release. This is a *really* messed + up situation for anyone trying to maintain a development machine. + Thank the png and gtk theme people if its a pain in your ass too. + Closes: #186779 + * Add real package options to the gl build deps. Closes: #182210 + * Really fix the XRCed problem, unlike 2.4.0.7 ; ) Closes: #183712 + + -- Ron Lee Tue, 15 Apr 2003 18:42:54 -0700 + +wxwindows2.4 (2.4.0.3) unstable; urgency=low + + * Changed Conflict to Replaces so people can use 2.4 -dev before all + their 2.3 deps are gone. Closes: #178305 + * Added wxPy supplied 2.3 distutils to the source package, apparently the + standard 2.2 one is now insufficient. This hopefully Closes: #178457 + + -- Ron Lee Mon, 27 Jan 2003 17:36:59 -0800 + +wxwindows2.4 (2.4.0.2) unstable; urgency=low + + * Added missing quantize.h to install. Closes: #178135 + * Removed unnecessary -dev deps. + * move wxwin.m4 &c out of the runtime package and conflict with earlier + versions that didn't. Also nuke some empty dir cruft that slipped by. + Thanks for noticing the latter Josip. Closes: #176033 + * dinstall won't close bugs from earlier unreleased versions :( + see below for explanations. Closes: #162948, #171258, #168148 + Closes: #170748, #168250, #164557, #172390, #172447, #168887 + Closes: #155476, #155478 + + -- Ron Lee Thu, 16 Jan 2003 16:46:31 -0800 + +wxwindows2.4 (2.4.0) unstable; urgency=low + + * The fingers crossed release. + * de.po typo fix. Closes: #174084 + * tr.po stable tree patch. Closes: #174667 + * Add a manpage for the wxPython scripts pointing to the pydoc docs. + * Disabled generation of gtk-univ, it is a rather insensible combination + now and should be replaced by x11-univ instead. + * There had to be some payoff to all the delays -- a clean gcc3.2 + transition :-) This package certainly obsoletes 2.3.3.2 and I'll + be seeking to finally have 2.2.9.2 removed as well once Audacity + is updated. + + -- Ron Lee Thu, 19 Dec 2002 00:50:48 -0800 + +wxwindows2.3 (2.3.4.1) unstable; urgency=low + + * 2.4.0pre1 I guess. + * Added -ffunction-sections for broken hppa linker. Closes: #162948 + * Conflict/Replace wxPython2.2. Since its nmu these two packages + can no longer currently coexist. Closes: #171258 + * xrced.py path search fixed. Closes: #168148, #170748 + * Actually install all wxUniv headers to the header package. + Closes: #168250, #164557 + * Robin tells me this one should be fixed in 2.3 too, I can't confirm + so please reopen if it's not. Closes: #172390 + * Added menu items for pycrust/pyshell, thanks Martin. Closes: #172447 + * Broken header fixed. Closes: #168887 + + -- Ron Lee Mon, 18 Nov 2002 18:54:21 -0800 + +wxwindows2.3 (2.3.3.2) unstable; urgency=low + + * The one more for luck release. + * Debian-wise, it fixes the problem with contrib lib name clashes; + code-wise, lots of little issues (and a couple of big 'uns) from + 2.3.3 -- see the more regular change or cvs logs for details... + * Yes, it's still the unstable branch, yes the request for testing + to see if we can reasonably obsolete 2.2 in post-woody debian + is still current, and yes we're still working toward a stable + 2.4 release as fast as we can. Big thanks to everyone who's + been patient and/or active fixing things. + + -- Ron Lee Thu, 26 Sep 2002 17:43:05 -0700 + +wxwindows2.3 (2.3.3.1) unstable; urgency=low + + * Ok, Robin says wxPython is good to go. + * Since wx2.2 has crashed and burned with the new releases of + python and png, Could package maintainers with packages that + depend on wx please recompile with this package and let me + know if they still need 2.2 in woody? If not I'll have them + removed. There should be a 2.4 release following very soon. + (hah, let's see how the date on that comment testifies!) + * Yes, I know wxpython is missing man pages for some of its + scripts. File a bug if you must, but preferably, if you know + what they do, attach a patch containing one. I don't use them + myself or could even do more than guess what they do today. + Sorry, C++. + + -- Ron Lee Thu, 19 Sep 2002 16:25:12 -0700 + +wxwindows2.3 (2.3.3) unstable; urgency=low + + * The "If it sucks, You whined for it!" release. + * It's also STILL our unstable branch, so I'll probably summarily + close any bugs related to that fact. Please report bugs in + the code to wx-dev@lists.wxwindows.org (or the wx bug tracker on + SourceForge) and not the debian BTS. They'll get to the right + people much faster that way. Packaging bugs to the BTS per normal. + Thanks! + Closes: #155476, #155478 + * New dynamic library/object loading code. + * Fixes several showstoppers from 2.3.2 + * wxPython now built with python2.2 + * Depend explicitly on libpng3-dev, hopefully that will stay the + right thing a little longer. Closes: #143439 + * Various wxPython issues all likely to be entirely different in 2.3 + Please reopen (and/or tell Robin :) if they aren't fixed. + Closes: #153276, #124372, #146757, #148062, #146303 + * Broken package managers are not my problem, unless enough people + think so to make it policy. Autogenerated bugs for things like + this suck too, just btw. If you're going to autogenerate menial + labor for people, at least autogenerate a patch to go along with + it. Closes: #130971, #130989, #130992 + + -- Ron Lee Wed, 19 Dec 2001 15:41:31 -0800 + +wxwindows2.3 (2.3.2) unstable; urgency=low + + * Major Overhaul. First serious release contender. + + Added .dll's to msw-cross packages. + Added -dbg versions of the cross packages. + Added experimental -univ(gtk) package. + Switched to python 2.1 + + -- Ron Lee Thu, 27 Sep 2001 05:55:07 -0700 + +wxwindows2.3 (2.3.1) unstable; urgency=low + + * 2.3.1 test debs -- still not QA'd for general release yet. + + -- Ron Lee Sun, 10 Jun 2001 20:10:36 -0700 + +wxwindows2.3 (2.3.0) unstable; urgency=low + + * Updated 2.2 build scripts for 2.3 + * initial test builds, please do not release.. + + -- Ron Lee Sat, 27 Jan 2001 01:51:24 -0800 + +wxwindows2.2 (2.2.9.2) unstable; urgency=high + + * Fix wxPython gl bug. Closes: #130758 + * Add versioned build dep on the -dev package too + to help avoid the 'png fiasco' for packages built + with wx. (Thanks Joshua) Closes: #131355 + + -- Ron Lee Fri, 25 Jan 2002 03:11:28 -0800 + +wxwindows2.2 (2.2.9.1) unstable; urgency=high + + * recompile with libpng2.. oops. Closes: #129762 + + -- Ron Lee Mon, 21 Jan 2002 13:20:00 -0800 + +wxwindows2.2 (2.2.9) unstable; urgency=high + + * fix for arches with unsigned char as default. + * high urgency because this fix really should get + into woody. + Closes: #127014 + + -- Ron Lee Mon, 31 Dec 2001 06:53:27 -0800 + +wxwindows2.2 (2.2.8.5) unstable; urgency=low + + * Add wxSIZE_T_IS defines to setup.h + Add automate that to my TODO list. + + -- Ron Lee Tue, 27 Nov 2001 05:55:47 -0800 + +wxwindows2.2 (2.2.8.4) unstable; urgency=low + + * Put the (modified) size_t == ulong kludge back into sndwav.cpp + it's still needed until wxDataOutputStream is made 64 bit + friendly, which may not happen for 2.2 since it will probably + not be binary compatible. + * caps a memory leak in the jpeg handler. + + -- Ron Lee Sun, 25 Nov 2001 11:53:59 -0800 + +wxwindows2.2 (2.2.8.3) unstable; urgency=low + + * Backported size_t test from 2.3 tree, removes the need for + specific tests for various 64 bit platforms including now + S/390 (thanks to Gerhard Tonn for the report). + Closes: #120768 + + -- Ron Lee Fri, 23 Nov 2001 20:53:49 -0800 + +wxwindows2.2 (2.2.8.2) unstable; urgency=low + + * python-dev doesn't get me python? More bytes in Build-Dep then + I guess ... Closes: #119954 + + -- Ron Lee Sun, 18 Nov 2001 04:28:41 -0800 + +wxwindows2.2 (2.2.8.1) unstable; urgency=low + + * Rebuild for python2.1 Closes: #119226, #118835 + + -- Ron Lee Mon, 12 Nov 2001 21:47:38 -0800 + +wxwindows2.2 (2.2.8) unstable; urgency=medium + + * Fixed bogus samples makefile. Closes: #110061 + * Added ability to build wxMSW-cross packages, but they + are not built and distributed by default. + + If you think such creatures belong in the archive, + see README.Debian + + * Pruned more inapplicable files from the raw cvs source, + cleaned configure.in and removed the need for a common setup.h, + removed superfluous library links and generally tweaked things + so as to make adding new ports easier. + * added --gl-libs flag to wx-config. + * added wx2.4 forward compatible event macros. + * added build fixes for IA64 from Jeff Licquia, and fixed clean + rules to pick up unnoticed strays that effected NMU builds. + Thanks Jeff. Closes: #101734, #104679 (fixed in NMU) + * Medium urgency since several other packages are waiting + for this to get into testing. + + -- Ron Lee Thu, 30 Aug 2001 15:41:49 -0700 + +wxwindows2.2 (2.2.7) unstable; urgency=medium + + * The "Testing Tarantella" release. + * various small control (mis)behaviours corrected. + * added missing build-dep for gettext. + * updated wxPython description, Closes: #102689 + * Never publicly released, oh well. + + -- Ron Lee Sun, 10 Jun 2001 19:32:46 -0700 + +wxwindows2.2 (2.2.6.1) unstable; urgency=low + + * fix rules so it really doesn't build -indep for ports + and fixed ambiguous overload bug in mmedia contrib. + This time it will build on alpha for sure. Really. :) + Closes: #92288 + * added extra -dev package deps. Closes: #91364 + + -- Ron Lee Sat, 7 Apr 2001 06:49:58 -0700 + +wxwindows2.2 (2.2.6) unstable; urgency=low + + * changed i18n package back to building during arch phase + so we can reap the .mo files as they are created. Closes: #86174 + * OBCBLR Closes: #84692 + * fix wxPython build gremlin. Closes: #89209, #85129 + * tweaked wx-config alternatives priority to favour the most + likely default use. + * general buglet count reduced. + + -- Ron Lee Thu, 8 Mar 2001 21:10:07 -0800 + +wxwindows2.2 (2.2.5.1) unstable; urgency=low + + * "This One's for Dirk" Closes: #84696 + * 2.2.5 has known issues and will not be released for Debian. + * Fixed parser.y for Alpha builds (#82949) + * changed mesa dependency to the virtual libgl package and + added Conflicts for the old 2.1 packages (which are now + gone from woody anyway) Closes: #80120, #70778, #70779, #70780 + * wxPython now builds as a single unit (including contrib) + so removed the libwxgtk-python-contrib package + * updated translations + * new event table macro to enable code being written with 2.2 + to be forward compatible with the changes in 2.4 + * numerous sundry bugfixes + + -- Ron Lee Wed, 24 Jan 2001 18:51:24 -0800 + +wxwindows2.2 (2.2.2) unstable; urgency=low + + * added missing dependancy for contrib-dev package. Closes: #70880 + * by popular demand, added a package with the python-contrib libs. + * more tweaks to deb/rules. autodetect the python install location, + and cache the results of configure tests for all packages. + * and of course a whole stack of minor fixes in the main codebase too. + + -- Ron Lee Tue, 5 Sep 2000 18:51:24 +0930 + +wxwindows2.2 (2.2.1) unstable; urgency=low + + * wxWin 2.2.1 stable release. + * First upload to deb.org after repackaging to build directly from + upstream cvs. + * still not quite lintian clean yet: + - wxPython lib can't be built with a proper soname yet. + - the -dbg packages need an override for the shlib symlink. + - and a couple of packages have the lib symlink 'before the + lib', but that's ugly to fix right now, they aren't critical + libs, and allegedly this will be handled by dpkg sometime soon. + * moved full licence text into copyright file. + + -- Ron Lee Sun, 13 Feb 2000 18:40:00 +1030 + +Local variables: +mode: debian-changelog +End: + --- wxwidgets2.6-2.6.3.2.2.orig/debian/wx-examples.examples +++ wxwidgets2.6-2.6.3.2.2/debian/wx-examples.examples @@ -0,0 +1,5 @@ +debian/README.examples +debian/unpack_examples.sh +docs/examples/samples +docs/examples/wxPython + --- wxwidgets2.6-2.6.3.2.2.orig/debian/libwxbase-dbg.postinst +++ wxwidgets2.6-2.6.3.2.2/debian/libwxbase-dbg.postinst @@ -0,0 +1,9 @@ +#! /bin/sh +set -e + +update-alternatives --install /usr/bin/wx-config wx-config \ + /usr/lib/wx/config/base-unicode-debug-=V \ + $(( =PRIO * 10 + 5 )) + +#DEBHELPER# + --- wxwidgets2.6-2.6.3.2.2.orig/debian/lintian-override.in +++ wxwidgets2.6-2.6.3.2.2/debian/lintian-override.in @@ -0,0 +1,8 @@ +libwxbase=V-dbg: non-dev-pkg-with-shlib-symlink +libwxbase=V-dbg: package-name-doesnt-match-sonames +libwxbase=SOV: package-name-doesnt-match-sonames +libwxgtk=V-dbg: non-dev-pkg-with-shlib-symlink +libwxgtk=V-dbg: package-name-doesnt-match-sonames +libwxgtk=SOV: package-name-doesnt-match-sonames +python-wxtools: python-script-but-no-python-dep + --- wxwidgets2.6-2.6.3.2.2.orig/debian/python-wxgtk.prerm +++ wxwidgets2.6-2.6.3.2.2/debian/python-wxgtk.prerm @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e + +for pyver in =PYVERS; do + update-alternatives --remove wx$pyver.pth /usr/lib/wx/python/wx=V.pth +done; + +#DEBHELPER# + --- wxwidgets2.6-2.6.3.2.2.orig/debian/libwxmsw-dbg.postinst +++ wxwidgets2.6-2.6.3.2.2/debian/libwxmsw-dbg.postinst @@ -0,0 +1,9 @@ +#! /bin/sh +set -e + +update-alternatives --install /usr/bin/wx-config wx-config \ + /usr/lib/wx/config/=H-msw-ansi-debug-=V \ + $(( =PRIO * 10 + 2 )) + +#DEBHELPER# + --- wxwidgets2.6-2.6.3.2.2.orig/debian/libwxgtk-dev.postinst +++ wxwidgets2.6-2.6.3.2.2/debian/libwxgtk-dev.postinst @@ -0,0 +1,9 @@ +#! /bin/sh +set -e + +update-alternatives --install /usr/bin/wx-config wx-config \ + /usr/lib/wx/config/gtk2-unicode-release-=V \ + $(( =PRIO * 10 + 8 )) + +#DEBHELPER# + --- wxwidgets2.6-2.6.3.2.2.orig/debian/libwxgtk-dbg.prerm +++ wxwidgets2.6-2.6.3.2.2/debian/libwxgtk-dbg.prerm @@ -0,0 +1,7 @@ +#! /bin/sh +set -e + +update-alternatives --remove wx-config /usr/lib/wx/config/gtk2-unicode-debug-=V + +#DEBHELPER# + --- wxwidgets2.6-2.6.3.2.2.orig/debian/libwxgtk-dbg.postinst +++ wxwidgets2.6-2.6.3.2.2/debian/libwxgtk-dbg.postinst @@ -0,0 +1,9 @@ +#! /bin/sh +set -e + +update-alternatives --install /usr/bin/wx-config wx-config \ + /usr/lib/wx/config/gtk2-unicode-debug-=V \ + $(( =PRIO * 10 + 6 )) + +#DEBHELPER# + --- wxwidgets2.6-2.6.3.2.2.orig/debian/compat +++ wxwidgets2.6-2.6.3.2.2/debian/compat @@ -0,0 +1 @@ +5 --- wxwidgets2.6-2.6.3.2.2.orig/debian/unpack_examples.sh.in +++ wxwidgets2.6-2.6.3.2.2/debian/unpack_examples.sh.in @@ -0,0 +1,62 @@ +#!/bin/bash +# +# Unpack compressed examples from the packaged documentation +# into a directory where the user can compile and/or run them. + +WX_EXAMPLES_DIR="/usr/share/doc/wx=V-examples/examples" + +usage() { + echo "$0 [subdir [subdir] ...] dest_dir" + echo " subdir - a subdir of $WX_EXAMPLES_DIR to unpack." + echo " dest_dir - location for the unpacked examples." + echo + echo "If no subdirs are supplied explicitly, all examples will be unpacked." + exit 1 +} + +if [ $# -lt 1 ]; then + usage +fi + +while [ $# -gt 1 ]; do + SUBDIRS="$SUBDIRS $1" + shift +done + +DESTDIR="$1" + +if [ -e $DESTDIR ]; then + echo "Destination $DESTDIR already exists. Cowardly exiting." + exit 2 +fi + +if [ -z "$SUBDIRS" ]; then + for d in $(cd $WX_EXAMPLES_DIR 2> /dev/null && ls -d * 2> /dev/null); do + [ -d "$WX_EXAMPLES_DIR/$d" ] && SUBDIRS="$SUBDIRS $d" + done +else + for d in $SUBDIRS; do + if [ -d "$WX_EXAMPLES_DIR/$d" ]; then + _SUBDIRS="$d" + else + echo "Subdir $WX_EXAMPLES_DIR/$d does not exist. Skipping." + fi + done + SUBDIRS="$_SUBDIRS" +fi + +if [ -z "$SUBDIRS" ]; then + echo "Nothing to copy from $WX_EXAMPLES_DIR. Aborting." + exit 1 +fi + +mkdir -p $DESTDIR +for d in $SUBDIRS; do + echo "Copying $WX_EXAMPLES_DIR/$d to $DESTDIR" + cp -pr "$WX_EXAMPLES_DIR/$d" "$DESTDIR" +done + +echo -n "Unpacking... " +find $DESTDIR -name "*.gz" -exec gunzip {} \; +echo "done." + --- wxwidgets2.6-2.6.3.2.2.orig/debian/libwxmsw-dev.prerm +++ wxwidgets2.6-2.6.3.2.2/debian/libwxmsw-dev.prerm @@ -0,0 +1,7 @@ +#! /bin/sh +set -e + +update-alternatives --remove wx-config /usr/lib/wx/config/=H-msw-ansi-release-=V + +#DEBHELPER# + --- wxwidgets2.6-2.6.3.2.2.orig/debian/control +++ wxwidgets2.6-2.6.3.2.2/debian/control @@ -0,0 +1,255 @@ +Source: wxwidgets2.6 +Section: libs +Priority: optional +Build-Depends: debhelper (>= 5.0.37.1), flex, bison, gettext, libgtk2.0-dev, + python-all-dev, python-all-dbg, python-central, + zlib1g-dev, libjpeg62-dev, libpng12-dev, libtiff4-dev, + libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, + libesd0-dev, libgnomeprintui2.2-dev, bc +Maintainer: Ubuntu MOTU developers +XSBC-Original-Maintainer: Ron Lee +XS-Python-Version: all +Standards-Version: 3.7.3 + +Package: libwxbase2.6-0 +Architecture: any +Section: libs +Depends: ${shlibs:Depends} +Replaces: libwxgtk2.6-0 (<<2.6.3.2) +Description: wxBase library (runtime) - non-GUI support classes of wxWidgets toolkit + wxBase is a collection of C++ classes providing basic data structures + (strings, lists, arrays), powerful wxDateTime class for date manipulations, + portable wrappers around many OS-specific functions allowing to build the + same program under all supported folders, wxThread class for writing + multithreaded programs using either Win32 or POSIX threads and much more. + wxBase currently supports the following platforms: Generic Unix (Linux, + FreeBSD, Solaris, HP-UX, ...), win32, and BeOS. + . + This package is only useful for non-GUI apps. It offers a subset of the + classes in libwx_gtk2.6 for use in console apps and daemons. You do not need + this package to build or use wxWidgets GUI apps. + +Package: libwxbase2.6-dev +Architecture: any +Section: libdevel +Depends: wx2.6-headers (= ${Source-Version}), libwxbase2.6-0 (= ${Source-Version}), libc6-dev +Replaces: libwxgtk2.6-dev (<<2.6.3.2) +Suggests: wx-common, wx2.6-doc, gettext +Description: wxBase library (development) - non-GUI support classes of wxWidgets toolkit + wxBase is a collection of C++ classes providing basic data structures + (strings, lists, arrays), powerful wxDateTime class for date manipulations, + portable wrappers around many OS-specific functions allowing to build the + same program under all supported folders, wxThread class for writing + multithreaded programs using either Win32 or POSIX threads and much more. + wxBase currently supports the following platforms: Generic Unix (Linux, + FreeBSD, Solaris, HP-UX, ...), win32, and BeOS. + . + This package provides the files needed to compile apps using the wxBase + library. + +Package: libwxbase2.6-dbg +Architecture: any +Section: libdevel +Priority: extra +Depends: wx2.6-headers (= ${Source-Version}), libc6-dev +Replaces: libwxgtk2.6-dbg (<<2.6.3.2) +Description: wxBase library (debug) - non-GUI support classes of wxWidgets toolkit + wxBase is a collection of C++ classes providing basic data structures + (strings, lists, arrays), powerful wxDateTime class for date manipulations, + portable wrappers around many OS-specific functions allowing to build the + same program under all supported folders, wxThread class for writing + multithreaded programs using either Win32 or POSIX threads and much more. + wxBase currently supports the following platforms: Generic Unix (Linux, + FreeBSD, Solaris, HP-UX, ...) win32, and BeOS. + . + This package provides a debug version of the wxBase library. It is compiled + both with -g for normal debugger tracing and with the __WXDEBUG__ flag which + provides many internal checks by wxWidgets itself that are not performed on + apps compiled with the 'release version' libs in the -dev package. + +Package: libwxgtk2.6-0 +Architecture: any +Section: libs +Depends: ${shlibs:Depends} +Suggests: libgnomeprintui2.2-0 +Description: wxWidgets Cross-platform C++ GUI toolkit (GTK+ runtime) + wxWidgets (formerly known as wxWindows) is a class library for C++ providing + GUI components and other facilities on several popular platforms (and some + unpopular ones as well). For more information see http://wxwidgets.org + . + This package provides the shared libraries needed to run programs linked + against wxWidgets. To use the (optional) glcanvas library you will need + to have Mesa or OpenGL installed. + +Package: libwxgtk2.6-dev +Architecture: any +Section: libdevel +Depends: wx2.6-headers (= ${Source-Version}), libwxgtk2.6-0 (= ${Source-Version}), libwxbase2.6-dev (= ${Source-Version}), libc6-dev +Suggests: wx-common, wx2.6-doc, libstdc++-dev, gettext, xlibmesa-gl-dev | libgl-dev, xlibmesa-glu-dev | libglu-dev +Description: wxWidgets Cross-platform C++ GUI toolkit (GTK+ development) + wxWidgets (formerly known as wxWindows) is a class library for C++ providing + GUI components and other facilities on several popular platforms (and some + unpopular ones as well). For more information see http://wxwidgets.org + . + This package provides files needed to compile wxWidgets programs. If you + want to compile apps using the (optional) glcanvas library you will need + to have Mesa or OpenGL installed too. + +Package: libwxgtk2.6-dbg +Architecture: any +Section: libdevel +Priority: extra +Depends: wx2.6-headers (= ${Source-Version}), libwxbase2.6-dbg (= ${Source-Version}), libc6-dev +Description: wxWidgets Cross-platform C++ GUI toolkit (GTK+ development) + wxWidgets (formerly known as wxWindows) is a class library for C++ providing + GUI components and other facilities on several popular platforms (and some + unpopular ones as well). For more information see http://wxwidgets.org + . + This package provides a debug version of the wxGTK library. It is compiled + both with -g for normal debugger tracing and with the __WXDEBUG__ flag which + provides many internal checks by wxWidgets itself that are not performed on + apps compiled with the 'release version' libs in the -dev package. + +Package: python-wxgtk2.6 +Architecture: any +Section: python +Depends: python-wxversion (>= 2.8.6.1-0ubuntu2), ${python:Depends}, ${shlibs:Depends} +Suggests: wx2.6-doc, wx2.6-examples +Conflicts: libwxgtk2.6-0-python, wxpython2.6-0 +Replaces: libwxgtk2.6-0-python, wxpython2.6-0 +Provides: ${python:Provides} +XB-Python-Version: ${python:Versions} +Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython binding) + wxWidgets (formerly known as wxWindows) is a class library for C++ providing + GUI components and other facilities on several popular platforms (and some + unpopular ones as well). For more information see http://wxwidgets.org + . + This package provides a Python binding to the wxGTK library and the + wxPython runtime support libraries. + +Package: python-wxgtk2.6-dbg +Priority: extra +Architecture: any +Section: python +Depends: python-wxgtk2.6 (= ${Source-Version}), python-dbg, ${shlibs:Depends} +Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython binding, debug version) + wxWidgets is a class library for C++ providing GUI (Graphical User + Interface) and other facilities on more than one platform. Version 2.6 + currently supports subsets of GTK+, Motif, and MS Windows. + . + This package provides a Python binding to the wxGTK debug library. + This package contains the extensions built for the python debug interpreter. + +Package: python-wxversion +Architecture: all +Section: python +Depends: ${python:Depends}, python-wxgtk2.6 (>= 2.6.3.2.2-1ubuntu2) | python-wxgtk2.8 (>= 2.8.6.1-0ubuntu2) +Conflicts: wxpython2.6-0, python-wxgtk2.8 (<< 2.8.6.1-0ubuntu2), python-wxgtk2.6 (<< 2.6.3.2.2-1ubuntu2) +Replaces: wxpython2.6-0 +XB-Python-Version: ${python:Versions} +Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython version selector) + wxWidgets (formerly known as wxWindows) is a class library for C++ providing + GUI components and other facilities on several popular platforms (and some + unpopular ones as well). For more information see http://wxwidgets.org + . + This package provides the wxPython version selector. + +Package: python-wxtools +Architecture: all +Section: python +Depends: python-wxgtk2.6, ${python:Depends}, ${shlibs:Depends} +Conflicts: wxpython2.6-0 +Replaces: wxpython2.6-0, libwxgtk2.4-python, wxpython2.4-1 +XB-Python-Version: ${python:Versions} +Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython common files) + wxWidgets (formerly known as wxWindows) is a class library for C++ providing + GUI components and other facilities on several popular platforms (and some + unpopular ones as well). For more information see http://wxwidgets.org + . + This package provides support utilities and common files for wxPython2.6. + +Package: wx-common +Architecture: any +Section: devel +Depends: ${shlibs:Depends} +Conflicts: wx2.6-common +Replaces: wxwin2.4-headers, libwxgtk2.4-contrib-dev, wx2.6-common +Description: wxWidgets Cross-platform C++ GUI toolkit (common support files) + wxWidgets (formerly known as wxWindows) is a class library for C++ providing + GUI components and other facilities on several popular platforms (and some + unpopular ones as well). For more information see http://wxwidgets.org + . + This package provides common support files such as miscellaneous developer + aids, binary utilities and manual pages, that are not bound to any particular + wxWidgets release. + +Package: wx2.6-headers +Architecture: any +Section: devel +Description: wxWidgets Cross-platform C++ GUI toolkit (header files) + wxWidgets (formerly known as wxWindows) is a class library for C++ providing + GUI components and other facilities on several popular platforms (and some + unpopular ones as well). For more information see http://wxwidgets.org + . + This package provides the common header files required to build applications + using the wxWidgets toolkit. + +Package: wx2.6-i18n +Architecture: all +Section: libs +Conflicts: wx-i18n, wxwin-i18n, wx2.4-i18n +Replaces: wx-i18n, wxwin-i18n, wx2.4-i18n, wx2.5-i18n +Provides: wx-i18n +Description: wxWidgets Cross-platform C++ GUI toolkit (i18n support) + wxWidgets (formerly known as wxWindows) is a class library for C++ providing + GUI components and other facilities on several popular platforms (and some + unpopular ones as well). For more information see http://wxwidgets.org + . + This package provides the i18n message catalogs for wxWidgets. + +Package: wx2.6-doc +Architecture: all +Section: doc +Provides: wx-doc +Suggests: doc-base, www-browser +Description: wxWidgets Cross-platform C++ GUI toolkit (documentation) + wxWidgets (formerly known as wxWindows) is a class library for C++ providing + GUI components and other facilities on several popular platforms (and some + unpopular ones as well). For more information see http://wxwidgets.org + . + This package provides a HTML version of the wxWidgets reference manual. + +Package: wx2.6-examples +Architecture: all +Section: devel +Suggests: libwxgtk2.6-dev (= ${Source-Version}), wx2.6-doc +Description: wxWidgets Cross-platform C++ GUI toolkit (examples) + wxWidgets (formerly known as wxWindows) is a class library for C++ providing + GUI components and other facilities on several popular platforms (and some + unpopular ones as well). For more information see http://wxwidgets.org + . + This package contains examples of using the wxWidgets toolkit in + C++ and with the wxPython language binding. + +Package: libwxmsw2.6-dev +Architecture: i386 +Section: otherosfs +Depends: wx2.6-headers-msw (= ${Source-Version}) +Description: wxMSW mingw32msvc-cross + mingw32msvc-cross wxMSW libs. + +Package: libwxmsw2.6-dbg +Architecture: i386 +Section: otherosfs +Depends: wx2.6-headers-msw (= ${Source-Version}) +Description: wxMSW mingw32msvc-cross (debug) + mingw32msvc-cross wxMSW libs. + __WXDEBUG__ version. + +Package: wx2.6-headers-msw +Architecture: i386 +Section: otherosfs +Depends: wx2.6-headers (= ${Source-Version}) +Description: Extra wxWidgets headers for mingw32msvc-cross + Headers required by the wxWidgets mingw32msvc-cross libraries. + --- wxwidgets2.6-2.6.3.2.2.orig/debian/control.in +++ wxwidgets2.6-2.6.3.2.2/debian/control.in @@ -0,0 +1,255 @@ +Source: wxwidgets=V +Section: libs +Priority: optional +Build-Depends: debhelper (>= 5.0.37.1), flex, bison, gettext, libgtk2.0-dev, + python-all-dev, python-all-dbg, python-central, + zlib1g-dev, libjpeg62-dev, libpng12-dev, libtiff4-dev, + libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, + libesd0-dev, libgnomeprintui2.2-dev, bc +Maintainer: Ubuntu MOTU developers +XSBC-Original-Maintainer: Ron Lee +XS-Python-Version: all +Standards-Version: 3.7.3 + +Package: libwxbase=SOV +Architecture: any +Section: libs +Depends: ${shlibs:Depends} +Replaces: libwxgtk2.6-0 (<<2.6.3.2) +Description: wxBase library (runtime) - non-GUI support classes of wxWidgets toolkit + wxBase is a collection of C++ classes providing basic data structures + (strings, lists, arrays), powerful wxDateTime class for date manipulations, + portable wrappers around many OS-specific functions allowing to build the + same program under all supported folders, wxThread class for writing + multithreaded programs using either Win32 or POSIX threads and much more. + wxBase currently supports the following platforms: Generic Unix (Linux, + FreeBSD, Solaris, HP-UX, ...), win32, and BeOS. + . + This package is only useful for non-GUI apps. It offers a subset of the + classes in libwx_gtk=V for use in console apps and daemons. You do not need + this package to build or use wxWidgets GUI apps. + +Package: libwxbase=V-dev +Architecture: any +Section: libdevel +Depends: wx=V-headers (= ${Source-Version}), libwxbase=SOV (= ${Source-Version}), libc6-dev +Replaces: libwxgtk2.6-dev (<<2.6.3.2) +Suggests: wx-common, wx=V-doc, gettext +Description: wxBase library (development) - non-GUI support classes of wxWidgets toolkit + wxBase is a collection of C++ classes providing basic data structures + (strings, lists, arrays), powerful wxDateTime class for date manipulations, + portable wrappers around many OS-specific functions allowing to build the + same program under all supported folders, wxThread class for writing + multithreaded programs using either Win32 or POSIX threads and much more. + wxBase currently supports the following platforms: Generic Unix (Linux, + FreeBSD, Solaris, HP-UX, ...), win32, and BeOS. + . + This package provides the files needed to compile apps using the wxBase + library. + +Package: libwxbase=V-dbg +Architecture: any +Section: libdevel +Priority: extra +Depends: wx=V-headers (= ${Source-Version}), libc6-dev +Replaces: libwxgtk2.6-dbg (<<2.6.3.2) +Description: wxBase library (debug) - non-GUI support classes of wxWidgets toolkit + wxBase is a collection of C++ classes providing basic data structures + (strings, lists, arrays), powerful wxDateTime class for date manipulations, + portable wrappers around many OS-specific functions allowing to build the + same program under all supported folders, wxThread class for writing + multithreaded programs using either Win32 or POSIX threads and much more. + wxBase currently supports the following platforms: Generic Unix (Linux, + FreeBSD, Solaris, HP-UX, ...) win32, and BeOS. + . + This package provides a debug version of the wxBase library. It is compiled + both with -g for normal debugger tracing and with the __WXDEBUG__ flag which + provides many internal checks by wxWidgets itself that are not performed on + apps compiled with the 'release version' libs in the -dev package. + +Package: libwxgtk=SOV +Architecture: any +Section: libs +Depends: ${shlibs:Depends} +Suggests: libgnomeprintui2.2-0 +Description: wxWidgets Cross-platform C++ GUI toolkit (GTK+ runtime) + wxWidgets (formerly known as wxWindows) is a class library for C++ providing + GUI components and other facilities on several popular platforms (and some + unpopular ones as well). For more information see http://wxwidgets.org + . + This package provides the shared libraries needed to run programs linked + against wxWidgets. To use the (optional) glcanvas library you will need + to have Mesa or OpenGL installed. + +Package: libwxgtk=V-dev +Architecture: any +Section: libdevel +Depends: wx=V-headers (= ${Source-Version}), libwxgtk=SOV (= ${Source-Version}), libwxbase=V-dev (= ${Source-Version}), libc6-dev +Suggests: wx-common, wx=V-doc, libstdc++-dev, gettext, xlibmesa-gl-dev | libgl-dev, xlibmesa-glu-dev | libglu-dev +Description: wxWidgets Cross-platform C++ GUI toolkit (GTK+ development) + wxWidgets (formerly known as wxWindows) is a class library for C++ providing + GUI components and other facilities on several popular platforms (and some + unpopular ones as well). For more information see http://wxwidgets.org + . + This package provides files needed to compile wxWidgets programs. If you + want to compile apps using the (optional) glcanvas library you will need + to have Mesa or OpenGL installed too. + +Package: libwxgtk=V-dbg +Architecture: any +Section: libdevel +Priority: extra +Depends: wx=V-headers (= ${Source-Version}), libwxbase=V-dbg (= ${Source-Version}), libc6-dev +Description: wxWidgets Cross-platform C++ GUI toolkit (GTK+ development) + wxWidgets (formerly known as wxWindows) is a class library for C++ providing + GUI components and other facilities on several popular platforms (and some + unpopular ones as well). For more information see http://wxwidgets.org + . + This package provides a debug version of the wxGTK library. It is compiled + both with -g for normal debugger tracing and with the __WXDEBUG__ flag which + provides many internal checks by wxWidgets itself that are not performed on + apps compiled with the 'release version' libs in the -dev package. + +Package: python-wxgtk=V +Architecture: any +Section: python +Depends: python-wxversion (>= 2.8.6.1-0ubuntu2), ${python:Depends}, ${shlibs:Depends} +Suggests: wx=V-doc, wx=V-examples +Conflicts: libwxgtk2.6-0-python, wxpython2.6-0 +Replaces: libwxgtk2.6-0-python, wxpython2.6-0 +Provides: ${python:Provides} +XB-Python-Version: ${python:Versions} +Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython binding) + wxWidgets (formerly known as wxWindows) is a class library for C++ providing + GUI components and other facilities on several popular platforms (and some + unpopular ones as well). For more information see http://wxwidgets.org + . + This package provides a Python binding to the wxGTK library and the + wxPython runtime support libraries. + +Package: python-wxgtk=V-dbg +Priority: extra +Architecture: any +Section: python +Depends: python-wxgtk=V (= ${Source-Version}), python-dbg, ${shlibs:Depends} +Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython binding, debug version) + wxWidgets is a class library for C++ providing GUI (Graphical User + Interface) and other facilities on more than one platform. Version =V + currently supports subsets of GTK+, Motif, and MS Windows. + . + This package provides a Python binding to the wxGTK debug library. + This package contains the extensions built for the python debug interpreter. + +Package: python-wxversion +Architecture: all +Section: python +Depends: ${python:Depends}, python-wxgtk2.6 (>= 2.6.3.2.2-1ubuntu2) | python-wxgtk2.8 (>= 2.8.6.1-0ubuntu2) +Conflicts: wxpython2.6-0, python-wxgtk2.8 (<< 2.8.6.1-0ubuntu2), python-wxgtk2.6 (<< 2.6.3.2.2-1ubuntu2) +Replaces: wxpython2.6-0 +XB-Python-Version: ${python:Versions} +Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython version selector) + wxWidgets (formerly known as wxWindows) is a class library for C++ providing + GUI components and other facilities on several popular platforms (and some + unpopular ones as well). For more information see http://wxwidgets.org + . + This package provides the wxPython version selector. + +Package: python-wxtools +Architecture: all +Section: python +Depends: python-wxgtk=V, ${python:Depends}, ${shlibs:Depends} +Conflicts: wxpython2.6-0 +Replaces: wxpython2.6-0, libwxgtk2.4-python, wxpython2.4-1 +XB-Python-Version: ${python:Versions} +Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython common files) + wxWidgets (formerly known as wxWindows) is a class library for C++ providing + GUI components and other facilities on several popular platforms (and some + unpopular ones as well). For more information see http://wxwidgets.org + . + This package provides support utilities and common files for wxPython=V. + +Package: wx-common +Architecture: any +Section: devel +Depends: ${shlibs:Depends} +Conflicts: wx2.6-common +Replaces: wxwin2.4-headers, libwxgtk2.4-contrib-dev, wx2.6-common +Description: wxWidgets Cross-platform C++ GUI toolkit (common support files) + wxWidgets (formerly known as wxWindows) is a class library for C++ providing + GUI components and other facilities on several popular platforms (and some + unpopular ones as well). For more information see http://wxwidgets.org + . + This package provides common support files such as miscellaneous developer + aids, binary utilities and manual pages, that are not bound to any particular + wxWidgets release. + +Package: wx=V-headers +Architecture: any +Section: devel +Description: wxWidgets Cross-platform C++ GUI toolkit (header files) + wxWidgets (formerly known as wxWindows) is a class library for C++ providing + GUI components and other facilities on several popular platforms (and some + unpopular ones as well). For more information see http://wxwidgets.org + . + This package provides the common header files required to build applications + using the wxWidgets toolkit. + +Package: wx=V-i18n +Architecture: all +Section: libs +Conflicts: wx-i18n, wxwin-i18n, wx2.4-i18n +Replaces: wx-i18n, wxwin-i18n, wx2.4-i18n, wx2.5-i18n +Provides: wx-i18n +Description: wxWidgets Cross-platform C++ GUI toolkit (i18n support) + wxWidgets (formerly known as wxWindows) is a class library for C++ providing + GUI components and other facilities on several popular platforms (and some + unpopular ones as well). For more information see http://wxwidgets.org + . + This package provides the i18n message catalogs for wxWidgets. + +Package: wx=V-doc +Architecture: all +Section: doc +Provides: wx-doc +Suggests: doc-base, www-browser +Description: wxWidgets Cross-platform C++ GUI toolkit (documentation) + wxWidgets (formerly known as wxWindows) is a class library for C++ providing + GUI components and other facilities on several popular platforms (and some + unpopular ones as well). For more information see http://wxwidgets.org + . + This package provides a HTML version of the wxWidgets reference manual. + +Package: wx=V-examples +Architecture: all +Section: devel +Suggests: libwxgtk=V-dev (= ${Source-Version}), wx=V-doc +Description: wxWidgets Cross-platform C++ GUI toolkit (examples) + wxWidgets (formerly known as wxWindows) is a class library for C++ providing + GUI components and other facilities on several popular platforms (and some + unpopular ones as well). For more information see http://wxwidgets.org + . + This package contains examples of using the wxWidgets toolkit in + C++ and with the wxPython language binding. + +Package: libwxmsw=V-dev +Architecture: i386 +Section: otherosfs +Depends: wx=V-headers-msw (= ${Source-Version}) +Description: wxMSW mingw32msvc-cross + mingw32msvc-cross wxMSW libs. + +Package: libwxmsw=V-dbg +Architecture: i386 +Section: otherosfs +Depends: wx=V-headers-msw (= ${Source-Version}) +Description: wxMSW mingw32msvc-cross (debug) + mingw32msvc-cross wxMSW libs. + __WXDEBUG__ version. + +Package: wx=V-headers-msw +Architecture: i386 +Section: otherosfs +Depends: wx=V-headers (= ${Source-Version}) +Description: Extra wxWidgets headers for mingw32msvc-cross + Headers required by the wxWidgets mingw32msvc-cross libraries. + --- wxwidgets2.6-2.6.3.2.2.orig/debian/wx-doc.doc-base +++ wxwidgets2.6-2.6.3.2.2/debian/wx-doc.doc-base @@ -0,0 +1,10 @@ +Document: wx=V-manual +Title: wxWidgets=V Programming Manual +Author: The wxWidgets Cabal +Abstract: This manual describes the wxWidgets=V cross-platform GUI toolkit. +Section: Apps/Programming + +Format: HTML +Index: /usr/share/doc/wx=V-doc/wx-manual.html/wx=V-manual_contents.html +Files: /usr/share/doc/wx=V-doc/wx-manual.html/* + --- wxwidgets2.6-2.6.3.2.2.orig/debian/README.examples +++ wxwidgets2.6-2.6.3.2.2/debian/README.examples @@ -0,0 +1,24 @@ + +These examples are provided as extended documentation for the wxWidgets +package. If you wish to actually run them rather than just browse them +as documents you should copy them into a working directory elsewhere +first. Note that some of them will attempt to write to the current +working directory, or to the home directory of the user they are run as. + +Some of the files have been compressed in accordance with Debian policy +regarding documentation, you will need to uncompress such files before +building or executing them. + +The unpack_examples.sh script is provided to assist with that. + +The examples provided here typically show a minimal implementation of +the feature(s) they are demonstrating. There are examples of more +complete (mini) applications, available in the /wxPython/samples and +/demos directories of the wxWidgets cvs repository (which is browsable +via http://cvs.wxwidgets.org), or of course you can always apt-get the +source of any wx using package for some less contrived examples of +real world wx applications. + + Ron + + --- wxwidgets2.6-2.6.3.2.2.orig/debian/libwxbase-dev.prerm +++ wxwidgets2.6-2.6.3.2.2/debian/libwxbase-dev.prerm @@ -0,0 +1,7 @@ +#! /bin/sh +set -e + +update-alternatives --remove wx-config /usr/lib/wx/config/base-unicode-release-=V + +#DEBHELPER# + --- wxwidgets2.6-2.6.3.2.2.orig/debian/libwxmsw-dev.postinst +++ wxwidgets2.6-2.6.3.2.2/debian/libwxmsw-dev.postinst @@ -0,0 +1,9 @@ +#! /bin/sh +set -e + +update-alternatives --install /usr/bin/wx-config wx-config \ + /usr/lib/wx/config/=H-msw-ansi-release-=V \ + $(( =PRIO * 10 + 4 )) + +#DEBHELPER# + --- wxwidgets2.6-2.6.3.2.2.orig/debian/python-wxgtk.postinst +++ wxwidgets2.6-2.6.3.2.2/debian/python-wxgtk.postinst @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e + +for pyver in =PYVERS; do + update-alternatives --install /usr/lib/python$pyver/site-packages/wx.pth wx$pyver.pth \ + /usr/lib/wx/python/wx=V.pth =PRIO +done; + +#DEBHELPER# --- wxwidgets2.6-2.6.3.2.2.orig/debian/README.Debian +++ wxwidgets2.6-2.6.3.2.2/debian/README.Debian @@ -0,0 +1,77 @@ +wxwidgets for Debian +---------------------- + +The following packages are built from the wxWidgets CVS source. + +libwxbase wxBase runtime shared libraries +libwxbase-dev extra files and static libs for building wxBase apps +libwxbase-dbg wxBase libraries built with -g and __WXDEBUG__ + +libwxgtk wxGTK runtime shared libraries, including selected + contrib libs. +libwxgtk-dev extra files required for building wxGTK apps +libwxgtk-dbg wxGTK libraries built with -g and __WXDEBUG__ + +python-wxgtk Python binding to wxGTK (from 2.2.3 onward, this + obsoletes the libwxgtk-python-contrib package as + all python modules are built into a single monolith) +python-wxversion The wxversion.py version selector, new to wxPython2.6 +python-wxtools The ancillary tools from the wxPython distribution. + +wx-common common helper files and support applications. +wx-headers common header files for building wxWidgets apps +wx-doc HTML version of the wxWidgets manual +wx-examples wxWidgets and wxPython demos and samples (source) +wx-i18n message catalogs for native language support + + + Note that static libraries are no longer supplied in these + packages. Please read, or have understood: + http://people.redhat.com/drepper/no_static_linking.html + among others before reporting this as a bug. + + The following binaries can be built from the source package + with the mingw32 cross compiler, but are not distributed + as a part of the main Debian distribution. + + Please do *not* file bug reports for these packages to the + Debian bts. But do feel free to email me personally if you + find problems and/or have patches to fix them. + +libwxmsw-dev mingw32-cross wxMSW libs. +libwxmsw-dbg mingw32-cross wxMSW (debug) libs. +wx-headers-msw extra headers needed for wxMSW. + + You can build these extra packages using the binary-cross target + in debian/rules. + + + It is also possible to build a python-wxgtk-dbg package. + There are some limitations (like this package cannot be installed + concurrently with the release version), but some developers may + find such a thing useful in any case. It will transparently + replace the release package for installed apps that depend on the + release package, but should NEVER be used when preparing packages + for upload. This package may be created from the source using the + binary-dbg-py target in debian/rules. (note that doing this will + also destroy any release build that exists in the same tree, they + cannot coexist there either yet) + + + Finally, because all of these packages can take quite some time to + build, the source package supports the use of distcc. The package + builds will automatically parallelise to suit the number of hosts + you have listed in DISTCC_HOSTS. This will work for both native + and cross builds of the c++ libraries, if you have the relevant + compilers on all your build hosts. + You may override that heuristic by setting the CONCURRENCY_LEVEL + environment variable to the number of jobs you wish make to fork. + That variable is also supported by the kernel-package scripts and + is respected for consistency here. + + wxPython builds cannot be parallelised at this stage and will run + serially regardless of your configuration. + + + -- Ron Lee , Sun, 13 Feb 2000 18:40:00 +1030 + --- wxwidgets2.6-2.6.3.2.2.orig/debian/libwxmsw-dbg.prerm +++ wxwidgets2.6-2.6.3.2.2/debian/libwxmsw-dbg.prerm @@ -0,0 +1,7 @@ +#! /bin/sh +set -e + +update-alternatives --remove wx-config /usr/lib/wx/config/=H-msw-ansi-debug-=V + +#DEBHELPER# + --- wxwidgets2.6-2.6.3.2.2.orig/debian/rules +++ wxwidgets2.6-2.6.3.2.2/debian/rules @@ -0,0 +1,1015 @@ +#!/usr/bin/make -f +# debian/rules file to build packages from wx CVS source +# +# Sculpted 13/2/2000 by Ron Lee from new and +# variously stolen code :-) +# It makes copious use of the debhelper utilities written by +# Joey Hess and others. + +SHELL = /bin/bash + +#export DH_VERBOSE=1 +export DH_OPTIONS + +ifdef CONCURRENCY_LEVEL + + # A user who knows what they want, that's like gold... + # respect their precious opinion of how much blue smoke to use. + JOB_COUNT := $(CONCURRENCY_LEVEL) + +else +ifdef DISTCC_HOSTS + + # Otherwise, if they have a cluster, try to put it to good use. + JOB_COUNT := $(shell set $${DISTCC_HOSTS} > /dev/null 2>&1 ; echo $$\#) + + # Not much faster, but it might keep you warm in winter... + #JOB_COUNT := $(shell set $${DISTCC_HOSTS} > /dev/null 2>&1 ; echo $$(($$\# + $$\#))) +endif +endif + +ifdef JOB_COUNT + FAST_MAKE = $(MAKE) -j $(JOB_COUNT) +else + FAST_MAKE = $(MAKE) +endif + +PYVER := $(shell pyversions -vd) +PYVERS := $(shell pyversions -vr) + +# If another source package is to supply the common binary packages +# for a particular Debian release, then define this variable to indicate +# the $(release) that is expected to provide it. Do not define it at +# all if this is to be the default (or only) wx source package for the +# target release. +# +# for etch: +#DEBIAN_WX_DEFAULT_VERSION = 2.6 +DEBIAN_WX_DEFAULT_VERSION = 2.8 + + +# This will extract a flavour out of the package name in the changelog +# and flavour the packages and binaries with it. 'Official' builds +# should use a package name of the form wxwidgets$RELEASE. Flavoured +# builds should use wxwidgets$RELEASE-$FLAVOUR, where any descriptive +# alphanumeric name will do for FLAVOUR. This will allow a custom build +# to be installed alongside the mainline ones without conflict. +DEBIAN_WXFLAVOUR := $(shell dpkg-parsechangelog | sed -ne '/^Source: /s@.*wxwidgets[0-9.]\+-\?\(.*\)@\1@p') + +release := $(shell dpkg-parsechangelog | sed -n 's/^Source: wxwidgets//p') + +# This is broken completely now by bakefiles changes. Until we add +# some hocus pocus to the main tree, to export these values from it +# again, we approximate its behaviour (fairly precisely fwiw) to +# specify $soversion below. Re-automate if incompatible changes +# result in it actually changing. +#soversion := $(shell grep '^WX_CURRENT=' configure.in | sed 's/WX_CURRENT=\([0-9]\+\).*/\1/') +soversion := 0 +sorelease := $(release:%-$(DEBIAN_WXFLAVOUR)=%)-$(soversion)$(addprefix -,$(DEBIAN_WXFLAVOUR)) + +# Base value for alternative priorities. +alt_prio := $(subst .,,$(release)) + +pytoolkit := gtk2 +pydir := usr/lib/$(PYVER)/site-packages +wxsubdir := wx-$(release)-$(pytoolkit)-unicode +wxpydir := $(pydir)/$(wxsubdir) + +cross_host := i586-mingw32msvc +cross_build := $(shell ./config.guess) + +config_cache = ../config_deb.cache +config_cache_cross = ../config_deb_cross.cache + + +# Packages to build: +package_wxbase_lib := libwxbase$(sorelease) +package_wxbase_dev := libwxbase$(release)-dev +package_wxbase_dbg := libwxbase$(release)-dbg + +package_gtk_lib := libwxgtk$(sorelease) +package_gtk_dev := libwxgtk$(release)-dev +package_gtk_dbg := libwxgtk$(release)-dbg + + + + +package_gtk_py_lib := python-wxgtk$(release) +package_gtk_py_ver = python-wxversion +package_gtk_py_tools = python-wxtools + +package_headers := wx$(release)-headers +package_i18n := wx$(release)-i18n +package_doc := wx$(release)-doc +package_examples := wx$(release)-examples +package_common = wx-common + +# The packages listed here are common to all wx versions, and may be provided +# by another source package if more than one is in the release simultaneously. +common_packages := $(package_common) $(package_gtk_py_ver) $(package_gtk_py_tools) + + +package_gtk_dbg_py := python-wxgtk$(release)-dbg + + + +package_msw_dev := libwxmsw$(release)-dev +package_msw_dbg := libwxmsw$(release)-dbg +package_headers_msw := wx$(release)-headers-msw + +# The packages listed here will not be built by default. +extra_packages := $(package_msw_dev) $(package_msw_dbg) $(package_headers_msw) + +ifdef DEBIAN_WX_DEFAULT_VERSION + + extra_packages += $(common_packages) + +endif + + +# Build directories: +objdir_wxbase_shared = objs_wxbase_sh +objdir_wxbase_debug = objs_wxbase_d +objdir_gtk_shared = objs_gtk_sh +objdir_gtk_debug = objs_gtk_d +objdir_gtk_install = objs_gtk_install +objdir_doc_cruft = objs_doc_con +objdir_doc = docs/wx-manual.html +objdir_examples = docs/examples +objdir_i18n = locale + +objdir_msw_shared = objs_msw_sh +objdir_msw_static = objs_msw_st +objdir_msw_dbg = objs_msw_d +objdir_msw_install = objs_msw_install + +objdirs := $(objdir_wxbase_shared) $(objdir_wxbase_debug) \ + $(objdir_gtk_shared) $(objdir_gtk_debug) $(objdir_gtk_install) \ + $(objdir_doc_cruft) $(objdir_doc) $(objdir_examples) \ + $(objdir_msw_shared) $(objdir_msw_static) $(objdir_msw_dbg) \ + $(objdir_msw_install) + +# note that the i18n package is actually arch indep (once built) +# but must be built (and installed) during the arch any phase as +# it's pulled out of the wxGTK shared lib package. +# +# similarly some of the wxpython packages are arch indep too, but +# all files for it are installed during the arch any phase. + + +# Build stamps: +build_arch_stamps = build-wxbase-shared-stamp build-wxbase-debug-stamp \ + build-gtk-shared-stamp build-gtk-shared-contrib-stamp \ + build-gtk-debug-stamp build-gtk-debug-contrib-stamp \ + build-i18n-stamp build-gtk-py-stamp build-gtk-dbg-py-stamp + +build_indep_stamps = build-examples-stamp build-doc-stamp + +build_cross_stamps = build-msw-shared-stamp build-msw-static-stamp build-msw-dbg-stamp + +build_stamps_native := $(build_arch_stamps) $(build_indep_stamps) + +build_stamps := $(build_stamps_native) $(build_cross_stamps) + + +# Install targets: +install_all_arch = install-wxbase-lib install-wxbase-dev install-wxbase-dbg \ + install-gtk-lib install-gtk-dev install-gtk-dbg \ + install-headers install-i18n \ + install-gtk-py install-gtk-dbg-py + +ifndef DEBIAN_WX_DEFAULT_VERSION + + install_all_arch += install-common + +endif + +install_all_indep = install-examples install-doc + +install_all_cross = install-msw-dev install-msw-dbg install-headers-msw + +install_all_native := $(install_all_arch) $(install_all_indep) + +install_all := $(install_all_native) $(install_all_cross) + + +# wxPython uses this to build in-tree +wxconfig := $(shell pwd)/$(objdir_gtk_shared)/wx-config --no_rpath +wxconfig-dbg := $(shell pwd)/$(objdir_gtk_debug)/wx-config --no_rpath + +# and this after it is installed. +py_wxconfig := wx-config --version=$(release) --toolkit=$(pytoolkit) \ + --unicode --debug=no --static=no +pyd_wxconfig := wx-config --version=$(release) --toolkit=$(pytoolkit) \ + --unicode --debug --static=no + + +#contrib_libs := $(subst CVS,,$(notdir $(wildcard contrib/include/wx/*))) + + +# The Rules: + +debian/control: debian/control.in + sed -e "s/=V/$(release)/g;s/=SOV/$(sorelease)/g" \ + < debian/control.in > debian/control + +control-files-stamp: debian/control + dh_testdir + @for f in postinst prerm; do \ + echo "generating control file $(package_wxbase_dev).$$f"; \ + sed -e "s/=V/$(release)/g; \ + s/=PRIO/$(alt_prio)/g" \ + < debian/libwxbase-dev.$$f \ + > debian/$(package_wxbase_dev).$$f; \ + done; + @for f in postinst prerm; do \ + echo "generating control file $(package_wxbase_dbg).$$f"; \ + sed -e "s/=V/$(release)/g; \ + s/=PRIO/$(alt_prio)/g" \ + < debian/libwxbase-dbg.$$f \ + > debian/$(package_wxbase_dbg).$$f; \ + done; + @for f in postinst prerm; do \ + echo "generating control file $(package_gtk_dev).$$f"; \ + sed -e "s/=V/$(release)/g; \ + s/=PRIO/$(alt_prio)/g" \ + < debian/libwxgtk-dev.$$f \ + > debian/$(package_gtk_dev).$$f; \ + done; + @for f in postinst prerm; do \ + echo "generating control file $(package_gtk_dbg).$$f"; \ + sed -e "s/=V/$(release)/g; \ + s/=PRIO/$(alt_prio)/g" \ + < debian/libwxgtk-dbg.$$f \ + > debian/$(package_gtk_dbg).$$f; \ + done; + @for f in docs postinst prerm; do \ + echo "generating control file $(package_gtk_py_lib).$$f"; \ + sed -e "s|=WXPYDIR|$(wxpydir)|g; \ + s/=PYVERS/$(PYVERS)/g; \ + s/=V/$(release)/g; \ + s/=PRIO/$(alt_prio)/g" \ + < debian/python-wxgtk.$$f \ + > debian/$(package_gtk_py_lib).$$f; \ + done; + @echo "generating control file $(package_gtk_dbg_py).docs"; + @cp debian/python-wxgtk.docs debian/$(package_gtk_dbg_py).docs; + @for f in docs doc-base; do \ + echo "generating control file $(package_doc).$$f"; \ + sed -e "s/=V/$(release)/g" < debian/wx-doc.$$f \ + > debian/$(package_doc).$$f; \ + done; + @for f in examples; do \ + echo "generating control file $(package_examples).$$f"; \ + cp debian/wx-examples.$$f debian/$(package_examples).$$f; \ + done; + @for f in postinst prerm; do \ + echo "generating control file $(package_msw_dev).$$f"; \ + sed -e "s/=V/$(release)/g; \ + s/=H/$(cross_host)/g; \ + s/=PRIO/$(alt_prio)/g" \ + < debian/libwxmsw-dev.$$f \ + > debian/$(package_msw_dev).$$f; \ + done; + @for f in postinst prerm; do \ + echo "generating control file $(package_msw_dbg).$$f"; \ + sed -e "s/=V/$(release)/g; \ + s/=H/$(cross_host)/g; \ + s/=PRIO/$(alt_prio)/g" \ + < debian/libwxmsw-dbg.$$f \ + > debian/$(package_msw_dbg).$$f; \ + done; +# @echo "generating control file $(package_common).menu"; \ +# sed -e "s/=V/$(release)/g" < debian/wx-common.menu \ +# > debian/$(package_common).menu; + @echo "generating control file lintian-override"; \ + sed -e "s/=V/$(release)/g; \ + s/=SOV/$(sorelease)/g" \ + < debian/lintian-override.in \ + > debian/lintian-override; \ + touch $@ + +build_arch: control-files-stamp $(build_arch_stamps) +build_all: control-files-stamp $(build_stamps_native) + +# Really we should probably do nothing here until we know which +# binary target is being called, but alpha builds were exploding +# (compiler segfaults) in random places when building under fakeroot +# from the binary-arch target. Build all -arch files here then, and +# let the -indep stuff fend for itself later. + +build: build_arch + + +# The wx2.6 build system makes us run around in circles to get a separate +# libwxbase. We need to configure it here in order to get the correct +# config files to use it alone, but there is no point building it as the +# wxgtk build is going to do that again anyway. We'll move the relevant +# files out when that is done. + +configure-wxbase-shared-stamp: + dh_testdir + mkdir -p $(objdir_wxbase_shared) + cd $(objdir_wxbase_shared) \ + && ../configure --prefix=/usr \ + --cache-file=$(config_cache) \ + --with-flavour=$(DEBIAN_WXFLAVOUR) \ + --disable-gui \ + --with-zlib=sys \ + --enable-unicode \ + --disable-reserved_virtual + touch $@ + +build-wxbase-shared-stamp: configure-wxbase-shared-stamp + dh_testdir + # Nothing to build here, move along... + #cd $(objdir_wxbase_shared) && $(FAST_MAKE) + touch $@ + +configure-wxbase-debug-stamp: + dh_testdir + mkdir -p $(objdir_wxbase_debug) + cd $(objdir_wxbase_debug) \ + && ../configure --prefix=/usr \ + --cache-file=$(config_cache) \ + --with-flavour=$(DEBIAN_WXFLAVOUR) \ + --disable-gui \ + --enable-debug \ + --with-zlib=sys \ + --enable-unicode \ + --disable-reserved_virtual + touch $@ + +build-wxbase-debug-stamp: configure-wxbase-debug-stamp + dh_testdir + # Nothing to build here, move along... + #cd $(objdir_wxbase_debug) && $(FAST_MAKE) + touch $@ + +configure-gtk-shared-stamp: + dh_testdir + mkdir -p $(objdir_gtk_shared) + cd $(objdir_gtk_shared) \ + && ../configure --prefix=/usr \ + --cache-file=$(config_cache) \ + --with-flavour=$(DEBIAN_WXFLAVOUR) \ + --with-gtk \ + --with-opengl \ + --with-gnomeprint \ + --with-zlib=sys \ + --with-libjpeg=sys \ + --with-libpng=sys \ + --with-libtiff=sys \ + --enable-unicode \ + --disable-reserved_virtual + touch $@ + +build-gtk-shared-stamp: configure-gtk-shared-stamp + dh_testdir + cd $(objdir_gtk_shared) && $(FAST_MAKE) + touch $@ + + +configure-gtk-debug-stamp: + dh_testdir + mkdir -p $(objdir_gtk_debug) + cd $(objdir_gtk_debug) \ + && ../configure --prefix=/usr \ + --cache-file=$(config_cache) \ + --with-flavour=$(DEBIAN_WXFLAVOUR) \ + --with-gtk \ + --with-opengl \ + --with-gnomeprint \ + --with-zlib=sys \ + --with-libjpeg=sys \ + --with-libpng=sys \ + --with-libtiff=sys \ + --enable-debug \ + --enable-unicode \ + --disable-reserved_virtual + touch $@ + +build-gtk-debug-stamp: configure-gtk-debug-stamp + dh_testdir + cd $(objdir_gtk_debug) && $(FAST_MAKE) + touch $@ + + +build-gtk-shared-contrib-stamp: build-gtk-shared-stamp + dh_testdir + cd $(objdir_gtk_shared)/contrib/src && $(FAST_MAKE) + cd $(objdir_gtk_shared)/utils/wxrc && $(FAST_MAKE) + touch $@ + + +build-gtk-debug-contrib-stamp: build-gtk-debug-stamp + dh_testdir + cd $(objdir_gtk_debug)/contrib/src && $(FAST_MAKE) + touch $@ + + +purge-dbg-py: + @if [ ! -e build-gtk-py-stamp ]; then \ + $(MAKE) -f debian/rules clean-py; \ + fi + $(RM) build-gtk-dbg-py-stamp + +build-gtk-py-stamp: $(PYVERS:%=build-gtk-py%-stamp) # purge-dbg-py + touch $@ + +build-gtk-py%-stamp: build-gtk-shared-stamp # purge-dbg-py + dh_testdir + touch docs/lgpl.txt + cd wxPython \ + && python$* ./setup.py build \ + WX_CONFIG='$(wxconfig)' \ + WXPORT=$(pytoolkit) \ + UNICODE=1 \ + FLAVOUR=$(DEBIAN_WXFLAVOUR) + touch $@ + +build-doc-stamp: build-gtk-shared-stamp + dh_testdir + cd $(objdir_gtk_shared)/utils/tex2rtf/src && $(FAST_MAKE) + rm -rf $(objdir_doc) + rm -rf $(objdir_doc_cruft) + mkdir $(objdir_doc) + mkdir $(objdir_doc_cruft) + cd $(objdir_doc_cruft) \ + && LD_LIBRARY_PATH=../$(objdir_gtk_shared)/lib:$(LD_LIBRARY_PATH) \ + ../$(objdir_gtk_shared)/utils/tex2rtf/src/tex2rtf \ + ../docs/latex/wx/manual.tex \ + ../$(objdir_doc)/wx$(release)-manual.html \ + -twice -html + cp docs/latex/wx/*.gif $(objdir_doc) + rm -rf $(objdir_doc_cruft) + rm -f $(objdir_doc)/wx$(release)-manual.{con,hh*,htx,ref} + touch $@ + +build-examples-stamp: build-gtk-shared-stamp + dh_testdir + mkdir -p $(objdir_examples) + + # copy all samples and the Makefile generated for libwxgtk. + cp -a samples $(objdir_examples) + rm -f $(objdir_examples)/samples/Makefile + cp -a $(objdir_gtk_shared)/samples/Makefile $(objdir_examples)/samples + + cd $(objdir_examples)/samples \ + && find -name 'Makefile.in' -exec rm -f '{}' ';' \ + && for d in $$(find -type d); do \ + if [ -f $$d/makefile.unx ]; then \ + mv $$d/makefile.unx $$d/Makefile; \ + fi; \ + done \ + + cp -a wxPython/demo $(objdir_examples)/wxPython + + echo "generating install_examples.sh script"; + sed -e 's/=V/$(release)/g' < debian/unpack_examples.sh.in \ + > debian/unpack_examples.sh + chmod 755 debian/unpack_examples.sh + + touch $@ + +build-i18n-stamp: build-gtk-shared-stamp + dh_testdir + + # touch .po files first, since if they are not already up + # to date then _now_ is not the time to fix it. + # That should have been been done before cvs was tagged. + cd $(objdir_i18n) \ + && touch *.po \ + && $(MAKE) allmo + touch $@ + +purge-release-py: + @if [ ! -e build-gtk-dbg-py-stamp ]; then \ + $(MAKE) -f debian/rules clean-py; \ + fi + $(RM) build-gtk-py-stamp + +build-gtk-dbg-py-stamp: $(PYVERS:%=build-gtk-dbg-py%-stamp) # purge-release-py + touch $@ + +build-gtk-dbg-py%-stamp: build-gtk-debug-stamp # purge-release-py + dh_testdir + touch docs/lgpl.txt + cd wxPython \ + && python$*-dbg ./setup.py build \ + WX_CONFIG='$(wxconfig-dbg)' \ + WXPORT=$(pytoolkit) \ + UNICODE=1 \ + FLAVOUR=$(addsuffix -,$(DEBIAN_WXFLAVOUR))dbg + touch $@ + + +configure-msw-shared-stamp: + dh_testdir + mkdir -p $(objdir_msw_shared) + cd $(objdir_msw_shared) \ + && ../configure --prefix=/usr/$(cross_host) \ + --cache-file=$(config_cache_cross) \ + --host=$(cross_host) \ + --build=$(cross_build) \ + --with-flavour=$(DEBIAN_WXFLAVOUR) + touch $@ + +build-msw-shared-stamp: configure-msw-shared-stamp + dh_testdir + cd $(objdir_msw_shared) && $(FAST_MAKE) + touch $@ + +configure-msw-static-stamp: + dh_testdir + mkdir -p $(objdir_msw_static) + cd $(objdir_msw_static) \ + && ../configure --prefix=/usr/$(cross_host) \ + --cache-file=$(config_cache_cross) \ + --host=$(cross_host) \ + --build=$(cross_build) \ + --with-flavour=$(DEBIAN_WXFLAVOUR) \ + --disable-shared + touch $@ + +build-msw-static-stamp: configure-msw-static-stamp + dh_testdir + cd $(objdir_msw_static) && $(FAST_MAKE) + touch $@ + +configure-msw-dbg-stamp: + dh_testdir + mkdir -p $(objdir_msw_dbg) + cd $(objdir_msw_dbg) \ + && ../configure --prefix=/usr/$(cross_host) \ + --cache-file=$(config_cache_cross) \ + --host=$(cross_host) \ + --build=$(cross_build) \ + --with-flavour=$(DEBIAN_WXFLAVOUR) \ + --enable-debug + touch $@ + +build-msw-dbg-stamp: configure-msw-dbg-stamp + dh_testdir + cd $(objdir_msw_dbg) && $(FAST_MAKE) + touch $@ + + +clean-py: + cd wxPython && rm -rf licence build* docs/xml-raw wx/*.py + rm -f wxPython/wx/build/build_options.py + rm -f wxPython/wx/build/config.py wxPython/src/wx.pth + + # What to do about src/__version__.py ??? + + +# We do the equivalent of this above by removing build, unfortunately +# its not enough by itself to get the tree properly clean again. +# && ./setup.py clean + +clean: debian/control clean-py + dh_testdir + dh_testroot + + rm -rf config_deb.cache config_deb_cross.cache *-stamp $(objdirs) + rm -f docs/lgpl.txt + rm -f $(objdir_i18n)/*.mo + + dh_clean + rm -f debian/$(package_wxbase_lib).* + rm -f debian/$(package_wxbase_dev).* + rm -f debian/$(package_wxbase_dbg).* + rm -f debian/$(package_gtk_lib).* + rm -f debian/$(package_gtk_dev).* + rm -f debian/$(package_gtk_dbg).* + rm -f debian/$(package_gtk_py_lib).* + rm -f debian/$(package_headers).* + rm -f debian/$(package_i18n).* + rm -f debian/$(package_doc).* + rm -f debian/$(package_examples).* + rm -f debian/$(package_gtk_dbg_py).* + rm -f debian/$(package_msw_dev).* + rm -f debian/$(package_msw_dbg).* + rm -f debian/lintian-override + rm -f debian/unpack_examples.sh + find -name '*.py[co]' | xargs -r rm -f + find -name '*.mo' | xargs -r rm -f + rm -rf include/wx-$(release) + +install_arch: build_arch $(install_all_arch) + +install: build_all $(install_all_native) + + +install-wxbase-lib: DH_OPTIONS=-p$(package_wxbase_lib) +install-wxbase-lib: build-wxbase-shared-stamp install-gtk-shared-stamp + dh_testdir + dh_testroot + dh_clean -k + @# No, this is not a typo, we steal these libs from the gtk build. + dh_install $(objdir_gtk_install)/lib/libwx_base*.so.* usr/lib + dh_installdirs usr/share/lintian/overrides + cp debian/lintian-override debian/$(package_wxbase_lib)/usr/share/lintian/overrides/$(package_wxbase_lib) + +install-wxbase-dev: DH_OPTIONS=-p$(package_wxbase_dev) +install-wxbase-dev: build-wxbase-shared-stamp install-gtk-shared-stamp + dh_testdir + dh_testroot + dh_clean -k + @# No, this is not a typo, we steal these libs from the gtk build. + dh_install $(objdir_gtk_install)/lib/libwx_base*.so usr/lib + dh_install $(objdir_wxbase_shared)/lib/wx/include usr/lib/wx + dh_install $(objdir_wxbase_shared)/lib/wx/config/base* usr/lib/wx/config + +install-wxbase-dbg: DH_OPTIONS=-p$(package_wxbase_dbg) +install-wxbase-dbg: build-wxbase-debug-stamp + dh_testdir + dh_testroot + dh_clean -k + @# No, this is not a typo, we steal these libs from the gtk debug build. + dh_install $(objdir_gtk_debug)/lib/libwx_base* usr/lib + dh_install $(objdir_wxbase_debug)/lib/wx/include usr/lib/wx + dh_install $(objdir_wxbase_debug)/lib/wx/config/base* usr/lib/wx/config + dh_installdirs usr/share/lintian/overrides + cp debian/lintian-override debian/$(package_wxbase_dbg)/usr/share/lintian/overrides/$(package_wxbase_dbg) + +install-gtk-shared-stamp: build-gtk-shared-stamp build-gtk-shared-contrib-stamp + dh_testdir + mkdir -p $(objdir_gtk_install) + cd $(objdir_gtk_shared) \ + && $(MAKE) install prefix=`pwd`/../$(objdir_gtk_install) + cd $(objdir_gtk_shared)/contrib/src \ + && $(MAKE) install prefix=`pwd`/../../../$(objdir_gtk_install) + touch $@ + +install-gtk-lib: DH_OPTIONS=-p$(package_gtk_lib) +install-gtk-lib: install-gtk-shared-stamp + dh_testdir + dh_testroot + dh_clean -k + dh_install $(objdir_gtk_install)/lib/libwx_gtk*.so.* usr/lib + dh_installdirs usr/share/lintian/overrides + cp debian/lintian-override debian/$(package_gtk_lib)/usr/share/lintian/overrides/$(package_gtk_lib) + +install-gtk-dev: DH_OPTIONS=-p$(package_gtk_dev) +install-gtk-dev: install-gtk-shared-stamp + dh_testdir + dh_testroot + dh_clean -k + dh_install $(objdir_gtk_install)/lib/libwx_gtk*.so usr/lib + dh_install $(objdir_gtk_install)/lib/wx/include usr/lib/wx + dh_install $(objdir_gtk_install)/lib/wx/config/gtk* usr/lib/wx/config + +install-gtk-dbg: DH_OPTIONS=-p$(package_gtk_dbg) +install-gtk-dbg: build-gtk-debug-stamp build-gtk-debug-contrib-stamp + dh_testdir + dh_testroot + dh_clean -k + dh_install $(objdir_gtk_debug)/lib/libwx_gtk* usr/lib + dh_install $(objdir_gtk_debug)/lib/wx/include usr/lib/wx + dh_install $(objdir_gtk_debug)/lib/wx/config/gtk* usr/lib/wx/config + dh_installdirs usr/share/lintian/overrides + cp debian/lintian-override debian/$(package_gtk_dbg)/usr/share/lintian/overrides/$(package_gtk_dbg) + + +install-gtk-py-lib: DH_OPTIONS=-p$(package_gtk_py_lib) +install-gtk-py-lib: install-gtk-py-lib-pre $(PYVERS:%=install-gtk-pylib%) + DH_PYCENTRAL=nomove dh_pycentral + /bin/echo -n "$(wxsubdir)" > debian/$(package_gtk_py_lib)/usr/lib/wx/python/wx$(release).pth +install-gtk-py-lib-pre: + dh_testdir + dh_testroot + dh_clean -k +install-gtk-pylib%: install-gtk-py-lib-pre build-gtk-py%-stamp + dh_testdir + dh_testroot + dh_installdirs usr/lib/wx/python + cd wxPython \ + && python$* ./setup.py install \ + --prefix=`pwd`/../debian/$(package_gtk_py_lib)/usr \ + WX_CONFIG='$(wxconfig)' \ + SYS_WX_CONFIG='$(py_wxconfig)' \ + WXPORT=$(pytoolkit) \ + UNICODE=1 \ + FLAVOUR=$(DEBIAN_WXFLAVOUR) + + rm -f debian/$(package_gtk_py_lib)/usr/lib/python$*/site-packages/wx.pth + + find debian/$(package_gtk_py_lib)/usr/lib/python$* -name '*.py?' -exec rm '{}' ';' + + # This is rather bogus, its included in the main copyright file now though. + rm -f debian/$(package_gtk_py_lib)/usr/lib/python$*/site-packages/$(wxsubdir)/wx/tools/XRCed/license.txt + +install-gtk-py-ver: DH_OPTIONS=-p$(package_gtk_py_ver) +install-gtk-py-ver: install-gtk-py-lib + dh_testdir + dh_testroot + dh_clean -k + +ifndef DEBIAN_WX_DEFAULT_VERSION + + dh_movefiles --sourcedir=debian/$(package_gtk_py_lib) \ + $(foreach pv,$(PYVERS),usr/lib/python$(pv)/site-packages/wxversion.py) + DH_PYCENTRAL=nomove dh_pycentral + for v in $(PYVERS); do \ + ln -sf ../../wx/python/wx.pth debian/$(package_gtk_py_ver)/usr/lib/python$$v/site-packages/wx.pth; \ + done +else + rm -f debian/$(package_gtk_py_lib)/usr/lib/python*/site-packages/wxversion.py +endif + +install-gtk-py-tools: DH_OPTIONS=-p$(package_gtk_py_tools) +install-gtk-py-tools: install-gtk-py-ver + dh_testdir + dh_testroot + dh_clean -k + +ifndef DEBIAN_WX_DEFAULT_VERSION + + dh_movefiles --sourcedir=debian/$(package_gtk_py_lib) usr/bin + + dh_installman debian/wxPython-tools.1 + dh_link usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/img2py.1 \ + usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/img2xpm.1 \ + usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/img2png.1 \ + usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pycrust.1 \ + usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pyshell.1 \ + usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/xrced.1 \ + usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/helpviewer.1 \ + usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pyalacarte.1 \ + usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pyalamode.1 \ + usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pywrap.1 \ + usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pywxrc.1 + + dh_installdirs usr/share/lintian/overrides + cp debian/lintian-override debian/$(package_gtk_py_tools)/usr/share/lintian/overrides/$(package_gtk_py_tools) +endif + rm -r debian/$(package_gtk_py_lib)/usr/bin + + DH_PYCENTRAL=nomove dh_pycentral + +install-gtk-py: install-gtk-py-tools + + +install-common: DH_OPTIONS=-p$(package_common) +install-common: install-gtk-shared-stamp + dh_testdir + dh_testroot + dh_clean -k + + dh_install $(objdir_gtk_install)/share/aclocal usr/share + dh_installman debian/wx-config.1 + + dh_install $(objdir_gtk_shared)/utils/wxrc/wxrc usr/bin + dh_installman debian/wxrc-tools.1 + dh_link usr/share/man/man1/wxrc-tools.1 usr/share/man/man1/wxrc.1 + + +install-headers: DH_OPTIONS=-p$(package_headers) +install-headers: install-gtk-shared-stamp + dh_testdir + dh_testroot + dh_clean -k + +# The only way to be really sure we get the univ headers correct is to install +# them. Do that in a scratch dirs, and move the gtk ones last, so at least +# they win in the result of any uncaught conflict. + +# cd $(objdir_gtk_univ) \ +# && $(MAKE) install prefix=`pwd`/../$(objdir_univ_install)/usr + +# dh_movefiles --sourcedir=$(objdir_univ_install) + dh_install $(objdir_gtk_install)/include usr + + mkdir -p debian/$(package_headers)/usr/include/wx-$(release)/wx/wxPython + cp -p wxPython/include/wx/wxPython/*.h \ + debian/$(package_headers)/usr/include/wx-$(release)/wx/wxPython/ + +install-i18n: DH_OPTIONS=-p$(package_i18n) +install-i18n: build-i18n-stamp install-gtk-shared-stamp + dh_testdir + dh_testroot + dh_clean -k + dh_install $(objdir_gtk_install)/share/locale usr/share + +install-doc: DH_OPTIONS=-p$(package_doc) +install-doc: build-doc-stamp + dh_testdir + dh_testroot + dh_clean -k + + @# Link this monstrosity with an overly obfuscated name + @# to something that both people and browsers can expect to find. + dh_link usr/share/doc/$(package_doc)/wx-manual.html/wx$(release)-manual_contents.html \ + usr/share/doc/$(package_doc)/wx-manual.html/index.html + +install-examples: DH_OPTIONS=-p$(package_examples) +install-examples: build-examples-stamp + dh_testdir + dh_testroot + dh_clean -k + +install-gtk-dbg-py: DH_OPTIONS=-p$(package_gtk_dbg_py) +install-gtk-dbg-py: install-gtk-dbg-py-pre $(PYVERS:%=install-gtk-dbg-py%) +install-gtk-dbg-py-pre: + dh_testdir + dh_testroot + dh_clean -k +install-gtk-dbg-py%: install-gtk-dbg-py-pre build-gtk-dbg-py%-stamp + dh_testdir + dh_testroot + dh_installdirs usr/lib/wx/python + cd wxPython \ + && python$*-dbg ./setup.py install \ + --prefix=`pwd`/../debian/$(package_gtk_dbg_py)/usr \ + WX_CONFIG='$(wxconfig-dbg)' \ + SYS_WX_CONFIG='$(pyd_wxconfig)' \ + WXPORT=$(pytoolkit) \ + UNICODE=1 \ + FLAVOUR=$(addsuffix -,$(DEBIAN_WXFLAVOUR))dbg + + mv debian/$(package_gtk_dbg_py)/usr/lib/python$*/site-packages/$(wxsubdir)-dbg \ + debian/$(package_gtk_dbg_py)/usr/lib/python$*/site-packages/$(wxsubdir) + + -find debian/$(package_gtk_dbg_py) -name '*_d.so' + find debian/$(package_gtk_dbg_py) ! -type d ! -name '*.so' | xargs rm -f + find debian/$(package_gtk_dbg_py) -depth -type d -empty -exec rmdir {} \; + + +install-msw-dev: DH_OPTIONS=-p$(package_msw_dev) +install-msw-dev: build-msw-shared-stamp build-msw-static-stamp + dh_testdir + dh_testroot + dh_clean -k + dh_install $(objdir_msw_shared)/lib/*.dll* usr/$(cross_host)/lib + dh_install $(objdir_msw_shared)/lib/wx/include usr/$(cross_host)/lib/wx + dh_install $(objdir_msw_shared)/lib/wx/config/$(cross_host)* usr/$(cross_host)/lib/wx/config + dh_install $(objdir_msw_static)/lib/*.a usr/$(cross_host)/lib + dh_install $(objdir_msw_static)/lib/wx/include usr/$(cross_host)/lib/wx + dh_install $(objdir_msw_static)/lib/wx/config/$(cross_host)* usr/$(cross_host)/lib/wx/config + $(cross_host)-strip --strip-debug debian/$(package_msw_dev)/usr/$(cross_host)/lib/*.a + + @# As a special case for the cross packages, we link their config + @# under /usr as well as under the normal cross prefix. This way + @# --prefix=/usr/$(cross_host) and --prefix=/usr --host=$(cross_host) + @# will have a congruent effect on wx-config. + @( for f in `ls -1 debian/$(package_msw_dev)/usr/$(cross_host)/lib/wx/config`; do \ + all_cfg="$${all_cfg} usr/$(cross_host)/lib/wx/config/$$f usr/lib/wx/config/$$f"; \ + echo "linking cross config /usr/$(cross_host)/lib/wx/config/$$f"; \ + done; \ + dh_link $${all_cfg}; \ + ) + +install-msw-dbg: DH_OPTIONS=-p$(package_msw_dbg) +install-msw-dbg: build-msw-dbg-stamp + dh_testdir + dh_testroot + dh_clean -k + dh_install $(objdir_msw_dbg)/lib/*.dll* usr/$(cross_host)/lib + dh_install $(objdir_msw_dbg)/lib/wx/include usr/$(cross_host)/lib/wx + dh_install $(objdir_msw_dbg)/lib/wx/config/$(cross_host)* usr/$(cross_host)/lib/wx/config + # No static lib, they're freakin' huge! + #$(cross_host)-strip --strip-debug debian/$(package_msw_dbg)/usr/$(cross_host)/lib/*.a + + @( for f in `ls -1 debian/$(package_msw_dbg)/usr/$(cross_host)/lib/wx/config`; do \ + all_cfg="$${all_cfg} usr/$(cross_host)/lib/wx/config/$$f usr/lib/wx/config/$$f"; \ + echo "linking cross config /usr/$(cross_host)/lib/wx/config/$$f"; \ + done; \ + dh_link $${all_cfg}; \ + ) + +install-headers-msw: DH_OPTIONS=-p$(package_headers_msw) +install-headers-msw: + dh_testdir + dh_testroot + dh_clean -k + + cd $(objdir_msw_shared) \ + && $(MAKE) install prefix=`pwd`/../$(objdir_msw_install) + +# Symlink all the headers that will be installed by the main -headers +# package to where the cross compiler will expect them. + @( for f in `ls -1 $(objdir_msw_install)/include/wx-$(release)/wx`; do \ + all_h="$${all_h} usr/include/wx-$(release)/wx/$$f usr/$(cross_host)/include/wx-$(release)/wx/$$f"; \ + echo "linking header /usr/include/wx-$(release)/wx/$$f"; \ + done; \ + dh_link $${all_h}; \ + ) + +# But install this lot for real. + rm -f debian/$(package_headers_msw)/usr/$(cross_host)/include/wx-$(release)/wx/msw + dh_install $(objdir_msw_install)/include/wx-$(release)/wx/msw usr/$(cross_host)/include/wx-$(release)/wx + + +binary-common: + dh_testdir + dh_testroot + dh_installdocs + dh_installchangelogs + dh_installexamples + dh_installmenu + dh_link + + @# Don't strip debug libs at all, and strip cross libs elsewhere + @# with the cross host tools until dh_strip gets smarter. +ifneq (, $(filter -a, $(DH_OPTIONS))) + dh_strip -N$(package_gtk_dbg) -N$(package_wxbase_dbg) \ + -N$(package_msw_dev) -N$(package_msw_dbg) \ + -N$(package_gtk_py_lib) -N$(package_gtk_dbg_py) + DH_OPTIONS= dh_strip -p$(package_gtk_py_lib) --dbg-package=$(package_gtk_dbg_py) +endif + dh_compress + dh_fixperms + + @# Don't do this for the dbg-py special build because dh_makeshlibs + @# will crap out if it is called with no packages to act on. +ifneq ($(DH_OPTIONS),-p$(package_gtk_dbg_py)) + dh_makeshlibs -N$(package_gtk_py_lib) -V +endif + + dh_installdeb + dh_shlibdeps -ldebian/$(package_gtk_lib)/usr/lib:debian/$(package_gtk_dbg)/usr/lib + dh_gencontrol + dh_md5sums + dh_builddeb + +# Build architecture-independent files here. +# Note that you currently can't build the indep packages without first +# building the arch specific package files needed to create them. +binary-indep: build_all install + $(MAKE) -f debian/rules \ + DH_OPTIONS="-i $(addprefix -N,$(extra_packages))" \ + binary-common + +# Build just the architecture-dependent files here. +binary-arch: build_arch install_arch + $(MAKE) -f debian/rules \ + DH_OPTIONS="-a $(addprefix -N,$(extra_packages))" \ + binary-common + rm -rf debian/$(package_gtk_dbg_py)/usr/share/doc/$(package_gtk_dbg_py) + ln -s $(package_gtk_py_lib) debian/$(package_gtk_dbg_py)/usr/share/doc/$(package_gtk_dbg_py) + +# Build all packages target. +binary: binary-arch binary-indep + + +# This is a special target for building the wxMSW-cross packages. +# It's not currently called during the official package build run +# but may be run separately to build the extra packages. +# There is an implied build dep on the mingw32 cross compiler +# that is not in the control file. +binary-cross: control-files-stamp $(install_all_cross) + $(MAKE) -f debian/rules \ + DH_OPTIONS="-p$(package_msw_dev) -p$(package_msw_dbg) -p$(package_headers_msw)" \ + binary-common + + +# Build wxPython against libwxgtk-dbg. This package will conflict +# with the release build one, but may be useful to some people. +binary-dbg-py: control-files-stamp install-gtk-dbg-py + $(MAKE) -f debian/rules DH_OPTIONS="-p$(package_gtk_dbg_py)" binary-common + + +############################################################################ +# +# Some rules to build a subset of the complete list of packages that can be +# built from CVS. Beware that packages produced with these rules may *NOT* +# be compatible with packages built using the 'binary' target or even with +# Debian policy. Do not distribute packages built with these rules, they +# are currently useful for rapid in-house testing by developers only. + +# libwxgtk shared lib package +binary-gtk: control-files-stamp install-gtk-lib install-headers + $(MAKE) -f debian/rules DH_OPTIONS="-p$(package_gtk_lib) -p$(package_headers)" binary-common + +binary-gtk-dev: control-files-stamp install-gtk-dev install-headers + $(MAKE) -f debian/rules \ + DH_OPTIONS="-p$(package_gtk_lib) -p$(package_gtk_dev) -p$(package_headers)" \ + binary-common + +binary-gtk-dbg: control-files-stamp install-gtk-dbg install-headers + $(MAKE) -f debian/rules DH_OPTIONS="-p$(package_gtk_dbg) -p$(package_headers)" binary-common + + +# docs package +binary-doc: control-files-stamp install-doc + $(MAKE) -f debian/rules DH_OPTIONS=-p$(package_doc) binary-common + +binary-fast:control-files-stamp install-gtk-dbg install-msw-dev install-headers install-headers-msw + $(MAKE) -f debian/rules DH_OPTIONS="-p$(package_gtk_dbg) -p$(package_msw_dev) -p$(package_headers) -p$(package_headers_msw)" binary-common + + +.PHONY: build build_all build_arch \ + clean clean-py purge-release-py purge-dbg-py \ + binary-indep binary-arch binary binary-common \ + binary-gtk binary-gtk-dev binary-gtk-dbg \ + binary-wxbase binary-wxbase-dev binary-wxbase-dbg \ + binary-doc binary-cross binary-dbg-py \ + install install_arch install-gtk-lib install-gtk-dev \ + install-gtk-dbg \ + install-gtk-py install-gtk-py-tools install-gtk-py-ver \ + install-gtk-py-lib install-gtk-dbg-py \ + install-common install-headers install-i18n install-doc \ + install-examples install-msw-dev install-msw-dbg install-headers-msw \ + debian/control + --- wxwidgets2.6-2.6.3.2.2.orig/debian/wxPython-tools.1 +++ wxwidgets2.6-2.6.3.2.2/debian/wxPython-tools.1 @@ -0,0 +1,35 @@ +.TH wxPython\-tools 1 "3 Jan 2003" "Debian GNU/Linux" "wxWidgets" +.SH NAME +img2py \- wxPython tools. +.br +img2png \- wxPython tools. +.br +img2xpm \- wxPython tools. +.br +pycrust \- wxPython tools. +.br +pyshell \- wxPython tools. +.br +xrced \- wxPython tools. +.br +helpviewer \- wxPython tools. +.br +pyalacarte \- wxPython tools. +.br +pyalamode \- wxPython tools. +.br +pywrap \- wxPython tools. +.br +pywxrc \- wxPython tools. + +.SH DESCRIPTION +The real documentation for these tools is available in pydoc format. + +.SH SEE ALSO +.BR pydoc (1) + +.SH COPYRIGHT +This manpage was written by Ron Lee for the Debian GNU/Linux +distribution of wxWidgets. It may be freely distributed by anyone insane enough +to find it useful. + --- wxwidgets2.6-2.6.3.2.2.orig/debian/wx-doc.docs +++ wxwidgets2.6-2.6.3.2.2/debian/wx-doc.docs @@ -0,0 +1,2 @@ +docs/wx-manual.html + --- wxwidgets2.6-2.6.3.2.2.orig/debian/wxrc-tools.1 +++ wxwidgets2.6-2.6.3.2.2/debian/wxrc-tools.1 @@ -0,0 +1,15 @@ +.TH wxrc\-tools 1 "30 Jul 2004" "Debian GNU/Linux" "wxWindows" +.SH NAME +wxrc \- command line compiler for wx xml resources. + +.SH DESCRIPTION +The real documentation for this tool (what of it that exists) is available +in the wxWindows manual, which is packaged in html format in the wx2.6-doc +package and installed in /usr/share/doc/wx2.6-doc/wx-manual.html on Debian +systems. + +.SH COPYRIGHT +This manpage was written by Ron Lee for the Debian GNU/Linux +distribution of wxWindows. It may be freely distributed by anyone insane enough +to find it useful. + --- wxwidgets2.6-2.6.3.2.2.orig/debian/wx-config.1 +++ wxwidgets2.6-2.6.3.2.2/debian/wx-config.1 @@ -0,0 +1,152 @@ +.TH wx\-config 1 "29 Sep 2004" "Debian GNU/Linux" "wxWidgets" + +.SH NAME +wx-config \- wxWidgets configuration search and query tool + +.SH SYNOPSIS +.nh +.HP +.B wx\-config [ OPTIONS ... ] [ LIB ... ] + +.SH DESCRIPTION +.I wx\-config +returns information about the wxWidgets libraries available on your system. +It may be used to retrieve the information you require to build applications +using these libraries. +.PP +Changing the library options you wish to use for an application previously +involved managing alternative configurations by a system dependent means. +It is now possible to select from any of the configurations installed +on your system via this single tool. You can view all available +configurations installed in the system default prefix with the command +.I wx\-config \-\-list +and select from them by using the feature options described below. +.PP +Optional LIB arguments (comma or space separated) may be used to specify +individually the wxWidgets component libraries that you wish to use, +or to specify additional components not ususally included by default. +The magic token +.B std +may be used to import all libraries that would be used by default if none +were specified explicitly. +.br +eg. +.I wx-config --libs std,gizmos +.hy + +.SH OPTIONS +.l +\fIwx\-config\fP accepts the following options with no restrictions on +their order as was required in previous releases: + +.SS Installed root +These options change or query the filesystem root for the operations +listed below. + +.TP 15 +.B \-\-prefix[=PREFIX] +Without the optional argument, the current default prefix will be +output. If the argument is supplied, PREFIX will be searched for +matching configs in place of the default. You may use both forms +in the same command. +.TP 15 +.B \-\-exec\-prefix[=EXEC-PREFIX] +Similar to \-\-prefix, but acts on the exec-prefix. If not specified +will default to the value of prefix. + +.SS Query options +These options return information about the wxWidgets default version +and and installed alternatives. +.TP 15 +.B \-\-list +List all configs in prefix and show those that match any additional +feature options given. +.TP 15 +.B \-\-release +Output the wxWidgets release number. +.TP 15 +.B \-\-version\-full +Output the wxWidgets version number in all its glory. +.TP 15 +.B \-\-basename +Output the base name of the wxWidgets libraries. + +.SS Feature options +These options select features which determine which wxWidgets +configuration to use. + +.TP 15 +.B \-\-host=HOST +Specify a (posix extended) regex of host aliases to match for cross +compiled configurations. eg. \-\-host=i586-mingw32msvc, \-\-host=.* +If unspecified, the default is to match only configurations native to +the build machine. +.TP 15 +.B \-\-toolkit=TOOLKIT +Specify a (posix extended) regex of the toolkits to match. +The toolkit is responsible for look and feel of the compiled +application. eg. gtk, gtk2, motif, msw. +If unspecified the default is to prefer the system default toolkit, +but to match any toolkit in the absence of a stricter specification. +.TP 15 +.B \-\-version[=VERSION] +Without the optional argument, return the wxWidgets version. If the +argument is supplied it specifies a (posix extended) regex of the +versions to match. If unspecified the default is to prefer the system +default version, but to match any version in the absence of a stricter +specification. +.TP 15 +.B \-\-unicode[=yes|no]] +Specify the default character type for the application. +If unspecified, the system default will be preferred, but any type may +match in the absence of a stricter specification. +.TP 15 +.B \-\-debug[=yes|no]] +Specify whether to create a debug or release build for the application. +If unspecified, the system default (release) will be preferred, but any +type may match in the absence of a stricter specification. +Debug builds should never be uploaded to Debian, but are very useful +for finding certain common failure idioms. You are encouraged to use +them during active development of applications. They are not binary +compatible with the release libraries. +.TP 15 +.B \-\-static[=yes|no]] +Specify whether to statically or dynamically link wxWidgets libraries +into your application. If unspecified, the system default (dynamic) +will be preferred, but any type may match in the absence of a stricter +specification. Static linking is mainly useful still for cross ports +not natively supported by Debian, and can be hazardous in conjunction +with the gtk toolkits. Note that static libraries are no longer supplied +in the wxGTK packages any more. + +.SS Compiler options +These options generate output required to build an application using +a particular wxWidgets configuration. + +.TP 15 +.B \-\-libs +Output link flags required for a \fIwxWidgets\fP application. +.TP 15 +.B \-\-cppflags +Output parameters required by the C preprocessor. +.TP 15 +.B \-\-cflags +Output parameters required by the C compiler. +.TP 15 +.B \-\-cxxflags +Output parameters required by the C++ compiler. +.TP 15 +.B \-\-cc +Output the name of the C compiler \fB$(CC)\fP. +.TP 15 +.B \-\-cxx +Output the name of the C++ compiler \fB$(CXX)\fP. +.TP 15 +.B \-\-ld +Output the linker command. + +.SH COPYRIGHT +This manpage was written by Ron Lee for the Debian GNU/Linux +distribution of wxWindows. It may be freely distributed by anyone who finds +it useful. + --- wxwidgets2.6-2.6.3.2.2.orig/debian/libwxgtk-dev.prerm +++ wxwidgets2.6-2.6.3.2.2/debian/libwxgtk-dev.prerm @@ -0,0 +1,7 @@ +#! /bin/sh +set -e + +update-alternatives --remove wx-config /usr/lib/wx/config/gtk2-unicode-release-=V + +#DEBHELPER# + --- wxwidgets2.6-2.6.3.2.2.orig/debian/copyright +++ wxwidgets2.6-2.6.3.2.2/debian/copyright @@ -0,0 +1,222 @@ +This package was debianized by Ron Lee on +Sun, 13 Feb 2000 18:40:00 +1030. + +more information about wxWindows, as well as the source these debs +are produced from can be found at www.wxwindows.org + +Note for Debian users: +====================== + +Most of the core wxWindows library is licenced under the wxWindows Library +Licence (included below), however some additional features of the library +may include source licenced under terms which do not include the exception +permitting you to licence binary object code versions of works based on the +Library under terms of your own choice. At any time and without warning, +newer versions of the Debian binary packages may include such code. + +In short, if you plan to licence apps built against these debs under terms +compatible with the GPL or LGPL, then you have nothing to worry about. If +you wish to release your code under a licence which does not grant all of +the same rights as the LGPL would assert but would be permitted under the +terms of the exception, then you are strongly advised to either check the +licencing terms of all components that these debs (and all future versions +that you use) are built with, or build your own binaries of wxWindows which +include only such code as is definitely covered by the exception. + +You should presume that these debs will fall under the provisions of the +unmodified LGPL unless you can prove otherwise, however this note in no way +alters the actual terms of the authorative licence detailed below, it is +intended to be purely informative of the fact that the Debian binary packages +will be built primarily with features useful to Free Software developers and +may not be suitable "as is" for compiling software for distribution that is +licenced incompatibly with the LGPL. See /usr/share/common-licenses for +the full text of the LGPL. + +Modifications and additions to the Library itself are encouraged to be +placed under the wxWindows Library Licence. We hope you find it useful. + + -- Ron + +----------------------------------------------------------------------------- + +Preamble +======== + +The licensing of the wxWindows library is intended to protect the wxWindows +library, its developers, and its users, so that the considerable investment +it represents is not abused. + +Under the terms of the wxWindows Licence, you as a user are not +obliged to distribute wxWindows source code with your products, if you +distribute these products in binary form. However, you are prevented from +restricting use of the library in source code form, or denying others the +rights to use or distribute wxWindows library source code in the way +intended. + +The wxWindows Licence establishes the copyright for the code and related +material, and it gives you legal permission to copy, distribute and/or +modify the library. It also asserts that no warranty is given by the authors +for this or derived code. + +The core distribution of the wxWindows library contains files +under two different licences: + +- Most files are distributed under the GNU Library General Public + Licence, version 2, with the special exception that you may create and + distribute object code versions built from the source code or modified + versions of it (even if these modified versions include code under a + different licence), and distribute such binaries under your own + terms. + +- Most core wxWindows manuals are made available under the "wxWindows + Free Documentation Licence", which allows you to distribute modified + versions of the manuals, such as versions documenting any modifications + made by you in your version of the library. However, you may not restrict + any third party from reincorporating your changes into the original + manuals. + + + + wxWindows Library Licence, Version 3 + ==================================== + + Copyright (c) 1998 Julian Smart, Robert Roebling et al + + Everyone is permitted to copy and distribute verbatim copies + of this licence document, but changing it is not allowed. + + WXWINDOWS LIBRARY LICENCE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public Licence as published by + the Free Software Foundation; either version 2 of the Licence, or (at + your option) any later version. + + This library 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 Library + General Public Licence for more details. + + You should have received a copy of the GNU Library General Public Licence + along with this software, usually in a file named COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + Boston, MA 02110-1301, USA. + + EXCEPTION NOTICE + + 1. As a special exception, the copyright holders of this library give + permission for additional uses of the text contained in this release of + the library as licenced under the wxWindows Library Licence, applying + either version 3 of the Licence, or (at your option) any later version of + the Licence as published by the copyright holders of version 3 of the + Licence document. + + 2. The exception is that you may use, copy, link, modify and distribute + under the user's own terms, binary object code versions of works based + on the Library. + + 3. If you copy code from files distributed under the terms of the GNU + General Public Licence or the GNU Library General Public Licence into a + copy of this library, as this licence permits, the exception does not + apply to the code that you add in this way. To avoid misleading anyone as + to the status of such modified files, you must delete this exception + notice from such code and/or adjust the licensing conditions notice + accordingly. + + 4. If you write modifications of your own for this library, it is your + choice whether to permit this exception to apply to your modifications. + If you do not wish that, you must delete the exception notice from such + code and/or adjust the licensing conditions notice accordingly. + + + + wxWindows Free Documentation Licence, Version 3 + =============================================== + + Copyright (c) 1998 Julian Smart, Robert Roebling et al + + Everyone is permitted to copy and distribute verbatim copies + of this licence document, but changing it is not allowed. + + WXWINDOWS FREE DOCUMENTATION LICENCE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 1. Permission is granted to make and distribute verbatim copies of this + manual or piece of documentation provided any copyright notice and this + permission notice are preserved on all copies. + + 2. Permission is granted to process this file or document through a + document processing system and, at your option and the option of any third + party, print the results, provided a printed document carries a copying + permission notice identical to this one. + + 3. Permission is granted to copy and distribute modified versions of this + manual or piece of documentation under the conditions for verbatim + copying, provided also that any sections describing licensing conditions + for this manual, such as, in particular, the GNU General Public Licence, + the GNU Library General Public Licence, and any wxWindows Licence are + included exactly as in the original, and provided that the entire + resulting derived work is distributed under the terms of a permission + notice identical to this one. + + 4. Permission is granted to copy and distribute translations of this + manual or piece of documentation into another language, under the above + conditions for modified versions, except that sections related to + licensing, including this paragraph, may also be included in translations + approved by the copyright holders of the respective licence documents in + addition to the original English. + + WARRANTY DISCLAIMER + + 5. BECAUSE THIS MANUAL OR PIECE OF DOCUMENTATION IS LICENSED FREE OF CHARGE, + THERE IS NO WARRANTY FOR IT, TO THE EXTENT PERMITTED BY APPLICABLE LAW. + EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER + PARTIES PROVIDE THIS MANUAL OR PIECE OF DOCUMENTATION "AS IS" WITHOUT + WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF + THE MANUAL OR PIECE OF DOCUMENTATION IS WITH YOU. SHOULD THE MANUAL OR + PIECE OF DOCUMENTATION PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL + NECESSARY SERVICING, REPAIR OR CORRECTION. + + 6. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL + ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR + REDISTRIBUTE THE MANUAL OR PIECE OF DOCUMENTATION AS PERMITTED ABOVE, BE + LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR + CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE + MANUAL OR PIECE OF DOCUMENTATION (INCLUDING BUT NOT LIMITED TO LOSS OF + DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD + PARTIES OR A FAILURE OF A PROGRAM BASED ON THE MANUAL OR PIECE OF + DOCUMENTATION TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR + OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +----------------------------------------------------------------------------- + +XRCed is released under the following terms: + +Copyright (c) 2002, Roman Rolinsky +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. + + --- wxwidgets2.6-2.6.3.2.2.orig/debian/python-wxgtk.docs +++ wxwidgets2.6-2.6.3.2.2/debian/python-wxgtk.docs @@ -0,0 +1,4 @@ +wxPython/docs/README.txt +wxPython/docs/CHANGES.txt +wxPython/docs/MigrationGuide.txt + --- wxwidgets2.6-2.6.3.2.2.orig/debian/libwxbase-dev.postinst +++ wxwidgets2.6-2.6.3.2.2/debian/libwxbase-dev.postinst @@ -0,0 +1,9 @@ +#! /bin/sh +set -e + +update-alternatives --install /usr/bin/wx-config wx-config \ + /usr/lib/wx/config/base-unicode-release-=V \ + $(( =PRIO * 10 + 7 )) + +#DEBHELPER# + --- wxwidgets2.6-2.6.3.2.2.orig/include/wx/strconv.h +++ wxwidgets2.6-2.6.3.2.2/include/wx/strconv.h @@ -339,10 +339,14 @@ #if wxUSE_UNICODE #define wxConvertWX2MB(s) wxConvCurrent->cWX2MB(s) #define wxConvertMB2WX(s) wxConvCurrent->cMB2WX(s) + wxWCharBuffer wxSafeConvertMB2WX(const char *s); + wxCharBuffer wxSafeConvertWX2MB(const wchar_t *ws); #else // ANSI // no conversions to do #define wxConvertWX2MB(s) (s) #define wxConvertMB2WX(s) (s) + #define wxSafeConvertMB2WX(s) (s) + #define wxSafeConvertWX2MB(s) (s) #endif // Unicode/ANSI #endif --- wxwidgets2.6-2.6.3.2.2.orig/locale/pt_BR.po +++ wxwidgets2.6-2.6.3.2.2/locale/pt_BR.po @@ -933,7 +933,8 @@ #, c-format msgid "Can't check image format of file '%s': file does not exist." msgstr "" -"Impossível verificar formato de imagem do arquivo '%s': arquivo does não existe." +"Impossível verificar formato de imagem do arquivo '%s': arquivo does não " +"existe." #: ../src/msw/registry.cpp:442 #, c-format @@ -1553,8 +1554,8 @@ "Dial up functions are unavailable because the remote access service (RAS) is " "not installed on this machine. Please install it." msgstr "" -"Funções de discagem estão indisponíveis porque o serviço de acesso remoto (RAS) " -"não foi instalado nesta máquina. Por favor instale." +"Funções de discagem estão indisponíveis porque o serviço de acesso remoto " +"(RAS) não foi instalado nesta máquina. Por favor instale." #: ../src/generic/tipdlg.cpp:246 msgid "Did you know..." @@ -1588,8 +1589,8 @@ "Display all index items that contain given substring. Search is case " "insensitive." msgstr "" -"Mostra todos os itens que contem uma dada substring. Busca não importando " -"se são maiúsculas ou minúsculas." +"Mostra todos os itens que contem uma dada substring. Busca não importando se " +"são maiúsculas ou minúsculas." #: ../src/html/helpfrm.cpp:685 msgid "Display options dialog" @@ -1767,7 +1768,8 @@ msgid "" "Exporting registry key: file \"%s\" already exists and won't be overwritten." msgstr "" -"Exportando chave de registro: arquivo \"%s\" já existe e não pode ser reescrito." +"Exportando chave de registro: arquivo \"%s\" já existe e não pode ser " +"reescrito." #: ../src/common/fmapbase.cpp:143 msgid "Extended Unix Codepage for Japanese (EUC-JP)" @@ -2008,8 +2010,8 @@ "Failed to join a thread, potential memory leak detected - please restart the " "program" msgstr "" -"Falha ao unir a thread, falha de memória encontrada - por favor reinicialize o " -"programa" +"Falha ao unir a thread, falha de memória encontrada - por favor reinicialize " +"o programa" #: ../src/msw/utils.cpp:703 #, c-format @@ -2220,8 +2222,7 @@ #: ../src/common/debugrpt.cpp:679 #, fuzzy, c-format msgid "Failed to upload the debug report (error code %d)." -msgstr "" -"Falha ao carregar o relatório de depuração (código de erro %d)" +msgstr "Falha ao carregar o relatório de depuração (código de erro %d)" #: ../src/unix/snglinst.cpp:173 #, c-format @@ -2530,8 +2531,8 @@ "but be warned that it may hinder improving the program, so if\n" "at all possible please do continue with the report generation.\n" msgstr "" -"Se você desejar suprimir completamente o relatório de depuração, por favor escolha o " -"botão \"Cancela\",\n" +"Se você desejar suprimir completamente o relatório de depuração, por favor " +"escolha o botão \"Cancela\",\n" "mas será advertido que isto pode impedir a execução do programa, então se\n" "isto for possível por favor continue com a geração de relatório.\n" @@ -2579,8 +2580,8 @@ "Impossible to create a rich edit control, using simple text control instead. " "Please reinstall riched32.dll" msgstr "" -"Impossível criar um rich edit control, usando controle de texto simples. " -"Por favor reinstale riched32.dll" +"Impossível criar um rich edit control, usando controle de texto simples. Por " +"favor reinstale riched32.dll" #: ../src/unix/utilsunx.cpp:428 msgid "Impossible to get child process input" @@ -2843,8 +2844,8 @@ "MS HTML Help functions are unavailable because the MS HTML Help library is " "not installed on this machine. Please install it." msgstr "" -"A funções de auxílio MS HTML não estão disponíveis porque a biblioteca MS HTML Help não " -"foi instalada nesta máquina. Por favor instale." +"A funções de auxílio MS HTML não estão disponíveis porque a biblioteca MS " +"HTML Help não foi instalada nesta máquina. Por favor instale." #: ../src/univ/themes/win32.cpp:4929 msgid "Ma&ximize" @@ -3448,7 +3449,8 @@ msgid "" "Processing debug report has failed, leaving the files in \"%s\" directory." msgstr "" -"Processamento do relatório de depuração falhou, abandonando os arquivos no diretório \"%s\"." +"Processamento do relatório de depuração falhou, abandonando os arquivos no " +"diretório \"%s\"." #: ../src/common/log.cpp:466 msgid "Program aborted." @@ -3595,8 +3597,8 @@ "Search contents of help book(s) for all occurences of the text you typed " "above" msgstr "" -"Busca conteúdo de livro(s) de auxílio para todas as ocorrencias do texo que você digitou " -"acima" +"Busca conteúdo de livro(s) de auxílio para todas as ocorrencias do texo que " +"você digitou acima" #: ../src/generic/fdrepdlg.cpp:166 msgid "Search direction" @@ -3626,7 +3628,8 @@ #: ../src/common/ffile.cpp:212 #, c-format msgid "Seek error on file '%s' (large files not supported by stdio)" -msgstr "Procura erro no arquivo '%s' (arquivos grandes não são suportados por stdio)" +msgstr "" +"Procura erro no arquivo '%s' (arquivos grandes não são suportados por stdio)" #: ../src/mac/carbon/textctrl.cpp:1078 ../src/msw/textctrl.cpp:2068 msgid "Select &All" @@ -3919,8 +3922,8 @@ "private information,\n" "please uncheck them and they will be removed from the report.\n" msgstr "" -"O relatório contém os arquivos listados abaixo. Se qualquer destes arquivos contiver " -"informação privada,\n" +"O relatório contém os arquivos listados abaixo. Se qualquer destes arquivos " +"contiver informação privada,\n" "por favore desmarque ele e ele será removido do relatório.\n" #: ../src/common/cmdline.cpp:883 @@ -3938,27 +3941,28 @@ msgstr "O valor da opção '%s' precisa ser especificado." #: ../src/msw/dialup.cpp:455 -#, c-format +#, fuzzy, c-format msgid "" "The version of remote access service (RAS) installed on this machine is " -"too old, please upgrade (the following required function is missing: %s)." +"tooold, please upgrade (the following required function is missing: %s)." msgstr "" -"A versão do serviço de acesso remoto (RAS) instalado nets máquina é " -"muito antigo, por favor atualize (a seguinte função desejada está faltando: %s)." +"A versão do serviço de acesso remoto (RAS) instalado nets máquina é muito " +"antigo, por favor atualize (a seguinte função desejada está faltando: %s)." #: ../src/html/htmprint.cpp:601 msgid "" "There was a problem during page setup: you may need to set a default printer." msgstr "" -"Existe um problema durante a configuração da página: você pode precisar configurar a impressora default" +"Existe um problema durante a configuração da página: você pode precisar " +"configurar a impressora default" #: ../src/msw/datectrl.cpp:109 msgid "" "This system doesn't support date picker control, please upgrade your version " "of comctl32.dll" msgstr "" -"Este sistema não suporta o controle de escolha de data, por favor atualize sua versão " -"do comctl32.dll" +"Este sistema não suporta o controle de escolha de data, por favor atualize " +"sua versão do comctl32.dll" #: ../src/msw/thread.cpp:1206 #, fuzzy @@ -3996,7 +4000,9 @@ #: ../src/common/ftp.cpp:635 #, fuzzy msgid "Timeout while waiting for FTP server to connect, try passive mode." -msgstr "Timeout ocorreu enquanto esperava pelo servidor FTP para conectar, tente o modo passivo." +msgstr "" +"Timeout ocorreu enquanto esperava pelo servidor FTP para conectar, tente o " +"modo passivo." #: ../src/msw/timer.cpp:116 ../src/os2/timer.cpp:141 msgid "Timer creation failed." @@ -4257,8 +4263,8 @@ msgstr "Win32s em Windows 3.1" #: ../src/msw/utils.cpp:1112 -#, c-format -msgid "Windows 2000 (build %lu)" +#, fuzzy, c-format +msgid "Windows 2000 (build %lu" msgstr "Windows 2000 (contrução %lu)" #: ../src/msw/utils.cpp:1077 --- wxwidgets2.6-2.6.3.2.2.orig/locale/pl.po +++ wxwidgets2.6-2.6.3.2.2/locale/pl.po @@ -71,10 +71,8 @@ msgid "#define %s must be an integer." msgstr "#define %s musi byæ liczb± ca³kowit±." -#: ../src/html/helpfrm.cpp:1042 -#: ../src/html/helpfrm.cpp:1044 -#: ../src/html/helpfrm.cpp:1703 -#: ../src/html/helpfrm.cpp:1736 +#: ../src/html/helpfrm.cpp:1042 ../src/html/helpfrm.cpp:1044 +#: ../src/html/helpfrm.cpp:1703 ../src/html/helpfrm.cpp:1736 #, c-format msgid "%i of %i" msgstr "%i z %i" @@ -131,8 +129,7 @@ msgid "%s: ill-formed resource file syntax." msgstr "%s: b³êdna sk³adnia pliku zasobu." -#: ../src/html/helpfrm.cpp:357 -#: ../src/html/helpfrm.cpp:359 +#: ../src/html/helpfrm.cpp:357 ../src/html/helpfrm.cpp:359 msgid "&About..." msgstr "Inform&acje..." @@ -156,10 +153,8 @@ msgid "&Bold" msgstr "Pogru&biony" -#: ../src/common/stockitem.cpp:110 -#: ../src/generic/fontdlgg.cpp:363 -#: ../src/generic/fontdlgg.cpp:382 -#: ../src/generic/wizard.cpp:422 +#: ../src/common/stockitem.cpp:110 ../src/generic/fontdlgg.cpp:363 +#: ../src/generic/fontdlgg.cpp:382 ../src/generic/wizard.cpp:422 msgid "&Cancel" msgstr "&Anuluj" @@ -171,15 +166,12 @@ msgid "&Clear" msgstr "Wy&czy¶æ" -#: ../src/common/prntbase.cpp:875 -#: ../src/common/stockitem.cpp:112 -#: ../src/generic/logg.cpp:509 -#: ../src/html/helpfrm.cpp:354 +#: ../src/common/prntbase.cpp:875 ../src/common/stockitem.cpp:112 +#: ../src/generic/logg.cpp:509 ../src/html/helpfrm.cpp:354 msgid "&Close" msgstr "Zam&knij" -#: ../src/common/stockitem.cpp:113 -#: ../src/mac/carbon/textctrl.cpp:1074 +#: ../src/common/stockitem.cpp:113 ../src/mac/carbon/textctrl.cpp:1074 #: ../src/msw/textctrl.cpp:2064 msgid "&Copy" msgstr "&Kopiuj" @@ -188,8 +180,7 @@ msgid "&Debug report preview:" msgstr "Po&dgl±d raportu b³êdów:" -#: ../src/common/stockitem.cpp:115 -#: ../src/mac/carbon/textctrl.cpp:1076 +#: ../src/common/stockitem.cpp:115 ../src/mac/carbon/textctrl.cpp:1076 #: ../src/msw/textctrl.cpp:2066 msgid "&Delete" msgstr "&Usuñ" @@ -226,10 +217,8 @@ msgid "&Goto..." msgstr "&Przejd¼ do..." -#: ../src/common/stockitem.cpp:122 -#: ../src/generic/wizard.cpp:418 -#: ../src/generic/wizard.cpp:425 -#: ../src/html/helpfrm.cpp:362 +#: ../src/common/stockitem.cpp:122 ../src/generic/wizard.cpp:418 +#: ../src/generic/wizard.cpp:425 ../src/html/helpfrm.cpp:362 msgid "&Help" msgstr "&Pomoc" @@ -257,13 +246,11 @@ msgid "&New" msgstr "&Nowy" -#: ../src/generic/mdig.cpp:118 -#: ../src/msw/mdi.cpp:188 +#: ../src/generic/mdig.cpp:118 ../src/msw/mdi.cpp:188 msgid "&Next" msgstr "&Nastêpne" -#: ../src/generic/wizard.cpp:421 -#: ../src/generic/wizard.cpp:636 +#: ../src/generic/wizard.cpp:421 ../src/generic/wizard.cpp:636 msgid "&Next >" msgstr "&Dalej >" @@ -279,8 +266,7 @@ msgid "&Notes:" msgstr "&Uwagi:" -#: ../src/common/stockitem.cpp:133 -#: ../src/generic/fontdlgg.cpp:368 +#: ../src/common/stockitem.cpp:133 ../src/generic/fontdlgg.cpp:368 #: ../src/generic/fontdlgg.cpp:375 msgid "&OK" msgstr "&OK" @@ -293,8 +279,7 @@ msgid "&Open..." msgstr "&Otwórz..." -#: ../src/common/stockitem.cpp:135 -#: ../src/mac/carbon/textctrl.cpp:1075 +#: ../src/common/stockitem.cpp:135 ../src/mac/carbon/textctrl.cpp:1075 #: ../src/msw/textctrl.cpp:2065 msgid "&Paste" msgstr "Wkl&ej" @@ -307,8 +292,7 @@ msgid "&Preferences" msgstr "&Preferencje" -#: ../src/generic/mdig.cpp:119 -#: ../src/msw/mdi.cpp:189 +#: ../src/generic/mdig.cpp:119 ../src/msw/mdi.cpp:189 msgid "&Previous" msgstr "&Poprzednie" @@ -328,16 +312,13 @@ msgid "&Quit" msgstr "&Wyj¶cie" -#: ../src/common/cmdproc.cpp:292 -#: ../src/common/cmdproc.cpp:299 -#: ../src/common/stockitem.cpp:141 -#: ../src/mac/carbon/textctrl.cpp:1071 +#: ../src/common/cmdproc.cpp:292 ../src/common/cmdproc.cpp:299 +#: ../src/common/stockitem.cpp:141 ../src/mac/carbon/textctrl.cpp:1071 #: ../src/msw/textctrl.cpp:2061 msgid "&Redo" msgstr "&Ponów" -#: ../src/common/cmdproc.cpp:288 -#: ../src/common/cmdproc.cpp:308 +#: ../src/common/cmdproc.cpp:288 ../src/common/cmdproc.cpp:308 msgid "&Redo " msgstr "&Ponów " @@ -373,15 +354,12 @@ msgid "&Style:" msgstr "&Styl:" -#: ../src/common/stockitem.cpp:149 -#: ../src/generic/fontdlgg.cpp:337 +#: ../src/common/stockitem.cpp:149 ../src/generic/fontdlgg.cpp:337 msgid "&Underline" msgstr "&Podkre¶lony" -#: ../src/common/cmdproc.cpp:270 -#: ../src/common/stockitem.cpp:150 -#: ../src/mac/carbon/textctrl.cpp:1070 -#: ../src/msw/textctrl.cpp:2060 +#: ../src/common/cmdproc.cpp:270 ../src/common/stockitem.cpp:150 +#: ../src/mac/carbon/textctrl.cpp:1070 ../src/msw/textctrl.cpp:2060 msgid "&Undo" msgstr "&Cofnij" @@ -401,11 +379,8 @@ msgid "&Weight:" msgstr "&Waga" -#: ../src/generic/mdig.cpp:298 -#: ../src/generic/mdig.cpp:314 -#: ../src/generic/mdig.cpp:318 -#: ../src/msw/mdi.cpp:1410 -#: ../src/msw/mdi.cpp:1417 +#: ../src/generic/mdig.cpp:298 ../src/generic/mdig.cpp:314 +#: ../src/generic/mdig.cpp:318 ../src/msw/mdi.cpp:1410 ../src/msw/mdi.cpp:1417 #: ../src/msw/mdi.cpp:1447 msgid "&Window" msgstr "&Okno" @@ -414,14 +389,12 @@ msgid "&Yes" msgstr "&Tak" -#: ../src/common/config.cpp:433 -#: ../src/msw/regconf.cpp:258 +#: ../src/common/config.cpp:433 ../src/msw/regconf.cpp:258 #, c-format msgid "'%s' has extra '..', ignored." msgstr "'%s' ma nadmiarowe '..', zignorowane." -#: ../src/common/valtext.cpp:132 -#: ../src/common/valtext.cpp:162 +#: ../src/common/valtext.cpp:132 ../src/common/valtext.cpp:162 #: ../src/common/valtext.cpp:168 #, c-format msgid "'%s' is invalid" @@ -466,8 +439,7 @@ msgid "(Help)" msgstr "(Pomoc)" -#: ../src/html/helpfrm.cpp:431 -#: ../src/html/helpfrm.cpp:1114 +#: ../src/html/helpfrm.cpp:431 ../src/html/helpfrm.cpp:1114 #: ../src/html/helpfrm.cpp:1764 msgid "(bookmarks)" msgstr "(zak³adki)" @@ -495,13 +467,11 @@ ", oczekiwano static, #include or #define\n" "podczas przetwarzania zasobu." -#: ../src/generic/dirctrlg.cpp:683 -#: ../src/generic/filedlgg.cpp:740 +#: ../src/generic/dirctrlg.cpp:683 ../src/generic/filedlgg.cpp:740 msgid "." msgstr "." -#: ../src/generic/dirctrlg.cpp:684 -#: ../src/generic/filedlgg.cpp:741 +#: ../src/generic/dirctrlg.cpp:684 ../src/generic/filedlgg.cpp:741 msgid ".." msgstr ".." @@ -553,18 +523,15 @@ msgid "<<" msgstr "<<" -#: ../src/generic/filedlgg.cpp:259 -#: ../src/generic/filedlgg.cpp:282 +#: ../src/generic/filedlgg.cpp:259 ../src/generic/filedlgg.cpp:282 msgid "" msgstr "" -#: ../src/generic/filedlgg.cpp:263 -#: ../src/generic/filedlgg.cpp:286 +#: ../src/generic/filedlgg.cpp:263 ../src/generic/filedlgg.cpp:286 msgid "" msgstr "" -#: ../src/generic/filedlgg.cpp:261 -#: ../src/generic/filedlgg.cpp:284 +#: ../src/generic/filedlgg.cpp:261 ../src/generic/filedlgg.cpp:284 msgid "" msgstr "<£¡CZE>" @@ -698,7 +665,8 @@ #: ../include/wx/xti.h:849 msgid "AddToPropertyCollection called w/o valid adder" -msgstr "Funkcja AddToPropertyCollection wywo³ana bez poprawnego modu³u dodaj±cego" +msgstr "" +"Funkcja AddToPropertyCollection wywo³ana bez poprawnego modu³u dodaj±cego" #: ../src/html/helpctrl.cpp:106 #, c-format @@ -736,7 +704,8 @@ #: ../src/common/xtistrm.cpp:385 msgid "Already Registered Object passed to SetObjectClassInfo" -msgstr "Zarejestrowany wcze¶niej obiekt przekazany do funkcji SetObjectClassInfo" +msgstr "" +"Zarejestrowany wcze¶niej obiekt przekazany do funkcji SetObjectClassInfo" #: ../src/unix/dialup.cpp:362 msgid "Already dialling ISP." @@ -807,8 +776,7 @@ msgid "B6 Envelope, 176 x 125 mm" msgstr "Koperta B6, 176 x 125 mm" -#: ../src/common/imagbmp.cpp:477 -#: ../src/common/imagbmp.cpp:493 +#: ../src/common/imagbmp.cpp:477 ../src/common/imagbmp.cpp:493 msgid "BMP: Couldn't allocate memory." msgstr "BMP: Nie mo¿na przydzieliæ pamiêci." @@ -889,8 +857,7 @@ msgid "C65 Envelope, 114 x 229 mm" msgstr "Koperta C65, 114 x 229 mm" -#: ../src/html/chm.cpp:797 -#: ../src/html/chm.cpp:856 +#: ../src/html/chm.cpp:797 ../src/html/chm.cpp:856 msgid "CHM handler currently supports only local files!" msgstr "Obs³uga CHM obecnie wspiera tylko pliki lokalne!" @@ -903,8 +870,7 @@ msgid "Can not enumerate files '%s'" msgstr "Nie mo¿na wyliczyæ plików '%s'" -#: ../src/msw/dir.cpp:205 -#: ../src/unix/dir.cpp:232 +#: ../src/msw/dir.cpp:205 ../src/unix/dir.cpp:232 #, c-format msgid "Can not enumerate files in directory '%s'" msgstr "Nie mo¿na wyliczyæ plików w katalogu '%s'" @@ -914,8 +880,7 @@ msgid "Can not resume thread %lu" msgstr "Nie mo¿na wznowiæ w±tku %lu" -#: ../src/mac/classic/thread.cpp:491 -#: ../src/msw/thread.cpp:827 +#: ../src/mac/classic/thread.cpp:491 ../src/msw/thread.cpp:827 #, c-format msgid "Can not resume thread %x" msgstr "Nie mo¿na wznowiæ w±tku %x" @@ -929,8 +894,7 @@ msgid "Can not suspend thread %lu" msgstr "Nie mo¿na zawiesiæ w±tku %lu" -#: ../src/mac/classic/thread.cpp:464 -#: ../src/msw/thread.cpp:812 +#: ../src/mac/classic/thread.cpp:464 ../src/msw/thread.cpp:812 #, c-format msgid "Can not suspend thread %x" msgstr "Nie mo¿na zawiesiæ w±tku %x" @@ -963,10 +927,8 @@ msgid "Can't create registry key '%s'" msgstr "Nie mo¿na utworzyæ klucza rejestru '%s'" -#: ../src/mac/carbon/mpthread.cpp:911 -#: ../src/mac/carbon/thread.cpp:1100 -#: ../src/mac/classic/thread.cpp:439 -#: ../src/msw/thread.cpp:594 +#: ../src/mac/carbon/mpthread.cpp:911 ../src/mac/carbon/thread.cpp:1100 +#: ../src/mac/classic/thread.cpp:439 ../src/msw/thread.cpp:594 #: ../src/os2/thread.cpp:486 msgid "Can't create thread" msgstr "Nie mo¿na utworzyæ w±tku" @@ -981,8 +943,7 @@ msgid "Can't delete key '%s'" msgstr "Nie mo¿na usun±æ klucza '%s'" -#: ../src/msw/iniconf.cpp:444 -#: ../src/os2/iniconf.cpp:458 +#: ../src/msw/iniconf.cpp:444 ../src/os2/iniconf.cpp:458 #, c-format msgid "Can't delete the INI file '%s'" msgstr "Nie mo¿na usun±æ pliku INI '%s'" @@ -1025,8 +986,7 @@ msgid "Can't initialize zlib inflate stream." msgstr "Nie mo¿na zainicjowaæ strumienia dekompresji biblioteki zlib." -#: ../src/common/image.cpp:1367 -#: ../src/common/image.cpp:1387 +#: ../src/common/image.cpp:1367 ../src/common/image.cpp:1387 #, c-format msgid "Can't load image from file '%s': file does not exist." msgstr "Nie mo¿na wczytaæ obrazu z pliku '%s': plik nie istnieje." @@ -1043,15 +1003,16 @@ #: ../src/common/zstream.cpp:159 msgid "Can't read inflate stream: unexpected EOF in underlying stream." -msgstr "Nie mo¿na odczytaæ dekompresowanego strumienia: nieoczekiwany koniec w strumieniu." +msgstr "" +"Nie mo¿na odczytaæ dekompresowanego strumienia: nieoczekiwany koniec w " +"strumieniu." #: ../src/msw/registry.cpp:960 #, c-format msgid "Can't read value of '%s'" msgstr "Nie mo¿na odczytaæ warto¶ci '%s'" -#: ../src/msw/registry.cpp:795 -#: ../src/msw/registry.cpp:825 +#: ../src/msw/registry.cpp:795 ../src/msw/registry.cpp:825 #: ../src/msw/registry.cpp:885 #, c-format msgid "Can't read value of key '%s'" @@ -1062,19 +1023,16 @@ msgid "Can't save image to file '%s': unknown extension." msgstr "Nie mo¿na zapisaæ obrazu do pliku '%s': nieznane rozszerzenie." -#: ../src/generic/logg.cpp:569 -#: ../src/generic/logg.cpp:1020 +#: ../src/generic/logg.cpp:569 ../src/generic/logg.cpp:1020 msgid "Can't save log contents to file." msgstr "Nie mo¿na zapisaæ zawarto¶ci dziennika w pliku." # ustaliæ? -#: ../src/msw/thread.cpp:550 -#: ../src/os2/thread.cpp:469 +#: ../src/msw/thread.cpp:550 ../src/os2/thread.cpp:469 msgid "Can't set thread priority" msgstr "Nie mo¿na zmieniæ priorytetu w±tku" -#: ../src/msw/registry.cpp:812 -#: ../src/msw/registry.cpp:854 +#: ../src/msw/registry.cpp:812 ../src/msw/registry.cpp:854 #: ../src/msw/registry.cpp:975 #, c-format msgid "Can't set value of '%s'" @@ -1085,21 +1043,18 @@ msgid "Can't write to deflate stream: %s" msgstr "Nie mo¿na zapisywaæ do kompresowanego strumienia: %s" -#: ../src/generic/choicdgg.cpp:291 -#: ../src/generic/dirdlgg.cpp:114 -#: ../src/generic/numdlgg.cpp:136 -#: ../src/generic/textdlgg.cpp:120 -#: ../src/gtk/fontdlg.cpp:155 -#: ../src/motif/msgdlg.cpp:204 +#: ../src/generic/choicdgg.cpp:291 ../src/generic/dirdlgg.cpp:114 +#: ../src/generic/numdlgg.cpp:136 ../src/generic/textdlgg.cpp:120 +#: ../src/gtk/fontdlg.cpp:155 ../src/motif/msgdlg.cpp:204 #: ../contrib/src/deprecated/proplist.cpp:518 msgid "Cancel" msgstr "Zrezygnuj" # units --> ? -#: ../src/xrc/xmlres.cpp:1188 -#: ../src/xrc/xmlres.cpp:1236 +#: ../src/xrc/xmlres.cpp:1188 ../src/xrc/xmlres.cpp:1236 msgid "Cannot convert dialog units: dialog unknown." -msgstr "Nie mo¿na wykonaæ konwersji okien dialogowych: nieznane okno dialogowe." +msgstr "" +"Nie mo¿na wykonaæ konwersji okien dialogowych: nieznane okno dialogowe." #: ../src/common/strconv.cpp:2665 #, c-format @@ -1217,8 +1172,7 @@ msgid "Cannot print empty page." msgstr "Nie mo¿na wydrukowaæ pustej strony." -#: ../src/msw/volume.cpp:160 -#: ../src/msw/volume.cpp:491 +#: ../src/msw/volume.cpp:160 ../src/msw/volume.cpp:491 #, c-format msgid "Cannot read typename from '%s'!" msgstr "Nie mo¿na odczytaæ nazwy typu z '%s'!" @@ -1231,13 +1185,11 @@ msgid "Cannot start thread: error writing TLS" msgstr "Nie mo¿na wystartowaæ w±tku: b³±d zapisu TLS" -#: ../src/mac/carbon/mpthread.cpp:977 -#: ../src/mac/carbon/thread.cpp:1174 +#: ../src/mac/carbon/mpthread.cpp:977 ../src/mac/carbon/thread.cpp:1174 msgid "Cannot wait for thread termination." msgstr "Nie mo¿na czekaæ na zakoñczenie w±tku." -#: ../src/mac/carbon/mpthread.cpp:893 -#: ../src/mac/carbon/thread.cpp:1082 +#: ../src/mac/carbon/mpthread.cpp:893 ../src/mac/carbon/thread.cpp:1082 msgid "Cant create the thread event queue" msgstr "Nie mo¿na utworzyæ kolejki zdarzeñ w±tku" @@ -1261,8 +1213,7 @@ msgid "Choose ISP to dial" msgstr "Wybierz ISP do po³±czenia" -#: ../src/generic/colrdlgg.cpp:151 -#: ../src/gtk/colordlg.cpp:45 +#: ../src/generic/colrdlgg.cpp:151 ../src/gtk/colordlg.cpp:45 #: ../src/palmos/colordlg.cpp:79 msgid "Choose colour" msgstr "Wybierz kolor" @@ -1279,22 +1230,17 @@ msgid "Clear the log contents" msgstr "Wyczy¶æ zawarto¶æ dziennika" -#: ../src/generic/fontdlgg.cpp:365 -#: ../src/generic/fontdlgg.cpp:384 +#: ../src/generic/fontdlgg.cpp:365 ../src/generic/fontdlgg.cpp:384 msgid "Click to cancel the font selection." msgstr "Anulowanie wyboru czcionki" -#: ../src/generic/fontdlgg.cpp:370 -#: ../src/generic/fontdlgg.cpp:372 -#: ../src/generic/fontdlgg.cpp:377 -#: ../src/generic/fontdlgg.cpp:379 +#: ../src/generic/fontdlgg.cpp:370 ../src/generic/fontdlgg.cpp:372 +#: ../src/generic/fontdlgg.cpp:377 ../src/generic/fontdlgg.cpp:379 msgid "Click to confirm the font selection." msgstr "Potwierdzenie wyboru czcionki" -#: ../src/generic/dbgrptg.cpp:92 -#: ../src/generic/progdlgg.cpp:629 -#: ../src/generic/progdlgg.cpp:634 -#: ../contrib/src/deprecated/proplist.cpp:513 +#: ../src/generic/dbgrptg.cpp:92 ../src/generic/progdlgg.cpp:629 +#: ../src/generic/progdlgg.cpp:634 ../contrib/src/deprecated/proplist.cpp:513 msgid "Close" msgstr "Zamknij" @@ -1323,8 +1269,7 @@ msgid "Config entry name cannot start with '%c'." msgstr "Nazwa pozycji konfiguracji nie mo¿e zaczynaæ siê od '%c'." -#: ../src/generic/filedlgg.cpp:1318 -#: ../src/gtk/filedlg.cpp:67 +#: ../src/generic/filedlgg.cpp:1318 ../src/gtk/filedlg.cpp:67 msgid "Confirm" msgstr "Potwierd¼" @@ -1385,7 +1330,8 @@ "Could not resolve control class or id '%s'. Use (non-zero) integer instead\n" " or provide #define (see manual for caveats)" msgstr "" -"Nie rozpoznano klasy lub identyfikatora '%s'. U¿yj (niezerow±) liczbê ca³kowit± \n" +"Nie rozpoznano klasy lub identyfikatora '%s'. U¿yj (niezerow±) liczbê " +"ca³kowit± \n" " lub #define (szukaj szczegó³ów w dokumentacji)" #: ../contrib/src/deprecated/resource.cpp:1278 @@ -1401,8 +1347,7 @@ msgid "Could not start document preview." msgstr "Nie mo¿na wystartowaæ podgl±du dokumentu." -#: ../src/generic/printps.cpp:185 -#: ../src/gtk/gnome/gprint.cpp:763 +#: ../src/generic/printps.cpp:185 ../src/gtk/gnome/gprint.cpp:763 #: ../src/msw/printwin.cpp:235 msgid "Could not start printing." msgstr "Nie mo¿na rozpocz±æ drukowania." @@ -1412,10 +1357,8 @@ msgid "Could not transfer data to window" msgstr "Nie mo¿na przenie¶æ danych do okna" -#: ../src/mac/carbon/mpthread.cpp:227 -#: ../src/mac/carbon/mpthread.cpp:306 -#: ../src/mac/carbon/thread.cpp:414 -#: ../src/mac/carbon/thread.cpp:495 +#: ../src/mac/carbon/mpthread.cpp:227 ../src/mac/carbon/mpthread.cpp:306 +#: ../src/mac/carbon/thread.cpp:414 ../src/mac/carbon/thread.cpp:495 msgid "Could not unlock mutex" msgstr "Nie odblokowano muteksu" @@ -1423,21 +1366,17 @@ msgid "Couldn't acquire a mutex lock" msgstr "Nie mo¿na przechwyciæ muteksu" -#: ../src/msw/dragimag.cpp:166 -#: ../src/msw/dragimag.cpp:206 -#: ../src/msw/imaglist.cpp:158 -#: ../src/msw/imaglist.cpp:176 +#: ../src/msw/dragimag.cpp:166 ../src/msw/dragimag.cpp:206 +#: ../src/msw/imaglist.cpp:158 ../src/msw/imaglist.cpp:176 #: ../src/msw/imaglist.cpp:188 msgid "Couldn't add an image to the image list." msgstr "Nie mo¿na dodaæ obrazu do listy obrazów." -#: ../src/msw/timer.cpp:106 -#: ../src/os2/timer.cpp:155 +#: ../src/msw/timer.cpp:106 ../src/os2/timer.cpp:155 msgid "Couldn't create a timer" msgstr "Nie mo¿na utworzyæ stopera" -#: ../src/mgl/cursor.cpp:135 -#: ../src/mgl/cursor.cpp:166 +#: ../src/mgl/cursor.cpp:135 ../src/mgl/cursor.cpp:166 msgid "Couldn't create cursor." msgstr "Nie mo¿na utworzyæ kursora." @@ -1447,14 +1386,14 @@ msgid "Couldn't find symbol '%s' in a dynamic library" msgstr "Nie mo¿na znale¼æ symbolu '%s' w bibliotece" -#: ../src/mac/classic/thread.cpp:521 -#: ../src/msw/thread.cpp:853 +#: ../src/mac/classic/thread.cpp:521 ../src/msw/thread.cpp:853 msgid "Couldn't get the current thread pointer" msgstr "Nie mo¿na pobraæ wska¼nika aktualnego w±tku" #: ../src/common/imagpng.cpp:596 msgid "Couldn't load a PNG image - file is corrupted or not enough memory." -msgstr "Nie mo¿na wczytaæ obrazu PNG - plik jest uszkodzony lub zabrak³o pamiêci." +msgstr "" +"Nie mo¿na wczytaæ obrazu PNG - plik jest uszkodzony lub zabrak³o pamiêci." #: ../src/unix/sound.cpp:472 #, c-format @@ -1480,14 +1419,12 @@ msgid "Couldn't retrieve information about list control item %d." msgstr "Nie mo¿na pobraæ informacji o elemencie listy kontroli %d." -#: ../src/common/imagpng.cpp:642 -#: ../src/common/imagpng.cpp:651 +#: ../src/common/imagpng.cpp:642 ../src/common/imagpng.cpp:651 #: ../src/common/imagpng.cpp:659 msgid "Couldn't save PNG image." msgstr "Nie mo¿na zapisaæ obrazu PNG." -#: ../src/mac/classic/thread.cpp:779 -#: ../src/msw/thread.cpp:611 +#: ../src/mac/classic/thread.cpp:779 ../src/msw/thread.cpp:611 msgid "Couldn't terminate thread" msgstr "Nie mo¿na zakoñczyæ w±tku" @@ -1499,13 +1436,11 @@ msgid "Create directory" msgstr "Tworzenie katalogu" -#: ../src/generic/dirdlgg.cpp:140 -#: ../src/generic/filedlgg.cpp:999 +#: ../src/generic/dirdlgg.cpp:140 ../src/generic/filedlgg.cpp:999 msgid "Create new directory" msgstr "Utwórz nowy katalog" -#: ../src/common/stockitem.cpp:114 -#: ../src/mac/carbon/textctrl.cpp:1073 +#: ../src/common/stockitem.cpp:114 ../src/mac/carbon/textctrl.cpp:1073 #: ../src/msw/textctrl.cpp:2063 msgid "Cu&t" msgstr "&Wytnij" @@ -1590,8 +1525,12 @@ msgstr "Pulpit" #: ../src/msw/dialup.cpp:395 -msgid "Dial up functions are unavailable because the remote access service (RAS) is not installed on this machine. Please install it." -msgstr "Funkcje Dial up nie s± dostêpne, poniewa¿ serwis zdalnego dostêpu (RAS) nie jest zainstalowany na tej maszynie. Zainstaluj go." +msgid "" +"Dial up functions are unavailable because the remote access service (RAS) is " +"not installed on this machine. Please install it." +msgstr "" +"Funkcje Dial up nie s± dostêpne, poniewa¿ serwis zdalnego dostêpu (RAS) nie " +"jest zainstalowany na tej maszynie. Zainstaluj go." #: ../src/generic/tipdlg.cpp:246 msgid "Did you know..." @@ -1620,8 +1559,12 @@ msgstr "Katalog nie istnieje." #: ../src/html/helpfrm.cpp:503 -msgid "Display all index items that contain given substring. Search is case insensitive." -msgstr "Wy¶wietla wszystkie elementy indeksu zawieraj±ce podany ³añcuch. Szuka bez uwzglêdniania wielko¶ci liter." +msgid "" +"Display all index items that contain given substring. Search is case " +"insensitive." +msgstr "" +"Wy¶wietla wszystkie elementy indeksu zawieraj±ce podany ³añcuch. Szuka bez " +"uwzglêdniania wielko¶ci liter." #: ../src/html/helpfrm.cpp:685 msgid "Display options dialog" @@ -1629,7 +1572,8 @@ #: ../src/msw/mimetype.cpp:671 msgid "" -"Do you want to overwrite the command used to %s files with extension \"%s\" ?\n" +"Do you want to overwrite the command used to %s files with extension \"%s" +"\" ?\n" "Current value is \n" "%s, \n" "New value is \n" @@ -1650,8 +1594,7 @@ msgid "Don't Save" msgstr "Nie Zapisuj" -#: ../src/html/htmlwin.cpp:451 -#: ../src/msw/frame.cpp:211 +#: ../src/html/htmlwin.cpp:451 ../src/msw/frame.cpp:211 msgid "Done" msgstr "Zrobione" @@ -1704,26 +1647,22 @@ #: ../src/common/config.cpp:384 #, c-format -msgid "Environment variables expansion failed: missing '%c' at position %u in '%s'." -msgstr "Rozwiniêcie zmiennych ¶rodowiskowych nie powiod³o siê: zabrak³o '%c' na pozycji '%u' w '%s'." +msgid "" +"Environment variables expansion failed: missing '%c' at position %u in '%s'." +msgstr "" +"Rozwiniêcie zmiennych ¶rodowiskowych nie powiod³o siê: zabrak³o '%c' na " +"pozycji '%u' w '%s'." -#: ../src/generic/dirctrlg.cpp:689 -#: ../src/generic/dirctrlg.cpp:707 -#: ../src/generic/dirctrlg.cpp:718 -#: ../src/generic/dirdlgg.cpp:342 -#: ../src/generic/filedlgg.cpp:632 -#: ../src/generic/filedlgg.cpp:744 -#: ../src/generic/filedlgg.cpp:758 -#: ../src/generic/filedlgg.cpp:772 -#: ../src/generic/filedlgg.cpp:1269 -#: ../src/generic/filedlgg.cpp:1295 -#: ../src/generic/filedlgg.cpp:1325 -#: ../src/gtk/fontdlg.cpp:81 +#: ../src/generic/dirctrlg.cpp:689 ../src/generic/dirctrlg.cpp:707 +#: ../src/generic/dirctrlg.cpp:718 ../src/generic/dirdlgg.cpp:342 +#: ../src/generic/filedlgg.cpp:632 ../src/generic/filedlgg.cpp:744 +#: ../src/generic/filedlgg.cpp:758 ../src/generic/filedlgg.cpp:772 +#: ../src/generic/filedlgg.cpp:1269 ../src/generic/filedlgg.cpp:1295 +#: ../src/generic/filedlgg.cpp:1325 ../src/gtk/fontdlg.cpp:81 msgid "Error" msgstr "B³±d" -#: ../src/msdos/utilsdos.cpp:213 -#: ../src/unix/utilsunx.cpp:1090 +#: ../src/msdos/utilsdos.cpp:213 ../src/unix/utilsunx.cpp:1090 #: ../src/unix/utilsunx.cpp:1098 msgid "Error " msgstr "B³±d " @@ -1744,8 +1683,7 @@ msgid "Error saving user configuration data." msgstr "B³±d zapisu konfiguracji u¿ytkownika." -#: ../src/mac/carbon/mpthread.cpp:482 -#: ../src/mac/carbon/thread.cpp:672 +#: ../src/mac/carbon/mpthread.cpp:482 ../src/mac/carbon/thread.cpp:672 msgid "Error while waiting on semaphore" msgstr "B³±d oczekiwania na semafor" @@ -1799,8 +1737,11 @@ #: ../src/msw/registry.cpp:1140 #, c-format -msgid "Exporting registry key: file \"%s\" already exists and won't be overwritten." -msgstr "Eksport klucza rejestrów: plik \"%s\" ju¿ istnieje i nie mo¿e zostaæ nadpisany." +msgid "" +"Exporting registry key: file \"%s\" already exists and won't be overwritten." +msgstr "" +"Eksport klucza rejestrów: plik \"%s\" ju¿ istnieje i nie mo¿e zostaæ " +"nadpisany." #: ../src/common/fmapbase.cpp:143 msgid "Extended Unix Codepage for Japanese (EUC-JP)" @@ -1939,15 +1880,16 @@ #: ../src/msw/fdrepdlg.cpp:474 #, c-format msgid "Failed to create the standard find/replace dialog (error code %d)" -msgstr "Nie uda³o siê utworzyæ standardowego okna dialogowego wyszukaj/zast±p (kod b³êdu %d)" +msgstr "" +"Nie uda³o siê utworzyæ standardowego okna dialogowego wyszukaj/zast±p (kod " +"b³êdu %d)" #: ../src/html/winpars.cpp:549 #, c-format msgid "Failed to display HTML document in %s encoding" msgstr "Nie uda³o siê wy¶wieliæ dokumentu HTML w kodowaniu %s" -#: ../src/mac/carbon/clipbrd.cpp:194 -#: ../src/mac/classic/clipbrd.cpp:185 +#: ../src/mac/carbon/clipbrd.cpp:194 ../src/mac/classic/clipbrd.cpp:185 #: ../src/msw/clipbrd.cpp:131 msgid "Failed to empty the clipboard." msgstr "Nie uda³o siê opró¿niæ schowka." @@ -1959,22 +1901,24 @@ # to moja swobodna interpretacja #: ../src/msw/dde.cpp:650 msgid "Failed to establish an advise loop with DDE server" -msgstr "Nie uda³o siê rozpocz±æ transakcji doradzaj±cej (advise) z serwerem DDE" +msgstr "" +"Nie uda³o siê rozpocz±æ transakcji doradzaj±cej (advise) z serwerem DDE" #: ../src/msw/dialup.cpp:658 #, c-format msgid "Failed to establish dialup connection: %s" msgstr "Nie uda³o siê nawi±zaæ po³±czenia dialup: %s" -#: ../src/unix/utilsunx.cpp:508 -#: ../src/unix/utilsunx.cpp:524 +#: ../src/unix/utilsunx.cpp:508 ../src/unix/utilsunx.cpp:524 #, c-format msgid "Failed to execute '%s'\n" msgstr "Nie uda³o siê wykonaæ '%s'\n" #: ../src/common/debugrpt.cpp:666 msgid "Failed to execute curl, please install it in PATH." -msgstr "Nie powiod³o siê uruchomienie curl, proszê zainstalowaæ go w dostêpnym katalogu (PATH)." +msgstr "" +"Nie powiod³o siê uruchomienie curl, proszê zainstalowaæ go w dostêpnym " +"katalogu (PATH)." #: ../contrib/src/deprecated/resource.cpp:2489 #, c-format @@ -2008,8 +1952,7 @@ msgid "Failed to get ISP names: %s" msgstr "Nie uda³o siê usyskaæ listy ISP: %s" -#: ../src/mac/carbon/clipbrd.cpp:143 -#: ../src/mac/classic/clipbrd.cpp:134 +#: ../src/mac/carbon/clipbrd.cpp:143 ../src/mac/classic/clipbrd.cpp:134 msgid "Failed to get clipboard data." msgstr "Nie uda³o siê pobraæ danych ze schowka." @@ -2045,8 +1988,12 @@ # po³±czyæ? # wyciek? #: ../src/unix/threadpsx.cpp:897 -msgid "Failed to join a thread, potential memory leak detected - please restart the program" -msgstr "Nie uda³o po³±czyæ z w±tkiem, potencjalny wyciek pamiêci - uruchom program ponownie" +msgid "" +"Failed to join a thread, potential memory leak detected - please restart the " +"program" +msgstr "" +"Nie uda³o po³±czyæ z w±tkiem, potencjalny wyciek pamiêci - uruchom program " +"ponownie" #: ../src/msw/utils.cpp:703 #, c-format @@ -2212,8 +2159,7 @@ msgid "Failed to set temporary file permissions" msgstr "Nie uda³o siê nadaæ praw dostêpu pliku tymczasowemu" -#: ../src/unix/threadpsx.cpp:1245 -#: ../src/unix/threadpsx.cpp:1256 +#: ../src/unix/threadpsx.cpp:1245 ../src/unix/threadpsx.cpp:1256 #, c-format msgid "Failed to set thread priority %d." msgstr "Nie uda³o siê zmieniæ priorytetu w±tku na %d." @@ -2223,15 +2169,15 @@ msgid "Failed to store image '%s' to memory VFS!" msgstr "Nie uda³o siê od³o¿yæ obrazu '%s' do pamiêci VFS!" -#: ../src/mac/carbon/mpthread.cpp:1273 -#: ../src/mac/carbon/thread.cpp:1465 +#: ../src/mac/carbon/mpthread.cpp:1273 ../src/mac/carbon/thread.cpp:1465 #: ../src/unix/threadpsx.cpp:1429 msgid "Failed to terminate a thread." msgstr "Nie uda³o siê zakoñczyæ w±tku." #: ../src/msw/dde.cpp:669 msgid "Failed to terminate the advise loop with DDE server" -msgstr "Nie uda³o siê zakoñczyæ transakcji doradzaj±cej (advise) z serwerem DDE" +msgstr "" +"Nie uda³o siê zakoñczyæ transakcji doradzaj±cej (advise) z serwerem DDE" #: ../src/msw/dialup.cpp:955 #, c-format @@ -2285,8 +2231,7 @@ msgid "File %s does not exist." msgstr "Plik %s nie istnieje." -#: ../src/generic/filedlgg.cpp:1316 -#: ../src/gtk/filedlg.cpp:64 +#: ../src/generic/filedlgg.cpp:1316 ../src/gtk/filedlg.cpp:64 #, c-format msgid "File '%s' already exists, do you really want to overwrite it?" msgstr "Plik '%s' ju¿ istnieje, naprawdê chcesz go zast±piæ?" @@ -2304,13 +2249,11 @@ msgid "File couldn't be loaded." msgstr "Plik nie mo¿e byæ wczytany." -#: ../src/common/docview.cpp:571 -#: ../src/common/docview.cpp:1596 +#: ../src/common/docview.cpp:571 ../src/common/docview.cpp:1596 msgid "File error" msgstr "B³±d plikowy" -#: ../src/generic/dirctrlg.cpp:707 -#: ../src/generic/filedlgg.cpp:758 +#: ../src/generic/dirctrlg.cpp:707 ../src/generic/filedlgg.cpp:758 msgid "File name exists already." msgstr "Plik o tej nazwie ju¿ istnieje." @@ -2418,7 +2361,8 @@ #: ../include/wx/xti.h:853 msgid "GetPropertyCollection called w/o valid collection getter" -msgstr "Funkcja GetPropertyCollection wywo³ana bez poprawnego modu³u pobieraj±cego" +msgstr "" +"Funkcja GetPropertyCollection wywo³ana bez poprawnego modu³u pobieraj±cego" #: ../src/html/helpfrm.cpp:651 msgid "Go back" @@ -2432,8 +2376,7 @@ msgid "Go one level up in document hierarchy" msgstr "Id¼ poziom wy¿ej w hierarchi dokumentu" -#: ../src/generic/dirdlgg.cpp:145 -#: ../src/generic/filedlgg.cpp:989 +#: ../src/generic/dirdlgg.cpp:145 ../src/generic/filedlgg.cpp:989 msgid "Go to home directory" msgstr "Id¼ do katalogu domowego" @@ -2449,8 +2392,7 @@ msgid "Greek (ISO-8859-7)" msgstr "Grecki (ISO-8859-7)" -#: ../src/common/zstream.cpp:72 -#: ../src/common/zstream.cpp:209 +#: ../src/common/zstream.cpp:72 ../src/common/zstream.cpp:209 msgid "Gzip not supported by this version of zlib" msgstr "Format Gzip nie jest wspierany przez tê wersjê biblioteki zlib" @@ -2472,8 +2414,7 @@ msgid "Hebrew (ISO-8859-8)" msgstr "Hebrajski (ISO-8859-8)" -#: ../src/html/helpfrm.cpp:337 -#: ../contrib/src/deprecated/proplist.cpp:523 +#: ../src/html/helpfrm.cpp:337 ../contrib/src/deprecated/proplist.cpp:523 msgid "Help" msgstr "Pomoc" @@ -2481,8 +2422,7 @@ msgid "Help Browser Options" msgstr "Opcje przegl±darki pomocy" -#: ../src/generic/helpext.cpp:442 -#: ../src/generic/helpext.cpp:443 +#: ../src/generic/helpext.cpp:442 ../src/generic/helpext.cpp:443 msgid "Help Index" msgstr "Spis tre¶ci" @@ -2520,12 +2460,9 @@ msgid "ICO: Error in reading mask DIB." msgstr "ICO: B³±d odczytu maski DIB." -#: ../src/common/imagbmp.cpp:1048 -#: ../src/common/imagbmp.cpp:1107 -#: ../src/common/imagbmp.cpp:1116 -#: ../src/common/imagbmp.cpp:1127 -#: ../src/common/imagbmp.cpp:1171 -#: ../src/common/imagbmp.cpp:1181 +#: ../src/common/imagbmp.cpp:1048 ../src/common/imagbmp.cpp:1107 +#: ../src/common/imagbmp.cpp:1116 ../src/common/imagbmp.cpp:1127 +#: ../src/common/imagbmp.cpp:1171 ../src/common/imagbmp.cpp:1181 #: ../src/common/imagbmp.cpp:1190 msgid "ICO: Error writing the image file!" msgstr "ICO: B³±d przy zapisie do pliku." @@ -2576,7 +2513,8 @@ #: ../src/generic/dbgrptg.cpp:310 msgid "" -"If you wish to suppress this debug report completely, please choose the \"Cancel\" button,\n" +"If you wish to suppress this debug report completely, please choose the " +"\"Cancel\" button,\n" "but be warned that it may hinder improving the program, so if\n" "at all possible please do continue with the report generation.\n" msgstr "" @@ -2605,8 +2543,7 @@ msgid "Illegal Parameter Count for Create Method" msgstr "Nieprawid³owa Liczba Parametrów w Metodzie Create" -#: ../src/generic/dirctrlg.cpp:689 -#: ../src/generic/filedlgg.cpp:744 +#: ../src/generic/dirctrlg.cpp:689 ../src/generic/filedlgg.cpp:744 msgid "Illegal directory name." msgstr "Niedozwolona nazwa katalogu." @@ -2624,8 +2561,12 @@ msgstr "Nie jest to obraz typu %d." #: ../src/msw/textctrl.cpp:361 -msgid "Impossible to create a rich edit control, using simple text control instead. Please reinstall riched32.dll" -msgstr "Nie jest mo¿liwe utworzenie kontrolki rich edit, u¿yj zamiast tego prostego 'text control'. Przeinstaluj riched32.dll" +msgid "" +"Impossible to create a rich edit control, using simple text control instead. " +"Please reinstall riched32.dll" +msgstr "" +"Nie jest mo¿liwe utworzenie kontrolki rich edit, u¿yj zamiast tego prostego " +"'text control'. Przeinstaluj riched32.dll" #: ../src/unix/utilsunx.cpp:428 msgid "Impossible to get child process input" @@ -2694,14 +2635,17 @@ msgid "Invalid lock file '%s'." msgstr "Nieprawid³owy plik blokuj±cy '%s'." -#: ../src/common/xtistrm.cpp:365 -#: ../src/common/xtistrm.cpp:380 +#: ../src/common/xtistrm.cpp:365 ../src/common/xtistrm.cpp:380 msgid "Invalid or Null Object ID passed to GetObjectClassInfo" -msgstr "B³êdny lub Pusty Identyfikator Obiektu przekazany do funkcji GetObjectClassInfo" +msgstr "" +"B³êdny lub Pusty Identyfikator Obiektu przekazany do funkcji " +"GetObjectClassInfo" #: ../src/common/xtistrm.cpp:395 msgid "Invalid or Null Object ID passed to HasObjectClassInfo" -msgstr "B³êdny lub Pusty Identyfikator Obiektu przekazany do funkcji HasObjectClassInfo" +msgstr "" +"B³êdny lub Pusty Identyfikator Obiektu przekazany do funkcji " +"HasObjectClassInfo" #: ../src/common/regex.cpp:210 #, c-format @@ -2788,8 +2732,7 @@ msgid "KOI8-U" msgstr "KOI8-U" -#: ../src/generic/prntdlgg.cpp:609 -#: ../src/generic/prntdlgg.cpp:867 +#: ../src/generic/prntdlgg.cpp:609 ../src/generic/prntdlgg.cpp:867 msgid "Landscape" msgstr "Pejza¿" @@ -2869,8 +2812,7 @@ msgid "Log saved to the file '%s'." msgstr "Log zosta³ zapisany do pliku '%s'." -#: ../include/wx/xti.h:501 -#: ../include/wx/xti.h:505 +#: ../include/wx/xti.h:501 ../include/wx/xti.h:505 msgid "Long Conversions not supported" msgstr "Konwersja typu 'Long' nie jest wspierana." @@ -2883,8 +2825,12 @@ msgstr "MP Thread Support jest niedostêpny w tym systemie" #: ../src/msw/helpchm.cpp:60 -msgid "MS HTML Help functions are unavailable because the MS HTML Help library is not installed on this machine. Please install it." -msgstr "Funkcje pomocy dla MS HTML Help nie s± dostêpne, poniewa¿ biblioteka MS HTML Help nie jest zainstalowana na tej maszynie. Zainstaluj j±." +msgid "" +"MS HTML Help functions are unavailable because the MS HTML Help library is " +"not installed on this machine. Please install it." +msgstr "" +"Funkcje pomocy dla MS HTML Help nie s± dostêpne, poniewa¿ biblioteka MS HTML " +"Help nie jest zainstalowana na tej maszynie. Zainstaluj j±." #: ../src/univ/themes/win32.cpp:4929 msgid "Ma&ximize" @@ -2965,10 +2911,8 @@ msgstr "Nowa pozycja" # To jest maska do tworzenia nazw typu NowaNaz1 itd -#: ../src/generic/dirdlgg.cpp:316 -#: ../src/generic/dirdlgg.cpp:326 -#: ../src/generic/filedlgg.cpp:608 -#: ../src/generic/filedlgg.cpp:617 +#: ../src/generic/dirdlgg.cpp:316 ../src/generic/dirdlgg.cpp:326 +#: ../src/generic/filedlgg.cpp:608 ../src/generic/filedlgg.cpp:617 msgid "NewName" msgstr "NowaNaz" @@ -2980,10 +2924,8 @@ msgid "Next page" msgstr "Nastêpna strona" -#: ../src/mac/carbon/msgdlg.cpp:58 -#: ../src/mac/carbon/msgdlg.cpp:143 -#: ../src/mac/classic/msgdlg.cpp:56 -#: ../src/mac/classic/msgdlg.cpp:140 +#: ../src/mac/carbon/msgdlg.cpp:58 ../src/mac/carbon/msgdlg.cpp:143 +#: ../src/mac/classic/msgdlg.cpp:56 ../src/mac/classic/msgdlg.cpp:140 #: ../src/motif/msgdlg.cpp:204 msgid "No" msgstr "Nie" @@ -3006,7 +2948,8 @@ msgid "" "No font for displaying text in encoding '%s' found,\n" "but an alternative encoding '%s' is available.\n" -"Do you want to use this encoding (otherwise you will have to choose another one)?" +"Do you want to use this encoding (otherwise you will have to choose another " +"one)?" msgstr "" "Brak czcionki do wy¶wielenia tekstu w kodowaniu '%s',\n" "jednak dostêpne jest alternatywne kodowanie '%s'.\n" @@ -3028,20 +2971,17 @@ msgid "No handler found for XML node '%s', class '%s'!" msgstr "Brak procedury obs³ugi dla wêz³a XML '%s', klasa '%s'!" -#: ../src/common/image.cpp:1505 -#: ../src/common/image.cpp:1548 +#: ../src/common/image.cpp:1505 ../src/common/image.cpp:1548 msgid "No handler found for image type." msgstr "Brak procedury obs³ugi grafiki." -#: ../src/common/image.cpp:1513 -#: ../src/common/image.cpp:1556 +#: ../src/common/image.cpp:1513 ../src/common/image.cpp:1556 #: ../src/common/image.cpp:1589 #, c-format msgid "No image handler for type %d defined." msgstr "Brak procedury obs³ugi obrazów typu %d." -#: ../src/common/image.cpp:1574 -#: ../src/common/image.cpp:1604 +#: ../src/common/image.cpp:1574 ../src/common/image.cpp:1604 #, c-format msgid "No image handler for type %s defined." msgstr "Brak procedury obs³ugi obrazów typu %s." @@ -3054,8 +2994,7 @@ msgid "No sound" msgstr "Brak d¼wiêku" -#: ../src/common/image.cpp:1200 -#: ../src/common/image.cpp:1239 +#: ../src/common/image.cpp:1200 ../src/common/image.cpp:1239 msgid "No unused colour in image being masked." msgstr "Brak nieu¿ywanych kolorów w maskowanym obrazie." @@ -3067,8 +3006,7 @@ msgid "Nordic (ISO-8859-10)" msgstr "Nordycki (ISO-8859-10)" -#: ../src/generic/fontdlgg.cpp:232 -#: ../src/generic/fontdlgg.cpp:235 +#: ../src/generic/fontdlgg.cpp:232 ../src/generic/fontdlgg.cpp:235 msgid "Normal" msgstr "Normalny" @@ -3084,8 +3022,7 @@ msgid "Note, 8 1/2 x 11 in" msgstr "Note, 8 1/2 x 11 cali" -#: ../src/gtk/fontdlg.cpp:147 -#: ../src/msw/dialog.cpp:194 +#: ../src/gtk/fontdlg.cpp:147 ../src/msw/dialog.cpp:194 #: ../contrib/src/deprecated/proplist.cpp:506 msgid "OK" msgstr "OK" @@ -3094,13 +3031,11 @@ msgid "Objects must have an id attribute" msgstr "Obiekty musz± posiadaæ w³a¶ciwo¶æ typu 'id'" -#: ../src/common/docview.cpp:1269 -#: ../src/common/docview.cpp:1619 +#: ../src/common/docview.cpp:1269 ../src/common/docview.cpp:1619 msgid "Open File" msgstr "Otwieranie Pliku" -#: ../src/html/helpfrm.cpp:673 -#: ../src/html/helpfrm.cpp:1579 +#: ../src/html/helpfrm.cpp:673 ../src/html/helpfrm.cpp:1579 msgid "Open HTML document" msgstr "Otwórz dokument HTML" @@ -3109,10 +3044,8 @@ msgid "Open file \"%s\"" msgstr "Otwieranie pliku \"%s\"" -#: ../src/generic/dirctrlg.cpp:718 -#: ../src/generic/dirdlgg.cpp:342 -#: ../src/generic/filedlgg.cpp:632 -#: ../src/generic/filedlgg.cpp:772 +#: ../src/generic/dirctrlg.cpp:718 ../src/generic/dirdlgg.cpp:342 +#: ../src/generic/filedlgg.cpp:632 ../src/generic/filedlgg.cpp:772 msgid "Operation not permitted." msgstr "Operacja nie jest dozwolona." @@ -3131,18 +3064,15 @@ msgid "Option '%s': '%s' cannot be converted to a date." msgstr "Opcja '%s': nie mo¿na przekszta³ciæ '%s' na datê." -#: ../src/generic/dirdlgg.cpp:116 -#: ../src/generic/prntdlgg.cpp:614 +#: ../src/generic/dirdlgg.cpp:116 ../src/generic/prntdlgg.cpp:614 msgid "Options" msgstr "Opcje" -#: ../src/generic/prntdlgg.cpp:611 -#: ../src/generic/prntdlgg.cpp:868 +#: ../src/generic/prntdlgg.cpp:611 ../src/generic/prntdlgg.cpp:868 msgid "Orientation" msgstr "Orientacja" -#: ../src/common/imagpcx.cpp:462 -#: ../src/common/imagpcx.cpp:485 +#: ../src/common/imagpcx.cpp:462 ../src/common/imagpcx.cpp:485 msgid "PCX: couldn't allocate memory" msgstr "PCX: Nie mo¿na przydzieliæ pamiêci." @@ -3158,8 +3088,7 @@ msgid "PCX: this is not a PCX file." msgstr "PCX: To nie jest plik w formacie PCX." -#: ../src/common/imagpcx.cpp:464 -#: ../src/common/imagpcx.cpp:486 +#: ../src/common/imagpcx.cpp:464 ../src/common/imagpcx.cpp:486 msgid "PCX: unknown error !!!" msgstr "PCX: nieznany b³±d !!!" @@ -3175,8 +3104,7 @@ msgid "PNM: File format is not recognized." msgstr "PNM: Nieznany format pliku." -#: ../src/common/imagpnm.cpp:108 -#: ../src/common/imagpnm.cpp:125 +#: ../src/common/imagpnm.cpp:108 ../src/common/imagpnm.cpp:125 #: ../src/common/imagpnm.cpp:142 msgid "PNM: File seems truncated." msgstr "PNM: Plik wygl±da na obciêty." @@ -3299,8 +3227,7 @@ msgid "Page Setup" msgstr "Ustawienia strony" -#: ../src/common/prntbase.cpp:451 -#: ../src/gtk/gnome/gprint.cpp:540 +#: ../src/common/prntbase.cpp:451 ../src/gtk/gnome/gprint.cpp:540 msgid "Page setup" msgstr "Ustawienia strony" @@ -3308,14 +3235,12 @@ msgid "Pages" msgstr "Strony" -#: ../src/generic/prntdlgg.cpp:800 -#: ../src/generic/prntdlgg.cpp:854 +#: ../src/generic/prntdlgg.cpp:800 ../src/generic/prntdlgg.cpp:854 #: ../src/generic/prntdlgg.cpp:1056 msgid "Paper Size" msgstr "Rozmiar papieru" -#: ../src/generic/prntdlgg.cpp:598 -#: ../src/generic/prntdlgg.cpp:841 +#: ../src/generic/prntdlgg.cpp:598 ../src/generic/prntdlgg.cpp:841 #: ../src/generic/prntdlgg.cpp:1051 msgid "Paper size" msgstr "Rozmiar papieru" @@ -3328,8 +3253,7 @@ msgid "Passing a already registered object to SetObjectName" msgstr "Przekazano ju¿ zarejestrowany obiekt do funkcji SetObjectName" -#: ../src/common/xtistrm.cpp:436 -#: ../src/common/xtistrm.cpp:656 +#: ../src/common/xtistrm.cpp:436 ../src/common/xtistrm.cpp:656 msgid "Passing an unkown object to GetObject" msgstr "Przekazanie nieznanego obiektu do funkcji GetObject" @@ -3373,8 +3297,7 @@ msgid "Please wait while printing\n" msgstr "Proszê czekaæ, trwa drukowanie\n" -#: ../src/generic/prntdlgg.cpp:608 -#: ../src/generic/prntdlgg.cpp:866 +#: ../src/generic/prntdlgg.cpp:608 ../src/generic/prntdlgg.cpp:866 msgid "Portrait" msgstr "Portret" @@ -3382,8 +3305,7 @@ msgid "PostScript file" msgstr "plik PostScript" -#: ../src/generic/fontdlgg.cpp:348 -#: ../src/html/helpfrm.cpp:1235 +#: ../src/generic/fontdlgg.cpp:348 ../src/html/helpfrm.cpp:1235 msgid "Preview:" msgstr "Podgl±d:" @@ -3391,10 +3313,8 @@ msgid "Previous page" msgstr "Poprzednia strona" -#: ../src/common/prntbase.cpp:393 -#: ../src/generic/prntdlgg.cpp:138 -#: ../src/generic/prntdlgg.cpp:151 -#: ../src/gtk/gnome/gprint.cpp:395 +#: ../src/common/prntbase.cpp:393 ../src/generic/prntdlgg.cpp:138 +#: ../src/generic/prntdlgg.cpp:151 ../src/gtk/gnome/gprint.cpp:395 #: ../src/gtk/gnome/gprint.cpp:407 msgid "Print" msgstr "Drukuj" @@ -3403,8 +3323,7 @@ msgid "Print Preview" msgstr "Podgl±d wydruku" -#: ../src/common/prntbase.cpp:1246 -#: ../src/common/prntbase.cpp:1272 +#: ../src/common/prntbase.cpp:1246 ../src/common/prntbase.cpp:1272 msgid "Print Preview Failure" msgstr "Awaria podgl±du wydruku" @@ -3464,8 +3383,7 @@ msgid "Printer:" msgstr "Drukarka:" -#: ../src/common/prntbase.cpp:310 -#: ../src/common/prntbase.cpp:531 +#: ../src/common/prntbase.cpp:310 ../src/common/prntbase.cpp:531 msgid "Printing " msgstr "Drukowanie " @@ -3484,8 +3402,11 @@ #: ../src/common/debugrpt.cpp:546 #, c-format -msgid "Processing debug report has failed, leaving the files in \"%s\" directory." -msgstr "Przetwarzanie raportu b³êdów nie powiod³o siê, pozostawiaj±c pliku w katalogu \"%s\"." +msgid "" +"Processing debug report has failed, leaving the files in \"%s\" directory." +msgstr "" +"Przetwarzanie raportu b³êdów nie powiod³o siê, pozostawiaj±c pliku w " +"katalogu \"%s\"." #: ../src/common/log.cpp:466 msgid "Program aborted." @@ -3499,8 +3420,7 @@ msgid "Question" msgstr "Pytanie" -#: ../src/common/ffile.cpp:125 -#: ../src/common/ffile.cpp:144 +#: ../src/common/ffile.cpp:125 ../src/common/ffile.cpp:144 #, c-format msgid "Read error on file '%s'" msgstr "B³±d odczytu pliku '%s'" @@ -3563,7 +3483,8 @@ #: ../src/common/rendcmn.cpp:196 #, c-format msgid "Renderer \"%s\" has incompatible version %d.%d and couldn't be loaded." -msgstr "Wizualizator \"%s\" ma niezgodn± wersjê %d.%d i nie mo¿e byæ za³adowany." +msgstr "" +"Wizualizator \"%s\" ma niezgodn± wersjê %d.%d i nie mo¿e byæ za³adowany." #: ../src/common/stockitem.cpp:117 msgid "Rep&lace" @@ -3618,14 +3539,17 @@ msgid "Script" msgstr "Script" -#: ../src/html/helpfrm.cpp:536 -#: ../src/html/helpfrm.cpp:551 +#: ../src/html/helpfrm.cpp:536 ../src/html/helpfrm.cpp:551 msgid "Search" msgstr "Szukaj" #: ../src/html/helpfrm.cpp:538 -msgid "Search contents of help book(s) for all occurences of the text you typed above" -msgstr "Przeszukuje zawarto¶æ pliku(ów) pomocy dla wszystkich wyst±pieñ wprowadzonego powy¿ej tekstu" +msgid "" +"Search contents of help book(s) for all occurences of the text you typed " +"above" +msgstr "" +"Przeszukuje zawarto¶æ pliku(ów) pomocy dla wszystkich wyst±pieñ " +"wprowadzonego powy¿ej tekstu" #: ../src/generic/fdrepdlg.cpp:166 msgid "Search direction" @@ -3658,8 +3582,7 @@ msgid "Seek error on file '%s' (large files not supported by stdio)" msgstr "B³±d wyszukiwania w pliku '%s' (stdio nie wspiera olbrzymich plików)" -#: ../src/mac/carbon/textctrl.cpp:1078 -#: ../src/msw/textctrl.cpp:2068 +#: ../src/mac/carbon/textctrl.cpp:1078 ../src/msw/textctrl.cpp:2068 msgid "Select &All" msgstr "&Zaznacz wszystko" @@ -3687,7 +3610,8 @@ #: ../include/wx/xti.h:841 msgid "SetProperty called w/o valid setter" -msgstr "Funkcja SetProperty wywo³ana bez poprawnej modu³y ustawiaj±cego w³a¶ciwo¶æ" +msgstr "" +"Funkcja SetProperty wywo³ana bez poprawnej modu³y ustawiaj±cego w³a¶ciwo¶æ" #: ../src/generic/prntdlgg.cpp:182 msgid "Setup..." @@ -3705,8 +3629,7 @@ msgid "Show all items in index" msgstr "Poka¿ wszystkie elementy indeksu" -#: ../src/generic/dirdlgg.cpp:112 -#: ../src/generic/dirdlgg.cpp:175 +#: ../src/generic/dirdlgg.cpp:112 ../src/generic/dirdlgg.cpp:175 msgid "Show hidden directories" msgstr "Poka¿ ukryte katalogi" @@ -3718,8 +3641,7 @@ msgid "Show/hide navigation panel" msgstr "Poka¿/ukryj panel sterowania" -#: ../src/generic/fontdlgg.cpp:353 -#: ../src/generic/fontdlgg.cpp:355 +#: ../src/generic/fontdlgg.cpp:353 ../src/generic/fontdlgg.cpp:355 msgid "Shows the font preview." msgstr "Podgl±d czcionki." @@ -3727,8 +3649,7 @@ msgid "Size" msgstr "Rozmiar" -#: ../src/generic/progdlgg.cpp:222 -#: ../src/generic/progdlgg.cpp:240 +#: ../src/generic/progdlgg.cpp:222 ../src/generic/progdlgg.cpp:240 #: ../src/generic/progdlgg.cpp:598 msgid "Skip" msgstr "Pomiñ" @@ -3741,8 +3662,7 @@ msgid "Sorry, could not open this file for saving." msgstr "Niestety nie mo¿na otworzyæ tego pliku do zapisu." -#: ../src/common/docview.cpp:617 -#: ../src/common/docview.cpp:1598 +#: ../src/common/docview.cpp:617 ../src/common/docview.cpp:1598 msgid "Sorry, could not open this file." msgstr "Niestety nie mo¿na otworzyæ tego pliku." @@ -3758,8 +3678,7 @@ msgid "Sorry, print preview needs a printer to be installed." msgstr "Niestety, podgl±d wydruku wymaga zainstalowania drukarki." -#: ../src/common/docview.cpp:1268 -#: ../src/common/docview.cpp:1618 +#: ../src/common/docview.cpp:1268 ../src/common/docview.cpp:1618 msgid "Sorry, the format for this file is unknown." msgstr "Niestety, nieznany format pliku." @@ -3786,16 +3705,16 @@ #: ../src/common/xtistrm.cpp:253 msgid "Streaming delegates for not already streamed objects not yet supported" -msgstr "Delegacja w strumieniu dlaobiektu który nie jest ju¿ w strumieniu nie jest jeszcze wspierana" +msgstr "" +"Delegacja w strumieniu dlaobiektu który nie jest ju¿ w strumieniu nie jest " +"jeszcze wspierana" -#: ../src/msw/colour.cpp:38 -#: ../src/palmos/colour.cpp:38 +#: ../src/msw/colour.cpp:38 ../src/palmos/colour.cpp:38 #, c-format msgid "String To Colour : Incorrect colour specification : %s" msgstr "Nieprawid³owa specyfikacja koloru : %s" -#: ../include/wx/xti.h:428 -#: ../include/wx/xti.h:432 +#: ../include/wx/xti.h:428 ../include/wx/xti.h:432 msgid "String conversions not supported" msgstr "Konwersja tekstu nie jest wspierana" @@ -3824,8 +3743,7 @@ msgid "TIFF library warning." msgstr "Ostrze¿enie biblioteki TIFF." -#: ../src/common/imagtiff.cpp:248 -#: ../src/common/imagtiff.cpp:259 +#: ../src/common/imagtiff.cpp:248 ../src/common/imagtiff.cpp:259 #: ../src/common/imagtiff.cpp:399 msgid "TIFF: Couldn't allocate memory." msgstr "TIFF: Nie mo¿na przydzieliæ pamiêci." @@ -3917,28 +3835,23 @@ "Plik '%s' nie istnieje i nie mo¿na go otworzyæ.\n" "Informacja o nim zosta³a usuniêta z listy ostatnio u¿ywanych plików." -#: ../src/generic/fontdlgg.cpp:316 -#: ../src/generic/fontdlgg.cpp:318 +#: ../src/generic/fontdlgg.cpp:316 ../src/generic/fontdlgg.cpp:318 msgid "The font colour." msgstr "Kolor czcionki." -#: ../src/generic/fontdlgg.cpp:277 -#: ../src/generic/fontdlgg.cpp:279 +#: ../src/generic/fontdlgg.cpp:277 ../src/generic/fontdlgg.cpp:279 msgid "The font family." msgstr "Rodzina czcionki." -#: ../src/generic/fontdlgg.cpp:328 -#: ../src/generic/fontdlgg.cpp:330 +#: ../src/generic/fontdlgg.cpp:328 ../src/generic/fontdlgg.cpp:330 msgid "The font point size." msgstr "Rozmiar czcionki." -#: ../src/generic/fontdlgg.cpp:288 -#: ../src/generic/fontdlgg.cpp:290 +#: ../src/generic/fontdlgg.cpp:288 ../src/generic/fontdlgg.cpp:290 msgid "The font style." msgstr "Styl czcionki." -#: ../src/generic/fontdlgg.cpp:299 -#: ../src/generic/fontdlgg.cpp:301 +#: ../src/generic/fontdlgg.cpp:299 ../src/generic/fontdlgg.cpp:301 msgid "The font weight." msgstr "Waga czcionki." @@ -3949,10 +3862,12 @@ #: ../src/generic/dbgrptg.cpp:308 msgid "" -"The report contains the files listed below. If any of these files contain private information,\n" +"The report contains the files listed below. If any of these files contain " +"private information,\n" "please uncheck them and they will be removed from the report.\n" msgstr "" -"Raport zawiera pliki wymienione ni¿ej. Je¶li którykolwiek z tych plików zawiera prywatne informacje,\n" +"Raport zawiera pliki wymienione ni¿ej. Je¶li którykolwiek z tych plików " +"zawiera prywatne informacje,\n" "proszê odznacz go w celu usuniêcia go z raportu.\n" #: ../src/common/cmdline.cpp:883 @@ -3971,28 +3886,49 @@ #: ../src/msw/dialup.cpp:455 #, c-format -msgid "The version of remote access service (RAS) installed on this machine is tooold, please upgrade (the following required function is missing: %s)." -msgstr "Zainstalowana wersja serwiisu zdalnego dostêpu (RAS) jest zbyt stara, zainstaluj nowsz± (brakuj±ca funkcja to: %s)." +msgid "" +"The version of remote access service (RAS) installed on this machine is " +"tooold, please upgrade (the following required function is missing: %s)." +msgstr "" +"Zainstalowana wersja serwiisu zdalnego dostêpu (RAS) jest zbyt stara, " +"zainstaluj nowsz± (brakuj±ca funkcja to: %s)." #: ../src/html/htmprint.cpp:601 -msgid "There was a problem during page setup: you may need to set a default printer." -msgstr "Wyst±pi³ b³±d podczas konfigurowania strony: powiniene¶ okre¶liæ domy¶ln± drukarkê." +msgid "" +"There was a problem during page setup: you may need to set a default printer." +msgstr "" +"Wyst±pi³ b³±d podczas konfigurowania strony: powiniene¶ okre¶liæ domy¶ln± " +"drukarkê." #: ../src/msw/datectrl.cpp:109 -msgid "This system doesn't support date picker control, please upgrade your version of comctl32.dll" -msgstr "Ten system nie wspiera komponentu wyboru daty, nale¿y zaktualizowaæ bibliotekê comctl32.dll" +msgid "" +"This system doesn't support date picker control, please upgrade your version " +"of comctl32.dll" +msgstr "" +"Ten system nie wspiera komponentu wyboru daty, nale¿y zaktualizowaæ " +"bibliotekê comctl32.dll" #: ../src/msw/thread.cpp:1206 -msgid "Thread module initialization failed: can not store value in thread local storage" -msgstr "Zainicjowanie modu³u w±tków nie powiod³o siê: nie mo¿na od³o¿yæ warto¶ci do lokalnej pamiêci w±tków" +msgid "" +"Thread module initialization failed: can not store value in thread local " +"storage" +msgstr "" +"Zainicjowanie modu³u w±tków nie powiod³o siê: nie mo¿na od³o¿yæ warto¶ci do " +"lokalnej pamiêci w±tków" #: ../src/unix/threadpsx.cpp:1603 msgid "Thread module initialization failed: failed to create thread key" -msgstr "Zainicjowanie modu³u w±tków nie powiod³o siê: nie uda³o siê utworzyæ klucza w±tków" +msgstr "" +"Zainicjowanie modu³u w±tków nie powiod³o siê: nie uda³o siê utworzyæ klucza " +"w±tków" #: ../src/msw/thread.cpp:1194 -msgid "Thread module initialization failed: impossible to allocate index in thread local storage" -msgstr "Zainicjowanie modu³u w±tków nie powiod³o siê: nie jest mo¿liwe przydzielenie indeksu w lokalnej pamiêci w±tków." +msgid "" +"Thread module initialization failed: impossible to allocate index in thread " +"local storage" +msgstr "" +"Zainicjowanie modu³u w±tków nie powiod³o siê: nie jest mo¿liwe przydzielenie " +"indeksu w lokalnej pamiêci w±tków." #: ../src/unix/threadpsx.cpp:1108 msgid "Thread priority setting is ignored." @@ -4008,10 +3944,10 @@ #: ../src/common/ftp.cpp:635 msgid "Timeout while waiting for FTP server to connect, try passive mode." -msgstr "Przekroczono czas oczekiwania dla serwera FTP, spróbuj trybu pasywnego." +msgstr "" +"Przekroczono czas oczekiwania dla serwera FTP, spróbuj trybu pasywnego." -#: ../src/msw/timer.cpp:116 -#: ../src/os2/timer.cpp:141 +#: ../src/msw/timer.cpp:116 ../src/os2/timer.cpp:141 msgid "Timer creation failed." msgstr "Nie powiod³o siê utworzenie stopera." @@ -4040,8 +3976,7 @@ msgid "Trying to remove file '%s' from memory VFS, but it is not loaded!" msgstr "Prób± usuniêcia pliku '%s' z pamiêci VFS, który nie zosta³ wczytany!" -#: ../src/common/sckaddr.cpp:146 -#: ../src/common/sckaddr.cpp:250 +#: ../src/common/sckaddr.cpp:146 ../src/common/sckaddr.cpp:250 msgid "Trying to solve a NULL hostname: giving up" msgstr "próba u¿ycia niezdefiniowej (NULL) nazwy serwera: rezygnacja" @@ -4053,8 +3988,7 @@ msgid "Type" msgstr "Typ" -#: ../src/common/xtistrm.cpp:281 -#: ../src/common/xtixml.cpp:351 +#: ../src/common/xtistrm.cpp:281 ../src/common/xtixml.cpp:351 #: ../src/common/xtixml.cpp:498 msgid "Type must have enum - long conversion" msgstr "Typ musi umo¿liwiaæ konswersjê enum - long" @@ -4156,8 +4090,7 @@ msgid "Unknown long option '%s'" msgstr "Nieznana d³uga opcja '%s'" -#: ../src/common/cmdline.cpp:608 -#: ../src/common/cmdline.cpp:629 +#: ../src/common/cmdline.cpp:608 ../src/common/cmdline.cpp:629 #, c-format msgid "Unknown option '%s'" msgstr "Nieznana opcja '%s'" @@ -4177,8 +4110,7 @@ msgid "Unmatched '{' in an entry for mime type %s." msgstr "Nieodpowiedni '{' w pozycji dla typu mime %s." -#: ../src/common/cmdproc.cpp:261 -#: ../src/common/cmdproc.cpp:287 +#: ../src/common/cmdproc.cpp:261 ../src/common/cmdproc.cpp:287 #: ../src/common/cmdproc.cpp:307 msgid "Unnamed command" msgstr "Polecenie bez nazwy" @@ -4188,10 +4120,8 @@ msgid "Unrecognized style %s while parsing resource." msgstr "Nierozpoznany styl %s podczas przetwarzania zasobu." -#: ../src/mac/carbon/clipbrd.cpp:68 -#: ../src/mac/classic/clipbrd.cpp:64 -#: ../src/msw/clipbrd.cpp:273 -#: ../src/msw/clipbrd.cpp:445 +#: ../src/mac/carbon/clipbrd.cpp:68 ../src/mac/classic/clipbrd.cpp:64 +#: ../src/msw/clipbrd.cpp:273 ../src/msw/clipbrd.cpp:445 msgid "Unsupported clipboard format." msgstr "Nieobs³ugiwany format schowka." @@ -4244,7 +4174,9 @@ #: ../src/html/htmlpars.cpp:391 msgid "Warning: attempt to remove HTML tag handler from empty stack." -msgstr "Ostrze¿enie: próba usuniêcia procedury obs³ugi znacznika HTML z pustego stosu." +msgstr "" +"Ostrze¿enie: próba usuniêcia procedury obs³ugi znacznika HTML z pustego " +"stosu." #: ../src/common/fmapbase.cpp:104 msgid "Western European (ISO-8859-1)" @@ -4254,8 +4186,7 @@ msgid "Western European with Euro (ISO-8859-15)" msgstr "Zachodnioeuropejski z Euro (ISO-8859-15)" -#: ../src/generic/fontdlgg.cpp:339 -#: ../src/generic/fontdlgg.cpp:341 +#: ../src/generic/fontdlgg.cpp:339 ../src/generic/fontdlgg.cpp:341 msgid "Whether the font is underlined." msgstr "Okre¶lenie podkre¶lenia." @@ -4390,8 +4321,7 @@ msgid "XPM: Malformed pixel data!" msgstr "XPM: Zniekszta³cone dane obrazu!" -#: ../src/common/xpmdecod.cpp:712 -#: ../src/common/xpmdecod.cpp:721 +#: ../src/common/xpmdecod.cpp:712 ../src/common/xpmdecod.cpp:721 #, c-format msgid "XPM: malformed colour definition '%s'!" msgstr "XPM: niepoprawna definicja koloru '%s'!" @@ -4401,8 +4331,7 @@ msgid "XRC resource '%s' (class '%s') not found!" msgstr "Nie znaleziono zasobu XRC '%s' (klasa '%s')!" -#: ../src/xrc/xmlres.cpp:1080 -#: ../src/xrc/xmlres.cpp:1092 +#: ../src/xrc/xmlres.cpp:1080 ../src/xrc/xmlres.cpp:1092 #, c-format msgid "XRC resource: Cannot create bitmap from '%s'." msgstr "Zasoby XRC: Nie mo¿na utworzyæ mapy bitowej z '%s'." @@ -4410,12 +4339,11 @@ #: ../src/xrc/xmlres.cpp:1036 #, c-format msgid "XRC resource: Incorrect colour specification '%s' for property '%s'." -msgstr "Zasoby XRC: Nieprawid³owa specyfikacja koloru '%s' dla w³a¶ciwo¶ci '%s'." +msgstr "" +"Zasoby XRC: Nieprawid³owa specyfikacja koloru '%s' dla w³a¶ciwo¶ci '%s'." -#: ../src/mac/carbon/msgdlg.cpp:59 -#: ../src/mac/carbon/msgdlg.cpp:142 -#: ../src/mac/classic/msgdlg.cpp:57 -#: ../src/mac/classic/msgdlg.cpp:139 +#: ../src/mac/carbon/msgdlg.cpp:59 ../src/mac/carbon/msgdlg.cpp:142 +#: ../src/mac/classic/msgdlg.cpp:57 ../src/mac/classic/msgdlg.cpp:139 #: ../src/motif/msgdlg.cpp:204 msgid "Yes" msgstr "Tak" @@ -4447,11 +4375,13 @@ # instance --> #: ../src/msw/dde.cpp:1048 msgid "" -"a DDEML function was called without first calling the DdeInitialize function,\n" +"a DDEML function was called without first calling the DdeInitialize " +"function,\n" "or an invalid instance identifier\n" "was passed to a DDEML function." msgstr "" -"zosta³a wywo³ana funkcja DDEML bez wcze¶niejszego wywo³ania funkcji DdeInitialize,\n" +"zosta³a wywo³ana funkcja DDEML bez wcze¶niejszego wywo³ania funkcji " +"DdeInitialize,\n" "lub do funkcji DDEML przes³ano\n" "nieprawid³owy identyfikator instancji." @@ -4469,19 +4399,23 @@ #: ../src/msw/dde.cpp:1039 msgid "a request for a synchronous advise transaction has timed out." -msgstr "up³yn±³ czas oczekiwania na rozpoczêcie synchronicznej transakcji advise." +msgstr "" +"up³yn±³ czas oczekiwania na rozpoczêcie synchronicznej transakcji advise." #: ../src/msw/dde.cpp:1045 msgid "a request for a synchronous data transaction has timed out." -msgstr "up³yn±³ czas oczekiwania na rozpoczêcie synchronicznej transakcji data." +msgstr "" +"up³yn±³ czas oczekiwania na rozpoczêcie synchronicznej transakcji data." #: ../src/msw/dde.cpp:1054 msgid "a request for a synchronous execute transaction has timed out." -msgstr "up³yn±³ czas oczekiwania na rozpoczêcie synchronicznej transakcji execute." +msgstr "" +"up³yn±³ czas oczekiwania na rozpoczêcie synchronicznej transakcji execute." #: ../src/msw/dde.cpp:1072 msgid "a request for a synchronous poke transaction has timed out." -msgstr "up³yn±³ czas oczekiwania na rozpoczêcie synchronicznej transakcji poke." +msgstr "" +"up³yn±³ czas oczekiwania na rozpoczêcie synchronicznej transakcji poke." #: ../src/msw/dde.cpp:1087 msgid "a request to end an advise transaction has timed out." @@ -4603,8 +4537,7 @@ msgid "can't determine if the end of file is reached on descriptor %d" msgstr "nie mo¿na okre¶liæ czy osi±gniêto koniec pliku w deskryptorze %d" -#: ../src/msdos/utilsdos.cpp:307 -#: ../src/msdos/utilsdos.cpp:466 +#: ../src/msdos/utilsdos.cpp:307 ../src/msdos/utilsdos.cpp:466 #, c-format msgid "can't execute '%s'" msgstr "nie uda³o siê wykonaæ '%s'" @@ -4627,8 +4560,7 @@ msgid "can't flush file descriptor %d" msgstr "nie mo¿na opró¿niæ deskryptora pliku %d" -#: ../src/common/file.cpp:399 -#: ../src/msw/wince/filefnwce.cpp:202 +#: ../src/common/file.cpp:399 ../src/msw/wince/filefnwce.cpp:202 #, c-format msgid "can't get seek position on file descriptor %d" msgstr "nie mo¿na odczytaæ bie¿±cej pozycji w deskryptorze pliku %d" @@ -4637,8 +4569,7 @@ msgid "can't load any font, aborting" msgstr "nie mo¿na za³adowaæ ¿adnej czcionki, program koñczy pracê" -#: ../src/common/ffile.cpp:75 -#: ../src/common/file.cpp:271 +#: ../src/common/ffile.cpp:75 ../src/common/file.cpp:271 #, c-format msgid "can't open file '%s'" msgstr "nie mo¿na otworzyæ pliku '%s'" @@ -4660,7 +4591,9 @@ #: ../src/common/dynlib.cpp:253 msgid "can't query for GUI plugins name in console applications" -msgstr "nie mo¿na pobieraæ nazw wtyczek interfejsu graficznego w aplikacji przeznaczonej dla trybu tekstowego" +msgstr "" +"nie mo¿na pobieraæ nazw wtyczek interfejsu graficznego w aplikacji " +"przeznaczonej dla trybu tekstowego" #: ../src/common/zipstrm.cpp:436 msgid "can't re-initialize zlib deflate stream" @@ -4685,8 +4618,7 @@ msgid "can't remove temporary file '%s'" msgstr "nie mo¿na usun±æ tymczasowego pliku '%s'" -#: ../src/common/file.cpp:385 -#: ../src/msw/wince/filefnwce.cpp:189 +#: ../src/common/file.cpp:385 ../src/msw/wince/filefnwce.cpp:189 #, c-format msgid "can't seek on file descriptor %d" msgstr "nie mo¿na ustawiæ pozycji w deskryptorze pliku %d" @@ -4736,8 +4668,7 @@ msgid "decompression error" msgstr "b³±d dekompresji" -#: ../src/common/fmapbase.cpp:705 -#: ../src/common/fmapbase.cpp:737 +#: ../src/common/fmapbase.cpp:705 ../src/common/fmapbase.cpp:737 msgid "default" msgstr "domy¶lny" @@ -4883,8 +4814,7 @@ msgid "invalid zip file" msgstr "nieprawid³owy plik zip" -#: ../src/common/fontcmn.cpp:586 -#: ../src/common/fontcmn.cpp:650 +#: ../src/common/fontcmn.cpp:586 ../src/common/fontcmn.cpp:650 msgid "italic" msgstr "kursywa" @@ -5038,8 +4968,7 @@ msgid "thirteenth" msgstr "trzynasty" -#: ../src/common/imagtiff.cpp:145 -#: ../src/common/imagtiff.cpp:161 +#: ../src/common/imagtiff.cpp:145 ../src/common/imagtiff.cpp:161 #, c-format msgid "tiff module: %s" msgstr "modu³ tiff: %s" @@ -5082,8 +5011,7 @@ msgid "unknown class %s" msgstr "nieznana klasa %s" -#: ../src/common/regex.cpp:163 -#: ../src/html/chm.cpp:352 +#: ../src/common/regex.cpp:163 ../src/html/chm.cpp:352 msgid "unknown error" msgstr "nieznany b³±d" @@ -5096,8 +5024,7 @@ msgid "unknown line terminator" msgstr "nieznany znacznik koñca linii" -#: ../src/common/file.cpp:367 -#: ../src/msw/wince/filefnwce.cpp:170 +#: ../src/common/file.cpp:367 ../src/msw/wince/filefnwce.cpp:170 msgid "unknown seek origin" msgstr "nieznany odno¶nik pozycjonowania" @@ -5115,8 +5042,7 @@ msgid "unnamed%d" msgstr "beznazwy%d" -#: ../src/common/zipstrm.cpp:1660 -#: ../src/common/zipstrm.cpp:2030 +#: ../src/common/zipstrm.cpp:1660 ../src/common/zipstrm.cpp:2030 msgid "unsupported Zip compression method" msgstr "niewspierana metoda kompresji Zip" @@ -5141,15 +5067,12 @@ msgid "wxGetTimeOfDay failed." msgstr "wxGetTimeOfDay zwróci³o b³±d." -#: ../src/common/socket.cpp:415 -#: ../src/common/socket.cpp:469 -#: ../src/mac/carbon/cfsocket.cpp:452 -#: ../src/mac/carbon/cfsocket.cpp:506 +#: ../src/common/socket.cpp:415 ../src/common/socket.cpp:469 +#: ../src/mac/carbon/cfsocket.cpp:452 ../src/mac/carbon/cfsocket.cpp:506 msgid "wxSocket: invalid signature in ReadMsg." msgstr "wxSocket: b³êdna sygnatura w ReadMsg." -#: ../src/common/socket.cpp:966 -#: ../src/mac/carbon/cfsocket.cpp:1006 +#: ../src/common/socket.cpp:966 ../src/mac/carbon/cfsocket.cpp:1006 msgid "wxSocket: unknown event!." msgstr "wxSocket: nieznane zdarzenie!" @@ -5166,8 +5089,7 @@ msgid "yesterday" msgstr "wczoraj" -#: ../src/common/zstream.cpp:165 -#: ../src/common/zstream.cpp:315 +#: ../src/common/zstream.cpp:165 ../src/common/zstream.cpp:315 #, c-format msgid "zlib error %d" msgstr "b³±d biblioteki zlib %d" @@ -5181,16 +5103,20 @@ #~ "Failed to get stack backtrace:\n" #~ "%s" #~ msgstr "Nie uda³o siê usyskaæ listy ISP: %s" + #~ msgid "Loading Grey Ascii PNM image is not yet implemented." #~ msgstr "£adowanie obrazów Grey Ascii PNM nie jest jeszcze zaimplementowane." + #~ msgid "Loading Grey Raw PNM image is not yet implemented." #~ msgstr "£adowanie obrazów Grey Raw PNM nie jest jeszcze zaimplementowane." #, fuzzy #~ msgid "Cannot wait on thread to exit." #~ msgstr "Nie mo¿na czekaæ na zakoñczenie w±tku" + #~ msgid "Could not load Rich Edit DLL '%s'" #~ msgstr "Nie mo¿na wczytaæ biblioteki Rich Edit '%s'" + #~ msgid "ZIP handler currently supports only local files!" #~ msgstr "Obs³ugiwane s± tylko lokalne pliki ZIP!" @@ -5198,14 +5124,18 @@ #~ msgid "" #~ "can't seek on file descriptor %d, large files support is not enabled." #~ msgstr "nie mo¿na ustawiæ pozycji w deskryptorze pliku %d" + #~ msgid "More..." #~ msgstr "Wiêcej..." + #~ msgid "Setup" #~ msgstr "Ustawienia" + #~ msgid "/#SYSTEM" #~ msgstr "/#SYSTEM" + #~ msgid "Backward" #~ msgstr "Wstecz" + #~ msgid "GetUnusedColour:: No Unused Color in image " #~ msgstr "Brak wolnych kolorów w obrazie (GetUnusedColour)" - --- wxwidgets2.6-2.6.3.2.2.orig/locale/sl.po +++ wxwidgets2.6-2.6.3.2.2/locale/sl.po @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: wxWidgets 2.6.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-10-13 04:17+0930\n" +"POT-Creation-Date: 2005-08-21 17:37+0200\n" "PO-Revision-Date: 2005-08-29 09:29+0100\n" "Last-Translator: Martin Srebotnjak \n" "Language-Team: LUGOS \n" @@ -11,7 +11,8 @@ "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: Slovenian\n" "X-Poedit-Country: SLOVENIA\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" +"%100==4 ? 3 : 0);\n" "X-Poedit-SourceCharset: iso-8859-1\n" #: ../src/common/debugrpt.cpp:569 @@ -82,10 +83,8 @@ # html/helpfrm.cpp:719 # html/helpfrm.cpp:1277 # html/helpfrm.cpp:1304 -#: ../src/html/helpfrm.cpp:1042 -#: ../src/html/helpfrm.cpp:1044 -#: ../src/html/helpfrm.cpp:1703 -#: ../src/html/helpfrm.cpp:1736 +#: ../src/html/helpfrm.cpp:1042 ../src/html/helpfrm.cpp:1044 +#: ../src/html/helpfrm.cpp:1703 ../src/html/helpfrm.cpp:1736 #, c-format msgid "%i of %i" msgstr "%i od %i" @@ -148,8 +147,7 @@ msgid "%s: ill-formed resource file syntax." msgstr "%s: slabo oblikovana skladnja datoteke vira." -#: ../src/html/helpfrm.cpp:357 -#: ../src/html/helpfrm.cpp:359 +#: ../src/html/helpfrm.cpp:357 ../src/html/helpfrm.cpp:359 msgid "&About..." msgstr "&O programu ..." @@ -187,10 +185,8 @@ # generic/proplist.cpp:523 # generic/wizard.cpp:192 # html/helpfrm.cpp:910 -#: ../src/common/stockitem.cpp:110 -#: ../src/generic/fontdlgg.cpp:363 -#: ../src/generic/fontdlgg.cpp:382 -#: ../src/generic/wizard.cpp:422 +#: ../src/common/stockitem.cpp:110 ../src/generic/fontdlgg.cpp:363 +#: ../src/generic/fontdlgg.cpp:382 ../src/generic/wizard.cpp:422 msgid "&Cancel" msgstr "&Preklièi" @@ -206,15 +202,12 @@ # generic/logg.cpp:477 # generic/tipdlg.cpp:170 -#: ../src/common/prntbase.cpp:875 -#: ../src/common/stockitem.cpp:112 -#: ../src/generic/logg.cpp:509 -#: ../src/html/helpfrm.cpp:354 +#: ../src/common/prntbase.cpp:875 ../src/common/stockitem.cpp:112 +#: ../src/generic/logg.cpp:509 ../src/html/helpfrm.cpp:354 msgid "&Close" msgstr "&Zapri" -#: ../src/common/stockitem.cpp:113 -#: ../src/mac/carbon/textctrl.cpp:1074 +#: ../src/common/stockitem.cpp:113 ../src/mac/carbon/textctrl.cpp:1074 #: ../src/msw/textctrl.cpp:2064 msgid "&Copy" msgstr "&Kopiraj" @@ -223,8 +216,7 @@ msgid "&Debug report preview:" msgstr "&Predogled poroèila o razhro¹èevanju:" -#: ../src/common/stockitem.cpp:115 -#: ../src/mac/carbon/textctrl.cpp:1076 +#: ../src/common/stockitem.cpp:115 ../src/mac/carbon/textctrl.cpp:1076 #: ../src/msw/textctrl.cpp:2066 msgid "&Delete" msgstr "&Zbri¹i" @@ -272,10 +264,8 @@ # generic/proplist.cpp:528 # html/helpfrm.cpp:208 # msw/mdi.cpp:1283 -#: ../src/common/stockitem.cpp:122 -#: ../src/generic/wizard.cpp:418 -#: ../src/generic/wizard.cpp:425 -#: ../src/html/helpfrm.cpp:362 +#: ../src/common/stockitem.cpp:122 ../src/generic/wizard.cpp:418 +#: ../src/generic/wizard.cpp:425 ../src/html/helpfrm.cpp:362 msgid "&Help" msgstr "&Pomoè" @@ -309,15 +299,13 @@ msgstr "&Nov" # msw/mdi.cpp:188 -#: ../src/generic/mdig.cpp:118 -#: ../src/msw/mdi.cpp:188 +#: ../src/generic/mdig.cpp:118 ../src/msw/mdi.cpp:188 msgid "&Next" msgstr "&Naslednji" # generic/wizard.cpp:189 # generic/wizard.cpp:286 -#: ../src/generic/wizard.cpp:421 -#: ../src/generic/wizard.cpp:636 +#: ../src/generic/wizard.cpp:421 ../src/generic/wizard.cpp:636 msgid "&Next >" msgstr "&Naslednji >" @@ -345,8 +333,7 @@ # generic/prntdlgg.cpp:467 # generic/proplist.cpp:511 # html/helpfrm.cpp:909 -#: ../src/common/stockitem.cpp:133 -#: ../src/generic/fontdlgg.cpp:368 +#: ../src/common/stockitem.cpp:133 ../src/generic/fontdlgg.cpp:368 #: ../src/generic/fontdlgg.cpp:375 msgid "&OK" msgstr "&V redu" @@ -364,8 +351,7 @@ msgstr "&Odpri ..." # common/cmdline.cpp:912 -#: ../src/common/stockitem.cpp:135 -#: ../src/mac/carbon/textctrl.cpp:1075 +#: ../src/common/stockitem.cpp:135 ../src/mac/carbon/textctrl.cpp:1075 #: ../src/msw/textctrl.cpp:2065 msgid "&Paste" msgstr "&Prilepi" @@ -380,8 +366,7 @@ msgstr "&Mo¾nosti" # html/helpfrm.cpp:512 -#: ../src/generic/mdig.cpp:119 -#: ../src/msw/mdi.cpp:189 +#: ../src/generic/mdig.cpp:119 ../src/msw/mdi.cpp:189 msgid "&Previous" msgstr "&Prej¹nji" @@ -407,18 +392,15 @@ # common/docview.cpp:1945 # common/docview.cpp:1956 -#: ../src/common/cmdproc.cpp:292 -#: ../src/common/cmdproc.cpp:299 -#: ../src/common/stockitem.cpp:141 -#: ../src/mac/carbon/textctrl.cpp:1071 +#: ../src/common/cmdproc.cpp:292 ../src/common/cmdproc.cpp:299 +#: ../src/common/stockitem.cpp:141 ../src/mac/carbon/textctrl.cpp:1071 #: ../src/msw/textctrl.cpp:2061 msgid "&Redo" msgstr "&Ponovi" # common/docview.cpp:1939 # common/docview.cpp:1966 -#: ../src/common/cmdproc.cpp:288 -#: ../src/common/cmdproc.cpp:308 +#: ../src/common/cmdproc.cpp:288 ../src/common/cmdproc.cpp:308 msgid "&Redo " msgstr "&Ponovi " @@ -464,16 +446,13 @@ msgstr "&Slog:" # generic/fontdlgg.cpp:242 -#: ../src/common/stockitem.cpp:149 -#: ../src/generic/fontdlgg.cpp:337 +#: ../src/common/stockitem.cpp:149 ../src/generic/fontdlgg.cpp:337 msgid "&Underline" msgstr "&Podèrtaj" # common/docview.cpp:1951 -#: ../src/common/cmdproc.cpp:270 -#: ../src/common/stockitem.cpp:150 -#: ../src/mac/carbon/textctrl.cpp:1070 -#: ../src/msw/textctrl.cpp:2060 +#: ../src/common/cmdproc.cpp:270 ../src/common/stockitem.cpp:150 +#: ../src/mac/carbon/textctrl.cpp:1070 ../src/msw/textctrl.cpp:2060 msgid "&Undo" msgstr "&Razveljavi" @@ -498,11 +477,8 @@ # msw/mdi.cpp:1287 # msw/mdi.cpp:1294 # msw/window.cpp:2286 -#: ../src/generic/mdig.cpp:298 -#: ../src/generic/mdig.cpp:314 -#: ../src/generic/mdig.cpp:318 -#: ../src/msw/mdi.cpp:1410 -#: ../src/msw/mdi.cpp:1417 +#: ../src/generic/mdig.cpp:298 ../src/generic/mdig.cpp:314 +#: ../src/generic/mdig.cpp:318 ../src/msw/mdi.cpp:1410 ../src/msw/mdi.cpp:1417 #: ../src/msw/mdi.cpp:1447 msgid "&Window" msgstr "&Okno" @@ -515,15 +491,13 @@ # common/config.cpp:396 # msw/regconf.cpp:264 -#: ../src/common/config.cpp:433 -#: ../src/msw/regconf.cpp:258 +#: ../src/common/config.cpp:433 ../src/msw/regconf.cpp:258 #, c-format msgid "'%s' has extra '..', ignored." msgstr "'%s' ima dodaten '..', ignorirano." # common/valtext.cpp:140 -#: ../src/common/valtext.cpp:132 -#: ../src/common/valtext.cpp:162 +#: ../src/common/valtext.cpp:132 ../src/common/valtext.cpp:162 #: ../src/common/valtext.cpp:168 #, c-format msgid "'%s' is invalid" @@ -578,8 +552,7 @@ # html/helpfrm.cpp:276 # html/helpfrm.cpp:783 # html/helpfrm.cpp:1330 -#: ../src/html/helpfrm.cpp:431 -#: ../src/html/helpfrm.cpp:1114 +#: ../src/html/helpfrm.cpp:431 ../src/html/helpfrm.cpp:1114 #: ../src/html/helpfrm.cpp:1764 msgid "(bookmarks)" msgstr "(zaznamki)" @@ -609,15 +582,13 @@ # generic/dirdlgg.cpp:264 # generic/filedlgg.cpp:713 -#: ../src/generic/dirctrlg.cpp:683 -#: ../src/generic/filedlgg.cpp:740 +#: ../src/generic/dirctrlg.cpp:683 ../src/generic/filedlgg.cpp:740 msgid "." msgstr "." # generic/dirdlgg.cpp:265 # generic/filedlgg.cpp:714 -#: ../src/generic/dirctrlg.cpp:684 -#: ../src/generic/filedlgg.cpp:741 +#: ../src/generic/dirctrlg.cpp:684 ../src/generic/filedlgg.cpp:741 msgid ".." msgstr ".." @@ -674,20 +645,17 @@ msgstr "<<" # generic/filedlgg.cpp:356 -#: ../src/generic/filedlgg.cpp:259 -#: ../src/generic/filedlgg.cpp:282 +#: ../src/generic/filedlgg.cpp:259 ../src/generic/filedlgg.cpp:282 msgid "" msgstr "" # generic/filedlgg.cpp:356 -#: ../src/generic/filedlgg.cpp:263 -#: ../src/generic/filedlgg.cpp:286 +#: ../src/generic/filedlgg.cpp:263 ../src/generic/filedlgg.cpp:286 msgid "" msgstr "" # generic/filedlgg.cpp:357 -#: ../src/generic/filedlgg.cpp:261 -#: ../src/generic/filedlgg.cpp:284 +#: ../src/generic/filedlgg.cpp:261 ../src/generic/filedlgg.cpp:284 msgid "" msgstr "" @@ -891,7 +859,9 @@ #: ../src/generic/logg.cpp:1163 #, c-format msgid "Append log to file '%s' (choosing [No] will overwrite it)?" -msgstr "®elite dopisati dnevnik v datoteko '%s' (izbira [Ne] povzroèi prepis datoteke)?" +msgstr "" +"®elite dopisati dnevnik v datoteko '%s' (izbira [Ne] povzroèi prepis " +"datoteke)?" #: ../src/common/fmapbase.cpp:109 msgid "Arabic (ISO-8859-6)" @@ -959,8 +929,7 @@ # common/imagbmp.cpp:266 # common/imagbmp.cpp:278 -#: ../src/common/imagbmp.cpp:477 -#: ../src/common/imagbmp.cpp:493 +#: ../src/common/imagbmp.cpp:477 ../src/common/imagbmp.cpp:493 msgid "BMP: Couldn't allocate memory." msgstr "BMP: pomnilnika ni mogoèe alocirati." @@ -1050,8 +1019,7 @@ msgid "C65 Envelope, 114 x 229 mm" msgstr "kuverta C65, 114 x 229 mm" -#: ../src/html/chm.cpp:797 -#: ../src/html/chm.cpp:856 +#: ../src/html/chm.cpp:797 ../src/html/chm.cpp:856 msgid "CHM handler currently supports only local files!" msgstr "Upravljalec CHM trenutno podpira le lokalne datoteke!" @@ -1073,8 +1041,7 @@ # common/filefn.cpp:1287 # msw/dir.cpp:294 -#: ../src/msw/dir.cpp:205 -#: ../src/unix/dir.cpp:232 +#: ../src/msw/dir.cpp:205 ../src/unix/dir.cpp:232 #, c-format msgid "Can not enumerate files in directory '%s'" msgstr "O¹tevilèenje datotek v imeniku '%s' ni mo¾no." @@ -1090,8 +1057,7 @@ msgstr "Niti %lu ni mogoèe nadaljevati." # msw/thread.cpp:552 -#: ../src/mac/classic/thread.cpp:491 -#: ../src/msw/thread.cpp:827 +#: ../src/mac/classic/thread.cpp:491 ../src/msw/thread.cpp:827 #, c-format msgid "Can not resume thread %x" msgstr "Niti %x ni mogoèe nadaljevati" @@ -1107,8 +1073,7 @@ msgstr "Niti %lu ni mogoèe zaèasno ustaviti." # msw/thread.cpp:537 -#: ../src/mac/classic/thread.cpp:464 -#: ../src/msw/thread.cpp:812 +#: ../src/mac/classic/thread.cpp:464 ../src/msw/thread.cpp:812 #, c-format msgid "Can not suspend thread %x" msgstr "Niti %x ni mogoèe zaèasno ustaviti." @@ -1127,7 +1092,8 @@ #: ../src/common/image.cpp:1939 #, c-format msgid "Can't check image format of file '%s': file does not exist." -msgstr "Formata slike v datoteki '%s' ni mogoèe preveriti: datoteka ne obstaja." +msgstr "" +"Formata slike v datoteki '%s' ni mogoèe preveriti: datoteka ne obstaja." # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. @@ -1160,10 +1126,8 @@ # FIRST AUTHOR , YEAR. # # msw/thread.cpp:519 -#: ../src/mac/carbon/mpthread.cpp:911 -#: ../src/mac/carbon/thread.cpp:1100 -#: ../src/mac/classic/thread.cpp:439 -#: ../src/msw/thread.cpp:594 +#: ../src/mac/carbon/mpthread.cpp:911 ../src/mac/carbon/thread.cpp:1100 +#: ../src/mac/classic/thread.cpp:439 ../src/msw/thread.cpp:594 #: ../src/os2/thread.cpp:486 msgid "Can't create thread" msgstr "Niti ni mogoèe ustvariti." @@ -1193,8 +1157,7 @@ # FIRST AUTHOR , YEAR. # # msw/iniconf.cpp:476 -#: ../src/msw/iniconf.cpp:444 -#: ../src/os2/iniconf.cpp:458 +#: ../src/msw/iniconf.cpp:444 ../src/os2/iniconf.cpp:458 #, c-format msgid "Can't delete the INI file '%s'" msgstr "Datoteke INI '%s' ni mogoèe izbrisati." @@ -1255,8 +1218,7 @@ # common/image.cpp:653 # common/image.cpp:673 -#: ../src/common/image.cpp:1367 -#: ../src/common/image.cpp:1387 +#: ../src/common/image.cpp:1367 ../src/common/image.cpp:1387 #, c-format msgid "Can't load image from file '%s': file does not exist." msgstr "Slike iz datoteke '%s' ni mogoèe nalo¾iti: datoteka ne obstaja" @@ -1293,8 +1255,7 @@ # # msw/registry.cpp:774 # msw/registry.cpp:813 -#: ../src/msw/registry.cpp:795 -#: ../src/msw/registry.cpp:825 +#: ../src/msw/registry.cpp:795 ../src/msw/registry.cpp:825 #: ../src/msw/registry.cpp:885 #, c-format msgid "Can't read value of key '%s'" @@ -1309,14 +1270,12 @@ # generic/logg.cpp:535 # generic/logg.cpp:932 -#: ../src/generic/logg.cpp:569 -#: ../src/generic/logg.cpp:1020 +#: ../src/generic/logg.cpp:569 ../src/generic/logg.cpp:1020 msgid "Can't save log contents to file." msgstr "Vsebine dnevnika ni mogoèe shraniti v datoteko." # msw/thread.cpp:485 -#: ../src/msw/thread.cpp:550 -#: ../src/os2/thread.cpp:469 +#: ../src/msw/thread.cpp:550 ../src/os2/thread.cpp:469 msgid "Can't set thread priority" msgstr "Prioritet niti ni bilo mogoèe nastaviti." @@ -1326,8 +1285,7 @@ # # msw/registry.cpp:799 # msw/registry.cpp:923 -#: ../src/msw/registry.cpp:812 -#: ../src/msw/registry.cpp:854 +#: ../src/msw/registry.cpp:812 ../src/msw/registry.cpp:854 #: ../src/msw/registry.cpp:975 #, c-format msgid "Can't set value of '%s'" @@ -1350,18 +1308,14 @@ # generic/proplist.cpp:523 # generic/wizard.cpp:192 # html/helpfrm.cpp:910 -#: ../src/generic/choicdgg.cpp:291 -#: ../src/generic/dirdlgg.cpp:114 -#: ../src/generic/numdlgg.cpp:136 -#: ../src/generic/textdlgg.cpp:120 -#: ../src/gtk/fontdlg.cpp:155 -#: ../src/motif/msgdlg.cpp:204 +#: ../src/generic/choicdgg.cpp:291 ../src/generic/dirdlgg.cpp:114 +#: ../src/generic/numdlgg.cpp:136 ../src/generic/textdlgg.cpp:120 +#: ../src/gtk/fontdlg.cpp:155 ../src/motif/msgdlg.cpp:204 #: ../contrib/src/deprecated/proplist.cpp:518 msgid "Cancel" msgstr "Preklièi" -#: ../src/xrc/xmlres.cpp:1188 -#: ../src/xrc/xmlres.cpp:1236 +#: ../src/xrc/xmlres.cpp:1188 ../src/xrc/xmlres.cpp:1236 msgid "Cannot convert dialog units: dialog unknown." msgstr "Enot pogovornih oken ni mogoèe pretvoriti: pogovorno okno neznano." @@ -1505,8 +1459,7 @@ msgstr "Prazne strani ni mogoèe natisniti." # html/helpdata.cpp:353 -#: ../src/msw/volume.cpp:160 -#: ../src/msw/volume.cpp:491 +#: ../src/msw/volume.cpp:160 ../src/msw/volume.cpp:491 #, c-format msgid "Cannot read typename from '%s'!" msgstr "Imena tipa ni mogoèe prebrati iz '%s'!" @@ -1520,8 +1473,7 @@ msgstr "Niti ni mo¾no zagnati: napaka pri pisanju TLS" # msw/thread.cpp:871 -#: ../src/mac/carbon/mpthread.cpp:977 -#: ../src/mac/carbon/thread.cpp:1174 +#: ../src/mac/carbon/mpthread.cpp:977 ../src/mac/carbon/thread.cpp:1174 msgid "Cannot wait for thread termination." msgstr "Na ustavitev niti ni mogoèe poèakati." @@ -1530,8 +1482,7 @@ # FIRST AUTHOR , YEAR. # # msw/thread.cpp:519 -#: ../src/mac/carbon/mpthread.cpp:893 -#: ../src/mac/carbon/thread.cpp:1082 +#: ../src/mac/carbon/mpthread.cpp:893 ../src/mac/carbon/thread.cpp:1082 msgid "Cant create the thread event queue" msgstr "Èakalne vrste nitnih dogodkov ni mogoèe ustvariti" @@ -1558,8 +1509,7 @@ msgid "Choose ISP to dial" msgstr "Izberite ponudnika spletnih storitev, ki ga ¾elite poklicati." -#: ../src/generic/colrdlgg.cpp:151 -#: ../src/gtk/colordlg.cpp:45 +#: ../src/generic/colrdlgg.cpp:151 ../src/gtk/colordlg.cpp:45 #: ../src/palmos/colordlg.cpp:79 msgid "Choose colour" msgstr "Izberite barvo" @@ -1580,25 +1530,20 @@ msgid "Clear the log contents" msgstr "Izprazni vsebino dnevnika" -#: ../src/generic/fontdlgg.cpp:365 -#: ../src/generic/fontdlgg.cpp:384 +#: ../src/generic/fontdlgg.cpp:365 ../src/generic/fontdlgg.cpp:384 msgid "Click to cancel the font selection." msgstr "Kliknite za preklic izbire pisave." -#: ../src/generic/fontdlgg.cpp:370 -#: ../src/generic/fontdlgg.cpp:372 -#: ../src/generic/fontdlgg.cpp:377 -#: ../src/generic/fontdlgg.cpp:379 +#: ../src/generic/fontdlgg.cpp:370 ../src/generic/fontdlgg.cpp:372 +#: ../src/generic/fontdlgg.cpp:377 ../src/generic/fontdlgg.cpp:379 msgid "Click to confirm the font selection." msgstr "Kliknite za potrditev izbire pisave." # common/prntbase.cpp:359 # generic/progdlgg.cpp:307 # generic/proplist.cpp:518 -#: ../src/generic/dbgrptg.cpp:92 -#: ../src/generic/progdlgg.cpp:629 -#: ../src/generic/progdlgg.cpp:634 -#: ../contrib/src/deprecated/proplist.cpp:513 +#: ../src/generic/dbgrptg.cpp:92 ../src/generic/progdlgg.cpp:629 +#: ../src/generic/progdlgg.cpp:634 ../contrib/src/deprecated/proplist.cpp:513 msgid "Close" msgstr "Zapri " @@ -1634,8 +1579,7 @@ msgstr "Vstopno konfiguracijsko ime se ne more zaèeti s '%c'." # generic/filedlgg.cpp:1077 -#: ../src/generic/filedlgg.cpp:1318 -#: ../src/gtk/filedlg.cpp:67 +#: ../src/generic/filedlgg.cpp:1318 ../src/gtk/filedlg.cpp:67 msgid "Confirm" msgstr "Potrdi" @@ -1711,7 +1655,8 @@ "Could not resolve control class or id '%s'. Use (non-zero) integer instead\n" " or provide #define (see manual for caveats)" msgstr "" -"Razre¹itev nadzornega razreda ali id '%s' ni uspela. Namesto tega uporabite (ne-nièelno) celo ¹tevilo\n" +"Razre¹itev nadzornega razreda ali id '%s' ni uspela. Namesto tega uporabite " +"(ne-nièelno) celo ¹tevilo\n" " ali priskrbite #define (oglejte si priroènik za opombe)." #: ../contrib/src/deprecated/resource.cpp:1278 @@ -1720,7 +1665,8 @@ "Could not resolve menu id '%s'. Use (non-zero) integer instead\n" "or provide #define (see manual for caveats)" msgstr "" -"Menijskega id '%s' ni mogoèe razre¹iti. Namesto tega uporabite (ne-nièelno) celo ¹tevilo\n" +"Menijskega id '%s' ni mogoèe razre¹iti. Namesto tega uporabite (ne-nièelno) " +"celo ¹tevilo\n" "ali preskrbite #define (oglejte si priroènik za opozorila)." # common/prntbase.cpp:711 @@ -1730,8 +1676,7 @@ # generic/printps.cpp:209 # msw/printwin.cpp:252 -#: ../src/generic/printps.cpp:185 -#: ../src/gtk/gnome/gprint.cpp:763 +#: ../src/generic/printps.cpp:185 ../src/gtk/gnome/gprint.cpp:763 #: ../src/msw/printwin.cpp:235 msgid "Could not start printing." msgstr "Tiskanja ni mogoèe pognati." @@ -1743,10 +1688,8 @@ # common/imagbmp.cpp:266 # common/imagbmp.cpp:278 -#: ../src/mac/carbon/mpthread.cpp:227 -#: ../src/mac/carbon/mpthread.cpp:306 -#: ../src/mac/carbon/thread.cpp:414 -#: ../src/mac/carbon/thread.cpp:495 +#: ../src/mac/carbon/mpthread.cpp:227 ../src/mac/carbon/mpthread.cpp:306 +#: ../src/mac/carbon/thread.cpp:414 ../src/mac/carbon/thread.cpp:495 msgid "Could not unlock mutex" msgstr "Mutexa ni mogoèe odkleniti." @@ -1761,24 +1704,20 @@ # msw/imaglist.cpp:152 # msw/imaglist.cpp:174 # msw/imaglist.cpp:187 -#: ../src/msw/dragimag.cpp:166 -#: ../src/msw/dragimag.cpp:206 -#: ../src/msw/imaglist.cpp:158 -#: ../src/msw/imaglist.cpp:176 +#: ../src/msw/dragimag.cpp:166 ../src/msw/dragimag.cpp:206 +#: ../src/msw/imaglist.cpp:158 ../src/msw/imaglist.cpp:176 #: ../src/msw/imaglist.cpp:188 msgid "Couldn't add an image to the image list." msgstr "Na seznam slik ni mogoèe dodati slike." # msw/timer.cpp:96 -#: ../src/msw/timer.cpp:106 -#: ../src/os2/timer.cpp:155 +#: ../src/msw/timer.cpp:106 ../src/os2/timer.cpp:155 msgid "Couldn't create a timer" msgstr "Èasovnika ni mogoèe ustvariti" # common/imagbmp.cpp:266 # common/imagbmp.cpp:278 -#: ../src/mgl/cursor.cpp:135 -#: ../src/mgl/cursor.cpp:166 +#: ../src/mgl/cursor.cpp:135 ../src/mgl/cursor.cpp:166 msgid "Couldn't create cursor." msgstr "Kazalke ni mogoèe ustvariti." @@ -1789,15 +1728,16 @@ msgstr "Simbola '%s' v dinamièni knji¾nici ni mogoèe najti." # msw/thread.cpp:578 -#: ../src/mac/classic/thread.cpp:521 -#: ../src/msw/thread.cpp:853 +#: ../src/mac/classic/thread.cpp:521 ../src/msw/thread.cpp:853 msgid "Couldn't get the current thread pointer" msgstr "Trenutnega kazalca niti ni mogoèe dobiti" # common/imagpng.cpp:251 #: ../src/common/imagpng.cpp:596 msgid "Couldn't load a PNG image - file is corrupted or not enough memory." -msgstr "Slike PNG ni mogoèe nalo¾iti - datoteka je pokvarjena ali pa primanjkuje spomina." +msgstr "" +"Slike PNG ni mogoèe nalo¾iti - datoteka je pokvarjena ali pa primanjkuje " +"spomina." # common/filefn.cpp:1287 # msw/dir.cpp:294 @@ -1831,21 +1771,20 @@ msgstr "Podatkov o kontrolnem elementu seznama %d ni mogoèe pridobiti." # common/imagbmp.cpp:62 -#: ../src/common/imagpng.cpp:642 -#: ../src/common/imagpng.cpp:651 +#: ../src/common/imagpng.cpp:642 ../src/common/imagpng.cpp:651 #: ../src/common/imagpng.cpp:659 msgid "Couldn't save PNG image." msgstr "Slike PNG ni mogoèe shraniti." # msw/thread.cpp:958 -#: ../src/mac/classic/thread.cpp:779 -#: ../src/msw/thread.cpp:611 +#: ../src/mac/classic/thread.cpp:779 ../src/msw/thread.cpp:611 msgid "Couldn't terminate thread" msgstr "Niti ni mogoèe konèati." #: ../src/common/xtistrm.cpp:161 msgid "Create Parameter not found in declared RTTI Parameters" -msgstr "V prijavljenih spremenljivkah RTTI ustvarjenega parametra ni mogoèe najti." +msgstr "" +"V prijavljenih spremenljivkah RTTI ustvarjenega parametra ni mogoèe najti." # generic/dirdlgg.cpp:572 #: ../src/generic/dirdlgg.cpp:307 @@ -1853,13 +1792,11 @@ msgstr "Ustvari imenik" # generic/filedlgg.cpp:883 -#: ../src/generic/dirdlgg.cpp:140 -#: ../src/generic/filedlgg.cpp:999 +#: ../src/generic/dirdlgg.cpp:140 ../src/generic/filedlgg.cpp:999 msgid "Create new directory" msgstr "Ustvari nov imenik" -#: ../src/common/stockitem.cpp:114 -#: ../src/mac/carbon/textctrl.cpp:1073 +#: ../src/common/stockitem.cpp:114 ../src/mac/carbon/textctrl.cpp:1073 #: ../src/msw/textctrl.cpp:2063 msgid "Cu&t" msgstr "&Izre¾i" @@ -1959,8 +1896,12 @@ # msw/dialup.cpp:354 #: ../src/msw/dialup.cpp:395 -msgid "Dial up functions are unavailable because the remote access service (RAS) is not installed on this machine. Please install it." -msgstr "Funkcije klicne povezave niso na voljo, ker storitev oddaljenega dostopa (RAS) na tem raèunalniku ni name¹èena. Prosimo namestite jo." +msgid "" +"Dial up functions are unavailable because the remote access service (RAS) is " +"not installed on this machine. Please install it." +msgstr "" +"Funkcije klicne povezave niso na voljo, ker storitev oddaljenega dostopa " +"(RAS) na tem raèunalniku ni name¹èena. Prosimo namestite jo." # generic/tipdlg.cpp:177 #: ../src/generic/tipdlg.cpp:246 @@ -1996,8 +1937,12 @@ # html/helpfrm.cpp:366 #: ../src/html/helpfrm.cpp:503 -msgid "Display all index items that contain given substring. Search is case insensitive." -msgstr "Poka¾i vse indeksirane predmete, ki vsebujejo podtekst. Iskanje je obèutljivo na velikost èrk" +msgid "" +"Display all index items that contain given substring. Search is case " +"insensitive." +msgstr "" +"Poka¾i vse indeksirane predmete, ki vsebujejo podtekst. Iskanje je " +"obèutljivo na velikost èrk" # html/helpfrm.cpp:535 #: ../src/html/helpfrm.cpp:685 @@ -2006,7 +1951,8 @@ #: ../src/msw/mimetype.cpp:671 msgid "" -"Do you want to overwrite the command used to %s files with extension \"%s\" ?\n" +"Do you want to overwrite the command used to %s files with extension \"%s" +"\" ?\n" "Current value is \n" "%s, \n" "New value is \n" @@ -2029,8 +1975,7 @@ msgstr "Ne shrani" # html/htmlwin.cpp:216 -#: ../src/html/htmlwin.cpp:451 -#: ../src/msw/frame.cpp:211 +#: ../src/html/htmlwin.cpp:451 ../src/msw/frame.cpp:211 msgid "Done" msgstr "Konèano" @@ -2090,8 +2035,10 @@ # common/config.cpp:349 #: ../src/common/config.cpp:384 #, c-format -msgid "Environment variables expansion failed: missing '%c' at position %u in '%s'." -msgstr "Raz¹iritev okoljske spremenjivke ni uspela: manjka '%c' na mestu %u v '%s'." +msgid "" +"Environment variables expansion failed: missing '%c' at position %u in '%s'." +msgstr "" +"Raz¹iritev okoljske spremenjivke ni uspela: manjka '%c' na mestu %u v '%s'." # generic/dirdlgg.cpp:268 # generic/dirdlgg.cpp:286 @@ -2104,24 +2051,17 @@ # generic/filedlgg.cpp:1043 # generic/filedlgg.cpp:1092 # generic/helpxlp.cpp:241 -#: ../src/generic/dirctrlg.cpp:689 -#: ../src/generic/dirctrlg.cpp:707 -#: ../src/generic/dirctrlg.cpp:718 -#: ../src/generic/dirdlgg.cpp:342 -#: ../src/generic/filedlgg.cpp:632 -#: ../src/generic/filedlgg.cpp:744 -#: ../src/generic/filedlgg.cpp:758 -#: ../src/generic/filedlgg.cpp:772 -#: ../src/generic/filedlgg.cpp:1269 -#: ../src/generic/filedlgg.cpp:1295 -#: ../src/generic/filedlgg.cpp:1325 -#: ../src/gtk/fontdlg.cpp:81 +#: ../src/generic/dirctrlg.cpp:689 ../src/generic/dirctrlg.cpp:707 +#: ../src/generic/dirctrlg.cpp:718 ../src/generic/dirdlgg.cpp:342 +#: ../src/generic/filedlgg.cpp:632 ../src/generic/filedlgg.cpp:744 +#: ../src/generic/filedlgg.cpp:758 ../src/generic/filedlgg.cpp:772 +#: ../src/generic/filedlgg.cpp:1269 ../src/generic/filedlgg.cpp:1295 +#: ../src/generic/filedlgg.cpp:1325 ../src/gtk/fontdlg.cpp:81 msgid "Error" msgstr "Napaka" # common/log.cpp:362 -#: ../src/msdos/utilsdos.cpp:213 -#: ../src/unix/utilsunx.cpp:1090 +#: ../src/msdos/utilsdos.cpp:213 ../src/unix/utilsunx.cpp:1090 #: ../src/unix/utilsunx.cpp:1098 msgid "Error " msgstr "Napaka" @@ -2145,8 +2085,7 @@ msgid "Error saving user configuration data." msgstr "Napaka pri shranjevanju podatkov nastavitev uporabnika." -#: ../src/mac/carbon/mpthread.cpp:482 -#: ../src/mac/carbon/thread.cpp:672 +#: ../src/mac/carbon/mpthread.cpp:482 ../src/mac/carbon/thread.cpp:672 msgid "Error while waiting on semaphore" msgstr "Napaka pri èakanju na semafor" @@ -2203,8 +2142,10 @@ #: ../src/msw/registry.cpp:1140 #, c-format -msgid "Exporting registry key: file \"%s\" already exists and won't be overwritten." -msgstr "Izvoz registrskega kljuèa: datoteka \"%s\" ¾e obstaja in ne bo prepisana." +msgid "" +"Exporting registry key: file \"%s\" already exists and won't be overwritten." +msgstr "" +"Izvoz registrskega kljuèa: datoteka \"%s\" ¾e obstaja in ne bo prepisana." #: ../src/common/fmapbase.cpp:143 msgid "Extended Unix Codepage for Japanese (EUC-JP)" @@ -2385,7 +2326,9 @@ #: ../src/msw/fdrepdlg.cpp:474 #, c-format msgid "Failed to create the standard find/replace dialog (error code %d)" -msgstr "Standardnega najdi/zamenjaj pogovornega okna ni bilo uspe¹no ustvarjeno (koda napake %d)" +msgstr "" +"Standardnega najdi/zamenjaj pogovornega okna ni bilo uspe¹no ustvarjeno " +"(koda napake %d)" # html/winpars.cpp:364 #: ../src/html/winpars.cpp:549 @@ -2394,8 +2337,7 @@ msgstr "Dokumenta HTML, kodiranega v %s, ni mogoèe prikazati." # msw/clipbrd.cpp:134 -#: ../src/mac/carbon/clipbrd.cpp:194 -#: ../src/mac/classic/clipbrd.cpp:185 +#: ../src/mac/carbon/clipbrd.cpp:194 ../src/mac/classic/clipbrd.cpp:185 #: ../src/msw/clipbrd.cpp:131 msgid "Failed to empty the clipboard." msgstr "Izpraznitev odlo¾i¹èa ni uspela." @@ -2421,8 +2363,7 @@ msgstr "Klicna povezava ni bila uspe¹no vzpostavljena: %s" # common/ffile.cpp:182 -#: ../src/unix/utilsunx.cpp:508 -#: ../src/unix/utilsunx.cpp:524 +#: ../src/unix/utilsunx.cpp:508 ../src/unix/utilsunx.cpp:524 #, c-format msgid "Failed to execute '%s'\n" msgstr "'%s' ni mogoèe izvesti\n" @@ -2465,8 +2406,7 @@ msgstr "Neuspe¹no pridobivanje imen ISP: %s" # generic/dirdlgg.cpp:550 -#: ../src/mac/carbon/clipbrd.cpp:143 -#: ../src/mac/classic/clipbrd.cpp:134 +#: ../src/mac/carbon/clipbrd.cpp:143 ../src/mac/classic/clipbrd.cpp:134 msgid "Failed to get clipboard data." msgstr "Pridobivanje podatkov z odlo¾i¹èa ni uspelo." @@ -2504,8 +2444,12 @@ msgstr "Zaklenjene datoteke '%s' ni mogoèe pregledati." #: ../src/unix/threadpsx.cpp:897 -msgid "Failed to join a thread, potential memory leak detected - please restart the program" -msgstr "Pridru¾itev k niti ni uspela, odkrita mo¾na izguba spomina - prosimo ponovno za¾enite program" +msgid "" +"Failed to join a thread, potential memory leak detected - please restart the " +"program" +msgstr "" +"Pridru¾itev k niti ni uspela, odkrita mo¾na izguba spomina - prosimo ponovno " +"za¾enite program" #: ../src/msw/utils.cpp:703 #, c-format @@ -2724,8 +2668,7 @@ msgstr "Neuspe¹no nastavljanje pravic za trenutno datoteko" # generic/dirdlgg.cpp:550 -#: ../src/unix/threadpsx.cpp:1245 -#: ../src/unix/threadpsx.cpp:1256 +#: ../src/unix/threadpsx.cpp:1245 ../src/unix/threadpsx.cpp:1256 #, c-format msgid "Failed to set thread priority %d." msgstr "Prioritete niti %d ni bilo mogoèe nastaviti." @@ -2737,8 +2680,7 @@ msgstr "Slike '%s' ni mogoèe shraniti v spominski VFS!" # generic/dirdlgg.cpp:550 -#: ../src/mac/carbon/mpthread.cpp:1273 -#: ../src/mac/carbon/thread.cpp:1465 +#: ../src/mac/carbon/mpthread.cpp:1273 ../src/mac/carbon/thread.cpp:1465 #: ../src/unix/threadpsx.cpp:1429 msgid "Failed to terminate a thread." msgstr "Niti ni mogoèe prekiniti." @@ -2810,8 +2752,7 @@ msgstr "Datoteka %s ne obstaja." # generic/filedlgg.cpp:1074 -#: ../src/generic/filedlgg.cpp:1316 -#: ../src/gtk/filedlg.cpp:64 +#: ../src/generic/filedlgg.cpp:1316 ../src/gtk/filedlg.cpp:64 #, c-format msgid "File '%s' already exists, do you really want to overwrite it?" msgstr "Datoteka %s ¾e obstaja, jo resnièno ¾elite prepisati?" @@ -2834,15 +2775,13 @@ # common/docview.cpp:296 # common/docview.cpp:332 # common/docview.cpp:1388 -#: ../src/common/docview.cpp:571 -#: ../src/common/docview.cpp:1596 +#: ../src/common/docview.cpp:571 ../src/common/docview.cpp:1596 msgid "File error" msgstr "Datoteèna napaka" # generic/dirdlgg.cpp:286 # generic/filedlgg.cpp:731 -#: ../src/generic/dirctrlg.cpp:707 -#: ../src/generic/filedlgg.cpp:758 +#: ../src/generic/dirctrlg.cpp:707 ../src/generic/filedlgg.cpp:758 msgid "File name exists already." msgstr "Ime datoteke ¾e obstaja." @@ -2980,8 +2919,7 @@ msgstr "Pojdi nivo vi¹je v hierarhiji dokumenta" # generic/filedlgg.cpp:875 -#: ../src/generic/dirdlgg.cpp:145 -#: ../src/generic/filedlgg.cpp:989 +#: ../src/generic/dirdlgg.cpp:145 ../src/generic/filedlgg.cpp:989 msgid "Go to home directory" msgstr "Pojdi na domaèi imenik" @@ -2998,8 +2936,7 @@ msgid "Greek (ISO-8859-7)" msgstr "gr¹ko (ISO-8859-7)" -#: ../src/common/zstream.cpp:72 -#: ../src/common/zstream.cpp:209 +#: ../src/common/zstream.cpp:72 ../src/common/zstream.cpp:209 msgid "Gzip not supported by this version of zlib" msgstr "Ta razlièica zlib ne podpira Gzip" @@ -3025,8 +2962,7 @@ # generic/proplist.cpp:528 # html/helpfrm.cpp:208 # msw/mdi.cpp:1283 -#: ../src/html/helpfrm.cpp:337 -#: ../contrib/src/deprecated/proplist.cpp:523 +#: ../src/html/helpfrm.cpp:337 ../contrib/src/deprecated/proplist.cpp:523 msgid "Help" msgstr "Pomoè" @@ -3037,8 +2973,7 @@ # generic/helphtml.cpp:319 # generic/helphtml.cpp:320 -#: ../src/generic/helpext.cpp:442 -#: ../src/generic/helpext.cpp:443 +#: ../src/generic/helpext.cpp:442 ../src/generic/helpext.cpp:443 msgid "Help Index" msgstr "Indeks pomoèi" @@ -3082,12 +3017,9 @@ msgid "ICO: Error in reading mask DIB." msgstr "ICO: napaka pri branju maske DIB." -#: ../src/common/imagbmp.cpp:1048 -#: ../src/common/imagbmp.cpp:1107 -#: ../src/common/imagbmp.cpp:1116 -#: ../src/common/imagbmp.cpp:1127 -#: ../src/common/imagbmp.cpp:1171 -#: ../src/common/imagbmp.cpp:1181 +#: ../src/common/imagbmp.cpp:1048 ../src/common/imagbmp.cpp:1107 +#: ../src/common/imagbmp.cpp:1116 ../src/common/imagbmp.cpp:1127 +#: ../src/common/imagbmp.cpp:1171 ../src/common/imagbmp.cpp:1181 #: ../src/common/imagbmp.cpp:1190 msgid "ICO: Error writing the image file!" msgstr "ICO: napaka pri pisanju v datoteko slike!" @@ -3138,11 +3070,13 @@ #: ../src/generic/dbgrptg.cpp:310 msgid "" -"If you wish to suppress this debug report completely, please choose the \"Cancel\" button,\n" +"If you wish to suppress this debug report completely, please choose the " +"\"Cancel\" button,\n" "but be warned that it may hinder improving the program, so if\n" "at all possible please do continue with the report generation.\n" msgstr "" -"Èe ¾elite popolnoma prepreèiti to poroèilo o razhro¹èevanju, prosimo izberite gumb \"Razveljavi\",\n" +"Èe ¾elite popolnoma prepreèiti to poroèilo o razhro¹èevanju, prosimo " +"izberite gumb \"Razveljavi\",\n" "vendar vedite, da to lahko onemogoèa izbolj¹anje programa, tako da èe je\n" "le mogoèe, prosimo nadaljujte s tvorbo poroèila.\n" @@ -3169,8 +3103,7 @@ # generic/dirdlgg.cpp:268 # generic/filedlgg.cpp:717 -#: ../src/generic/dirctrlg.cpp:689 -#: ../src/generic/filedlgg.cpp:744 +#: ../src/generic/dirctrlg.cpp:689 ../src/generic/filedlgg.cpp:744 msgid "Illegal directory name." msgstr "Napaèno ime imenika" @@ -3190,8 +3123,13 @@ # msw/textctrl.cpp:219 #: ../src/msw/textctrl.cpp:361 -msgid "Impossible to create a rich edit control, using simple text control instead. Please reinstall riched32.dll" -msgstr "Kontrolnika za bogato urejanje ni mogoèe ustvariti, namesto tega bo uporabljen kontrolnik za enostavno urejanje besedila. Prosimo ponovno namestite riched32.dll" +msgid "" +"Impossible to create a rich edit control, using simple text control instead. " +"Please reinstall riched32.dll" +msgstr "" +"Kontrolnika za bogato urejanje ni mogoèe ustvariti, namesto tega bo " +"uporabljen kontrolnik za enostavno urejanje besedila. Prosimo ponovno " +"namestite riched32.dll" #: ../src/unix/utilsunx.cpp:428 msgid "Impossible to get child process input" @@ -3263,8 +3201,7 @@ msgid "Invalid lock file '%s'." msgstr "Datoteka '%s' ni veljavna datoteka zaklopa." -#: ../src/common/xtistrm.cpp:365 -#: ../src/common/xtistrm.cpp:380 +#: ../src/common/xtistrm.cpp:365 ../src/common/xtistrm.cpp:380 msgid "Invalid or Null Object ID passed to GetObjectClassInfo" msgstr "V GetObjectClassInfo podan neveljaven ali nièelni predmetni ID." @@ -3363,8 +3300,7 @@ # generic/dcpsg.cpp:2262 # generic/prntdlgg.cpp:441 # generic/prntdlgg.cpp:637 -#: ../src/generic/prntdlgg.cpp:609 -#: ../src/generic/prntdlgg.cpp:867 +#: ../src/generic/prntdlgg.cpp:609 ../src/generic/prntdlgg.cpp:867 msgid "Landscape" msgstr "Pokrajina" @@ -3454,8 +3390,7 @@ msgid "Log saved to the file '%s'." msgstr "Dnevnik je bil shranjen v datoteko '%s'" -#: ../include/wx/xti.h:501 -#: ../include/wx/xti.h:505 +#: ../include/wx/xti.h:501 ../include/wx/xti.h:505 msgid "Long Conversions not supported" msgstr "Dolge pretvorbe niso podprte" @@ -3468,8 +3403,12 @@ msgstr "Na tem sistemu podpora nitim MP ni na voljo." #: ../src/msw/helpchm.cpp:60 -msgid "MS HTML Help functions are unavailable because the MS HTML Help library is not installed on this machine. Please install it." -msgstr "Funkcije MS HTML Help niso na voljo, ker knji¾nica MS HTML Help ni name¹èena na tem raèunalniku. Prosimo namestite jo." +msgid "" +"MS HTML Help functions are unavailable because the MS HTML Help library is " +"not installed on this machine. Please install it." +msgstr "" +"Funkcije MS HTML Help niso na voljo, ker knji¾nica MS HTML Help ni name¹èena " +"na tem raèunalniku. Prosimo namestite jo." #: ../src/univ/themes/win32.cpp:4929 msgid "Ma&ximize" @@ -3554,10 +3493,8 @@ msgstr "Nov element" # generic/filedlgg.cpp:610 -#: ../src/generic/dirdlgg.cpp:316 -#: ../src/generic/dirdlgg.cpp:326 -#: ../src/generic/filedlgg.cpp:608 -#: ../src/generic/filedlgg.cpp:617 +#: ../src/generic/dirdlgg.cpp:316 ../src/generic/dirdlgg.cpp:326 +#: ../src/generic/filedlgg.cpp:608 ../src/generic/filedlgg.cpp:617 msgid "NewName" msgstr "NovoIme" @@ -3573,10 +3510,8 @@ # common/dlgcmn.cpp:111 # common/dlgcmn.cpp:121 -#: ../src/mac/carbon/msgdlg.cpp:58 -#: ../src/mac/carbon/msgdlg.cpp:143 -#: ../src/mac/classic/msgdlg.cpp:56 -#: ../src/mac/classic/msgdlg.cpp:140 +#: ../src/mac/carbon/msgdlg.cpp:58 ../src/mac/carbon/msgdlg.cpp:143 +#: ../src/mac/classic/msgdlg.cpp:56 ../src/mac/classic/msgdlg.cpp:140 #: ../src/motif/msgdlg.cpp:204 msgid "No" msgstr "Ne" @@ -3601,7 +3536,8 @@ msgid "" "No font for displaying text in encoding '%s' found,\n" "but an alternative encoding '%s' is available.\n" -"Do you want to use this encoding (otherwise you will have to choose another one)?" +"Do you want to use this encoding (otherwise you will have to choose another " +"one)?" msgstr "" "Nobena pisava za prikaz besedila, kodiranega v '%s', ne obstaja,\n" "na voljo pa je drugaæno kodiranje '%s'.\n" @@ -3625,15 +3561,13 @@ msgstr "Za vozel XML '%s', razred '%s' ni mogoèe najti nobenega upravljalca!" # common/image.cpp:758 -#: ../src/common/image.cpp:1505 -#: ../src/common/image.cpp:1548 +#: ../src/common/image.cpp:1505 ../src/common/image.cpp:1548 msgid "No handler found for image type." msgstr "Upravljalca za vrsto slike ni mogoèe najti." # common/image.cpp:766 # common/image.cpp:800 -#: ../src/common/image.cpp:1513 -#: ../src/common/image.cpp:1556 +#: ../src/common/image.cpp:1513 ../src/common/image.cpp:1556 #: ../src/common/image.cpp:1589 #, c-format msgid "No image handler for type %d defined." @@ -3641,8 +3575,7 @@ # common/image.cpp:784 # common/image.cpp:816 -#: ../src/common/image.cpp:1574 -#: ../src/common/image.cpp:1604 +#: ../src/common/image.cpp:1574 ../src/common/image.cpp:1604 #, c-format msgid "No image handler for type %s defined." msgstr "Ta vrsto %s ni doloèen noben upravljalec slik." @@ -3657,8 +3590,7 @@ msgid "No sound" msgstr "Brez zvoka" -#: ../src/common/image.cpp:1200 -#: ../src/common/image.cpp:1239 +#: ../src/common/image.cpp:1200 ../src/common/image.cpp:1239 msgid "No unused colour in image being masked." msgstr "Nobena neuporabljena barva v sliki ni maskirana." @@ -3672,8 +3604,7 @@ # generic/fontdlgg.cpp:212 # generic/fontdlgg.cpp:215 -#: ../src/generic/fontdlgg.cpp:232 -#: ../src/generic/fontdlgg.cpp:235 +#: ../src/generic/fontdlgg.cpp:232 ../src/generic/fontdlgg.cpp:235 msgid "Normal" msgstr "Obièajno" @@ -3699,8 +3630,7 @@ # generic/prntdlgg.cpp:467 # generic/proplist.cpp:511 # html/helpfrm.cpp:909 -#: ../src/gtk/fontdlg.cpp:147 -#: ../src/msw/dialog.cpp:194 +#: ../src/gtk/fontdlg.cpp:147 ../src/msw/dialog.cpp:194 #: ../contrib/src/deprecated/proplist.cpp:506 msgid "OK" msgstr "V redu" @@ -3709,15 +3639,13 @@ msgid "Objects must have an id attribute" msgstr "Objekti morajo imeti atribut id" -#: ../src/common/docview.cpp:1269 -#: ../src/common/docview.cpp:1619 +#: ../src/common/docview.cpp:1269 ../src/common/docview.cpp:1619 msgid "Open File" msgstr "Odpri datoteko" # html/helpfrm.cpp:523 # html/helpfrm.cpp:1183 -#: ../src/html/helpfrm.cpp:673 -#: ../src/html/helpfrm.cpp:1579 +#: ../src/html/helpfrm.cpp:673 ../src/html/helpfrm.cpp:1579 msgid "Open HTML document" msgstr "Odpri dokument HTML" @@ -3730,10 +3658,8 @@ # generic/dirdlgg.cpp:605 # generic/filedlgg.cpp:625 # generic/filedlgg.cpp:744 -#: ../src/generic/dirctrlg.cpp:718 -#: ../src/generic/dirdlgg.cpp:342 -#: ../src/generic/filedlgg.cpp:632 -#: ../src/generic/filedlgg.cpp:772 +#: ../src/generic/dirctrlg.cpp:718 ../src/generic/dirdlgg.cpp:342 +#: ../src/generic/filedlgg.cpp:632 ../src/generic/filedlgg.cpp:772 msgid "Operation not permitted." msgstr "Operacija ni dovoljena." @@ -3756,22 +3682,19 @@ msgstr "Opcije '%s':'%s' ne morem pretvoriti v datum" # generic/prntdlgg.cpp:447 -#: ../src/generic/dirdlgg.cpp:116 -#: ../src/generic/prntdlgg.cpp:614 +#: ../src/generic/dirdlgg.cpp:116 ../src/generic/prntdlgg.cpp:614 msgid "Options" msgstr "Mo¾nosti" # generic/prntdlgg.cpp:443 # generic/prntdlgg.cpp:638 -#: ../src/generic/prntdlgg.cpp:611 -#: ../src/generic/prntdlgg.cpp:868 +#: ../src/generic/prntdlgg.cpp:611 ../src/generic/prntdlgg.cpp:868 msgid "Orientation" msgstr "Orientacija" # common/imagpcx.cpp:448 # common/imagpcx.cpp:471 -#: ../src/common/imagpcx.cpp:462 -#: ../src/common/imagpcx.cpp:485 +#: ../src/common/imagpcx.cpp:462 ../src/common/imagpcx.cpp:485 msgid "PCX: couldn't allocate memory" msgstr "PCX: spomina ni mogoèe alocirati." @@ -3792,8 +3715,7 @@ # common/imagpcx.cpp:450 # common/imagpcx.cpp:472 -#: ../src/common/imagpcx.cpp:464 -#: ../src/common/imagpcx.cpp:486 +#: ../src/common/imagpcx.cpp:464 ../src/common/imagpcx.cpp:486 msgid "PCX: unknown error !!!" msgstr "PCX: neznana napaka!" @@ -3813,8 +3735,7 @@ msgstr "PNM: datoteèni zapis ni prepoznan." # common/imagpnm.cpp:112 -#: ../src/common/imagpnm.cpp:108 -#: ../src/common/imagpnm.cpp:125 +#: ../src/common/imagpnm.cpp:108 ../src/common/imagpnm.cpp:125 #: ../src/common/imagpnm.cpp:142 msgid "PNM: File seems truncated." msgstr "PNM: datoteka se zdi okrnjena." @@ -3941,8 +3862,7 @@ msgstr "Nastavitev strani" # generic/prntdlgg.cpp:604 -#: ../src/common/prntbase.cpp:451 -#: ../src/gtk/gnome/gprint.cpp:540 +#: ../src/common/prntbase.cpp:451 ../src/gtk/gnome/gprint.cpp:540 msgid "Page setup" msgstr "Nastavitev strani" @@ -3954,8 +3874,7 @@ # generic/prntdlgg.cpp:555 # generic/prntdlgg.cpp:626 # generic/prntdlgg.cpp:808 -#: ../src/generic/prntdlgg.cpp:800 -#: ../src/generic/prntdlgg.cpp:854 +#: ../src/generic/prntdlgg.cpp:800 ../src/generic/prntdlgg.cpp:854 #: ../src/generic/prntdlgg.cpp:1056 msgid "Paper Size" msgstr "Velikost papirja" @@ -3963,8 +3882,7 @@ # generic/prntdlgg.cpp:433 # generic/prntdlgg.cpp:615 # generic/prntdlgg.cpp:804 -#: ../src/generic/prntdlgg.cpp:598 -#: ../src/generic/prntdlgg.cpp:841 +#: ../src/generic/prntdlgg.cpp:598 ../src/generic/prntdlgg.cpp:841 #: ../src/generic/prntdlgg.cpp:1051 msgid "Paper size" msgstr "Velikost papirja" @@ -3977,8 +3895,7 @@ msgid "Passing a already registered object to SetObjectName" msgstr "Podajanje ¾e registriranega objekta k SetObjectName" -#: ../src/common/xtistrm.cpp:436 -#: ../src/common/xtistrm.cpp:656 +#: ../src/common/xtistrm.cpp:436 ../src/common/xtistrm.cpp:656 msgid "Passing an unkown object to GetObject" msgstr "Podajanje neznanega objekta k GetObject" @@ -4009,7 +3926,8 @@ # msw/dialup.cpp:768 #: ../src/msw/dialup.cpp:787 msgid "Please choose which ISP do you want to connect to" -msgstr "Prosimo izberite ponudnika spletnih storitev, s katerim se ¾elite povezati." +msgstr "" +"Prosimo izberite ponudnika spletnih storitev, s katerim se ¾elite povezati." #: ../src/msw/listctrl.cpp:444 #, c-format @@ -4029,8 +3947,7 @@ # generic/dcpsg.cpp:2261 # generic/prntdlgg.cpp:440 # generic/prntdlgg.cpp:636 -#: ../src/generic/prntdlgg.cpp:608 -#: ../src/generic/prntdlgg.cpp:866 +#: ../src/generic/prntdlgg.cpp:608 ../src/generic/prntdlgg.cpp:866 msgid "Portrait" msgstr "Portet" @@ -4040,8 +3957,7 @@ msgstr "PostScript datoteka" # html/helpfrm.cpp:903 -#: ../src/generic/fontdlgg.cpp:348 -#: ../src/html/helpfrm.cpp:1235 +#: ../src/generic/fontdlgg.cpp:348 ../src/html/helpfrm.cpp:1235 msgid "Preview:" msgstr "Predogled:" @@ -4052,10 +3968,8 @@ # generic/prntdlgg.cpp:113 # generic/prntdlgg.cpp:127 -#: ../src/common/prntbase.cpp:393 -#: ../src/generic/prntdlgg.cpp:138 -#: ../src/generic/prntdlgg.cpp:151 -#: ../src/gtk/gnome/gprint.cpp:395 +#: ../src/common/prntbase.cpp:393 ../src/generic/prntdlgg.cpp:138 +#: ../src/generic/prntdlgg.cpp:151 ../src/gtk/gnome/gprint.cpp:395 #: ../src/gtk/gnome/gprint.cpp:407 msgid "Print" msgstr "Tiskanje" @@ -4067,8 +3981,7 @@ # common/prntbase.cpp:687 # common/prntbase.cpp:711 -#: ../src/common/prntbase.cpp:1246 -#: ../src/common/prntbase.cpp:1272 +#: ../src/common/prntbase.cpp:1246 ../src/common/prntbase.cpp:1272 msgid "Print Preview Failure" msgstr "Napaka pri predogledu tiskanja" @@ -4147,8 +4060,7 @@ # common/prntbase.cpp:106 # common/prntbase.cpp:148 -#: ../src/common/prntbase.cpp:310 -#: ../src/common/prntbase.cpp:531 +#: ../src/common/prntbase.cpp:310 ../src/common/prntbase.cpp:531 msgid "Printing " msgstr "Tiskanje poteka" @@ -4170,8 +4082,11 @@ #: ../src/common/debugrpt.cpp:546 #, c-format -msgid "Processing debug report has failed, leaving the files in \"%s\" directory." -msgstr "Obdelava poroèila o razhro¹èevanju ni uspela, datoteke so ostale v imeniku \"%s\"." +msgid "" +"Processing debug report has failed, leaving the files in \"%s\" directory." +msgstr "" +"Obdelava poroèila o razhro¹èevanju ni uspela, datoteke so ostale v imeniku " +"\"%s\"." # common/log.cpp:356 #: ../src/common/log.cpp:466 @@ -4190,8 +4105,7 @@ # common/ffile.cpp:133 # common/ffile.cpp:154 -#: ../src/common/ffile.cpp:125 -#: ../src/common/ffile.cpp:144 +#: ../src/common/ffile.cpp:125 ../src/common/ffile.cpp:144 #, c-format msgid "Read error on file '%s'" msgstr "Napaka pri branju datoteke '%s'" @@ -4261,7 +4175,9 @@ #: ../src/common/rendcmn.cpp:196 #, c-format msgid "Renderer \"%s\" has incompatible version %d.%d and couldn't be loaded." -msgstr "Prikazovalnik \"%s\" je nezdru¾ljive razlièice %d.%d in ga ni mogoèe nalo¾iti." +msgstr "" +"Prikazovalnik \"%s\" je nezdru¾ljive razlièice %d.%d in ga ni mogoèe " +"nalo¾iti." # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. @@ -4340,15 +4256,17 @@ # generic/helpwxht.cpp:161 # html/helpfrm.cpp:414 # html/helpfrm.cpp:434 -#: ../src/html/helpfrm.cpp:536 -#: ../src/html/helpfrm.cpp:551 +#: ../src/html/helpfrm.cpp:536 ../src/html/helpfrm.cpp:551 msgid "Search" msgstr "Iskanje" # html/helpfrm.cpp:416 #: ../src/html/helpfrm.cpp:538 -msgid "Search contents of help book(s) for all occurences of the text you typed above" -msgstr "Iskanje v knjigah s pomoèjo za vse pojavitve zgoraj natipkanega besedila" +msgid "" +"Search contents of help book(s) for all occurences of the text you typed " +"above" +msgstr "" +"Iskanje v knjigah s pomoèjo za vse pojavitve zgoraj natipkanega besedila" # generic/dirdlgg.cpp:572 #: ../src/generic/fdrepdlg.cpp:166 @@ -4390,8 +4308,7 @@ # common/docview.cpp:1371 # common/docview.cpp:1422 -#: ../src/mac/carbon/textctrl.cpp:1078 -#: ../src/msw/textctrl.cpp:2068 +#: ../src/mac/carbon/textctrl.cpp:1078 ../src/msw/textctrl.cpp:2068 msgid "Select &All" msgstr "Izberi &vse" @@ -4434,7 +4351,8 @@ # msw/dialup.cpp:539 #: ../src/msw/dialup.cpp:567 msgid "Several active dialup connections found, choosing one randomly." -msgstr "Najdenih je veè aktivnih klicnih povezav, izbrana bo nakljuèna med njimi." +msgstr "" +"Najdenih je veè aktivnih klicnih povezav, izbrana bo nakljuèna med njimi." # html/helpfrm.cpp:331 #: ../src/html/helpfrm.cpp:493 @@ -4447,8 +4365,7 @@ msgstr "Poka¾i vse predmete v indeksu" # generic/filedlgg.cpp:913 -#: ../src/generic/dirdlgg.cpp:112 -#: ../src/generic/dirdlgg.cpp:175 +#: ../src/generic/dirdlgg.cpp:112 ../src/generic/dirdlgg.cpp:175 msgid "Show hidden directories" msgstr "Poka¾i skrite imenike" @@ -4462,8 +4379,7 @@ msgid "Show/hide navigation panel" msgstr "Poka¾i/skrij navigacijski pano" -#: ../src/generic/fontdlgg.cpp:353 -#: ../src/generic/fontdlgg.cpp:355 +#: ../src/generic/fontdlgg.cpp:353 ../src/generic/fontdlgg.cpp:355 msgid "Shows the font preview." msgstr "Prika¾e predogled pisave." @@ -4472,8 +4388,7 @@ msgid "Size" msgstr "Velikost" -#: ../src/generic/progdlgg.cpp:222 -#: ../src/generic/progdlgg.cpp:240 +#: ../src/generic/progdlgg.cpp:222 ../src/generic/progdlgg.cpp:240 #: ../src/generic/progdlgg.cpp:598 msgid "Skip" msgstr "Preskoèi" @@ -4491,8 +4406,7 @@ # common/docview.cpp:342 # common/docview.cpp:354 # common/docview.cpp:1390 -#: ../src/common/docview.cpp:617 -#: ../src/common/docview.cpp:1598 +#: ../src/common/docview.cpp:617 ../src/common/docview.cpp:1598 msgid "Sorry, could not open this file." msgstr "Oprostite, te datoteke ni moè odpreti." @@ -4513,8 +4427,7 @@ # common/docview.cpp:342 # common/docview.cpp:354 # common/docview.cpp:1390 -#: ../src/common/docview.cpp:1268 -#: ../src/common/docview.cpp:1618 +#: ../src/common/docview.cpp:1268 ../src/common/docview.cpp:1618 msgid "Sorry, the format for this file is unknown." msgstr "Oprostite, ta zapis datoteke je neznan." @@ -4545,21 +4458,21 @@ msgid "Streaming delegates for not already streamed objects not yet supported" msgstr "Pretoèni predstavniki za ¹e ne pretoèene predmete ¹e niso podprti." -#: ../src/msw/colour.cpp:38 -#: ../src/palmos/colour.cpp:38 +#: ../src/msw/colour.cpp:38 ../src/palmos/colour.cpp:38 #, c-format msgid "String To Colour : Incorrect colour specification : %s" msgstr "Niz v barvo: nepravilna specifikacija barve: %s" -#: ../include/wx/xti.h:428 -#: ../include/wx/xti.h:432 +#: ../include/wx/xti.h:428 ../include/wx/xti.h:432 msgid "String conversions not supported" msgstr "Pretvorbe nizov niso podprte" #: ../src/xrc/xmlres.cpp:750 #, c-format msgid "Subclass '%s' not found for resource '%s', not subclassing!" -msgstr "Podrazreda '%s' ni moè najti za vir '%s', brez razdelitve na podrazrede (subclassing)!" +msgstr "" +"Podrazreda '%s' ni moè najti za vir '%s', brez razdelitve na podrazrede " +"(subclassing)!" #: ../src/common/paper.cpp:157 msgid "SuperA/SuperA/A4 227 x 356 mm" @@ -4585,8 +4498,7 @@ # common/imagtiff.cpp:192 # common/imagtiff.cpp:203 # common/imagtiff.cpp:314 -#: ../src/common/imagtiff.cpp:248 -#: ../src/common/imagtiff.cpp:259 +#: ../src/common/imagtiff.cpp:248 ../src/common/imagtiff.cpp:259 #: ../src/common/imagtiff.cpp:399 msgid "TIFF: Couldn't allocate memory." msgstr "TIFF: spomina ni mogoèe alocirati." @@ -4689,29 +4601,24 @@ "Datoteka '%s' ne obstaja in je ni mogoèe odpreti.\n" "Izbisana je bila iz seznama zadnjih uporabljenih datotek." -#: ../src/generic/fontdlgg.cpp:316 -#: ../src/generic/fontdlgg.cpp:318 +#: ../src/generic/fontdlgg.cpp:316 ../src/generic/fontdlgg.cpp:318 msgid "The font colour." msgstr "Barva pisave." -#: ../src/generic/fontdlgg.cpp:277 -#: ../src/generic/fontdlgg.cpp:279 +#: ../src/generic/fontdlgg.cpp:277 ../src/generic/fontdlgg.cpp:279 msgid "The font family." msgstr "Dru¾ina pisave." # html/helpfrm.cpp:899 -#: ../src/generic/fontdlgg.cpp:328 -#: ../src/generic/fontdlgg.cpp:330 +#: ../src/generic/fontdlgg.cpp:328 ../src/generic/fontdlgg.cpp:330 msgid "The font point size." msgstr "Velikost pisave." -#: ../src/generic/fontdlgg.cpp:288 -#: ../src/generic/fontdlgg.cpp:290 +#: ../src/generic/fontdlgg.cpp:288 ../src/generic/fontdlgg.cpp:290 msgid "The font style." msgstr "Slog pisave." -#: ../src/generic/fontdlgg.cpp:299 -#: ../src/generic/fontdlgg.cpp:301 +#: ../src/generic/fontdlgg.cpp:299 ../src/generic/fontdlgg.cpp:301 msgid "The font weight." msgstr "Odebeljenost pisave." @@ -4722,10 +4629,12 @@ #: ../src/generic/dbgrptg.cpp:308 msgid "" -"The report contains the files listed below. If any of these files contain private information,\n" +"The report contains the files listed below. If any of these files contain " +"private information,\n" "please uncheck them and they will be removed from the report.\n" msgstr "" -"Poroèilo vsebuje datoteke, navedene spodaj. Èe katere od teh datotek vsebujejo zasebne podatke,\n" +"Poroèilo vsebuje datoteke, navedene spodaj. Èe katere od teh datotek " +"vsebujejo zasebne podatke,\n" "jih prosimo odznaèite in odstranjene bodo iz poroèila.\n" # common/cmdline.cpp:761 @@ -4747,21 +4656,37 @@ #: ../src/msw/dialup.cpp:455 #, c-format -msgid "The version of remote access service (RAS) installed on this machine is tooold, please upgrade (the following required function is missing: %s)." -msgstr "Razlièica storitve oddaljenega dostopa (RAS), name¹èena na tem raèunalniku, je zastarela, prosimo nadgradite jo (manjka naslednja zahtevana funkcija: %s)." +msgid "" +"The version of remote access service (RAS) installed on this machine is " +"tooold, please upgrade (the following required function is missing: %s)." +msgstr "" +"Razlièica storitve oddaljenega dostopa (RAS), name¹èena na tem raèunalniku, " +"je zastarela, prosimo nadgradite jo (manjka naslednja zahtevana funkcija: %" +"s)." #: ../src/html/htmprint.cpp:601 -msgid "There was a problem during page setup: you may need to set a default printer." -msgstr "Med pripravo strani je pri¹lo do te¾ave: morda morate nastaviti privzeti tiskalnik." +msgid "" +"There was a problem during page setup: you may need to set a default printer." +msgstr "" +"Med pripravo strani je pri¹lo do te¾ave: morda morate nastaviti privzeti " +"tiskalnik." #: ../src/msw/datectrl.cpp:109 -msgid "This system doesn't support date picker control, please upgrade your version of comctl32.dll" -msgstr "Ta sistem ne podpira kontrolnika za izbor datuma, prosimo nadgradite svojo razlièico comctl32.dll" +msgid "" +"This system doesn't support date picker control, please upgrade your version " +"of comctl32.dll" +msgstr "" +"Ta sistem ne podpira kontrolnika za izbor datuma, prosimo nadgradite svojo " +"razlièico comctl32.dll" # msw/thread.cpp:1083 #: ../src/msw/thread.cpp:1206 -msgid "Thread module initialization failed: can not store value in thread local storage" -msgstr "Inicializacija modula niti ni uspela: vrednosti ni mogoèe shraniti v lokalni shrambi niti" +msgid "" +"Thread module initialization failed: can not store value in thread local " +"storage" +msgstr "" +"Inicializacija modula niti ni uspela: vrednosti ni mogoèe shraniti v lokalni " +"shrambi niti" #: ../src/unix/threadpsx.cpp:1603 msgid "Thread module initialization failed: failed to create thread key" @@ -4769,8 +4694,12 @@ # msw/thread.cpp:1071 #: ../src/msw/thread.cpp:1194 -msgid "Thread module initialization failed: impossible to allocate index in thread local storage" -msgstr "Inicializacija modula niti ni uspela: indeksa ni mogoèe alocirati v lokalni shrambi niti" +msgid "" +"Thread module initialization failed: impossible to allocate index in thread " +"local storage" +msgstr "" +"Inicializacija modula niti ni uspela: indeksa ni mogoèe alocirati v lokalni " +"shrambi niti" #: ../src/unix/threadpsx.cpp:1108 msgid "Thread priority setting is ignored." @@ -4788,10 +4717,11 @@ #: ../src/common/ftp.cpp:635 msgid "Timeout while waiting for FTP server to connect, try passive mode." -msgstr "Èasovna prekoraèitev pri èakanju na stre¾nik FTP za povezavo, poskusite pasiven naèin." +msgstr "" +"Èasovna prekoraèitev pri èakanju na stre¾nik FTP za povezavo, poskusite " +"pasiven naèin." -#: ../src/msw/timer.cpp:116 -#: ../src/os2/timer.cpp:141 +#: ../src/msw/timer.cpp:116 ../src/os2/timer.cpp:141 msgid "Timer creation failed." msgstr "Ustvarjanje èasovnika (timer) ni uspelo." @@ -4823,11 +4753,11 @@ #: ../src/common/fs_mem.cpp:205 #, c-format msgid "Trying to remove file '%s' from memory VFS, but it is not loaded!" -msgstr "Poskus odstanitve datoteke '%s' iz spominskega VFS, vendar ni nalo¾ena!" +msgstr "" +"Poskus odstanitve datoteke '%s' iz spominskega VFS, vendar ni nalo¾ena!" # common/sckaddr.cpp:107 -#: ../src/common/sckaddr.cpp:146 -#: ../src/common/sckaddr.cpp:250 +#: ../src/common/sckaddr.cpp:146 ../src/common/sckaddr.cpp:250 msgid "Trying to solve a NULL hostname: giving up" msgstr "Poskus razre¹evanja imena stre¾nika NULL: opu¹èanje" @@ -4839,8 +4769,7 @@ msgid "Type" msgstr "Vrsta" -#: ../src/common/xtistrm.cpp:281 -#: ../src/common/xtixml.cpp:351 +#: ../src/common/xtistrm.cpp:281 ../src/common/xtixml.cpp:351 #: ../src/common/xtixml.cpp:498 msgid "Type must have enum - long conversion" msgstr "Tip mora imeti pretvorbo enum - long" @@ -4949,8 +4878,7 @@ msgstr "Nepoznana dolga opcija '%s'" # common/cmdline.cpp:518 -#: ../src/common/cmdline.cpp:608 -#: ../src/common/cmdline.cpp:629 +#: ../src/common/cmdline.cpp:608 ../src/common/cmdline.cpp:629 #, c-format msgid "Unknown option '%s'" msgstr "Nepoznana opcija '%s'" @@ -4974,8 +4902,7 @@ # common/docview.cpp:1923 # common/docview.cpp:1938 # common/docview.cpp:1965 -#: ../src/common/cmdproc.cpp:261 -#: ../src/common/cmdproc.cpp:287 +#: ../src/common/cmdproc.cpp:261 ../src/common/cmdproc.cpp:287 #: ../src/common/cmdproc.cpp:307 msgid "Unnamed command" msgstr "Neimenovan ukaz" @@ -4987,10 +4914,8 @@ # msw/clipbrd.cpp:268 # msw/clipbrd.cpp:369 -#: ../src/mac/carbon/clipbrd.cpp:68 -#: ../src/mac/classic/clipbrd.cpp:64 -#: ../src/msw/clipbrd.cpp:273 -#: ../src/msw/clipbrd.cpp:445 +#: ../src/mac/carbon/clipbrd.cpp:68 ../src/mac/classic/clipbrd.cpp:64 +#: ../src/msw/clipbrd.cpp:273 ../src/msw/clipbrd.cpp:445 msgid "Unsupported clipboard format." msgstr "Nepodprta oblika zapisa za odlo¾i¹èe." @@ -5061,8 +4986,7 @@ msgid "Western European with Euro (ISO-8859-15)" msgstr "zahodnoevropsko z Evrom (ISO-8859-15)" -#: ../src/generic/fontdlgg.cpp:339 -#: ../src/generic/fontdlgg.cpp:341 +#: ../src/generic/fontdlgg.cpp:339 ../src/generic/fontdlgg.cpp:341 msgid "Whether the font is underlined." msgstr "Èe je pisava podèrtana ali ne." @@ -5207,8 +5131,7 @@ msgid "XPM: Malformed pixel data!" msgstr "XPM: napaèno oblikovani podatki toèk!" -#: ../src/common/xpmdecod.cpp:712 -#: ../src/common/xpmdecod.cpp:721 +#: ../src/common/xpmdecod.cpp:712 ../src/common/xpmdecod.cpp:721 #, c-format msgid "XPM: malformed colour definition '%s'!" msgstr "XPM: napaèno oblikovana definicija barve '%s'!" @@ -5218,8 +5141,7 @@ msgid "XRC resource '%s' (class '%s') not found!" msgstr "Vira XRC '%s' (razred '%s') ni moè najti!" -#: ../src/xrc/xmlres.cpp:1080 -#: ../src/xrc/xmlres.cpp:1092 +#: ../src/xrc/xmlres.cpp:1080 ../src/xrc/xmlres.cpp:1092 #, c-format msgid "XRC resource: Cannot create bitmap from '%s'." msgstr "XRC-vir: iz '%s' ni mogoèe ustvariti bitne slike." @@ -5231,10 +5153,8 @@ # common/dlgcmn.cpp:109 # common/dlgcmn.cpp:116 -#: ../src/mac/carbon/msgdlg.cpp:59 -#: ../src/mac/carbon/msgdlg.cpp:142 -#: ../src/mac/classic/msgdlg.cpp:57 -#: ../src/mac/classic/msgdlg.cpp:139 +#: ../src/mac/carbon/msgdlg.cpp:59 ../src/mac/carbon/msgdlg.cpp:142 +#: ../src/mac/classic/msgdlg.cpp:57 ../src/mac/classic/msgdlg.cpp:139 #: ../src/motif/msgdlg.cpp:204 msgid "Yes" msgstr "Da" @@ -5269,7 +5189,8 @@ # msw/dde.cpp:985 #: ../src/msw/dde.cpp:1048 msgid "" -"a DDEML function was called without first calling the DdeInitialize function,\n" +"a DDEML function was called without first calling the DdeInitialize " +"function,\n" "or an invalid instance identifier\n" "was passed to a DDEML function." msgstr "" @@ -5459,11 +5380,11 @@ #: ../src/common/file.cpp:457 #, c-format msgid "can't determine if the end of file is reached on descriptor %d" -msgstr "ni mogoèe ugotoviti, ali je bil konec datoteke na deskriptorju %d dose¾en" +msgstr "" +"ni mogoèe ugotoviti, ali je bil konec datoteke na deskriptorju %d dose¾en" # common/ffile.cpp:182 -#: ../src/msdos/utilsdos.cpp:307 -#: ../src/msdos/utilsdos.cpp:466 +#: ../src/msdos/utilsdos.cpp:307 ../src/msdos/utilsdos.cpp:466 #, c-format msgid "can't execute '%s'" msgstr "'%s' ni mogoèe izvesti" @@ -5486,7 +5407,8 @@ # msw/utils.cpp:376 #: ../src/msw/utils.cpp:380 msgid "can't find user's HOME, using current directory." -msgstr "uporabnikovega imenika HOME ni mogoèe najti, v uporabi je trenuten imenik." +msgstr "" +"uporabnikovega imenika HOME ni mogoèe najti, v uporabi je trenuten imenik." # common/file.cpp:319 #: ../src/common/file.cpp:341 @@ -5495,8 +5417,7 @@ msgstr "ni mogoèe izprazniti deskriptorja %d" # common/file.cpp:373 -#: ../src/common/file.cpp:399 -#: ../src/msw/wince/filefnwce.cpp:202 +#: ../src/common/file.cpp:399 ../src/msw/wince/filefnwce.cpp:202 #, c-format msgid "can't get seek position on file descriptor %d" msgstr "ni mogoèe najti iskalne pozicije v datoteènem deskriptorju %d" @@ -5508,8 +5429,7 @@ # common/ffile.cpp:85 # common/file.cpp:243 -#: ../src/common/ffile.cpp:75 -#: ../src/common/file.cpp:271 +#: ../src/common/ffile.cpp:75 ../src/common/file.cpp:271 #, c-format msgid "can't open file '%s'" msgstr "ni mogoèe odpreti datoteke '%s'" @@ -5533,7 +5453,8 @@ #: ../src/common/dynlib.cpp:253 msgid "can't query for GUI plugins name in console applications" -msgstr "Povpra¹evanje po imenu vtiènikov GUI v aplikacijah ukazne vrstice ni mo¾no." +msgstr "" +"Povpra¹evanje po imenu vtiènikov GUI v aplikacijah ukazne vrstice ni mo¾no." # html/helpfrm.cpp:1174 #: ../src/common/zipstrm.cpp:436 @@ -5574,8 +5495,7 @@ msgstr "ni mogoèe odstraniti zaèasne datoteke '%s'" # common/file.cpp:359 -#: ../src/common/file.cpp:385 -#: ../src/msw/wince/filefnwce.cpp:189 +#: ../src/common/file.cpp:385 ../src/msw/wince/filefnwce.cpp:189 #, c-format msgid "can't seek on file descriptor %d" msgstr "ni mogoèe iskati na datoteènem deskriptorju %d" @@ -5633,8 +5553,7 @@ msgid "decompression error" msgstr "napaka pri raz¹irjanju" -#: ../src/common/fmapbase.cpp:705 -#: ../src/common/fmapbase.cpp:737 +#: ../src/common/fmapbase.cpp:705 ../src/common/fmapbase.cpp:737 msgid "default" msgstr "privzeto" @@ -5797,8 +5716,7 @@ msgstr "neveljavna datoteka zip" # generic/fontdlgg.cpp:213 -#: ../src/common/fontcmn.cpp:586 -#: ../src/common/fontcmn.cpp:650 +#: ../src/common/fontcmn.cpp:586 ../src/common/fontcmn.cpp:650 msgid "italic" msgstr "le¾eèe" @@ -5975,8 +5893,7 @@ msgid "thirteenth" msgstr "trinajsti" -#: ../src/common/imagtiff.cpp:145 -#: ../src/common/imagtiff.cpp:161 +#: ../src/common/imagtiff.cpp:145 ../src/common/imagtiff.cpp:161 #, c-format msgid "tiff module: %s" msgstr "modul tiff: %s" @@ -6025,8 +5942,7 @@ msgstr "neznani razred %s" # generic/progdlgg.cpp:241 -#: ../src/common/regex.cpp:163 -#: ../src/html/chm.cpp:352 +#: ../src/common/regex.cpp:163 ../src/html/chm.cpp:352 msgid "unknown error" msgstr "neznana napaka" @@ -6042,8 +5958,7 @@ msgstr "neznana oznaka za konec vrstice" # common/file.cpp:342 -#: ../src/common/file.cpp:367 -#: ../src/msw/wince/filefnwce.cpp:170 +#: ../src/common/file.cpp:367 ../src/msw/wince/filefnwce.cpp:170 msgid "unknown seek origin" msgstr "nepoznana smer iskanja" @@ -6064,8 +5979,7 @@ msgid "unnamed%d" msgstr "neimenovana%d" -#: ../src/common/zipstrm.cpp:1660 -#: ../src/common/zipstrm.cpp:2030 +#: ../src/common/zipstrm.cpp:1660 ../src/common/zipstrm.cpp:2030 msgid "unsupported Zip compression method" msgstr "nepodprta metoda stiskanja Zip" @@ -6099,16 +6013,13 @@ # common/socket.cpp:347 # common/socket.cpp:401 -#: ../src/common/socket.cpp:415 -#: ../src/common/socket.cpp:469 -#: ../src/mac/carbon/cfsocket.cpp:452 -#: ../src/mac/carbon/cfsocket.cpp:506 +#: ../src/common/socket.cpp:415 ../src/common/socket.cpp:469 +#: ../src/mac/carbon/cfsocket.cpp:452 ../src/mac/carbon/cfsocket.cpp:506 msgid "wxSocket: invalid signature in ReadMsg." msgstr "wxSocket: nepravilen podpis v ReadMsg." # common/socket.cpp:921 -#: ../src/common/socket.cpp:966 -#: ../src/mac/carbon/cfsocket.cpp:1006 +#: ../src/common/socket.cpp:966 ../src/mac/carbon/cfsocket.cpp:1006 msgid "wxSocket: unknown event!." msgstr "wxSocket: neznan dogodek!" @@ -6128,8 +6039,7 @@ msgstr "vèeraj" # common/log.cpp:242 -#: ../src/common/zstream.cpp:165 -#: ../src/common/zstream.cpp:315 +#: ../src/common/zstream.cpp:165 ../src/common/zstream.cpp:315 #, c-format msgid "zlib error %d" msgstr "napaka zlib %d" @@ -6137,4 +6047,3 @@ #: ../src/common/prntbase.cpp:886 msgid "|<<" msgstr "|<<" - --- wxwidgets2.6-2.6.3.2.2.orig/locale/sv.po +++ wxwidgets2.6-2.6.3.2.2/locale/sv.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: wxWidgets-2.6.2\n" -"Report-Msgid-Bugs-To: wxWidgets development team \n" +"Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-08-21 17:37+0200\n" "PO-Revision-Date: 2005-09-19 02:32+0100\n" "Last-Translator: Jonas Rydberg \n" @@ -72,10 +72,8 @@ msgid "#define %s must be an integer." msgstr "#define %s måste vara ett heltal." -#: ../src/html/helpfrm.cpp:1042 -#: ../src/html/helpfrm.cpp:1044 -#: ../src/html/helpfrm.cpp:1703 -#: ../src/html/helpfrm.cpp:1736 +#: ../src/html/helpfrm.cpp:1042 ../src/html/helpfrm.cpp:1044 +#: ../src/html/helpfrm.cpp:1703 ../src/html/helpfrm.cpp:1736 #, c-format msgid "%i of %i" msgstr "%i av %i" @@ -132,8 +130,7 @@ msgid "%s: ill-formed resource file syntax." msgstr "%s: felformaterad resursfilsyntax." -#: ../src/html/helpfrm.cpp:357 -#: ../src/html/helpfrm.cpp:359 +#: ../src/html/helpfrm.cpp:357 ../src/html/helpfrm.cpp:359 msgid "&About..." msgstr "&Om..." @@ -157,10 +154,8 @@ msgid "&Bold" msgstr "&Fet" -#: ../src/common/stockitem.cpp:110 -#: ../src/generic/fontdlgg.cpp:363 -#: ../src/generic/fontdlgg.cpp:382 -#: ../src/generic/wizard.cpp:422 +#: ../src/common/stockitem.cpp:110 ../src/generic/fontdlgg.cpp:363 +#: ../src/generic/fontdlgg.cpp:382 ../src/generic/wizard.cpp:422 msgid "&Cancel" msgstr "&Avbryt" @@ -172,15 +167,12 @@ msgid "&Clear" msgstr "&Töm" -#: ../src/common/prntbase.cpp:875 -#: ../src/common/stockitem.cpp:112 -#: ../src/generic/logg.cpp:509 -#: ../src/html/helpfrm.cpp:354 +#: ../src/common/prntbase.cpp:875 ../src/common/stockitem.cpp:112 +#: ../src/generic/logg.cpp:509 ../src/html/helpfrm.cpp:354 msgid "&Close" msgstr "&Stäng" -#: ../src/common/stockitem.cpp:113 -#: ../src/mac/carbon/textctrl.cpp:1074 +#: ../src/common/stockitem.cpp:113 ../src/mac/carbon/textctrl.cpp:1074 #: ../src/msw/textctrl.cpp:2064 msgid "&Copy" msgstr "K&opiera" @@ -189,8 +181,7 @@ msgid "&Debug report preview:" msgstr "&Debugrapport förhandsgranskning:" -#: ../src/common/stockitem.cpp:115 -#: ../src/mac/carbon/textctrl.cpp:1076 +#: ../src/common/stockitem.cpp:115 ../src/mac/carbon/textctrl.cpp:1076 #: ../src/msw/textctrl.cpp:2066 msgid "&Delete" msgstr "&Ta bort" @@ -227,10 +218,8 @@ msgid "&Goto..." msgstr "&Gå till..." -#: ../src/common/stockitem.cpp:122 -#: ../src/generic/wizard.cpp:418 -#: ../src/generic/wizard.cpp:425 -#: ../src/html/helpfrm.cpp:362 +#: ../src/common/stockitem.cpp:122 ../src/generic/wizard.cpp:418 +#: ../src/generic/wizard.cpp:425 ../src/html/helpfrm.cpp:362 msgid "&Help" msgstr "&Hjälp" @@ -258,13 +247,11 @@ msgid "&New" msgstr "&Ny" -#: ../src/generic/mdig.cpp:118 -#: ../src/msw/mdi.cpp:188 +#: ../src/generic/mdig.cpp:118 ../src/msw/mdi.cpp:188 msgid "&Next" msgstr "&Nästa" -#: ../src/generic/wizard.cpp:421 -#: ../src/generic/wizard.cpp:636 +#: ../src/generic/wizard.cpp:421 ../src/generic/wizard.cpp:636 msgid "&Next >" msgstr "&Nästa >" @@ -280,8 +267,7 @@ msgid "&Notes:" msgstr "&Anteckningar:" -#: ../src/common/stockitem.cpp:133 -#: ../src/generic/fontdlgg.cpp:368 +#: ../src/common/stockitem.cpp:133 ../src/generic/fontdlgg.cpp:368 #: ../src/generic/fontdlgg.cpp:375 msgid "&OK" msgstr "&OK" @@ -294,8 +280,7 @@ msgid "&Open..." msgstr "&Öppna..." -#: ../src/common/stockitem.cpp:135 -#: ../src/mac/carbon/textctrl.cpp:1075 +#: ../src/common/stockitem.cpp:135 ../src/mac/carbon/textctrl.cpp:1075 #: ../src/msw/textctrl.cpp:2065 msgid "&Paste" msgstr "K&listra in" @@ -308,8 +293,7 @@ msgid "&Preferences" msgstr "&Inställningar" -#: ../src/generic/mdig.cpp:119 -#: ../src/msw/mdi.cpp:189 +#: ../src/generic/mdig.cpp:119 ../src/msw/mdi.cpp:189 msgid "&Previous" msgstr "&Föregående" @@ -329,16 +313,13 @@ msgid "&Quit" msgstr "&Avsluta" -#: ../src/common/cmdproc.cpp:292 -#: ../src/common/cmdproc.cpp:299 -#: ../src/common/stockitem.cpp:141 -#: ../src/mac/carbon/textctrl.cpp:1071 +#: ../src/common/cmdproc.cpp:292 ../src/common/cmdproc.cpp:299 +#: ../src/common/stockitem.cpp:141 ../src/mac/carbon/textctrl.cpp:1071 #: ../src/msw/textctrl.cpp:2061 msgid "&Redo" msgstr "&Upprepa" -#: ../src/common/cmdproc.cpp:288 -#: ../src/common/cmdproc.cpp:308 +#: ../src/common/cmdproc.cpp:288 ../src/common/cmdproc.cpp:308 msgid "&Redo " msgstr "&Upprepa " @@ -374,15 +355,12 @@ msgid "&Style:" msgstr "&Stil:" -#: ../src/common/stockitem.cpp:149 -#: ../src/generic/fontdlgg.cpp:337 +#: ../src/common/stockitem.cpp:149 ../src/generic/fontdlgg.cpp:337 msgid "&Underline" msgstr "&Understrykning" -#: ../src/common/cmdproc.cpp:270 -#: ../src/common/stockitem.cpp:150 -#: ../src/mac/carbon/textctrl.cpp:1070 -#: ../src/msw/textctrl.cpp:2060 +#: ../src/common/cmdproc.cpp:270 ../src/common/stockitem.cpp:150 +#: ../src/mac/carbon/textctrl.cpp:1070 ../src/msw/textctrl.cpp:2060 msgid "&Undo" msgstr "&Ångra" @@ -402,11 +380,8 @@ msgid "&Weight:" msgstr "&Vikt:" -#: ../src/generic/mdig.cpp:298 -#: ../src/generic/mdig.cpp:314 -#: ../src/generic/mdig.cpp:318 -#: ../src/msw/mdi.cpp:1410 -#: ../src/msw/mdi.cpp:1417 +#: ../src/generic/mdig.cpp:298 ../src/generic/mdig.cpp:314 +#: ../src/generic/mdig.cpp:318 ../src/msw/mdi.cpp:1410 ../src/msw/mdi.cpp:1417 #: ../src/msw/mdi.cpp:1447 msgid "&Window" msgstr "&Fönster" @@ -415,14 +390,12 @@ msgid "&Yes" msgstr "&Ja" -#: ../src/common/config.cpp:433 -#: ../src/msw/regconf.cpp:258 +#: ../src/common/config.cpp:433 ../src/msw/regconf.cpp:258 #, c-format msgid "'%s' has extra '..', ignored." msgstr "\"%s\" har extra \"..\", ignoreras." -#: ../src/common/valtext.cpp:132 -#: ../src/common/valtext.cpp:162 +#: ../src/common/valtext.cpp:132 ../src/common/valtext.cpp:162 #: ../src/common/valtext.cpp:168 #, c-format msgid "'%s' is invalid" @@ -467,8 +440,7 @@ msgid "(Help)" msgstr "(Hjälp)" -#: ../src/html/helpfrm.cpp:431 -#: ../src/html/helpfrm.cpp:1114 +#: ../src/html/helpfrm.cpp:431 ../src/html/helpfrm.cpp:1114 #: ../src/html/helpfrm.cpp:1764 msgid "(bookmarks)" msgstr "(bokmärken)" @@ -496,13 +468,11 @@ ", förväntade static, #include eller #define\n" "när resursen tolkades." -#: ../src/generic/dirctrlg.cpp:683 -#: ../src/generic/filedlgg.cpp:740 +#: ../src/generic/dirctrlg.cpp:683 ../src/generic/filedlgg.cpp:740 msgid "." msgstr "." -#: ../src/generic/dirctrlg.cpp:684 -#: ../src/generic/filedlgg.cpp:741 +#: ../src/generic/dirctrlg.cpp:684 ../src/generic/filedlgg.cpp:741 msgid ".." msgstr ".." @@ -554,18 +524,15 @@ msgid "<<" msgstr "<<" -#: ../src/generic/filedlgg.cpp:259 -#: ../src/generic/filedlgg.cpp:282 +#: ../src/generic/filedlgg.cpp:259 ../src/generic/filedlgg.cpp:282 msgid "" msgstr "" -#: ../src/generic/filedlgg.cpp:263 -#: ../src/generic/filedlgg.cpp:286 +#: ../src/generic/filedlgg.cpp:263 ../src/generic/filedlgg.cpp:286 msgid "" msgstr "" -#: ../src/generic/filedlgg.cpp:261 -#: ../src/generic/filedlgg.cpp:284 +#: ../src/generic/filedlgg.cpp:261 ../src/generic/filedlgg.cpp:284 msgid "" msgstr "" @@ -808,8 +775,7 @@ msgid "B6 Envelope, 176 x 125 mm" msgstr "B6 kuvert, 176 x 125 mm" -#: ../src/common/imagbmp.cpp:477 -#: ../src/common/imagbmp.cpp:493 +#: ../src/common/imagbmp.cpp:477 ../src/common/imagbmp.cpp:493 msgid "BMP: Couldn't allocate memory." msgstr "BMP: Kunde inte allokera minne." @@ -890,8 +856,7 @@ msgid "C65 Envelope, 114 x 229 mm" msgstr "C65 kuvert, 114 x 229 mm" -#: ../src/html/chm.cpp:797 -#: ../src/html/chm.cpp:856 +#: ../src/html/chm.cpp:797 ../src/html/chm.cpp:856 msgid "CHM handler currently supports only local files!" msgstr "CHM-hanteraren stöder för närvarande endast lokala filer!" @@ -904,8 +869,7 @@ msgid "Can not enumerate files '%s'" msgstr "Kan inte räkna upp filerna \"%s\"" -#: ../src/msw/dir.cpp:205 -#: ../src/unix/dir.cpp:232 +#: ../src/msw/dir.cpp:205 ../src/unix/dir.cpp:232 #, c-format msgid "Can not enumerate files in directory '%s'" msgstr "Kan inte räkna upp filerna i katalogen \"%s\"" @@ -915,8 +879,7 @@ msgid "Can not resume thread %lu" msgstr "Kan inte fortsätta tråden %lu" -#: ../src/mac/classic/thread.cpp:491 -#: ../src/msw/thread.cpp:827 +#: ../src/mac/classic/thread.cpp:491 ../src/msw/thread.cpp:827 #, c-format msgid "Can not resume thread %x" msgstr "Kan inte fortsätta tråden %x" @@ -930,8 +893,7 @@ msgid "Can not suspend thread %lu" msgstr "Kan inte hålla inne tråd %lu" -#: ../src/mac/classic/thread.cpp:464 -#: ../src/msw/thread.cpp:812 +#: ../src/mac/classic/thread.cpp:464 ../src/msw/thread.cpp:812 #, c-format msgid "Can not suspend thread %x" msgstr "Kan inte hålla inne tråd %x" @@ -964,10 +926,8 @@ msgid "Can't create registry key '%s'" msgstr "Kan inte skapa registernyckel \"%s\"" -#: ../src/mac/carbon/mpthread.cpp:911 -#: ../src/mac/carbon/thread.cpp:1100 -#: ../src/mac/classic/thread.cpp:439 -#: ../src/msw/thread.cpp:594 +#: ../src/mac/carbon/mpthread.cpp:911 ../src/mac/carbon/thread.cpp:1100 +#: ../src/mac/classic/thread.cpp:439 ../src/msw/thread.cpp:594 #: ../src/os2/thread.cpp:486 msgid "Can't create thread" msgstr "Kan inte skapa tråd" @@ -982,8 +942,7 @@ msgid "Can't delete key '%s'" msgstr "Kan inte ta bort nyckel \"%s\"" -#: ../src/msw/iniconf.cpp:444 -#: ../src/os2/iniconf.cpp:458 +#: ../src/msw/iniconf.cpp:444 ../src/os2/iniconf.cpp:458 #, c-format msgid "Can't delete the INI file '%s'" msgstr "Kan inte ta bort INI-filen \"%s\"" @@ -1026,8 +985,7 @@ msgid "Can't initialize zlib inflate stream." msgstr "Kan inte initialisera zlib inflate-ström." -#: ../src/common/image.cpp:1367 -#: ../src/common/image.cpp:1387 +#: ../src/common/image.cpp:1367 ../src/common/image.cpp:1387 #, c-format msgid "Can't load image from file '%s': file does not exist." msgstr "Kan inte ladda bild från fil \"%s\": filen finns inte." @@ -1051,8 +1009,7 @@ msgid "Can't read value of '%s'" msgstr "Kan inte läsa värdet av \"%s\"" -#: ../src/msw/registry.cpp:795 -#: ../src/msw/registry.cpp:825 +#: ../src/msw/registry.cpp:795 ../src/msw/registry.cpp:825 #: ../src/msw/registry.cpp:885 #, c-format msgid "Can't read value of key '%s'" @@ -1063,18 +1020,15 @@ msgid "Can't save image to file '%s': unknown extension." msgstr "Kan inte spara bild till fil \"%s\": okänd filändelse." -#: ../src/generic/logg.cpp:569 -#: ../src/generic/logg.cpp:1020 +#: ../src/generic/logg.cpp:569 ../src/generic/logg.cpp:1020 msgid "Can't save log contents to file." msgstr "Kan inte spara logginnehållet till fil." -#: ../src/msw/thread.cpp:550 -#: ../src/os2/thread.cpp:469 +#: ../src/msw/thread.cpp:550 ../src/os2/thread.cpp:469 msgid "Can't set thread priority" msgstr "Kan inte sätta trådprioritet" -#: ../src/msw/registry.cpp:812 -#: ../src/msw/registry.cpp:854 +#: ../src/msw/registry.cpp:812 ../src/msw/registry.cpp:854 #: ../src/msw/registry.cpp:975 #, c-format msgid "Can't set value of '%s'" @@ -1085,18 +1039,14 @@ msgid "Can't write to deflate stream: %s" msgstr "Kan inte skriva till deflate-ström: %s" -#: ../src/generic/choicdgg.cpp:291 -#: ../src/generic/dirdlgg.cpp:114 -#: ../src/generic/numdlgg.cpp:136 -#: ../src/generic/textdlgg.cpp:120 -#: ../src/gtk/fontdlg.cpp:155 -#: ../src/motif/msgdlg.cpp:204 +#: ../src/generic/choicdgg.cpp:291 ../src/generic/dirdlgg.cpp:114 +#: ../src/generic/numdlgg.cpp:136 ../src/generic/textdlgg.cpp:120 +#: ../src/gtk/fontdlg.cpp:155 ../src/motif/msgdlg.cpp:204 #: ../contrib/src/deprecated/proplist.cpp:518 msgid "Cancel" msgstr "Avbryt" -#: ../src/xrc/xmlres.cpp:1188 -#: ../src/xrc/xmlres.cpp:1236 +#: ../src/xrc/xmlres.cpp:1188 ../src/xrc/xmlres.cpp:1236 msgid "Cannot convert dialog units: dialog unknown." msgstr "Kan inte konvertera dialogenheter: okänd dialog." @@ -1216,8 +1166,7 @@ msgid "Cannot print empty page." msgstr "Kan inte skriva ut tom sida." -#: ../src/msw/volume.cpp:160 -#: ../src/msw/volume.cpp:491 +#: ../src/msw/volume.cpp:160 ../src/msw/volume.cpp:491 #, c-format msgid "Cannot read typename from '%s'!" msgstr "Kan inte läsa typnamn från \"%s\"!" @@ -1230,13 +1179,11 @@ msgid "Cannot start thread: error writing TLS" msgstr "Kan inte starta tråd: fel vid skrivning av TLS" -#: ../src/mac/carbon/mpthread.cpp:977 -#: ../src/mac/carbon/thread.cpp:1174 +#: ../src/mac/carbon/mpthread.cpp:977 ../src/mac/carbon/thread.cpp:1174 msgid "Cannot wait for thread termination." msgstr "Kan inte vänta på att tråden avslutas." -#: ../src/mac/carbon/mpthread.cpp:893 -#: ../src/mac/carbon/thread.cpp:1082 +#: ../src/mac/carbon/mpthread.cpp:893 ../src/mac/carbon/thread.cpp:1082 msgid "Cant create the thread event queue" msgstr "Kan inte skapa trådens händelsekö" @@ -1260,8 +1207,7 @@ msgid "Choose ISP to dial" msgstr "Välj Internetleverantör att ringa upp" -#: ../src/generic/colrdlgg.cpp:151 -#: ../src/gtk/colordlg.cpp:45 +#: ../src/generic/colrdlgg.cpp:151 ../src/gtk/colordlg.cpp:45 #: ../src/palmos/colordlg.cpp:79 msgid "Choose colour" msgstr "Välj färg" @@ -1278,22 +1224,17 @@ msgid "Clear the log contents" msgstr "Töm logginnehållet" -#: ../src/generic/fontdlgg.cpp:365 -#: ../src/generic/fontdlgg.cpp:384 +#: ../src/generic/fontdlgg.cpp:365 ../src/generic/fontdlgg.cpp:384 msgid "Click to cancel the font selection." msgstr "Klicka för att avbryta typsnittsvalet." -#: ../src/generic/fontdlgg.cpp:370 -#: ../src/generic/fontdlgg.cpp:372 -#: ../src/generic/fontdlgg.cpp:377 -#: ../src/generic/fontdlgg.cpp:379 +#: ../src/generic/fontdlgg.cpp:370 ../src/generic/fontdlgg.cpp:372 +#: ../src/generic/fontdlgg.cpp:377 ../src/generic/fontdlgg.cpp:379 msgid "Click to confirm the font selection." msgstr "Klicka för att bekräfta typsnittsvalet." -#: ../src/generic/dbgrptg.cpp:92 -#: ../src/generic/progdlgg.cpp:629 -#: ../src/generic/progdlgg.cpp:634 -#: ../contrib/src/deprecated/proplist.cpp:513 +#: ../src/generic/dbgrptg.cpp:92 ../src/generic/progdlgg.cpp:629 +#: ../src/generic/progdlgg.cpp:634 ../contrib/src/deprecated/proplist.cpp:513 msgid "Close" msgstr "Stäng" @@ -1322,8 +1263,7 @@ msgid "Config entry name cannot start with '%c'." msgstr "Konfigurationspost kan inte starta med \"%c\"." -#: ../src/generic/filedlgg.cpp:1318 -#: ../src/gtk/filedlg.cpp:67 +#: ../src/generic/filedlgg.cpp:1318 ../src/gtk/filedlg.cpp:67 msgid "Confirm" msgstr "Bekräfta" @@ -1384,7 +1324,8 @@ "Could not resolve control class or id '%s'. Use (non-zero) integer instead\n" " or provide #define (see manual for caveats)" msgstr "" -"Kunde inte slå upp kontrollklass eller id '%s'. Använd (ickenoll) heltal istället\n" +"Kunde inte slå upp kontrollklass eller id '%s'. Använd (ickenoll) heltal " +"istället\n" "eller tillhandahåll #define (se manualen för risker)" #: ../contrib/src/deprecated/resource.cpp:1278 @@ -1400,8 +1341,7 @@ msgid "Could not start document preview." msgstr "Kunde inte påbörja förhandsgranskning av dokumentet." -#: ../src/generic/printps.cpp:185 -#: ../src/gtk/gnome/gprint.cpp:763 +#: ../src/generic/printps.cpp:185 ../src/gtk/gnome/gprint.cpp:763 #: ../src/msw/printwin.cpp:235 msgid "Could not start printing." msgstr "Kunde inte påbörja utskrift." @@ -1410,10 +1350,8 @@ msgid "Could not transfer data to window" msgstr "Kunde inte föra över data till fönstret" -#: ../src/mac/carbon/mpthread.cpp:227 -#: ../src/mac/carbon/mpthread.cpp:306 -#: ../src/mac/carbon/thread.cpp:414 -#: ../src/mac/carbon/thread.cpp:495 +#: ../src/mac/carbon/mpthread.cpp:227 ../src/mac/carbon/mpthread.cpp:306 +#: ../src/mac/carbon/thread.cpp:414 ../src/mac/carbon/thread.cpp:495 msgid "Could not unlock mutex" msgstr "Kunde inte låsa upp mutex" @@ -1421,21 +1359,17 @@ msgid "Couldn't acquire a mutex lock" msgstr "Kunde inte förvärva ett mutexlås" -#: ../src/msw/dragimag.cpp:166 -#: ../src/msw/dragimag.cpp:206 -#: ../src/msw/imaglist.cpp:158 -#: ../src/msw/imaglist.cpp:176 +#: ../src/msw/dragimag.cpp:166 ../src/msw/dragimag.cpp:206 +#: ../src/msw/imaglist.cpp:158 ../src/msw/imaglist.cpp:176 #: ../src/msw/imaglist.cpp:188 msgid "Couldn't add an image to the image list." msgstr "Kunde inte lägga till en bild till bildlistan." -#: ../src/msw/timer.cpp:106 -#: ../src/os2/timer.cpp:155 +#: ../src/msw/timer.cpp:106 ../src/os2/timer.cpp:155 msgid "Couldn't create a timer" msgstr "Kunde inte skapa en timer" -#: ../src/mgl/cursor.cpp:135 -#: ../src/mgl/cursor.cpp:166 +#: ../src/mgl/cursor.cpp:135 ../src/mgl/cursor.cpp:166 msgid "Couldn't create cursor." msgstr "Kunde inte skapa markör." @@ -1444,8 +1378,7 @@ msgid "Couldn't find symbol '%s' in a dynamic library" msgstr "Kunde inte hitta symbolen \"%s\" i ett dynamiskt bibliotek" -#: ../src/mac/classic/thread.cpp:521 -#: ../src/msw/thread.cpp:853 +#: ../src/mac/classic/thread.cpp:521 ../src/msw/thread.cpp:853 msgid "Couldn't get the current thread pointer" msgstr "Kunde inte hämta den aktuella trådpekaren" @@ -1477,14 +1410,12 @@ msgid "Couldn't retrieve information about list control item %d." msgstr "Kunde inte hämta information om listkontrollpost %d." -#: ../src/common/imagpng.cpp:642 -#: ../src/common/imagpng.cpp:651 +#: ../src/common/imagpng.cpp:642 ../src/common/imagpng.cpp:651 #: ../src/common/imagpng.cpp:659 msgid "Couldn't save PNG image." msgstr "Kunde inte spara PNG-bild." -#: ../src/mac/classic/thread.cpp:779 -#: ../src/msw/thread.cpp:611 +#: ../src/mac/classic/thread.cpp:779 ../src/msw/thread.cpp:611 msgid "Couldn't terminate thread" msgstr "Kunde inte avsluta tråd" @@ -1496,13 +1427,11 @@ msgid "Create directory" msgstr "Skapa katalog" -#: ../src/generic/dirdlgg.cpp:140 -#: ../src/generic/filedlgg.cpp:999 +#: ../src/generic/dirdlgg.cpp:140 ../src/generic/filedlgg.cpp:999 msgid "Create new directory" msgstr "Skapa ny katalog" -#: ../src/common/stockitem.cpp:114 -#: ../src/mac/carbon/textctrl.cpp:1073 +#: ../src/common/stockitem.cpp:114 ../src/mac/carbon/textctrl.cpp:1073 #: ../src/msw/textctrl.cpp:2063 msgid "Cu&t" msgstr "&Klipp ut" @@ -1586,8 +1515,13 @@ msgstr "Skrivbord" #: ../src/msw/dialup.cpp:395 -msgid "Dial up functions are unavailable because the remote access service (RAS) is not installed on this machine. Please install it." -msgstr "Uppringningsfunktioner är inte tillgängliga på grund av att fjärråtkomstservice (RAS) inte är installerad på denna maskin. Var vänlig och installera den." +msgid "" +"Dial up functions are unavailable because the remote access service (RAS) is " +"not installed on this machine. Please install it." +msgstr "" +"Uppringningsfunktioner är inte tillgängliga på grund av att " +"fjärråtkomstservice (RAS) inte är installerad på denna maskin. Var vänlig " +"och installera den." #: ../src/generic/tipdlg.cpp:246 msgid "Did you know..." @@ -1616,8 +1550,12 @@ msgstr "Katalogen finns inte." #: ../src/html/helpfrm.cpp:503 -msgid "Display all index items that contain given substring. Search is case insensitive." -msgstr "Visa alla indexposter som innehåller given delsträng. Sökningen är skiftlägesokänslig." +msgid "" +"Display all index items that contain given substring. Search is case " +"insensitive." +msgstr "" +"Visa alla indexposter som innehåller given delsträng. Sökningen är " +"skiftlägesokänslig." #: ../src/html/helpfrm.cpp:685 msgid "Display options dialog" @@ -1625,7 +1563,8 @@ #: ../src/msw/mimetype.cpp:671 msgid "" -"Do you want to overwrite the command used to %s files with extension \"%s\" ?\n" +"Do you want to overwrite the command used to %s files with extension \"%s" +"\" ?\n" "Current value is \n" "%s, \n" "New value is \n" @@ -1646,8 +1585,7 @@ msgid "Don't Save" msgstr "Spara inte" -#: ../src/html/htmlwin.cpp:451 -#: ../src/msw/frame.cpp:211 +#: ../src/html/htmlwin.cpp:451 ../src/msw/frame.cpp:211 msgid "Done" msgstr "Färdigt" @@ -1700,26 +1638,21 @@ #: ../src/common/config.cpp:384 #, c-format -msgid "Environment variables expansion failed: missing '%c' at position %u in '%s'." -msgstr "Miljövariabelexpansion misslyckades: \"%c\" saknas på position %u i \"%s\"." +msgid "" +"Environment variables expansion failed: missing '%c' at position %u in '%s'." +msgstr "" +"Miljövariabelexpansion misslyckades: \"%c\" saknas på position %u i \"%s\"." -#: ../src/generic/dirctrlg.cpp:689 -#: ../src/generic/dirctrlg.cpp:707 -#: ../src/generic/dirctrlg.cpp:718 -#: ../src/generic/dirdlgg.cpp:342 -#: ../src/generic/filedlgg.cpp:632 -#: ../src/generic/filedlgg.cpp:744 -#: ../src/generic/filedlgg.cpp:758 -#: ../src/generic/filedlgg.cpp:772 -#: ../src/generic/filedlgg.cpp:1269 -#: ../src/generic/filedlgg.cpp:1295 -#: ../src/generic/filedlgg.cpp:1325 -#: ../src/gtk/fontdlg.cpp:81 +#: ../src/generic/dirctrlg.cpp:689 ../src/generic/dirctrlg.cpp:707 +#: ../src/generic/dirctrlg.cpp:718 ../src/generic/dirdlgg.cpp:342 +#: ../src/generic/filedlgg.cpp:632 ../src/generic/filedlgg.cpp:744 +#: ../src/generic/filedlgg.cpp:758 ../src/generic/filedlgg.cpp:772 +#: ../src/generic/filedlgg.cpp:1269 ../src/generic/filedlgg.cpp:1295 +#: ../src/generic/filedlgg.cpp:1325 ../src/gtk/fontdlg.cpp:81 msgid "Error" msgstr "Fel" -#: ../src/msdos/utilsdos.cpp:213 -#: ../src/unix/utilsunx.cpp:1090 +#: ../src/msdos/utilsdos.cpp:213 ../src/unix/utilsunx.cpp:1090 #: ../src/unix/utilsunx.cpp:1098 msgid "Error " msgstr "Fel " @@ -1740,8 +1673,7 @@ msgid "Error saving user configuration data." msgstr "Fel vid sparande av användarkonfigurationsdata." -#: ../src/mac/carbon/mpthread.cpp:482 -#: ../src/mac/carbon/thread.cpp:672 +#: ../src/mac/carbon/mpthread.cpp:482 ../src/mac/carbon/thread.cpp:672 msgid "Error while waiting on semaphore" msgstr "Fel vid väntande på semafor" @@ -1795,8 +1727,11 @@ #: ../src/msw/registry.cpp:1140 #, c-format -msgid "Exporting registry key: file \"%s\" already exists and won't be overwritten." -msgstr "Exporterar registernyckel: filen \"%s\" finns redan och kommer inte att skrivas över." +msgid "" +"Exporting registry key: file \"%s\" already exists and won't be overwritten." +msgstr "" +"Exporterar registernyckel: filen \"%s\" finns redan och kommer inte att " +"skrivas över." #: ../src/common/fmapbase.cpp:143 msgid "Extended Unix Codepage for Japanese (EUC-JP)" @@ -1939,8 +1874,7 @@ msgid "Failed to display HTML document in %s encoding" msgstr "Kunde inte visa HTML-dokument i %s-kodning" -#: ../src/mac/carbon/clipbrd.cpp:194 -#: ../src/mac/classic/clipbrd.cpp:185 +#: ../src/mac/carbon/clipbrd.cpp:194 ../src/mac/classic/clipbrd.cpp:185 #: ../src/msw/clipbrd.cpp:131 msgid "Failed to empty the clipboard." msgstr "Kunde inte tömma urklippsbordet." @@ -1958,8 +1892,7 @@ msgid "Failed to establish dialup connection: %s" msgstr "Kunde inte etablera uppringningsanslutning: %s" -#: ../src/unix/utilsunx.cpp:508 -#: ../src/unix/utilsunx.cpp:524 +#: ../src/unix/utilsunx.cpp:508 ../src/unix/utilsunx.cpp:524 #, c-format msgid "Failed to execute '%s'\n" msgstr "Kunde inte utföra \"%s\"\n" @@ -2000,8 +1933,7 @@ msgid "Failed to get ISP names: %s" msgstr "Kunde inte hämta Internetleverantörers namn: %s" -#: ../src/mac/carbon/clipbrd.cpp:143 -#: ../src/mac/classic/clipbrd.cpp:134 +#: ../src/mac/carbon/clipbrd.cpp:143 ../src/mac/classic/clipbrd.cpp:134 msgid "Failed to get clipboard data." msgstr "Kunde inte hämta urklippsdata." @@ -2035,8 +1967,12 @@ msgstr "Kunde inte inspektera låsfilen \"%s\"" #: ../src/unix/threadpsx.cpp:897 -msgid "Failed to join a thread, potential memory leak detected - please restart the program" -msgstr "Kunde inte slå ihop en tråd, möjlig minnesläcka hittad - var vänlig och starta om programmet" +msgid "" +"Failed to join a thread, potential memory leak detected - please restart the " +"program" +msgstr "" +"Kunde inte slå ihop en tråd, möjlig minnesläcka hittad - var vänlig och " +"starta om programmet" #: ../src/msw/utils.cpp:703 #, c-format @@ -2199,8 +2135,7 @@ msgid "Failed to set temporary file permissions" msgstr "Kunde inte sätta temporära filbehörigheter" -#: ../src/unix/threadpsx.cpp:1245 -#: ../src/unix/threadpsx.cpp:1256 +#: ../src/unix/threadpsx.cpp:1245 ../src/unix/threadpsx.cpp:1256 #, c-format msgid "Failed to set thread priority %d." msgstr "Kunde inte sätta trådprioritet %d." @@ -2210,8 +2145,7 @@ msgid "Failed to store image '%s' to memory VFS!" msgstr "Kunde inte spara bild \"%s\" till minnes-VFS!" -#: ../src/mac/carbon/mpthread.cpp:1273 -#: ../src/mac/carbon/thread.cpp:1465 +#: ../src/mac/carbon/mpthread.cpp:1273 ../src/mac/carbon/thread.cpp:1465 #: ../src/unix/threadpsx.cpp:1429 msgid "Failed to terminate a thread." msgstr "Kunde inte avsluta en tråd." @@ -2271,8 +2205,7 @@ msgid "File %s does not exist." msgstr "Filen %s finns inte." -#: ../src/generic/filedlgg.cpp:1316 -#: ../src/gtk/filedlg.cpp:64 +#: ../src/generic/filedlgg.cpp:1316 ../src/gtk/filedlg.cpp:64 #, c-format msgid "File '%s' already exists, do you really want to overwrite it?" msgstr "Filen \"%s\" finns redan, vill du verkligen skriva över den?" @@ -2290,13 +2223,11 @@ msgid "File couldn't be loaded." msgstr "Filen kunde inte laddas." -#: ../src/common/docview.cpp:571 -#: ../src/common/docview.cpp:1596 +#: ../src/common/docview.cpp:571 ../src/common/docview.cpp:1596 msgid "File error" msgstr "Filfel" -#: ../src/generic/dirctrlg.cpp:707 -#: ../src/generic/filedlgg.cpp:758 +#: ../src/generic/dirctrlg.cpp:707 ../src/generic/filedlgg.cpp:758 msgid "File name exists already." msgstr "Filnamnet finns redan." @@ -2416,8 +2347,7 @@ msgid "Go one level up in document hierarchy" msgstr "Gå upp en nivå i dokumenthierarki" -#: ../src/generic/dirdlgg.cpp:145 -#: ../src/generic/filedlgg.cpp:989 +#: ../src/generic/dirdlgg.cpp:145 ../src/generic/filedlgg.cpp:989 msgid "Go to home directory" msgstr "Gå till hemkatalog" @@ -2433,8 +2363,7 @@ msgid "Greek (ISO-8859-7)" msgstr "Grekiska (ISO-8859-7)" -#: ../src/common/zstream.cpp:72 -#: ../src/common/zstream.cpp:209 +#: ../src/common/zstream.cpp:72 ../src/common/zstream.cpp:209 msgid "Gzip not supported by this version of zlib" msgstr "Gzip stöds inte av den här versionen av zlib" @@ -2455,8 +2384,7 @@ msgid "Hebrew (ISO-8859-8)" msgstr "Hebreiska (ISO-8859-8)" -#: ../src/html/helpfrm.cpp:337 -#: ../contrib/src/deprecated/proplist.cpp:523 +#: ../src/html/helpfrm.cpp:337 ../contrib/src/deprecated/proplist.cpp:523 msgid "Help" msgstr "Hjälp" @@ -2464,8 +2392,7 @@ msgid "Help Browser Options" msgstr "Hjälpbläddraralternativ" -#: ../src/generic/helpext.cpp:442 -#: ../src/generic/helpext.cpp:443 +#: ../src/generic/helpext.cpp:442 ../src/generic/helpext.cpp:443 msgid "Help Index" msgstr "Hjälpindex" @@ -2502,12 +2429,9 @@ msgid "ICO: Error in reading mask DIB." msgstr "ICO: Fel vid läsning av mask DIB." -#: ../src/common/imagbmp.cpp:1048 -#: ../src/common/imagbmp.cpp:1107 -#: ../src/common/imagbmp.cpp:1116 -#: ../src/common/imagbmp.cpp:1127 -#: ../src/common/imagbmp.cpp:1171 -#: ../src/common/imagbmp.cpp:1181 +#: ../src/common/imagbmp.cpp:1048 ../src/common/imagbmp.cpp:1107 +#: ../src/common/imagbmp.cpp:1116 ../src/common/imagbmp.cpp:1127 +#: ../src/common/imagbmp.cpp:1171 ../src/common/imagbmp.cpp:1181 #: ../src/common/imagbmp.cpp:1190 msgid "ICO: Error writing the image file!" msgstr "ICO: Fel vid skrivning till bildfilen!" @@ -2556,7 +2480,8 @@ #: ../src/generic/dbgrptg.cpp:310 msgid "" -"If you wish to suppress this debug report completely, please choose the \"Cancel\" button,\n" +"If you wish to suppress this debug report completely, please choose the " +"\"Cancel\" button,\n" "but be warned that it may hinder improving the program, so if\n" "at all possible please do continue with the report generation.\n" msgstr "" @@ -2585,8 +2510,7 @@ msgid "Illegal Parameter Count for Create Method" msgstr "Otillåtet antal parametrar för Create-metod" -#: ../src/generic/dirctrlg.cpp:689 -#: ../src/generic/filedlgg.cpp:744 +#: ../src/generic/dirctrlg.cpp:689 ../src/generic/filedlgg.cpp:744 msgid "Illegal directory name." msgstr "Ogiltigt katalognamn." @@ -2604,8 +2528,12 @@ msgstr "Bildfilen är inte av typen %d." #: ../src/msw/textctrl.cpp:361 -msgid "Impossible to create a rich edit control, using simple text control instead. Please reinstall riched32.dll" -msgstr "Omöjligt att skapa en rich edit control, använder enkel text control istället. Installera om riched32.dll" +msgid "" +"Impossible to create a rich edit control, using simple text control instead. " +"Please reinstall riched32.dll" +msgstr "" +"Omöjligt att skapa en rich edit control, använder enkel text control " +"istället. Installera om riched32.dll" #: ../src/unix/utilsunx.cpp:428 msgid "Impossible to get child process input" @@ -2670,8 +2598,7 @@ msgid "Invalid lock file '%s'." msgstr "Ogiltig låsfil \"%s\"." -#: ../src/common/xtistrm.cpp:365 -#: ../src/common/xtistrm.cpp:380 +#: ../src/common/xtistrm.cpp:365 ../src/common/xtistrm.cpp:380 msgid "Invalid or Null Object ID passed to GetObjectClassInfo" msgstr "Ogiltigt eller null objekt-id skickat till GetObjectClassInfo" @@ -2764,8 +2691,7 @@ msgid "KOI8-U" msgstr "KOI8-U" -#: ../src/generic/prntdlgg.cpp:609 -#: ../src/generic/prntdlgg.cpp:867 +#: ../src/generic/prntdlgg.cpp:609 ../src/generic/prntdlgg.cpp:867 msgid "Landscape" msgstr "Liggande" @@ -2845,8 +2771,7 @@ msgid "Log saved to the file '%s'." msgstr "Logg sparad till filen \"%s\"." -#: ../include/wx/xti.h:501 -#: ../include/wx/xti.h:505 +#: ../include/wx/xti.h:501 ../include/wx/xti.h:505 msgid "Long Conversions not supported" msgstr "Konvertering till long stöds inte" @@ -2859,8 +2784,13 @@ msgstr "MP-trådstöd är inte tillgängligt på det här systemet" #: ../src/msw/helpchm.cpp:60 -msgid "MS HTML Help functions are unavailable because the MS HTML Help library is not installed on this machine. Please install it." -msgstr "MS HTML hjälpfunktioner är inte tillgängliga på grund av att MS HTML hjälpbiblioteket inte är installerat på den här maskinen. Vänligen installera det." +msgid "" +"MS HTML Help functions are unavailable because the MS HTML Help library is " +"not installed on this machine. Please install it." +msgstr "" +"MS HTML hjälpfunktioner är inte tillgängliga på grund av att MS HTML " +"hjälpbiblioteket inte är installerat på den här maskinen. Vänligen " +"installera det." #: ../src/univ/themes/win32.cpp:4929 msgid "Ma&ximize" @@ -2939,10 +2869,8 @@ msgid "New item" msgstr "Nytt element" -#: ../src/generic/dirdlgg.cpp:316 -#: ../src/generic/dirdlgg.cpp:326 -#: ../src/generic/filedlgg.cpp:608 -#: ../src/generic/filedlgg.cpp:617 +#: ../src/generic/dirdlgg.cpp:316 ../src/generic/dirdlgg.cpp:326 +#: ../src/generic/filedlgg.cpp:608 ../src/generic/filedlgg.cpp:617 msgid "NewName" msgstr "Nytt namn" @@ -2954,10 +2882,8 @@ msgid "Next page" msgstr "Nästa sida" -#: ../src/mac/carbon/msgdlg.cpp:58 -#: ../src/mac/carbon/msgdlg.cpp:143 -#: ../src/mac/classic/msgdlg.cpp:56 -#: ../src/mac/classic/msgdlg.cpp:140 +#: ../src/mac/carbon/msgdlg.cpp:58 ../src/mac/carbon/msgdlg.cpp:143 +#: ../src/mac/classic/msgdlg.cpp:56 ../src/mac/classic/msgdlg.cpp:140 #: ../src/motif/msgdlg.cpp:204 msgid "No" msgstr "Nej" @@ -2980,7 +2906,8 @@ msgid "" "No font for displaying text in encoding '%s' found,\n" "but an alternative encoding '%s' is available.\n" -"Do you want to use this encoding (otherwise you will have to choose another one)?" +"Do you want to use this encoding (otherwise you will have to choose another " +"one)?" msgstr "" "Inget typsnitt för att visa text med kodningen \"%s\" hittades,\n" "men en alternativ kodning \"%s\" är tillgänglig.\n" @@ -3002,20 +2929,17 @@ msgid "No handler found for XML node '%s', class '%s'!" msgstr "Ingen hanterare hittades för XML-nod \"%s\", klass \"%s\"!" -#: ../src/common/image.cpp:1505 -#: ../src/common/image.cpp:1548 +#: ../src/common/image.cpp:1505 ../src/common/image.cpp:1548 msgid "No handler found for image type." msgstr "Ingen hanterare hittades för bildtyp." -#: ../src/common/image.cpp:1513 -#: ../src/common/image.cpp:1556 +#: ../src/common/image.cpp:1513 ../src/common/image.cpp:1556 #: ../src/common/image.cpp:1589 #, c-format msgid "No image handler for type %d defined." msgstr "Ingen bildhanterare för typ %d är definierad." -#: ../src/common/image.cpp:1574 -#: ../src/common/image.cpp:1604 +#: ../src/common/image.cpp:1574 ../src/common/image.cpp:1604 #, c-format msgid "No image handler for type %s defined." msgstr "Ingen bildhanterare för typ %s är definierad." @@ -3028,8 +2952,7 @@ msgid "No sound" msgstr "Inget ljud" -#: ../src/common/image.cpp:1200 -#: ../src/common/image.cpp:1239 +#: ../src/common/image.cpp:1200 ../src/common/image.cpp:1239 msgid "No unused colour in image being masked." msgstr "Ingen oanvänd färg i bilden är maskad." @@ -3041,8 +2964,7 @@ msgid "Nordic (ISO-8859-10)" msgstr "Nordiska språk (ISO-8859-10)" -#: ../src/generic/fontdlgg.cpp:232 -#: ../src/generic/fontdlgg.cpp:235 +#: ../src/generic/fontdlgg.cpp:232 ../src/generic/fontdlgg.cpp:235 msgid "Normal" msgstr "Normal" @@ -3058,8 +2980,7 @@ msgid "Note, 8 1/2 x 11 in" msgstr "Note, 8 1/2 x 11 tum" -#: ../src/gtk/fontdlg.cpp:147 -#: ../src/msw/dialog.cpp:194 +#: ../src/gtk/fontdlg.cpp:147 ../src/msw/dialog.cpp:194 #: ../contrib/src/deprecated/proplist.cpp:506 msgid "OK" msgstr "OK" @@ -3068,13 +2989,11 @@ msgid "Objects must have an id attribute" msgstr "Objekt måste ha ett id-attribut" -#: ../src/common/docview.cpp:1269 -#: ../src/common/docview.cpp:1619 +#: ../src/common/docview.cpp:1269 ../src/common/docview.cpp:1619 msgid "Open File" msgstr "Öppna fil" -#: ../src/html/helpfrm.cpp:673 -#: ../src/html/helpfrm.cpp:1579 +#: ../src/html/helpfrm.cpp:673 ../src/html/helpfrm.cpp:1579 msgid "Open HTML document" msgstr "Öppna HTML-dokument" @@ -3083,10 +3002,8 @@ msgid "Open file \"%s\"" msgstr "Öppna fil \"%s\"" -#: ../src/generic/dirctrlg.cpp:718 -#: ../src/generic/dirdlgg.cpp:342 -#: ../src/generic/filedlgg.cpp:632 -#: ../src/generic/filedlgg.cpp:772 +#: ../src/generic/dirctrlg.cpp:718 ../src/generic/dirdlgg.cpp:342 +#: ../src/generic/filedlgg.cpp:632 ../src/generic/filedlgg.cpp:772 msgid "Operation not permitted." msgstr "Operation ej tillåten." @@ -3105,18 +3022,15 @@ msgid "Option '%s': '%s' cannot be converted to a date." msgstr "Flagga \"%s\": \"%s\" kan inte konverteras till ett datum." -#: ../src/generic/dirdlgg.cpp:116 -#: ../src/generic/prntdlgg.cpp:614 +#: ../src/generic/dirdlgg.cpp:116 ../src/generic/prntdlgg.cpp:614 msgid "Options" msgstr "Alternativ" -#: ../src/generic/prntdlgg.cpp:611 -#: ../src/generic/prntdlgg.cpp:868 +#: ../src/generic/prntdlgg.cpp:611 ../src/generic/prntdlgg.cpp:868 msgid "Orientation" msgstr "Orientering" -#: ../src/common/imagpcx.cpp:462 -#: ../src/common/imagpcx.cpp:485 +#: ../src/common/imagpcx.cpp:462 ../src/common/imagpcx.cpp:485 msgid "PCX: couldn't allocate memory" msgstr "PCX: Kunde inte allokera minne" @@ -3132,8 +3046,7 @@ msgid "PCX: this is not a PCX file." msgstr "PCX: Detta är inte en PCX fil." -#: ../src/common/imagpcx.cpp:464 -#: ../src/common/imagpcx.cpp:486 +#: ../src/common/imagpcx.cpp:464 ../src/common/imagpcx.cpp:486 msgid "PCX: unknown error !!!" msgstr "PCX: Okänt fel !!!" @@ -3149,8 +3062,7 @@ msgid "PNM: File format is not recognized." msgstr "PNM: Filformat är okänt." -#: ../src/common/imagpnm.cpp:108 -#: ../src/common/imagpnm.cpp:125 +#: ../src/common/imagpnm.cpp:108 ../src/common/imagpnm.cpp:125 #: ../src/common/imagpnm.cpp:142 msgid "PNM: File seems truncated." msgstr "PNM: Filen tycks vara trunkerad." @@ -3273,8 +3185,7 @@ msgid "Page Setup" msgstr "Sidinställningar" -#: ../src/common/prntbase.cpp:451 -#: ../src/gtk/gnome/gprint.cpp:540 +#: ../src/common/prntbase.cpp:451 ../src/gtk/gnome/gprint.cpp:540 msgid "Page setup" msgstr "Sidinställning" @@ -3282,14 +3193,12 @@ msgid "Pages" msgstr "Sidor" -#: ../src/generic/prntdlgg.cpp:800 -#: ../src/generic/prntdlgg.cpp:854 +#: ../src/generic/prntdlgg.cpp:800 ../src/generic/prntdlgg.cpp:854 #: ../src/generic/prntdlgg.cpp:1056 msgid "Paper Size" msgstr "Pappersstorlek" -#: ../src/generic/prntdlgg.cpp:598 -#: ../src/generic/prntdlgg.cpp:841 +#: ../src/generic/prntdlgg.cpp:598 ../src/generic/prntdlgg.cpp:841 #: ../src/generic/prntdlgg.cpp:1051 msgid "Paper size" msgstr "Pappersstorlek" @@ -3302,8 +3211,7 @@ msgid "Passing a already registered object to SetObjectName" msgstr "Skickade ett redan registrerat objekt till SetObjectName" -#: ../src/common/xtistrm.cpp:436 -#: ../src/common/xtistrm.cpp:656 +#: ../src/common/xtistrm.cpp:436 ../src/common/xtistrm.cpp:656 msgid "Passing an unkown object to GetObject" msgstr "Skickade ett okänt objekt till GetObject" @@ -3346,8 +3254,7 @@ msgid "Please wait while printing\n" msgstr "Vänta på utskrift\n" -#: ../src/generic/prntdlgg.cpp:608 -#: ../src/generic/prntdlgg.cpp:866 +#: ../src/generic/prntdlgg.cpp:608 ../src/generic/prntdlgg.cpp:866 msgid "Portrait" msgstr "Stående" @@ -3355,8 +3262,7 @@ msgid "PostScript file" msgstr "PostScript-fil" -#: ../src/generic/fontdlgg.cpp:348 -#: ../src/html/helpfrm.cpp:1235 +#: ../src/generic/fontdlgg.cpp:348 ../src/html/helpfrm.cpp:1235 msgid "Preview:" msgstr "Förhandsgranska:" @@ -3364,10 +3270,8 @@ msgid "Previous page" msgstr "Föregående sida" -#: ../src/common/prntbase.cpp:393 -#: ../src/generic/prntdlgg.cpp:138 -#: ../src/generic/prntdlgg.cpp:151 -#: ../src/gtk/gnome/gprint.cpp:395 +#: ../src/common/prntbase.cpp:393 ../src/generic/prntdlgg.cpp:138 +#: ../src/generic/prntdlgg.cpp:151 ../src/gtk/gnome/gprint.cpp:395 #: ../src/gtk/gnome/gprint.cpp:407 msgid "Print" msgstr "Skriv ut" @@ -3376,8 +3280,7 @@ msgid "Print Preview" msgstr "Förhandsgranska" -#: ../src/common/prntbase.cpp:1246 -#: ../src/common/prntbase.cpp:1272 +#: ../src/common/prntbase.cpp:1246 ../src/common/prntbase.cpp:1272 msgid "Print Preview Failure" msgstr "Förhandsgranskning misslyckades" @@ -3437,8 +3340,7 @@ msgid "Printer:" msgstr "Skrivare:" -#: ../src/common/prntbase.cpp:310 -#: ../src/common/prntbase.cpp:531 +#: ../src/common/prntbase.cpp:310 ../src/common/prntbase.cpp:531 msgid "Printing " msgstr "Skriver ut " @@ -3457,8 +3359,11 @@ #: ../src/common/debugrpt.cpp:546 #, c-format -msgid "Processing debug report has failed, leaving the files in \"%s\" directory." -msgstr "Behandling av debugrapport har misslyckats, lämnar filerna i katalogen \"%s\"." +msgid "" +"Processing debug report has failed, leaving the files in \"%s\" directory." +msgstr "" +"Behandling av debugrapport har misslyckats, lämnar filerna i katalogen \"%s" +"\"." #: ../src/common/log.cpp:466 msgid "Program aborted." @@ -3472,8 +3377,7 @@ msgid "Question" msgstr "Fråga" -#: ../src/common/ffile.cpp:125 -#: ../src/common/ffile.cpp:144 +#: ../src/common/ffile.cpp:125 ../src/common/ffile.cpp:144 #, c-format msgid "Read error on file '%s'" msgstr "Läsfel på fil \"%s\"" @@ -3536,7 +3440,8 @@ #: ../src/common/rendcmn.cpp:196 #, c-format msgid "Renderer \"%s\" has incompatible version %d.%d and couldn't be loaded." -msgstr "Rendrerare \"%s\" har inkompatibel version %d.%d och kunde inte laddas." +msgstr "" +"Rendrerare \"%s\" har inkompatibel version %d.%d och kunde inte laddas." #: ../src/common/stockitem.cpp:117 msgid "Rep&lace" @@ -3591,14 +3496,17 @@ msgid "Script" msgstr "Skrivstil" -#: ../src/html/helpfrm.cpp:536 -#: ../src/html/helpfrm.cpp:551 +#: ../src/html/helpfrm.cpp:536 ../src/html/helpfrm.cpp:551 msgid "Search" msgstr "Sök" #: ../src/html/helpfrm.cpp:538 -msgid "Search contents of help book(s) for all occurences of the text you typed above" -msgstr "Sök i hjälpboken/böckernas innehåll efter alla förekomster av texten du skrev in ovan" +msgid "" +"Search contents of help book(s) for all occurences of the text you typed " +"above" +msgstr "" +"Sök i hjälpboken/böckernas innehåll efter alla förekomster av texten du " +"skrev in ovan" #: ../src/generic/fdrepdlg.cpp:166 msgid "Search direction" @@ -3630,8 +3538,7 @@ msgid "Seek error on file '%s' (large files not supported by stdio)" msgstr "Sökfel på fil \"%s\" (stora filer stöds inte av stdio)" -#: ../src/mac/carbon/textctrl.cpp:1078 -#: ../src/msw/textctrl.cpp:2068 +#: ../src/mac/carbon/textctrl.cpp:1078 ../src/msw/textctrl.cpp:2068 msgid "Select &All" msgstr "Markera &allt" @@ -3676,8 +3583,7 @@ msgid "Show all items in index" msgstr "Visa alla poster i index" -#: ../src/generic/dirdlgg.cpp:112 -#: ../src/generic/dirdlgg.cpp:175 +#: ../src/generic/dirdlgg.cpp:112 ../src/generic/dirdlgg.cpp:175 msgid "Show hidden directories" msgstr "Visa dolda kataloger" @@ -3689,8 +3595,7 @@ msgid "Show/hide navigation panel" msgstr "Visa/dölj navigeringspanel" -#: ../src/generic/fontdlgg.cpp:353 -#: ../src/generic/fontdlgg.cpp:355 +#: ../src/generic/fontdlgg.cpp:353 ../src/generic/fontdlgg.cpp:355 msgid "Shows the font preview." msgstr "Visar typsnittsgranskningen." @@ -3698,8 +3603,7 @@ msgid "Size" msgstr "Storlek" -#: ../src/generic/progdlgg.cpp:222 -#: ../src/generic/progdlgg.cpp:240 +#: ../src/generic/progdlgg.cpp:222 ../src/generic/progdlgg.cpp:240 #: ../src/generic/progdlgg.cpp:598 msgid "Skip" msgstr "Hoppa över" @@ -3712,8 +3616,7 @@ msgid "Sorry, could not open this file for saving." msgstr "Kunde inte öppna denna fil för att spara." -#: ../src/common/docview.cpp:617 -#: ../src/common/docview.cpp:1598 +#: ../src/common/docview.cpp:617 ../src/common/docview.cpp:1598 msgid "Sorry, could not open this file." msgstr "Kunde inte öppna denna fil." @@ -3729,8 +3632,7 @@ msgid "Sorry, print preview needs a printer to be installed." msgstr "Förhandsgranskning kräver en installerad skrivare." -#: ../src/common/docview.cpp:1268 -#: ../src/common/docview.cpp:1618 +#: ../src/common/docview.cpp:1268 ../src/common/docview.cpp:1618 msgid "Sorry, the format for this file is unknown." msgstr "Filformatet för denna fil är okänt." @@ -3759,14 +3661,12 @@ msgid "Streaming delegates for not already streamed objects not yet supported" msgstr "Strömmande delegater för icke strömmande objekt stöds inte ännu" -#: ../src/msw/colour.cpp:38 -#: ../src/palmos/colour.cpp:38 +#: ../src/msw/colour.cpp:38 ../src/palmos/colour.cpp:38 #, c-format msgid "String To Colour : Incorrect colour specification : %s" msgstr "Sträng till färg: Felaktig färgspecifikation: %s" -#: ../include/wx/xti.h:428 -#: ../include/wx/xti.h:432 +#: ../include/wx/xti.h:428 ../include/wx/xti.h:432 msgid "String conversions not supported" msgstr "Strängomvandlingar stöds inte" @@ -3795,8 +3695,7 @@ msgid "TIFF library warning." msgstr "TIFF-bibliotek varning." -#: ../src/common/imagtiff.cpp:248 -#: ../src/common/imagtiff.cpp:259 +#: ../src/common/imagtiff.cpp:248 ../src/common/imagtiff.cpp:259 #: ../src/common/imagtiff.cpp:399 msgid "TIFF: Couldn't allocate memory." msgstr "TIFF: Kunde inte allokera minne." @@ -3888,28 +3787,23 @@ "Filen \"%s\" finns inte och kunde inte öppnas.\n" "Den har tagits bort från senast använda filer-listan." -#: ../src/generic/fontdlgg.cpp:316 -#: ../src/generic/fontdlgg.cpp:318 +#: ../src/generic/fontdlgg.cpp:316 ../src/generic/fontdlgg.cpp:318 msgid "The font colour." msgstr "Typsnittets färg." -#: ../src/generic/fontdlgg.cpp:277 -#: ../src/generic/fontdlgg.cpp:279 +#: ../src/generic/fontdlgg.cpp:277 ../src/generic/fontdlgg.cpp:279 msgid "The font family." msgstr "Typsnittets familj." -#: ../src/generic/fontdlgg.cpp:328 -#: ../src/generic/fontdlgg.cpp:330 +#: ../src/generic/fontdlgg.cpp:328 ../src/generic/fontdlgg.cpp:330 msgid "The font point size." msgstr "Typsnittsstorlek" -#: ../src/generic/fontdlgg.cpp:288 -#: ../src/generic/fontdlgg.cpp:290 +#: ../src/generic/fontdlgg.cpp:288 ../src/generic/fontdlgg.cpp:290 msgid "The font style." msgstr "Typsnittets stil." -#: ../src/generic/fontdlgg.cpp:299 -#: ../src/generic/fontdlgg.cpp:301 +#: ../src/generic/fontdlgg.cpp:299 ../src/generic/fontdlgg.cpp:301 msgid "The font weight." msgstr "Typsnittets vikt." @@ -3920,7 +3814,8 @@ #: ../src/generic/dbgrptg.cpp:308 msgid "" -"The report contains the files listed below. If any of these files contain private information,\n" +"The report contains the files listed below. If any of these files contain " +"private information,\n" "please uncheck them and they will be removed from the report.\n" msgstr "" "Rapporten innehåller filerna nedan. Om någon av filerna innehåller\n" @@ -3942,28 +3837,47 @@ #: ../src/msw/dialup.cpp:455 #, c-format -msgid "The version of remote access service (RAS) installed on this machine is tooold, please upgrade (the following required function is missing: %s)." -msgstr "Versionen av fjärråtkomsttjänsten (RAS) som är installerad på denna maskin är för gammal, uppgradera (följande nödvändig funktion saknas: %s)." +msgid "" +"The version of remote access service (RAS) installed on this machine is " +"tooold, please upgrade (the following required function is missing: %s)." +msgstr "" +"Versionen av fjärråtkomsttjänsten (RAS) som är installerad på denna maskin " +"är för gammal, uppgradera (följande nödvändig funktion saknas: %s)." #: ../src/html/htmprint.cpp:601 -msgid "There was a problem during page setup: you may need to set a default printer." -msgstr "Det var problem när sidan ställdes in: Du måste kanske ange en standardskrivare." +msgid "" +"There was a problem during page setup: you may need to set a default printer." +msgstr "" +"Det var problem när sidan ställdes in: Du måste kanske ange en " +"standardskrivare." #: ../src/msw/datectrl.cpp:109 -msgid "This system doesn't support date picker control, please upgrade your version of comctl32.dll" -msgstr "Detta system stöder inte datumväljningskontrollen, uppgradera din version av comctl32.dll" +msgid "" +"This system doesn't support date picker control, please upgrade your version " +"of comctl32.dll" +msgstr "" +"Detta system stöder inte datumväljningskontrollen, uppgradera din version av " +"comctl32.dll" #: ../src/msw/thread.cpp:1206 -msgid "Thread module initialization failed: can not store value in thread local storage" -msgstr "Trådmodulinitialisering misslyckades: Kan inte spara värde i trådens lokala lagring" +msgid "" +"Thread module initialization failed: can not store value in thread local " +"storage" +msgstr "" +"Trådmodulinitialisering misslyckades: Kan inte spara värde i trådens lokala " +"lagring" #: ../src/unix/threadpsx.cpp:1603 msgid "Thread module initialization failed: failed to create thread key" msgstr "Trådmodulinitialisering misslyckades: Kunde inte skapa trådnyckel" #: ../src/msw/thread.cpp:1194 -msgid "Thread module initialization failed: impossible to allocate index in thread local storage" -msgstr "Trådmodulinitialisering misslyckades: Omöjligt att allokera index i trådens lokala lagring" +msgid "" +"Thread module initialization failed: impossible to allocate index in thread " +"local storage" +msgstr "" +"Trådmodulinitialisering misslyckades: Omöjligt att allokera index i trådens " +"lokala lagring" #: ../src/unix/threadpsx.cpp:1108 msgid "Thread priority setting is ignored." @@ -3979,10 +3893,11 @@ #: ../src/common/ftp.cpp:635 msgid "Timeout while waiting for FTP server to connect, try passive mode." -msgstr "Tiden för att vänta på att FTP-server skall ansluta har gått ut, försök med passivt läge." +msgstr "" +"Tiden för att vänta på att FTP-server skall ansluta har gått ut, försök med " +"passivt läge." -#: ../src/msw/timer.cpp:116 -#: ../src/os2/timer.cpp:141 +#: ../src/msw/timer.cpp:116 ../src/os2/timer.cpp:141 msgid "Timer creation failed." msgstr "Kunde inte skapa timer." @@ -4011,8 +3926,7 @@ msgid "Trying to remove file '%s' from memory VFS, but it is not loaded!" msgstr "Försöker ta bort fil \"%s\" från minnes-VFS, men den är inte laddad!" -#: ../src/common/sckaddr.cpp:146 -#: ../src/common/sckaddr.cpp:250 +#: ../src/common/sckaddr.cpp:146 ../src/common/sckaddr.cpp:250 msgid "Trying to solve a NULL hostname: giving up" msgstr "Försöker slå upp ett NULL värdnamn: ger upp" @@ -4024,8 +3938,7 @@ msgid "Type" msgstr "Typ" -#: ../src/common/xtistrm.cpp:281 -#: ../src/common/xtixml.cpp:351 +#: ../src/common/xtistrm.cpp:281 ../src/common/xtixml.cpp:351 #: ../src/common/xtixml.cpp:498 msgid "Type must have enum - long conversion" msgstr "Typen måste ha enum - long omvandling" @@ -4127,8 +4040,7 @@ msgid "Unknown long option '%s'" msgstr "Okänd lång flagga \"%s\"" -#: ../src/common/cmdline.cpp:608 -#: ../src/common/cmdline.cpp:629 +#: ../src/common/cmdline.cpp:608 ../src/common/cmdline.cpp:629 #, c-format msgid "Unknown option '%s'" msgstr "Okänd flagga \"%s\"" @@ -4147,8 +4059,7 @@ msgid "Unmatched '{' in an entry for mime type %s." msgstr "Omatchad \"{\" i en post för mime-typ %s." -#: ../src/common/cmdproc.cpp:261 -#: ../src/common/cmdproc.cpp:287 +#: ../src/common/cmdproc.cpp:261 ../src/common/cmdproc.cpp:287 #: ../src/common/cmdproc.cpp:307 msgid "Unnamed command" msgstr "Namnlöst kommando" @@ -4158,10 +4069,8 @@ msgid "Unrecognized style %s while parsing resource." msgstr "Oväntad stil %s när resursen tolkades." -#: ../src/mac/carbon/clipbrd.cpp:68 -#: ../src/mac/classic/clipbrd.cpp:64 -#: ../src/msw/clipbrd.cpp:273 -#: ../src/msw/clipbrd.cpp:445 +#: ../src/mac/carbon/clipbrd.cpp:68 ../src/mac/classic/clipbrd.cpp:64 +#: ../src/msw/clipbrd.cpp:273 ../src/msw/clipbrd.cpp:445 msgid "Unsupported clipboard format." msgstr "Urklippsformatet stöds inte." @@ -4223,8 +4132,7 @@ msgid "Western European with Euro (ISO-8859-15)" msgstr "Västerländsk med Euro (ISO-8859-15)" -#: ../src/generic/fontdlgg.cpp:339 -#: ../src/generic/fontdlgg.cpp:341 +#: ../src/generic/fontdlgg.cpp:339 ../src/generic/fontdlgg.cpp:341 msgid "Whether the font is underlined." msgstr "Om typsnittet är understruket." @@ -4359,8 +4267,7 @@ msgid "XPM: Malformed pixel data!" msgstr "XPM: Felaktigt pixeldata!" -#: ../src/common/xpmdecod.cpp:712 -#: ../src/common/xpmdecod.cpp:721 +#: ../src/common/xpmdecod.cpp:712 ../src/common/xpmdecod.cpp:721 #, c-format msgid "XPM: malformed colour definition '%s'!" msgstr "XPM: Felaktig färgdefinition \"%s\"!" @@ -4370,8 +4277,7 @@ msgid "XRC resource '%s' (class '%s') not found!" msgstr "XRC-resurs \"%s\" (klass \"%s\") hittades inte!" -#: ../src/xrc/xmlres.cpp:1080 -#: ../src/xrc/xmlres.cpp:1092 +#: ../src/xrc/xmlres.cpp:1080 ../src/xrc/xmlres.cpp:1092 #, c-format msgid "XRC resource: Cannot create bitmap from '%s'." msgstr "XRC-resurs: Kan inte skapa bild från \"%s\"." @@ -4381,10 +4287,8 @@ msgid "XRC resource: Incorrect colour specification '%s' for property '%s'." msgstr "XRC-resurs: Felaktig färgspecifikation \"%s\" för egenskap \"%s\"." -#: ../src/mac/carbon/msgdlg.cpp:59 -#: ../src/mac/carbon/msgdlg.cpp:142 -#: ../src/mac/classic/msgdlg.cpp:57 -#: ../src/mac/classic/msgdlg.cpp:139 +#: ../src/mac/carbon/msgdlg.cpp:59 ../src/mac/carbon/msgdlg.cpp:142 +#: ../src/mac/classic/msgdlg.cpp:57 ../src/mac/classic/msgdlg.cpp:139 #: ../src/motif/msgdlg.cpp:204 msgid "Yes" msgstr "Ja" @@ -4415,7 +4319,8 @@ #: ../src/msw/dde.cpp:1048 msgid "" -"a DDEML function was called without first calling the DdeInitialize function,\n" +"a DDEML function was called without first calling the DdeInitialize " +"function,\n" "or an invalid instance identifier\n" "was passed to a DDEML function." msgstr "" @@ -4437,7 +4342,8 @@ #: ../src/msw/dde.cpp:1039 msgid "a request for a synchronous advise transaction has timed out." -msgstr "tiden för en förfrågan för en synkron meddelandetransaktion har gått ut." +msgstr "" +"tiden för en förfrågan för en synkron meddelandetransaktion har gått ut." #: ../src/msw/dde.cpp:1045 msgid "a request for a synchronous data transaction has timed out." @@ -4445,7 +4351,8 @@ #: ../src/msw/dde.cpp:1054 msgid "a request for a synchronous execute transaction has timed out." -msgstr "tiden för en förfrågan för en synkron exekveringstransaktion har gått ut." +msgstr "" +"tiden för en förfrågan för en synkron exekveringstransaktion har gått ut." #: ../src/msw/dde.cpp:1072 msgid "a request for a synchronous poke transaction has timed out." @@ -4453,7 +4360,8 @@ #: ../src/msw/dde.cpp:1087 msgid "a request to end an advise transaction has timed out." -msgstr "tiden för en förfrågan att avsluta en meddelandetransaktion har gått ut." +msgstr "" +"tiden för en förfrågan att avsluta en meddelandetransaktion har gått ut." #: ../src/msw/dde.cpp:1081 msgid "" @@ -4570,8 +4478,7 @@ msgid "can't determine if the end of file is reached on descriptor %d" msgstr "kan inte avgöra om slutet på filen är uppnått på identifierare %d" -#: ../src/msdos/utilsdos.cpp:307 -#: ../src/msdos/utilsdos.cpp:466 +#: ../src/msdos/utilsdos.cpp:307 ../src/msdos/utilsdos.cpp:466 #, c-format msgid "can't execute '%s'" msgstr "kan inte exekvera \"%s\"" @@ -4594,8 +4501,7 @@ msgid "can't flush file descriptor %d" msgstr "kan inte spola filidentifierare %d" -#: ../src/common/file.cpp:399 -#: ../src/msw/wince/filefnwce.cpp:202 +#: ../src/common/file.cpp:399 ../src/msw/wince/filefnwce.cpp:202 #, c-format msgid "can't get seek position on file descriptor %d" msgstr "kan inte hitta sökposition på filidentifierare %d" @@ -4604,8 +4510,7 @@ msgid "can't load any font, aborting" msgstr "kan inte ladda något typsnitt, avbryter" -#: ../src/common/ffile.cpp:75 -#: ../src/common/file.cpp:271 +#: ../src/common/ffile.cpp:75 ../src/common/file.cpp:271 #, c-format msgid "can't open file '%s'" msgstr "kan inte öppna fil \"%s\"" @@ -4651,8 +4556,7 @@ msgid "can't remove temporary file '%s'" msgstr "kan inte ta bort temporär fil \"%s\"" -#: ../src/common/file.cpp:385 -#: ../src/msw/wince/filefnwce.cpp:189 +#: ../src/common/file.cpp:385 ../src/msw/wince/filefnwce.cpp:189 #, c-format msgid "can't seek on file descriptor %d" msgstr "kan inte söka på filidentifierare %d" @@ -4700,8 +4604,7 @@ msgid "decompression error" msgstr "dekompressionsfel" -#: ../src/common/fmapbase.cpp:705 -#: ../src/common/fmapbase.cpp:737 +#: ../src/common/fmapbase.cpp:705 ../src/common/fmapbase.cpp:737 msgid "default" msgstr "förvald" @@ -4843,8 +4746,7 @@ msgid "invalid zip file" msgstr "ogiltig zip-fil" -#: ../src/common/fontcmn.cpp:586 -#: ../src/common/fontcmn.cpp:650 +#: ../src/common/fontcmn.cpp:586 ../src/common/fontcmn.cpp:650 msgid "italic" msgstr "kursiv" @@ -4996,8 +4898,7 @@ msgid "thirteenth" msgstr "trettonde" -#: ../src/common/imagtiff.cpp:145 -#: ../src/common/imagtiff.cpp:161 +#: ../src/common/imagtiff.cpp:145 ../src/common/imagtiff.cpp:161 #, c-format msgid "tiff module: %s" msgstr "tiffmodul: %s" @@ -5040,8 +4941,7 @@ msgid "unknown class %s" msgstr "okänd klass %s" -#: ../src/common/regex.cpp:163 -#: ../src/html/chm.cpp:352 +#: ../src/common/regex.cpp:163 ../src/html/chm.cpp:352 msgid "unknown error" msgstr "okänt fel" @@ -5054,8 +4954,7 @@ msgid "unknown line terminator" msgstr "okänt radavslut" -#: ../src/common/file.cpp:367 -#: ../src/msw/wince/filefnwce.cpp:170 +#: ../src/common/file.cpp:367 ../src/msw/wince/filefnwce.cpp:170 msgid "unknown seek origin" msgstr "okänd sökstart" @@ -5073,8 +4972,7 @@ msgid "unnamed%d" msgstr "namnlös%d" -#: ../src/common/zipstrm.cpp:1660 -#: ../src/common/zipstrm.cpp:2030 +#: ../src/common/zipstrm.cpp:1660 ../src/common/zipstrm.cpp:2030 msgid "unsupported Zip compression method" msgstr "komprimeringsmetod i Zip stöds inte" @@ -5099,15 +4997,12 @@ msgid "wxGetTimeOfDay failed." msgstr "wxGetTimeOfDay misslyckades." -#: ../src/common/socket.cpp:415 -#: ../src/common/socket.cpp:469 -#: ../src/mac/carbon/cfsocket.cpp:452 -#: ../src/mac/carbon/cfsocket.cpp:506 +#: ../src/common/socket.cpp:415 ../src/common/socket.cpp:469 +#: ../src/mac/carbon/cfsocket.cpp:452 ../src/mac/carbon/cfsocket.cpp:506 msgid "wxSocket: invalid signature in ReadMsg." msgstr "wxSocket: Ogiltig signatur i ReadMsg." -#: ../src/common/socket.cpp:966 -#: ../src/mac/carbon/cfsocket.cpp:1006 +#: ../src/common/socket.cpp:966 ../src/mac/carbon/cfsocket.cpp:1006 msgid "wxSocket: unknown event!." msgstr "wxSocket: Okänd händelse!" @@ -5124,8 +5019,7 @@ msgid "yesterday" msgstr "igår" -#: ../src/common/zstream.cpp:165 -#: ../src/common/zstream.cpp:315 +#: ../src/common/zstream.cpp:165 ../src/common/zstream.cpp:315 #, c-format msgid "zlib error %d" msgstr "zlib-fel %d" @@ -5140,42 +5034,57 @@ #~ msgstr "" #~ "Kunde inte hämta stackbakåtspår:\n" #~ "%s" + #~ msgid "Loading Grey Ascii PNM image is not yet implemented." #~ msgstr "Att ladda Grey Ascii PNM bilder är ännu inte implementerat." + #~ msgid "Loading Grey Raw PNM image is not yet implemented." #~ msgstr "Att ladda Grey Raw PNM bilder är ännu inte implementerat." + #~ msgid "Cannot wait on thread to exit." #~ msgstr "Kan inte vänta på att tråden avslutas." + #~ msgid "Could not load Rich Edit DLL '%s'" #~ msgstr "Kunde inte ladda Rich Edit DLL \"%s\"" + #~ msgid "ZIP handler currently supports only local files!" #~ msgstr "ZIP-hanteraren stöder för närvarande endast lokala filer!" + #~ msgid "" #~ "can't seek on file descriptor %d, large files support is not enabled." #~ msgstr "" #~ "kan inte söka på filidentifierare %d, stöd för stora filer är inte " #~ "aktiverat." + #~ msgid "More..." #~ msgstr "Mer..." + #~ msgid "Setup" #~ msgstr "Inställningar" + #~ msgid "/#SYSTEM" #~ msgstr "/#SYSTEM" + #~ msgid "Backward" #~ msgstr "Baklänges" + #~ msgid "GetUnusedColour:: No Unused Color in image " #~ msgstr "GetUnusedColour:: Ingen oanvänd färg i bilden" + #~ msgid "" #~ "Can't create list control window, check that comctl32.dll is installed." #~ msgstr "" #~ "Kan inte skapa listkontrollfönster, kontrollera att comctl32.dll är " #~ "installerad." + #~ msgid "Can't delete value of key '%s'" #~ msgstr "Kan inte ta bort värdet från nyckel \"%s\"" + #~ msgid "Failed to get the UTC system time." #~ msgstr "Kunde inte hämta UTC-systemtiden." + #~ msgid "gmtime() failed" #~ msgstr "gmtime() misslyckades" + #~ msgid "mktime() failed" #~ msgstr "mktime() misslyckades" - --- wxwidgets2.6-2.6.3.2.2.orig/locale/fr.po +++ wxwidgets2.6-2.6.3.2.2/locale/fr.po @@ -1,24 +1,28 @@ +# translation of fr.po to French +# Thomas Huriaux , 2006. +# Guilhelm Panaget , 2006. # Initial translation by Stephane Junique # Updated by Nicolas Velin msgid "" msgstr "" -"Project-Id-Version: wxWidgets-2.6.2\n" +"Project-Id-Version: wxwidgets\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-04-11 22:24+0200\n" -"PO-Revision-Date: 2005-09-07 09:34+0200\n" -"Last-Translator: Thomas Huriaux \n" +"POT-Creation-Date: 2005-08-21 17:37+0200\n" +"PO-Revision-Date: 2006-10-05 20:55+0200\n" +"Last-Translator: Guilhelm Panaget \n" "Language-Team: French \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=iso-8859-15\n" +"Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" "plural-forms: nplurals=2; plural=n > 1\n" +"X-Generator: KBabel 1.11.2\n" -#: ../src/common/debugrpt.cpp:547 +#: ../src/common/debugrpt.cpp:569 #, c-format msgid "\t%s: %s\n" msgstr "\t%s : %s\n" -#: ../src/common/debugrpt.cpp:550 +#: ../src/common/debugrpt.cpp:572 msgid "" "\n" "Please send this report to the program maintainer, thank you!\n" @@ -26,20 +30,20 @@ "\n" "Veuillez envoyer ce rapport au responsable du programme.\n" -#: ../src/palmos/utils.cpp:210 +#: ../src/palmos/utils.cpp:206 msgid " " msgstr " " -#: ../src/generic/dbgrptg.cpp:293 +#: ../src/generic/dbgrptg.cpp:312 msgid " Thank you and we're sorry for the inconvenience!\n" msgstr " Merci et désolé pour le dérangement.\n" -#: ../src/common/log.cpp:322 +#: ../src/common/log.cpp:321 #, c-format msgid " (error %ld: %s)" msgstr " (erreur %ld : %s)" -#: ../src/common/docview.cpp:1380 +#: ../src/common/docview.cpp:1419 msgid " - " msgstr " - " @@ -47,23 +51,23 @@ msgid " Preview" msgstr " Aperçu" -#: ../src/common/paper.cpp:134 +#: ../src/common/paper.cpp:124 msgid "#10 Envelope, 4 1/8 x 9 1/2 in" msgstr "Enveloppe n° 10 (4,125 x 9,5 pouces)" -#: ../src/common/paper.cpp:135 +#: ../src/common/paper.cpp:125 msgid "#11 Envelope, 4 1/2 x 10 3/8 in" msgstr "Enveloppe n° 11 (4,5 x 10,375 pouces)" -#: ../src/common/paper.cpp:136 +#: ../src/common/paper.cpp:126 msgid "#12 Envelope, 4 3/4 x 11 in" msgstr "Enveloppe n° 12 (4,75 x 11 pouces)" -#: ../src/common/paper.cpp:137 +#: ../src/common/paper.cpp:127 msgid "#14 Envelope, 5 x 11 1/2 in" msgstr "Enveloppe n° 14 (5 x 11,5 pouces)" -#: ../src/common/paper.cpp:133 +#: ../src/common/paper.cpp:123 msgid "#9 Envelope, 3 7/8 x 8 7/8 in" msgstr "Enveloppe n° 9 (3,875 x 8,875 pouces)" @@ -74,13 +78,13 @@ msgid "#define %s must be an integer." msgstr "#define %s doit être un entier." -#: ../src/html/helpfrm.cpp:1019 ../src/html/helpfrm.cpp:1021 -#: ../src/html/helpfrm.cpp:1689 ../src/html/helpfrm.cpp:1722 +#: ../src/html/helpfrm.cpp:1042 ../src/html/helpfrm.cpp:1044 +#: ../src/html/helpfrm.cpp:1703 ../src/html/helpfrm.cpp:1736 #, c-format msgid "%i of %i" msgstr "%i de %i" -#: ../src/generic/filedlgg.cpp:287 +#: ../src/generic/filedlgg.cpp:288 #, c-format msgid "%ld bytes" msgstr "%ld octets" @@ -90,27 +94,27 @@ msgid "%s (or %s)" msgstr "%s (ou %s)" -#: ../src/generic/logg.cpp:262 +#: ../src/generic/logg.cpp:261 #, c-format msgid "%s Error" msgstr "%s Erreur" -#: ../src/generic/logg.cpp:270 +#: ../src/generic/logg.cpp:269 #, c-format msgid "%s Information" msgstr "%s Information" -#: ../src/generic/logg.cpp:266 +#: ../src/generic/logg.cpp:265 #, c-format msgid "%s Warning" msgstr "%s Avertissement" -#: ../src/common/fldlgcmn.cpp:74 +#: ../src/common/fldlgcmn.cpp:81 #, c-format msgid "%s files (%s)|%s" msgstr "%s fichiers (%s)|%s" -#: ../src/common/msgout.cpp:189 +#: ../src/common/msgout.cpp:229 #, c-format msgid "%s message" msgstr "%s message" @@ -128,10 +132,11 @@ #: ../contrib/src/deprecated/resource.cpp:1901 #: ../contrib/src/deprecated/resource.cpp:2030 #: ../contrib/src/deprecated/resource.cpp:3123 +#, c-format msgid "%s: ill-formed resource file syntax." msgstr "%s : syntaxe du fichier de ressource malformée." -#: ../src/html/helpfrm.cpp:341 ../src/html/helpfrm.cpp:343 +#: ../src/html/helpfrm.cpp:357 ../src/html/helpfrm.cpp:359 msgid "&About..." msgstr "À &propos..." @@ -143,7 +148,7 @@ msgid "&Apply" msgstr "&Appliquer" -#: ../src/msw/mdi.cpp:190 +#: ../src/msw/mdi.cpp:187 msgid "&Arrange Icons" msgstr "&Arranger les icônes" @@ -155,12 +160,12 @@ msgid "&Bold" msgstr "&Gras" -#: ../src/common/stockitem.cpp:110 ../src/generic/fontdlgg.cpp:356 -#: ../src/generic/fontdlgg.cpp:375 ../src/generic/wizard.cpp:418 +#: ../src/common/stockitem.cpp:110 ../src/generic/fontdlgg.cpp:363 +#: ../src/generic/fontdlgg.cpp:382 ../src/generic/wizard.cpp:422 msgid "&Cancel" msgstr "&Annuler" -#: ../src/msw/mdi.cpp:186 +#: ../src/msw/mdi.cpp:183 msgid "&Cascade" msgstr "&Cascade" @@ -168,24 +173,26 @@ msgid "&Clear" msgstr "&Effacer" -#: ../src/common/prntbase.cpp:829 ../src/common/stockitem.cpp:112 -#: ../src/generic/logg.cpp:508 ../src/html/helpfrm.cpp:338 +#: ../src/common/prntbase.cpp:875 ../src/common/stockitem.cpp:112 +#: ../src/generic/logg.cpp:509 ../src/html/helpfrm.cpp:354 msgid "&Close" msgstr "&Fermer" -#: ../src/common/stockitem.cpp:113 ../src/msw/textctrl.cpp:2058 +#: ../src/common/stockitem.cpp:113 ../src/mac/carbon/textctrl.cpp:1074 +#: ../src/msw/textctrl.cpp:2064 msgid "&Copy" msgstr "&Copier" -#: ../src/generic/dbgrptg.cpp:301 +#: ../src/generic/dbgrptg.cpp:320 msgid "&Debug report preview:" msgstr "Aperçu du rapport de &débogage :" -#: ../src/common/stockitem.cpp:115 ../src/msw/textctrl.cpp:2060 +#: ../src/common/stockitem.cpp:115 ../src/mac/carbon/textctrl.cpp:1076 +#: ../src/msw/textctrl.cpp:2066 msgid "&Delete" msgstr "&Supprimer" -#: ../src/generic/logg.cpp:710 +#: ../src/generic/logg.cpp:717 msgid "&Details" msgstr "&Détails" @@ -193,7 +200,7 @@ msgid "&Down" msgstr "&Bas" -#: ../src/html/helpfrm.cpp:345 +#: ../src/html/helpfrm.cpp:361 msgid "&File" msgstr "&Fichier" @@ -201,11 +208,11 @@ msgid "&Find" msgstr "&Trouver" -#: ../src/generic/wizard.cpp:606 +#: ../src/generic/wizard.cpp:634 msgid "&Finish" msgstr "&Finir" -#: ../src/generic/fontdlgg.cpp:271 +#: ../src/generic/fontdlgg.cpp:273 msgid "&Font family:" msgstr "&Famille de polices :" @@ -213,12 +220,12 @@ msgid "&Forward" msgstr "&Suivant" -#: ../src/common/prntbase.cpp:864 +#: ../src/common/prntbase.cpp:910 msgid "&Goto..." msgstr "&Aller à..." -#: ../src/common/stockitem.cpp:122 ../src/generic/wizard.cpp:414 -#: ../src/generic/wizard.cpp:421 ../src/html/helpfrm.cpp:346 +#: ../src/common/stockitem.cpp:122 ../src/generic/wizard.cpp:418 +#: ../src/generic/wizard.cpp:425 ../src/html/helpfrm.cpp:362 msgid "&Help" msgstr "&Aide" @@ -234,11 +241,11 @@ msgid "&Italic" msgstr "&Italique" -#: ../src/generic/logg.cpp:509 +#: ../src/generic/logg.cpp:510 msgid "&Log" msgstr "&Journal" -#: ../src/univ/themes/win32.cpp:4817 +#: ../src/univ/themes/win32.cpp:4923 msgid "&Move" msgstr "&Déplacer" @@ -246,15 +253,15 @@ msgid "&New" msgstr "&Nouveau" -#: ../src/generic/mdig.cpp:117 ../src/msw/mdi.cpp:191 +#: ../src/generic/mdig.cpp:118 ../src/msw/mdi.cpp:188 msgid "&Next" msgstr "&Suivant" -#: ../src/generic/wizard.cpp:417 ../src/generic/wizard.cpp:608 +#: ../src/generic/wizard.cpp:421 ../src/generic/wizard.cpp:636 msgid "&Next >" msgstr "&Suivant >" -#: ../src/generic/tipdlg.cpp:238 +#: ../src/generic/tipdlg.cpp:243 msgid "&Next Tip" msgstr "&Astuce suivante" @@ -262,12 +269,12 @@ msgid "&No" msgstr "&Non" -#: ../src/generic/dbgrptg.cpp:323 +#: ../src/generic/dbgrptg.cpp:342 msgid "&Notes:" msgstr "&Notes :" -#: ../src/common/stockitem.cpp:133 ../src/generic/fontdlgg.cpp:361 -#: ../src/generic/fontdlgg.cpp:368 +#: ../src/common/stockitem.cpp:133 ../src/generic/fontdlgg.cpp:368 +#: ../src/generic/fontdlgg.cpp:375 msgid "&OK" msgstr "&Accepter" @@ -275,15 +282,16 @@ msgid "&Open" msgstr "&Ouvrir" -#: ../src/html/helpfrm.cpp:336 +#: ../src/html/helpfrm.cpp:352 msgid "&Open..." msgstr "&Ouvrir..." -#: ../src/common/stockitem.cpp:135 ../src/msw/textctrl.cpp:2059 +#: ../src/common/stockitem.cpp:135 ../src/mac/carbon/textctrl.cpp:1075 +#: ../src/msw/textctrl.cpp:2065 msgid "&Paste" msgstr "&Coller" -#: ../src/generic/fontdlgg.cpp:318 +#: ../src/generic/fontdlgg.cpp:324 msgid "&Point size:" msgstr "Taille de &point :" @@ -291,7 +299,7 @@ msgid "&Preferences" msgstr "&Préférences" -#: ../src/generic/mdig.cpp:118 ../src/msw/mdi.cpp:192 +#: ../src/generic/mdig.cpp:119 ../src/msw/mdi.cpp:189 msgid "&Previous" msgstr "&Précédent" @@ -299,7 +307,7 @@ msgid "&Print" msgstr "&Imprimer" -#: ../src/common/prntbase.cpp:834 +#: ../src/common/prntbase.cpp:880 msgid "&Print..." msgstr "&Imprimer..." @@ -311,20 +319,21 @@ msgid "&Quit" msgstr "&Quitter" -#: ../src/common/cmdproc.cpp:283 ../src/common/cmdproc.cpp:290 -#: ../src/common/stockitem.cpp:141 ../src/msw/textctrl.cpp:2055 +#: ../src/common/cmdproc.cpp:292 ../src/common/cmdproc.cpp:299 +#: ../src/common/stockitem.cpp:141 ../src/mac/carbon/textctrl.cpp:1071 +#: ../src/msw/textctrl.cpp:2061 msgid "&Redo" msgstr "&Refaire" -#: ../src/common/cmdproc.cpp:279 ../src/common/cmdproc.cpp:299 +#: ../src/common/cmdproc.cpp:288 ../src/common/cmdproc.cpp:308 msgid "&Redo " msgstr "&Refaire " -#: ../src/generic/fdrepdlg.cpp:168 +#: ../src/generic/fdrepdlg.cpp:185 msgid "&Replace" msgstr "&Remplacer" -#: ../src/univ/themes/win32.cpp:4816 +#: ../src/univ/themes/win32.cpp:4922 msgid "&Restore" msgstr "&Restaurer" @@ -332,15 +341,15 @@ msgid "&Save" msgstr "&Enregistrer" -#: ../src/generic/logg.cpp:504 +#: ../src/generic/logg.cpp:505 msgid "&Save..." msgstr "&Enregistrer..." -#: ../src/generic/tipdlg.cpp:233 +#: ../src/generic/tipdlg.cpp:238 msgid "&Show tips at startup" msgstr "&Afficher les astuces au démarrage" -#: ../src/univ/themes/win32.cpp:4819 +#: ../src/univ/themes/win32.cpp:4925 msgid "&Size" msgstr "&Taille" @@ -348,20 +357,20 @@ msgid "&Stop" msgstr "&Arrêter" -#: ../src/generic/fontdlgg.cpp:282 +#: ../src/generic/fontdlgg.cpp:284 msgid "&Style:" msgstr "&Style :" -#: ../src/common/stockitem.cpp:149 ../src/generic/fontdlgg.cpp:331 +#: ../src/common/stockitem.cpp:149 ../src/generic/fontdlgg.cpp:337 msgid "&Underline" msgstr "&Souligner" -#: ../src/common/cmdproc.cpp:261 ../src/common/stockitem.cpp:150 -#: ../src/msw/textctrl.cpp:2054 +#: ../src/common/cmdproc.cpp:270 ../src/common/stockitem.cpp:150 +#: ../src/mac/carbon/textctrl.cpp:1070 ../src/msw/textctrl.cpp:2060 msgid "&Undo" msgstr "&Annuler" -#: ../src/common/cmdproc.cpp:255 +#: ../src/common/cmdproc.cpp:264 msgid "&Undo " msgstr "&Annuler " @@ -373,13 +382,13 @@ msgid "&Up" msgstr "&Haut" -#: ../src/generic/fontdlgg.cpp:293 +#: ../src/generic/fontdlgg.cpp:295 msgid "&Weight:" msgstr "&Largeur :" -#: ../src/generic/mdig.cpp:297 ../src/generic/mdig.cpp:313 -#: ../src/generic/mdig.cpp:317 ../src/msw/mdi.cpp:1384 ../src/msw/mdi.cpp:1391 -#: ../src/msw/mdi.cpp:1421 +#: ../src/generic/mdig.cpp:298 ../src/generic/mdig.cpp:314 +#: ../src/generic/mdig.cpp:318 ../src/msw/mdi.cpp:1410 ../src/msw/mdi.cpp:1417 +#: ../src/msw/mdi.cpp:1447 msgid "&Window" msgstr "&Fenêtre" @@ -387,7 +396,8 @@ msgid "&Yes" msgstr "&Oui" -#: ../src/common/config.cpp:432 ../src/msw/regconf.cpp:258 +#: ../src/common/config.cpp:433 ../src/msw/regconf.cpp:258 +#, c-format msgid "'%s' has extra '..', ignored." msgstr "« %s » a trop de « .. » : ils sont ignorés." @@ -402,7 +412,7 @@ msgid "'%s' is not a correct numeric value for option '%s'." msgstr "« %s » n'est pas une valeur numérique correcte pour l'option « %s »." -#: ../src/common/intl.cpp:1152 +#: ../src/common/intl.cpp:1147 #, c-format msgid "'%s' is not a valid message catalog." msgstr "« %s » n'est pas un catalogue valable de messages." @@ -432,24 +442,24 @@ msgid "'%s' should only contain alphabetic or numeric characters." msgstr "« %s » ne doit contenir que des caractères alphanumériques." -#: ../src/html/helpfrm.cpp:953 +#: ../src/html/helpfrm.cpp:976 msgid "(Help)" msgstr "(Aide)" -#: ../src/html/helpfrm.cpp:415 ../src/html/helpfrm.cpp:1091 -#: ../src/html/helpfrm.cpp:1750 +#: ../src/html/helpfrm.cpp:431 ../src/html/helpfrm.cpp:1114 +#: ../src/html/helpfrm.cpp:1764 msgid "(bookmarks)" msgstr "(signets)" -#: ../src/common/debugrpt.cpp:537 +#: ../src/common/debugrpt.cpp:559 msgid "*** A debug report has been generated\n" msgstr "*** Un rapport de débogage a été créé\n" -#: ../src/common/debugrpt.cpp:540 +#: ../src/common/debugrpt.cpp:562 msgid "*** And includes the following files:\n" msgstr "*** Et inclut les fichiers suivants :\n" -#: ../src/common/debugrpt.cpp:538 +#: ../src/common/debugrpt.cpp:560 #, c-format msgid "*** It can be found in \"%s\"\n" msgstr "*** Il peut être trouvé dans « %s »\n" @@ -464,83 +474,99 @@ ", static, #include ou #define\n" "attendu lors de l'analyse des ressources." -#: ../src/generic/dirctrlg.cpp:655 ../src/generic/filedlgg.cpp:739 +#: ../src/generic/dirctrlg.cpp:683 ../src/generic/filedlgg.cpp:740 msgid "." msgstr "." -#: ../src/generic/dirctrlg.cpp:656 ../src/generic/filedlgg.cpp:740 +#: ../src/generic/dirctrlg.cpp:684 ../src/generic/filedlgg.cpp:741 msgid ".." msgstr ".." -#: ../src/common/paper.cpp:130 +#: ../src/common/paper.cpp:147 +msgid "10 x 11 in" +msgstr "10 x 11 pouces" + +#: ../src/common/paper.cpp:120 msgid "10 x 14 in" msgstr "10 x 14 pouces" -#: ../src/common/paper.cpp:131 +#: ../src/common/paper.cpp:121 msgid "11 x 17 in" msgstr "11 x 17 pouces" -#: ../src/common/paper.cpp:149 +#: ../src/common/paper.cpp:191 +msgid "12 x 11 in" +msgstr "12 x 11 pouces" + +#: ../src/common/paper.cpp:148 +msgid "15 x 11 in" +msgstr "15 x 11 pouces" + +#: ../src/common/paper.cpp:139 msgid "6 3/4 Envelope, 3 5/8 x 6 1/2 in" msgstr "Enveloppe 6 3/4 (3,625 x 6,5 pouces)" +#: ../src/common/paper.cpp:146 +msgid "9 x 11 in" +msgstr "9 x 11 pouces" + #: ../src/html/htmprint.cpp:309 msgid ": file does not exist!" msgstr " : le fichier n'existe pas." -#: ../src/common/fontmap.cpp:186 +#: ../src/common/fontmap.cpp:200 msgid ": unknown charset" msgstr " : jeu de caractères inconnu" -#: ../src/common/fontmap.cpp:400 +#: ../src/common/fontmap.cpp:414 msgid ": unknown encoding" msgstr " : codage inconnu" -#: ../src/generic/wizard.cpp:423 +#: ../src/generic/wizard.cpp:427 msgid "< &Back" msgstr "< &Retour" -#: ../src/common/prntbase.cpp:846 +#: ../src/common/prntbase.cpp:892 msgid "<<" msgstr "<<" -#: ../src/generic/filedlgg.cpp:258 ../src/generic/filedlgg.cpp:281 +#: ../src/generic/filedlgg.cpp:259 ../src/generic/filedlgg.cpp:282 msgid "" msgstr "" -#: ../src/generic/filedlgg.cpp:262 ../src/generic/filedlgg.cpp:285 +#: ../src/generic/filedlgg.cpp:263 ../src/generic/filedlgg.cpp:286 msgid "" msgstr "" -#: ../src/generic/filedlgg.cpp:260 ../src/generic/filedlgg.cpp:283 +#: ../src/generic/filedlgg.cpp:261 ../src/generic/filedlgg.cpp:284 msgid "" msgstr "" -#: ../src/html/helpfrm.cpp:1253 +#: ../src/html/helpfrm.cpp:1276 msgid "Bold italic face.
" msgstr "Gras italique.
" -#: ../src/html/helpfrm.cpp:1257 +#: ../src/html/helpfrm.cpp:1280 msgid "bold italic underlined
" msgstr "gras italique souligné
" -#: ../src/html/helpfrm.cpp:1252 +#: ../src/html/helpfrm.cpp:1275 msgid "Bold face. " msgstr "Gras. " -#: ../src/html/helpfrm.cpp:1251 +#: ../src/html/helpfrm.cpp:1274 msgid "Italic face. " msgstr "Italique. " -#: ../src/common/prntbase.cpp:852 +#: ../src/common/prntbase.cpp:898 msgid ">>" msgstr ">>" -#: ../src/common/prntbase.cpp:858 +#: ../src/common/prntbase.cpp:904 msgid ">>|" msgstr ">>|" -#: ../src/generic/dbgrptg.cpp:285 +#: ../src/generic/dbgrptg.cpp:304 msgid "A debug report has been generated in the directory\n" msgstr "Un rapport de débogage a été créé dans le dossier\n" @@ -548,23 +574,79 @@ msgid "A non empty collection must consist of 'element' nodes" msgstr "Une collection non vide doit comprendre des noeuds « éléments »" -#: ../src/common/paper.cpp:123 +#: ../src/common/paper.cpp:166 +msgid "A2 420 x 594 mm" +msgstr "A2 (420 x 594 mm)" + +#: ../src/common/paper.cpp:163 +msgid "A3 Extra 322 x 445 mm" +msgstr "A3 Extra (322 x 445 mm)" + +#: ../src/common/paper.cpp:168 +msgid "A3 Extra Transverse 322 x 445 mm" +msgstr "A3 Extra Portrait (322 x 445 mm)" + +#: ../src/common/paper.cpp:177 +msgid "A3 Rotated 420 x 297 mm" +msgstr "A3 Paysage (420 x 297 mm)" + +#: ../src/common/paper.cpp:167 +msgid "A3 Transverse 297 x 420 mm" +msgstr "A3 Portrait (297 x 420 mm)" + +#: ../src/common/paper.cpp:113 msgid "A3 sheet, 297 x 420 mm" -msgstr "Feuille A3, 297 x 420 mm" +msgstr "Feuille A3 (297 x 420 mm)" -#: ../src/common/paper.cpp:114 +#: ../src/common/paper.cpp:153 +msgid "A4 Extra 9.27 x 12.69 in" +msgstr "A4 Extra (9,27 x 12,69 pouces)" + +#: ../src/common/paper.cpp:160 +msgid "A4 Plus 210 x 330 mm" +msgstr "A4 Plus (210 x 330 mm)" + +#: ../src/common/paper.cpp:178 +msgid "A4 Rotated 297 x 210 mm" +msgstr "A4 Paysage (297 x 210 mm)" + +#: ../src/common/paper.cpp:155 +msgid "A4 Transverse 210 x 297 mm" +msgstr "A4 Portrait (210 x 297 mm)" + +#: ../src/common/paper.cpp:104 msgid "A4 sheet, 210 x 297 mm" -msgstr "Feuille A4, 210 x 297 mm" +msgstr "Feuille A4 (210 x 297 mm)" -#: ../src/common/paper.cpp:124 +#: ../src/common/paper.cpp:114 msgid "A4 small sheet, 210 x 297 mm" -msgstr "Petite feuille A4, 210 x 297 mm" +msgstr "Petite feuille A4 (210 x 297 mm)" -#: ../src/common/paper.cpp:125 +#: ../src/common/paper.cpp:164 +msgid "A5 Extra 174 x 235 mm" +msgstr "A5 Extra (174 x 235 mm)" + +#: ../src/common/paper.cpp:179 +msgid "A5 Rotated 210 x 148 mm" +msgstr "A5 Paysage (210 x 148 mm)" + +#: ../src/common/paper.cpp:161 +msgid "A5 Transverse 148 x 210 mm" +msgstr "A5 Portrait (148 x 210 mm)" + +#: ../src/common/paper.cpp:115 msgid "A5 sheet, 148 x 210 mm" -msgstr "Feuille A5, 148 x 210 mm" +msgstr "Feuille A5 (148 x 210 mm)" + +#: ../src/common/paper.cpp:171 +msgid "A6 105 x 148 mm" +msgstr "A6 (105 x 148 mm)" -#: ../src/generic/fontdlgg.cpp:85 +#: ../src/common/paper.cpp:184 +msgid "A6 Rotated 148 x 105 mm" +msgstr "A6 Paysage (148 x 105 mm)" + +#: ../src/generic/fontdlgg.cpp:87 msgid "ABCDEFGabcdefg12345" msgstr "ABCDEFGabcdefg12345" @@ -576,19 +658,19 @@ msgid "Add" msgstr "Ajouter" -#: ../src/html/helpfrm.cpp:428 +#: ../src/html/helpfrm.cpp:444 msgid "Add current page to bookmarks" msgstr "Ajouter la page courante aux signets" -#: ../src/generic/colrdlgg.cpp:297 +#: ../src/generic/colrdlgg.cpp:299 msgid "Add to custom colours" msgstr "Ajouter aux couleurs personnalisées" -#: ../include/wx/xti.h:900 +#: ../include/wx/xti.h:902 msgid "AddToPropertyCollection called on a generic accessor" msgstr "AddToPropertyCollection appelé sur un assesseur générique" -#: ../include/wx/xti.h:847 +#: ../include/wx/xti.h:849 msgid "AddToPropertyCollection called w/o valid adder" msgstr "AddToPropertyCollection appelé sans additionneur valable" @@ -609,20 +691,20 @@ msgid "All" msgstr "Tout" -#: ../src/common/fldlgcmn.cpp:57 +#: ../src/common/fldlgcmn.cpp:64 #, c-format msgid "All files (%s)|%s" msgstr "Tous les fichiers (%s)|%s" -#: ../include/wx/defs.h:2207 +#: ../include/wx/defs.h:2302 msgid "All files (*)|*" msgstr "Tous les fichiers (*)|*" -#: ../src/html/helpfrm.cpp:1564 +#: ../src/html/helpfrm.cpp:1578 msgid "All files (*.*)|*" msgstr "Tous les fichiers (*.*)|*" -#: ../include/wx/defs.h:2204 +#: ../include/wx/defs.h:2299 msgid "All files (*.*)|*.*" msgstr "Tous les fichiers (*.*)|*.*" @@ -634,12 +716,12 @@ msgid "Already dialling ISP." msgstr "Déjà en cours d'appel du FAI." -#: ../src/generic/logg.cpp:1100 +#: ../src/generic/logg.cpp:1163 #, c-format msgid "Append log to file '%s' (choosing [No] will overwrite it)?" msgstr "Ajouter le journal au fichier « %s » (choisir [Non] l'écrasera) ?" -#: ../src/common/fmapbase.cpp:108 +#: ../src/common/fmapbase.cpp:109 msgid "Arabic (ISO-8859-6)" msgstr "Arabe (ISO-8859-6)" @@ -647,29 +729,57 @@ msgid "Archive doesnt contain #SYSTEM file" msgstr "L'archive ne contient pas de fichier #SYSTEM" -#: ../src/generic/filedlgg.cpp:439 +#: ../src/generic/filedlgg.cpp:440 msgid "Attributes" msgstr "Attributs" #: ../src/common/paper.cpp:144 +msgid "B4 (ISO) 250 x 353 mm" +msgstr "ISO B4 (250 x 353 mm)" + +#: ../src/common/paper.cpp:180 +msgid "B4 (JIS) Rotated 364 x 257 mm" +msgstr "JIS B4 Portrait (364 x 257 mm)" + +#: ../src/common/paper.cpp:134 msgid "B4 Envelope, 250 x 353 mm" -msgstr "Enveloppe B4, 250 x 353 mm" +msgstr "Enveloppe B4 (250 x 353 mm)" -#: ../src/common/paper.cpp:126 +#: ../src/common/paper.cpp:116 msgid "B4 sheet, 250 x 354 mm" -msgstr "Feuille B4, 250 x 354 mm" +msgstr "Feuille B4 (250 x 354 mm)" -#: ../src/common/paper.cpp:145 +#: ../src/common/paper.cpp:165 +msgid "B5 (ISO) Extra 201 x 276 mm" +msgstr "ISO B5 Extra (201 x 276 mm)" + +#: ../src/common/paper.cpp:181 +msgid "B5 (JIS) Rotated 257 x 182 mm" +msgstr "JIS B5 Paysage (257 x 182 mm)" + +#: ../src/common/paper.cpp:162 +msgid "B5 (JIS) Transverse 182 x 257 mm" +msgstr "JIS B5 Portrait (182 x 257 mm)" + +#: ../src/common/paper.cpp:135 msgid "B5 Envelope, 176 x 250 mm" -msgstr "Enveloppe B5, 176 x 250 mm" +msgstr "Enveloppe B5 (176 x 250 mm)" -#: ../src/common/paper.cpp:127 +#: ../src/common/paper.cpp:117 msgid "B5 sheet, 182 x 257 millimeter" -msgstr "Feuille B5, 182 x 257 mm" +msgstr "Feuille B5 (182 x 257 mm)" -#: ../src/common/paper.cpp:146 +#: ../src/common/paper.cpp:189 +msgid "B6 (JIS) 128 x 182 mm" +msgstr "JIS B6 (128 x 182 mm)" + +#: ../src/common/paper.cpp:190 +msgid "B6 (JIS) Rotated 182 x 128 mm" +msgstr "JIS B6 Paysage (182 x 128 mm)" + +#: ../src/common/paper.cpp:136 msgid "B6 Envelope, 176 x 125 mm" -msgstr "Enveloppe B6, 176 x 125 mm" +msgstr "Enveloppe B6 (176 x 125 mm)" #: ../src/common/imagbmp.cpp:477 ../src/common/imagbmp.cpp:493 msgid "BMP: Couldn't allocate memory." @@ -699,11 +809,11 @@ msgid "BMP: wxImage doesn't have own wxPalette." msgstr "BMP : wxImage n'a pas sa propre wxPalette." -#: ../src/common/fmapbase.cpp:115 +#: ../src/common/fmapbase.cpp:116 msgid "Baltic (ISO-8859-13)" msgstr "Balte (ISO-8859-13)" -#: ../src/common/fmapbase.cpp:106 +#: ../src/common/fmapbase.cpp:107 msgid "Baltic (old) (ISO-8859-4)" msgstr "Balte (ancien) (ISO-8859-4)" @@ -712,55 +822,55 @@ msgid "Bitmap resource specification %s not found." msgstr "Spécification %s de la ressource bitmap introuvable." -#: ../src/generic/fontdlgg.cpp:235 +#: ../src/generic/fontdlgg.cpp:237 msgid "Bold" msgstr "Gras" -#: ../src/generic/prntdlgg.cpp:888 +#: ../src/generic/prntdlgg.cpp:892 msgid "Bottom margin (mm):" msgstr "Marge de bas de page (mm) :" -#: ../src/common/paper.cpp:115 +#: ../src/common/paper.cpp:105 msgid "C sheet, 17 x 22 in" -msgstr "Feuille C, 17 x 22 mm" +msgstr "Feuille C (17 x 22 mm)" -#: ../src/generic/logg.cpp:506 +#: ../src/generic/logg.cpp:507 msgid "C&lear" msgstr "&Effacer" -#: ../src/generic/fontdlgg.cpp:306 +#: ../src/generic/fontdlgg.cpp:308 msgid "C&olour:" msgstr "C&ouleur :" -#: ../src/common/paper.cpp:140 +#: ../src/common/paper.cpp:130 msgid "C3 Envelope, 324 x 458 mm" -msgstr "Enveloppe C3, 324 x 458 mm" +msgstr "Enveloppe C3 (324 x 458 mm)" -#: ../src/common/paper.cpp:141 +#: ../src/common/paper.cpp:131 msgid "C4 Envelope, 229 x 324 mm" -msgstr "Enveloppe C4, 229 x 324 mm" +msgstr "Enveloppe C4 (229 x 324 mm)" -#: ../src/common/paper.cpp:139 +#: ../src/common/paper.cpp:129 msgid "C5 Envelope, 162 x 229 mm" -msgstr "Enveloppe C5, 162 x 229 mm" +msgstr "Enveloppe C5 (162 x 229 mm)" -#: ../src/common/paper.cpp:142 +#: ../src/common/paper.cpp:132 msgid "C6 Envelope, 114 x 162 mm" -msgstr "Enveloppe C6, 114 x 162 mm" +msgstr "Enveloppe C6 (114 x 162 mm)" -#: ../src/common/paper.cpp:143 +#: ../src/common/paper.cpp:133 msgid "C65 Envelope, 114 x 229 mm" -msgstr "Enveloppe C65, 114 x 229 mm" +msgstr "Enveloppe C65 (114 x 229 mm)" #: ../src/html/chm.cpp:797 ../src/html/chm.cpp:856 msgid "CHM handler currently supports only local files!" msgstr "Le gestionnaire CHM ne gère actuellement que les fichiers locaux." -#: ../src/os2/thread.cpp:121 +#: ../src/os2/thread.cpp:117 msgid "Can not create mutex." msgstr "Impossible de créer le mutex." -#: ../src/common/filefn.cpp:1262 +#: ../src/common/filefn.cpp:1297 #, c-format msgid "Can not enumerate files '%s'" msgstr "Impossible d'énumérer les fichiers « %s »" @@ -770,12 +880,12 @@ msgid "Can not enumerate files in directory '%s'" msgstr "Impossible d'énumérer les fichiers dans le répertoire « %s »" -#: ../src/os2/thread.cpp:523 +#: ../src/os2/thread.cpp:519 #, c-format msgid "Can not resume thread %lu" msgstr "Impossible de reprendre le processus %lu" -#: ../src/mac/classic/thread.cpp:491 ../src/msw/thread.cpp:830 +#: ../src/mac/classic/thread.cpp:491 ../src/msw/thread.cpp:827 #, c-format msgid "Can not resume thread %x" msgstr "Impossible de reprendre le processus %x" @@ -784,87 +894,88 @@ msgid "Can not start thread: error writing TLS." msgstr "Impossible de lancer le processus : erreur lors de l'écriture de TLS." -#: ../src/os2/thread.cpp:510 +#: ../src/os2/thread.cpp:505 #, c-format msgid "Can not suspend thread %lu" msgstr "Impossible de suspendre le processus %lu" -#: ../src/mac/classic/thread.cpp:464 ../src/msw/thread.cpp:815 +#: ../src/mac/classic/thread.cpp:464 ../src/msw/thread.cpp:812 +#, c-format msgid "Can not suspend thread %x" msgstr "Impossible de suspendre le processus %x" -#: ../src/msw/thread.cpp:728 +#: ../src/msw/thread.cpp:725 msgid "Can not wait for thread termination" msgstr "Impossible d'attendre la fin du processus" -#: ../src/common/cmdproc.cpp:257 +#: ../src/common/cmdproc.cpp:266 msgid "Can't &Undo " msgstr "Impossible d'&annuler " -#: ../src/common/image.cpp:1550 +#: ../src/common/image.cpp:1939 #, c-format msgid "Can't check image format of file '%s': file does not exist." msgstr "" "Impossible de vérifier le format d'image du fichier « %s » : le fichier " "n'existe pas." -#: ../src/msw/registry.cpp:434 +#: ../src/msw/registry.cpp:442 #, c-format msgid "Can't close registry key '%s'" msgstr "Impossible de fermer la clé de registre « %s »" -#: ../src/msw/registry.cpp:510 +#: ../src/msw/registry.cpp:518 #, c-format msgid "Can't copy values of unsupported type %d." msgstr "Impossible de copier les valeurs de type %d non géré." -#: ../src/msw/registry.cpp:415 +#: ../src/msw/registry.cpp:423 #, c-format msgid "Can't create registry key '%s'" msgstr "Impossible de créer la clé de registre « %s »" #: ../src/mac/carbon/mpthread.cpp:911 ../src/mac/carbon/thread.cpp:1100 -#: ../src/mac/classic/thread.cpp:439 ../src/msw/thread.cpp:593 -#: ../src/os2/thread.cpp:491 +#: ../src/mac/classic/thread.cpp:439 ../src/msw/thread.cpp:594 +#: ../src/os2/thread.cpp:486 msgid "Can't create thread" msgstr "Impossible de créer le processus" -#: ../src/msw/window.cpp:3052 +#: ../src/msw/window.cpp:3130 #, c-format msgid "Can't create window of class %s" msgstr "Impossible de créer la fenêtre de classe %s" -#: ../src/msw/registry.cpp:686 +#: ../src/msw/registry.cpp:694 #, c-format msgid "Can't delete key '%s'" msgstr "Impossible d'effacer la clé « %s »" -#: ../src/msw/iniconf.cpp:444 ../src/os2/iniconf.cpp:448 +#: ../src/msw/iniconf.cpp:444 ../src/os2/iniconf.cpp:458 #, c-format msgid "Can't delete the INI file '%s'" msgstr "Impossible d'effacer le fichier INI « %s »" -#: ../src/msw/registry.cpp:713 +#: ../src/msw/registry.cpp:722 #, c-format msgid "Can't delete value '%s' from key '%s'" msgstr "Impossible d'effacer la valeur « %s » de la clé « %s »" -#: ../src/msw/registry.cpp:1061 +#: ../src/msw/registry.cpp:1071 #, c-format msgid "Can't enumerate subkeys of key '%s'" msgstr "Impossible d'énumérer les sous-clés de la clé « %s »" -#: ../src/msw/registry.cpp:1016 +#: ../src/msw/registry.cpp:1026 #, c-format msgid "Can't enumerate values of key '%s'" msgstr "Impossible d'énumérer les valeurs de la clé « %s »" -#: ../src/msw/registry.cpp:1267 +#: ../src/msw/registry.cpp:1288 #, c-format msgid "Can't export value of unsupported type %d." msgstr "Impossible d'exporter les valeurs de type non géré %d." -#: ../src/common/ffile.cpp:241 +#: ../src/common/ffile.cpp:238 #, c-format msgid "Can't find current position in file '%s'" msgstr "Impossible de trouver la position courante dans le fichier « %s »" @@ -882,13 +993,13 @@ msgid "Can't initialize zlib inflate stream." msgstr "Impossible d'initialiser le flux de chargement de zlib" -#: ../src/common/image.cpp:1137 ../src/common/image.cpp:1157 +#: ../src/common/image.cpp:1367 ../src/common/image.cpp:1387 #, c-format msgid "Can't load image from file '%s': file does not exist." msgstr "" "Impossible de charger l'image du fichier « %s » : le fichier n'existe pas." -#: ../src/msw/registry.cpp:381 +#: ../src/msw/registry.cpp:387 #, c-format msgid "Can't open registry key '%s'" msgstr "Impossible d'ouvrir la clé de registre « %s »" @@ -904,33 +1015,33 @@ "Impossible de lire le flux de chargement : EOF inattendu dans le flux " "inférieur." -#: ../src/msw/registry.cpp:950 +#: ../src/msw/registry.cpp:960 #, c-format msgid "Can't read value of '%s'" msgstr "Impossible de lire la valeur de « %s »" -#: ../src/msw/registry.cpp:786 ../src/msw/registry.cpp:816 -#: ../src/msw/registry.cpp:876 +#: ../src/msw/registry.cpp:795 ../src/msw/registry.cpp:825 +#: ../src/msw/registry.cpp:885 #, c-format msgid "Can't read value of key '%s'" msgstr "Impossible de lire la valeur de la clé « %s »" -#: ../src/common/image.cpp:1179 +#: ../src/common/image.cpp:1409 #, c-format msgid "Can't save image to file '%s': unknown extension." msgstr "" "Impossible d'enregistrer l'image dans le fichier « %s » : extension inconnue." -#: ../src/generic/logg.cpp:568 ../src/generic/logg.cpp:976 +#: ../src/generic/logg.cpp:569 ../src/generic/logg.cpp:1020 msgid "Can't save log contents to file." msgstr "Impossible d'enregistrer le contenu du journal dans le fichier." -#: ../src/msw/thread.cpp:549 ../src/os2/thread.cpp:473 +#: ../src/msw/thread.cpp:550 ../src/os2/thread.cpp:469 msgid "Can't set thread priority" msgstr "Impossible de spécifier la priorité du processus" -#: ../src/msw/registry.cpp:803 ../src/msw/registry.cpp:845 -#: ../src/msw/registry.cpp:965 +#: ../src/msw/registry.cpp:812 ../src/msw/registry.cpp:854 +#: ../src/msw/registry.cpp:975 #, c-format msgid "Can't set value of '%s'" msgstr "Impossible de spécifier la valeur de « %s »" @@ -940,67 +1051,67 @@ msgid "Can't write to deflate stream: %s" msgstr "impossible d'écrire pour décharger le flux : %s" -#: ../src/generic/choicdgg.cpp:285 ../src/generic/dirdlgg.cpp:116 -#: ../src/generic/numdlgg.cpp:131 ../src/generic/textdlgg.cpp:118 -#: ../src/gtk/fontdlg.cpp:149 ../src/motif/msgdlg.cpp:185 +#: ../src/generic/choicdgg.cpp:291 ../src/generic/dirdlgg.cpp:114 +#: ../src/generic/numdlgg.cpp:136 ../src/generic/textdlgg.cpp:120 +#: ../src/gtk/fontdlg.cpp:155 ../src/motif/msgdlg.cpp:204 #: ../contrib/src/deprecated/proplist.cpp:518 msgid "Cancel" msgstr "Annuler" -#: ../src/xrc/xmlres.cpp:1118 ../src/xrc/xmlres.cpp:1158 +#: ../src/xrc/xmlres.cpp:1188 ../src/xrc/xmlres.cpp:1236 msgid "Cannot convert dialog units: dialog unknown." msgstr "" "Impossible de convertir les unités de la fenêtre de dialogue : fenêtre de " "dialogue inconnue." -#: ../src/common/strconv.cpp:2481 +#: ../src/common/strconv.cpp:2665 #, c-format msgid "Cannot convert from the charset '%s'!" msgstr "Impossible de convertir depuis le jeu de caractères « %s »." -#: ../src/msw/dialup.cpp:509 +#: ../src/msw/dialup.cpp:546 #, c-format msgid "Cannot find active dialup connection: %s" msgstr "Impossible de trouver une connexion active : %s" -#: ../src/xrc/xmlres.cpp:269 +#: ../src/xrc/xmlres.cpp:330 #, c-format msgid "Cannot find container for unknown control '%s'." msgstr "Impossible de trouver un conteneur pour le contrôle inconnu « %s »" -#: ../src/xrc/xmlres.cpp:1193 +#: ../src/xrc/xmlres.cpp:1271 #, c-format msgid "Cannot find font node '%s'." msgstr "Impossible de trouver le noeud de la police de caractères « %s »." -#: ../src/msw/dialup.cpp:814 +#: ../src/msw/dialup.cpp:851 msgid "Cannot find the location of address book file" msgstr "Impossible de trouver l'emplacement du fichier du manuel des adresses" -#: ../src/unix/threadpsx.cpp:1099 +#: ../src/unix/threadpsx.cpp:1100 #, c-format msgid "Cannot get priority range for scheduling policy %d." msgstr "" "Impossible d'obtenir une gamme de priorités pour la charte de planification %" "d." -#: ../src/unix/utilsunx.cpp:758 +#: ../src/unix/utilsunx.cpp:775 msgid "Cannot get the hostname" msgstr "Impossible d'obtenir le nom d'hôte" -#: ../src/unix/utilsunx.cpp:794 +#: ../src/unix/utilsunx.cpp:811 msgid "Cannot get the official hostname" msgstr "Impossible d'obtenir le nom d'hôte officiel" -#: ../src/msw/dialup.cpp:908 +#: ../src/msw/dialup.cpp:945 msgid "Cannot hang up - no active dialup connection." msgstr "Impossible de raccrocher - pas de connexion active." -#: ../src/msw/app.cpp:308 ../src/msw/app.cpp:311 +#: ../include/wx/msw/ole/oleutils.h:47 msgid "Cannot initialize OLE" msgstr "Impossible d'initialiser l'OLE" -#: ../src/mgl/app.cpp:292 +#: ../src/mgl/app.cpp:286 msgid "Cannot initialize SciTech MGL!" msgstr "Impossible d'initialiser SciTech MGL." @@ -1013,7 +1124,7 @@ msgid "Cannot load icon from '%s'." msgstr "Impossible de charger l'icône depuis « %s »." -#: ../src/xrc/xmlres.cpp:392 +#: ../src/xrc/xmlres.cpp:453 #, c-format msgid "Cannot load resources from file '%s'." msgstr "Impossible de charger les ressources du fichier « %s »." @@ -1028,7 +1139,7 @@ msgid "Cannot open HTML help book: %s" msgstr "Impossible d'ouvrir le manuel d'aide HTML : %s" -#: ../src/generic/helpext.cpp:122 +#: ../src/generic/helpext.cpp:123 #, c-format msgid "Cannot open URL '%s'" msgstr "Impossible d'ouvrir le lien « %s »" @@ -1038,12 +1149,12 @@ msgid "Cannot open contents file: %s" msgstr "Impossible d'ouvrir le fichier de table des matières : %s" -#: ../src/xrc/xmlres.cpp:360 +#: ../src/xrc/xmlres.cpp:421 #, c-format msgid "Cannot open file '%s'." msgstr "Impossible d'ouvrir le fichier « %s »." -#: ../src/generic/dcpsg.cpp:1568 +#: ../src/generic/dcpsg.cpp:1569 msgid "Cannot open file for PostScript printing!" msgstr "Impossible d'ouvrir le fichier pour une impression PostScript." @@ -1052,22 +1163,22 @@ msgid "Cannot open index file: %s" msgstr "Impossible d'ouvrir le fichier d'index : %s" -#: ../src/common/intl.cpp:1208 +#: ../src/common/intl.cpp:1203 #, c-format msgid "Cannot parse Plural-Forms:'%s'" msgstr "Impossible de parcourir l'en-tête Plural-Forms : « %s »" -#: ../src/xrc/xmlres.cpp:1108 +#: ../src/xrc/xmlres.cpp:1172 #, c-format msgid "Cannot parse coordinates from '%s'." msgstr "Impossible de parcourir les coordonnées dans « %s »." -#: ../src/xrc/xmlres.cpp:1148 +#: ../src/xrc/xmlres.cpp:1220 #, c-format msgid "Cannot parse dimension from '%s'." msgstr "Impossible de parcourir les dimensions dans « %s »." -#: ../src/html/helpfrm.cpp:1548 +#: ../src/html/helpfrm.cpp:1562 msgid "Cannot print empty page." msgstr "Impossible d'imprimer une page vide." @@ -1076,11 +1187,11 @@ msgid "Cannot read typename from '%s'!" msgstr "Impossible de lire le nom de type de « %s »." -#: ../src/unix/threadpsx.cpp:1080 +#: ../src/unix/threadpsx.cpp:1081 msgid "Cannot retrieve thread scheduling policy." msgstr "Impossible de récupérer la charte de planification des processus." -#: ../src/unix/threadpsx.cpp:728 +#: ../src/unix/threadpsx.cpp:729 msgid "Cannot start thread: error writing TLS" msgstr "Impossible de lancer le processus : erreur lors de l'écriture de TLS" @@ -1092,11 +1203,11 @@ msgid "Cant create the thread event queue" msgstr "Impossible de créer la queue d'événements du processus" -#: ../src/html/helpfrm.cpp:511 +#: ../src/html/helpfrm.cpp:534 msgid "Case sensitive" msgstr "Sensible à la casse" -#: ../src/common/fmapbase.cpp:116 +#: ../src/common/fmapbase.cpp:117 msgid "Celtic (ISO-8859-14)" msgstr "Celtique (ISO-8859-14)" @@ -1104,92 +1215,92 @@ msgid "Centered" msgstr "Centré" -#: ../src/common/fmapbase.cpp:104 +#: ../src/common/fmapbase.cpp:105 msgid "Central European (ISO-8859-2)" msgstr "Europe centrale (ISO-8859-2)" -#: ../src/msw/dialup.cpp:749 +#: ../src/msw/dialup.cpp:786 msgid "Choose ISP to dial" msgstr "Choisir le FAI à appeler" #: ../src/generic/colrdlgg.cpp:151 ../src/gtk/colordlg.cpp:45 -#: ../src/palmos/colordlg.cpp:76 +#: ../src/palmos/colordlg.cpp:79 msgid "Choose colour" msgstr "Choisir la couleur" -#: ../src/gtk/fontdlg.cpp:127 +#: ../src/gtk/fontdlg.cpp:133 msgid "Choose font" msgstr "Choisir la police" -#: ../src/generic/mdig.cpp:114 +#: ../src/generic/mdig.cpp:115 msgid "Cl&ose" msgstr "&Fermer" -#: ../src/generic/logg.cpp:506 +#: ../src/generic/logg.cpp:507 msgid "Clear the log contents" msgstr "Effacer le contenu du journal" -#: ../src/generic/fontdlgg.cpp:358 ../src/generic/fontdlgg.cpp:377 +#: ../src/generic/fontdlgg.cpp:365 ../src/generic/fontdlgg.cpp:384 msgid "Click to cancel the font selection." msgstr "Cliquer pour annuler la sélection de la police." -#: ../src/generic/fontdlgg.cpp:363 ../src/generic/fontdlgg.cpp:365 #: ../src/generic/fontdlgg.cpp:370 ../src/generic/fontdlgg.cpp:372 +#: ../src/generic/fontdlgg.cpp:377 ../src/generic/fontdlgg.cpp:379 msgid "Click to confirm the font selection." msgstr "Cliquer pour confirmer la sélection de la police." -#: ../src/generic/progdlgg.cpp:624 ../src/generic/progdlgg.cpp:629 -#: ../contrib/src/deprecated/proplist.cpp:513 +#: ../src/generic/dbgrptg.cpp:92 ../src/generic/progdlgg.cpp:629 +#: ../src/generic/progdlgg.cpp:634 ../contrib/src/deprecated/proplist.cpp:513 msgid "Close" msgstr "Fermer" -#: ../src/univ/themes/win32.cpp:4825 +#: ../src/univ/themes/win32.cpp:4931 msgid "Close\tAlt-F4" msgstr "Fermer\tAlt-F4" -#: ../src/generic/mdig.cpp:115 +#: ../src/generic/mdig.cpp:116 msgid "Close All" msgstr "Fermer tout" -#: ../src/generic/logg.cpp:508 +#: ../src/generic/logg.cpp:509 msgid "Close this window" msgstr "Fermer cette fenêtre" -#: ../src/html/helpfrm.cpp:1562 +#: ../src/html/helpfrm.cpp:1576 msgid "Compressed HTML Help file (*.chm)|*.chm|" msgstr "Fichier HTML compilé (*.chm)|*.chm|" -#: ../src/generic/dirctrlg.cpp:548 +#: ../src/generic/dirctrlg.cpp:590 msgid "Computer" msgstr "L'ordinateur" -#: ../src/common/fileconf.cpp:929 +#: ../src/common/fileconf.cpp:962 #, c-format msgid "Config entry name cannot start with '%c'." msgstr "Le nom d'entrée de configuration ne peut pas commencer par « %c »." -#: ../src/generic/filedlgg.cpp:1287 ../src/gtk/filedlg.cpp:56 +#: ../src/generic/filedlgg.cpp:1318 ../src/gtk/filedlg.cpp:67 msgid "Confirm" msgstr "Confirmer" -#: ../src/msw/mimetype.cpp:677 +#: ../src/msw/mimetype.cpp:678 msgid "Confirm registry update" msgstr "Confirmer la mise à jour du registre" -#: ../src/html/htmlwin.cpp:381 +#: ../src/html/htmlwin.cpp:386 msgid "Connecting..." msgstr "Connexion en cours..." -#: ../src/html/helpfrm.cpp:453 +#: ../src/html/helpfrm.cpp:476 msgid "Contents" msgstr "Table des matières" -#: ../src/common/strconv.cpp:1258 +#: ../src/common/strconv.cpp:1416 #, c-format msgid "Conversion to charset '%s' doesn't work." msgstr "La conversion vers le jeu de caractères « %s » ne fonctionne pas." -#: ../src/html/htmlwin.cpp:819 +#: ../src/html/htmlwin.cpp:824 #, c-format msgid "Copied to clipboard:\"%s\"" msgstr "Copié dans le presse-papiers « %s »" @@ -1214,7 +1325,7 @@ msgid "Could not find resource include file %s." msgstr "Impossible de trouver le fichier de ressources inclus %s." -#: ../src/generic/tabg.cpp:1049 +#: ../src/generic/tabg.cpp:1048 msgid "Could not find tab for id" msgstr "Impossible de trouver l'onglet pour l'identifiant" @@ -1243,16 +1354,16 @@ "un entier (non nul) ou spécifier un #define (voir le manuel pour les mises\n" "en garde)" -#: ../src/common/prntbase.cpp:1226 +#: ../src/common/prntbase.cpp:1272 msgid "Could not start document preview." msgstr "Impossible de lancer l'aperçu du document." -#: ../src/generic/printps.cpp:185 ../src/gtk/gnome/gprint.cpp:756 -#: ../src/msw/printwin.cpp:237 +#: ../src/generic/printps.cpp:185 ../src/gtk/gnome/gprint.cpp:763 +#: ../src/msw/printwin.cpp:235 msgid "Could not start printing." msgstr "Impossible de lancer l'impression." -#: ../src/common/wincmn.cpp:1450 +#: ../src/common/wincmn.cpp:1498 msgid "Could not transfer data to window" msgstr "Impossible de transférer les données à la fenêtre" @@ -1261,13 +1372,13 @@ msgid "Could not unlock mutex" msgstr "Impossible de déverrouiller le mutex" -#: ../src/os2/thread.cpp:154 +#: ../src/os2/thread.cpp:150 msgid "Couldn't acquire a mutex lock" msgstr "Impossible de récupérer un verrou pour le mutex" #: ../src/msw/dragimag.cpp:166 ../src/msw/dragimag.cpp:206 -#: ../src/msw/imaglist.cpp:157 ../src/msw/imaglist.cpp:175 -#: ../src/msw/imaglist.cpp:187 +#: ../src/msw/imaglist.cpp:158 ../src/msw/imaglist.cpp:176 +#: ../src/msw/imaglist.cpp:188 msgid "Couldn't add an image to the image list." msgstr "Impossible d'ajouter une image à la liste des images." @@ -1279,12 +1390,12 @@ msgid "Couldn't create cursor." msgstr "Impossible de créer un curseur." -#: ../src/common/dynlib.cpp:198 +#: ../src/common/dynlib.cpp:199 #, c-format msgid "Couldn't find symbol '%s' in a dynamic library" msgstr "Impossible de trouver le symbole « %s » dans la bibliothèque dynamique" -#: ../src/mac/classic/thread.cpp:521 ../src/msw/thread.cpp:856 +#: ../src/mac/classic/thread.cpp:521 ../src/msw/thread.cpp:853 msgid "Couldn't get the current thread pointer" msgstr "Impossible d'obtenir le pointeur du processus actuel" @@ -1309,11 +1420,11 @@ msgid "Couldn't register clipboard format '%s'." msgstr "Impossible d'enregistrer le format de presse-papiers « %s »." -#: ../src/os2/thread.cpp:171 +#: ../src/os2/thread.cpp:167 msgid "Couldn't release a mutex" msgstr "Impossible de libérer un mutex" -#: ../src/msw/listctrl.cpp:738 +#: ../src/msw/listctrl.cpp:745 #, c-format msgid "Couldn't retrieve information about list control item %d." msgstr "" @@ -1325,7 +1436,7 @@ msgid "Couldn't save PNG image." msgstr "Impossible de sauvegarder l'image PNG." -#: ../src/mac/classic/thread.cpp:779 ../src/msw/thread.cpp:610 +#: ../src/mac/classic/thread.cpp:779 ../src/msw/thread.cpp:611 msgid "Couldn't terminate thread" msgstr "Impossible d'arrêter le processus" @@ -1337,27 +1448,28 @@ msgid "Create directory" msgstr "Créer le répertoire" -#: ../src/generic/dirdlgg.cpp:142 ../src/generic/filedlgg.cpp:977 +#: ../src/generic/dirdlgg.cpp:140 ../src/generic/filedlgg.cpp:999 msgid "Create new directory" msgstr "Créer un nouveau répertoire" -#: ../src/common/stockitem.cpp:114 ../src/msw/textctrl.cpp:2057 +#: ../src/common/stockitem.cpp:114 ../src/mac/carbon/textctrl.cpp:1073 +#: ../src/msw/textctrl.cpp:2063 msgid "Cu&t" msgstr "Cou&per" -#: ../src/generic/filedlgg.cpp:988 +#: ../src/generic/filedlgg.cpp:1010 msgid "Current directory:" msgstr "Répertoire courant :" -#: ../src/common/fmapbase.cpp:107 +#: ../src/common/fmapbase.cpp:108 msgid "Cyrillic (ISO-8859-5)" msgstr "Cyrillique (ISO-8859-5)" -#: ../src/common/paper.cpp:116 +#: ../src/common/paper.cpp:106 msgid "D sheet, 22 x 34 in" -msgstr "Feuille D, 22 x 34 mm" +msgstr "Feuille D (22 x 34 mm)" -#: ../src/msw/dde.cpp:633 +#: ../src/msw/dde.cpp:631 msgid "DDE poke request failed" msgstr "Échec de la demande de transfert DDE" @@ -1383,11 +1495,11 @@ msgid "DIB Header: Unknown encoding in file." msgstr "En-tête DIB : codage inconnu dans le fichier." -#: ../src/common/paper.cpp:138 +#: ../src/common/paper.cpp:128 msgid "DL Envelope, 110 x 220 mm" -msgstr "Enveloppe DL, 110 x 220 mm" +msgstr "Enveloppe DL (110 x 220 mm)" -#: ../src/generic/dbgrptg.cpp:276 +#: ../src/generic/dbgrptg.cpp:295 #, c-format msgid "Debug report \"%s\"" msgstr "Rapport de débogage « %s »" @@ -1396,15 +1508,15 @@ msgid "Debug report couldn't be created." msgstr "Échec de la création du rapport de débogage." -#: ../src/common/debugrpt.cpp:517 +#: ../src/common/debugrpt.cpp:539 msgid "Debug report generation has failed." msgstr "Échec de la création du rapport de débogage." -#: ../src/generic/fontdlgg.cpp:225 +#: ../src/generic/fontdlgg.cpp:227 msgid "Decorative" msgstr "Décoratif" -#: ../src/common/fmapbase.cpp:671 +#: ../src/common/fmapbase.cpp:681 msgid "Default encoding" msgstr "Codage par défaut" @@ -1421,11 +1533,11 @@ msgid "Deleted stale lock file '%s'." msgstr "Suppression du fichier verrou périmé « %s »." -#: ../src/generic/dirctrlg.cpp:628 +#: ../src/generic/dirctrlg.cpp:656 msgid "Desktop" msgstr "Bureau" -#: ../src/msw/dialup.cpp:358 +#: ../src/msw/dialup.cpp:395 msgid "" "Dial up functions are unavailable because the remote access service (RAS) is " "not installed on this machine. Please install it." @@ -1433,11 +1545,15 @@ "Les fonctions d'appel ne sont pas disponibles car le service d'accès à " "distance (RAS) n'est pas installé sur cet ordinateur. Veuillez l'installer." -#: ../src/generic/tipdlg.cpp:241 +#: ../src/generic/tipdlg.cpp:246 msgid "Did you know..." msgstr "Saviez-vous que..." -#: ../src/common/filefn.cpp:1152 +#: ../src/motif/filedlg.cpp:225 +msgid "Directories" +msgstr "Répertoires" + +#: ../src/common/filefn.cpp:1177 #, c-format msgid "Directory '%s' couldn't be created" msgstr "Le répertoire « %s » n'a pas pu être créé" @@ -1451,11 +1567,11 @@ msgid "Directory does not exist" msgstr "Répertoire inexistant" -#: ../src/generic/filedlgg.cpp:1264 +#: ../src/generic/filedlgg.cpp:1295 msgid "Directory doesn't exist." msgstr "Répertoire inexistant." -#: ../src/html/helpfrm.cpp:480 +#: ../src/html/helpfrm.cpp:503 msgid "" "Display all index items that contain given substring. Search is case " "insensitive." @@ -1463,11 +1579,11 @@ "Afficher tous les éléments de l'index qui contiennent une sous-chaîne " "donnée. Recherche non sensible à la casse." -#: ../src/html/helpfrm.cpp:662 +#: ../src/html/helpfrm.cpp:685 msgid "Display options dialog" msgstr "Dialogue d'options de l'affichage" -#: ../src/msw/mimetype.cpp:670 +#: ../src/msw/mimetype.cpp:671 msgid "" "Do you want to overwrite the command used to %s files with extension \"%s" "\" ?\n" @@ -1483,33 +1599,37 @@ "La nouvelle valeur est \n" "%s %1" -#: ../src/common/docview.cpp:444 +#: ../src/common/docview.cpp:464 #, c-format msgid "Do you want to save changes to document %s?" msgstr "Voulez-vous sauvegarder les modifications dans le document %s ?" -#: ../src/common/sizer.cpp:1758 +#: ../src/common/sizer.cpp:1839 msgid "Don't Save" msgstr "Ne pas enregistrer" -#: ../src/html/htmlwin.cpp:446 ../src/msw/frame.cpp:197 +#: ../src/html/htmlwin.cpp:451 ../src/msw/frame.cpp:211 msgid "Done" msgstr "Fait" -#: ../src/generic/progdlgg.cpp:428 +#: ../src/generic/progdlgg.cpp:433 msgid "Done." msgstr "Fait." +#: ../src/common/paper.cpp:183 +msgid "Double Japanese Postcard Rotated 148 x 200 mm" +msgstr "Double Carte Postale Japonaise Paysage (148 x 200 mm)" + #: ../src/common/xtixml.cpp:271 #, c-format msgid "Doubly used id : %d" msgstr "Identifiant utilisé deux fois : %d" -#: ../src/generic/fdrepdlg.cpp:151 +#: ../src/generic/fdrepdlg.cpp:158 msgid "Down" msgstr "Bas" -#: ../src/common/paper.cpp:117 +#: ../src/common/paper.cpp:107 msgid "E sheet, 34 x 44 in" msgstr "Feuille E (34 x 44 pouces)" @@ -1517,25 +1637,29 @@ msgid "Edit item" msgstr "Éditer l'élément" -#: ../src/generic/progdlgg.cpp:192 +#: ../src/generic/progdlgg.cpp:194 msgid "Elapsed time : " msgstr "Temps écoulé : " -#: ../src/common/prntbase.cpp:800 +#: ../src/common/prntbase.cpp:846 #, c-format msgid "Enter a page number between %d and %d:" msgstr "Saisir un numéro de page entre %d et %d :" -#: ../src/generic/dbgrptg.cpp:158 +#: ../src/generic/dbgrptg.cpp:169 #, c-format msgid "Enter command to open file \"%s\":" msgstr "Entrer la commande pour ouvrir le fichier « %s » :" -#: ../src/generic/helpext.cpp:442 +#: ../src/generic/helpext.cpp:443 msgid "Entries found" msgstr "Entrées trouvées" -#: ../src/common/config.cpp:383 +#: ../src/common/paper.cpp:149 +msgid "Envelope Invite 220 x 220 mm" +msgstr "Enveloppe Carrée (220 x 220 mm)" + +#: ../src/common/config.cpp:384 #, c-format msgid "" "Environment variables expansion failed: missing '%c' at position %u in '%s'." @@ -1543,17 +1667,17 @@ "Échec de l'expansion des variables d'environnement : « %c » manquant à la " "position %u dans « %s »." -#: ../src/generic/dirctrlg.cpp:661 ../src/generic/dirctrlg.cpp:679 -#: ../src/generic/dirctrlg.cpp:690 ../src/generic/dirdlgg.cpp:342 -#: ../src/generic/filedlgg.cpp:631 ../src/generic/filedlgg.cpp:743 -#: ../src/generic/filedlgg.cpp:757 ../src/generic/filedlgg.cpp:771 -#: ../src/generic/filedlgg.cpp:1239 ../src/generic/filedlgg.cpp:1264 -#: ../src/generic/filedlgg.cpp:1294 ../src/gtk/filedlg.cpp:68 -#: ../src/gtk/fontdlg.cpp:78 +#: ../src/generic/dirctrlg.cpp:689 ../src/generic/dirctrlg.cpp:707 +#: ../src/generic/dirctrlg.cpp:718 ../src/generic/dirdlgg.cpp:342 +#: ../src/generic/filedlgg.cpp:632 ../src/generic/filedlgg.cpp:744 +#: ../src/generic/filedlgg.cpp:758 ../src/generic/filedlgg.cpp:772 +#: ../src/generic/filedlgg.cpp:1269 ../src/generic/filedlgg.cpp:1295 +#: ../src/generic/filedlgg.cpp:1325 ../src/gtk/fontdlg.cpp:81 msgid "Error" msgstr "Erreur" -#: ../src/unix/utilsunx.cpp:1073 ../src/unix/utilsunx.cpp:1081 +#: ../src/msdos/utilsdos.cpp:213 ../src/unix/utilsunx.cpp:1090 +#: ../src/unix/utilsunx.cpp:1098 msgid "Error " msgstr "Erreur " @@ -1565,11 +1689,11 @@ msgid "Error in reading image DIB ." msgstr "Erreur lors de la lecture d'une image DIB." -#: ../src/common/fileconf.cpp:501 +#: ../src/common/fileconf.cpp:504 msgid "Error reading config options." msgstr "Erreur lors de la lecture des options de configuration." -#: ../src/common/fileconf.cpp:1015 +#: ../src/common/fileconf.cpp:1050 msgid "Error saving user configuration data." msgstr "" "Erreur lors de l'enregistrement des données de configuration de " @@ -1579,19 +1703,19 @@ msgid "Error while waiting on semaphore" msgstr "Erreur lors de l'attente d'une sémaphore" -#: ../src/common/log.cpp:477 +#: ../src/common/log.cpp:476 msgid "Error: " msgstr "Erreur : " -#: ../src/common/fmapbase.cpp:105 +#: ../src/common/fmapbase.cpp:106 msgid "Esperanto (ISO-8859-3)" msgstr "Espéranto (ISO-8859-3)" -#: ../src/generic/progdlgg.cpp:200 +#: ../src/generic/progdlgg.cpp:202 msgid "Estimated time : " msgstr "Temps estimé : " -#: ../src/generic/dbgrptg.cpp:211 +#: ../src/generic/dbgrptg.cpp:229 msgid "Executable files (*.exe)|*.exe|All files (*.*)|*.*||" msgstr "Fichiers exécutables (*.exe)|*.exe|Tous les fichiers (*.*)|*.*||" @@ -1600,12 +1724,12 @@ msgid "Execution of command '%s' failed" msgstr "Échec de l'exécution de la commande « %s »" -#: ../src/os2/utilsexc.cpp:169 +#: ../src/os2/utilsexc.cpp:165 #, c-format msgid "Execution of command '%s' failed with error: %ul" msgstr "Échec de l'exécution de la commande « %s » avec l'erreur : %ul" -#: ../src/common/paper.cpp:122 +#: ../src/common/paper.cpp:112 msgid "Executive, 7 1/4 x 10 1/2 in" msgstr "Executive (7,25 x 10,5 pouces)" @@ -1627,15 +1751,15 @@ msgid "Expected 'char' while parsing resource." msgstr "« char » attendu lors du parcours de la ressource." -#: ../src/msw/registry.cpp:1125 +#: ../src/msw/registry.cpp:1140 #, c-format msgid "" "Exporting registry key: file \"%s\" already exists and won't be overwritten." msgstr "" -"Exportation de la clé de registre : le fichier « %s » existe déjà et ne sera pas " -"écrasé." +"Exportation de la clé de registre : le fichier « %s » existe déjà et ne sera " +"pas écrasé." -#: ../src/common/fmapbase.cpp:141 +#: ../src/common/fmapbase.cpp:143 msgid "Extended Unix Codepage for Japanese (EUC-JP)" msgstr "Codepage Unix étendu pour le japonais (EUC-JP)" @@ -1644,7 +1768,7 @@ msgid "Extraction of '%s' into '%s' failed." msgstr "Échec de l'extraction de « %s » de « %s »." -#: ../src/msw/dialup.cpp:843 +#: ../src/msw/dialup.cpp:880 #, c-format msgid "Failed to %s dialup connection: %s" msgstr "N'a pas réussi à %s la connexion : %s" @@ -1653,7 +1777,7 @@ msgid "Failed to access lock file." msgstr "Échec de l'accès au fichier verrou." -#: ../src/msw/dib.cpp:543 +#: ../src/msw/dib.cpp:563 #, c-format msgid "Failed to allocated %luKb of memory for bitmap data." msgstr "Échec de l'allocation de %lu Ko de mémoire pour les données bitmap." @@ -1676,43 +1800,43 @@ msgid "Failed to close lock file '%s'" msgstr "Échec de la fermeture du fichier verrou « %s »" -#: ../src/msw/clipbrd.cpp:122 +#: ../src/msw/clipbrd.cpp:119 msgid "Failed to close the clipboard." msgstr "Échec de la fermeture du presse-papiers." -#: ../src/msw/dialup.cpp:783 +#: ../src/msw/dialup.cpp:820 msgid "Failed to connect: missing username/password." msgstr "Échec de la connexion : nom d'utilisateur ou mot de passe manquant." -#: ../src/msw/dialup.cpp:729 +#: ../src/msw/dialup.cpp:766 msgid "Failed to connect: no ISP to dial." msgstr "Échec de la connexion : pas de FAI à appeler." -#: ../src/msw/registry.cpp:618 +#: ../src/msw/registry.cpp:626 #, c-format msgid "Failed to copy registry value '%s'" msgstr "Échec de la copie de la valeur de registre « %s »" -#: ../src/msw/registry.cpp:627 +#: ../src/msw/registry.cpp:635 #, c-format msgid "Failed to copy the contents of registry key '%s' to '%s'." msgstr "Échec de la copie du contenu de la clé de registre « %s » vers « %s »" -#: ../src/common/filefn.cpp:996 +#: ../src/common/filefn.cpp:1003 #, c-format msgid "Failed to copy the file '%s' to '%s'" msgstr "Échec de la copie du fichier « %s » vers « %s »" -#: ../src/msw/registry.cpp:605 +#: ../src/msw/registry.cpp:613 #, c-format msgid "Failed to copy the registry subkey '%s' to '%s'." msgstr "Échec de la copie de la sous-clé de registre « %s » vers « %s »." -#: ../src/msw/dde.cpp:988 +#: ../src/msw/dde.cpp:989 msgid "Failed to create DDE string" msgstr "Échec de la création de la chaîne DDE" -#: ../src/msw/mdi.cpp:455 +#: ../src/msw/mdi.cpp:473 msgid "Failed to create MDI parent frame." msgstr "Échec de la création du cadre parent MDI." @@ -1720,7 +1844,7 @@ msgid "Failed to create a status bar." msgstr "Échec de la création d'une barre d'état." -#: ../src/common/filename.cpp:754 +#: ../src/common/filename.cpp:766 msgid "Failed to create a temporary file name" msgstr "Échec de la création d'un nom de fichier temporaire." @@ -1728,13 +1852,13 @@ msgid "Failed to create an anonymous pipe" msgstr "Échec de la création d'un tube anonyme" -#: ../src/msw/dde.cpp:450 +#: ../src/msw/dde.cpp:447 #, c-format msgid "Failed to create connection to server '%s' on topic '%s'" msgstr "" "Échec de la création d'une connexion au serveur « %s » sur le sujet « %s »" -#: ../src/msw/cursor.cpp:198 +#: ../src/msw/cursor.cpp:218 msgid "Failed to create cursor." msgstr "Échec de la création d'un curseur." @@ -1768,7 +1892,7 @@ msgstr "" "Échec de la création d'une entrée dans le registre pour les fichiers « %s »." -#: ../src/msw/fdrepdlg.cpp:479 +#: ../src/msw/fdrepdlg.cpp:474 #, c-format msgid "Failed to create the standard find/replace dialog (error code %d)" msgstr "" @@ -1780,8 +1904,8 @@ msgid "Failed to display HTML document in %s encoding" msgstr "Échec de l'affichage du document HTML avec le codage %s" -#: ../src/mac/carbon/clipbrd.cpp:187 ../src/mac/classic/clipbrd.cpp:185 -#: ../src/msw/clipbrd.cpp:134 +#: ../src/mac/carbon/clipbrd.cpp:194 ../src/mac/classic/clipbrd.cpp:185 +#: ../src/msw/clipbrd.cpp:131 msgid "Failed to empty the clipboard." msgstr "Échec du vidage du presse-papiers." @@ -1789,22 +1913,22 @@ msgid "Failed to enumerate video modes" msgstr "Échec de l'énumération des modes vidéo" -#: ../src/msw/dde.cpp:652 +#: ../src/msw/dde.cpp:650 msgid "Failed to establish an advise loop with DDE server" msgstr "" "Échec de l'établissement d'une boucle d'instructions avec le serveur DDE" -#: ../src/msw/dialup.cpp:621 +#: ../src/msw/dialup.cpp:658 #, c-format msgid "Failed to establish dialup connection: %s" msgstr "Échec de l'établissement d'une connexion : %s" -#: ../src/unix/utilsunx.cpp:491 ../src/unix/utilsunx.cpp:507 +#: ../src/unix/utilsunx.cpp:508 ../src/unix/utilsunx.cpp:524 #, c-format msgid "Failed to execute '%s'\n" msgstr "Échec de l'exécution de « %s »\n" -#: ../src/common/debugrpt.cpp:652 +#: ../src/common/debugrpt.cpp:666 msgid "Failed to execute curl, please install it in PATH." msgstr "Échec de l'exécution de curl, veuillez l'installer dans le PATH" @@ -1835,47 +1959,38 @@ "Ressource XPM %s introuvable.\n" "Avez-vous oublié d'utiliser wxResourceLoadBitmapData ?" -#: ../src/msw/dialup.cpp:681 +#: ../src/msw/dialup.cpp:718 #, c-format msgid "Failed to get ISP names: %s" msgstr "Échec de l'obtention des noms des FAI : %s" -#: ../src/mac/carbon/clipbrd.cpp:136 ../src/mac/classic/clipbrd.cpp:134 +#: ../src/mac/carbon/clipbrd.cpp:143 ../src/mac/classic/clipbrd.cpp:134 msgid "Failed to get clipboard data." msgstr "Échec de l'obtention des données du presse-papiers." -#: ../src/msw/clipbrd.cpp:716 +#: ../src/msw/clipbrd.cpp:723 msgid "Failed to get data from the clipboard" msgstr "Échec de l'obtention des données du presse-papiers" -#: ../src/msw/stackwalk.cpp:221 -#, c-format -msgid "" -"Failed to get stack backtrace:\n" -"%s" -msgstr "" -"Échec de l'obtention de la pile d'appel :\n" -"%s" - -#: ../src/common/stopwatch.cpp:189 +#: ../src/common/stopwatch.cpp:233 msgid "Failed to get the local system time" msgstr "Échec de l'obtention de l'heure locale du système" -#: ../src/common/filefn.cpp:1389 +#: ../src/common/filefn.cpp:1430 msgid "Failed to get the working directory" msgstr "Échec de l'obtention du répertoire courant" #: ../src/univ/theme.cpp:122 msgid "Failed to initialize GUI: no built-in themes found." msgstr "" -"Échec de l'initialisation de l'interface graphique : aucun thème préfabriqué n'a " -"été trouvé." +"Échec de l'initialisation de l'interface graphique : aucun thème préfabriqué " +"n'a été trouvé." #: ../src/msw/helpchm.cpp:69 msgid "Failed to initialize MS HTML Help." msgstr "Échec de l'initialisation de l'aide MS HTML." -#: ../src/msw/glcanvas.cpp:808 +#: ../src/msw/glcanvas.cpp:809 msgid "Failed to initialize OpenGL" msgstr "Échec de l'initialisation d'OpenGL" @@ -1884,15 +1999,15 @@ msgid "Failed to inspect the lock file '%s'" msgstr "Échec de l'inspection du fichier verrou « %s »" -#: ../src/unix/threadpsx.cpp:896 +#: ../src/unix/threadpsx.cpp:897 msgid "" "Failed to join a thread, potential memory leak detected - please restart the " "program" msgstr "" -"Échec de l'adjonction d'un processus : fuite potentielle de mémoire détectée, " -"redémarrez le programme" +"Échec de l'adjonction d'un processus : fuite potentielle de mémoire " +"détectée, redémarrez le programme" -#: ../src/msw/utils.cpp:693 +#: ../src/msw/utils.cpp:703 #, c-format msgid "Failed to kill process %d" msgstr "Échec de l'arrêt du processus %d" @@ -1911,12 +2026,12 @@ msgid "Failed to load mpr.dll." msgstr "Échec du chargement de mpr.dll" -#: ../src/common/dynlib.cpp:132 +#: ../src/common/dynlib.cpp:133 #, c-format msgid "Failed to load shared library '%s'" msgstr "Échec du chargement de la bibliothèque partagée « %s »" -#: ../src/common/dynlib.cpp:114 +#: ../src/common/dynlib.cpp:115 #, c-format msgid "Failed to load shared library '%s' Error '%s'" msgstr "Échec du chargement de la bibliothèque partagée « %s » : erreur « %s »" @@ -1932,7 +2047,7 @@ msgstr "" "Échec de la correspondance de « %s » avec l'expression rationnelle : %s" -#: ../src/common/filename.cpp:1894 +#: ../src/common/filename.cpp:1918 #, c-format msgid "Failed to modify file times for '%s'" msgstr "Échec de la modification de la date du fichier « %s »" @@ -1947,15 +2062,15 @@ msgid "Failed to open CHM archive '%s'." msgstr "Échec de l'ouverture de l'archive CHM « %s »." -#: ../src/common/filename.cpp:776 +#: ../src/common/filename.cpp:788 msgid "Failed to open temporary file." msgstr "Échec de l'ouverture d'un fichier temporaire." -#: ../src/msw/clipbrd.cpp:102 +#: ../src/msw/clipbrd.cpp:99 msgid "Failed to open the clipboard." msgstr "Échec de l'ouverture du presse-papiers." -#: ../src/msw/clipbrd.cpp:619 +#: ../src/msw/clipbrd.cpp:626 msgid "Failed to put data on the clipboard" msgstr "Échec de l'ajout de données dans le presse-papiers" @@ -1964,7 +2079,7 @@ msgstr "" "Échec de la lecture du numéro de processus (PID) depuis le fichier verrou." -#: ../src/unix/utilsunx.cpp:581 +#: ../src/unix/utilsunx.cpp:598 msgid "Failed to redirect child process input/output" msgstr "Échec de la redirection des entrées et sorties du processus fils" @@ -1972,16 +2087,16 @@ msgid "Failed to redirect the child process IO" msgstr "Échec de la redirection des entrées et sorties du processus fils" -#: ../src/msw/dde.cpp:300 +#: ../src/msw/dde.cpp:297 #, c-format msgid "Failed to register DDE server '%s'" msgstr "Échec de l'enregistrement du serveur DDE « %s »" -#: ../src/msw/glcanvas.cpp:368 +#: ../src/msw/glcanvas.cpp:363 msgid "Failed to register OpenGL window class." msgstr "Échec de l'enregistrement de la classe de fenêtres OpenGL." -#: ../src/common/fontmap.cpp:232 +#: ../src/common/fontmap.cpp:246 #, c-format msgid "Failed to remember the encoding for the charset '%s'." msgstr "Échec du rappel du codage du jeu de caractères « %s »." @@ -2001,39 +2116,39 @@ msgid "Failed to remove stale lock file '%s'." msgstr "Échec de la suppression du fichier verrou périmé « %s »." -#: ../src/msw/registry.cpp:456 +#: ../src/msw/registry.cpp:464 #, c-format msgid "Failed to rename registry value '%s' to '%s'." msgstr "Échec du renommage de la valeur de registre « %s » en « %s »." -#: ../src/msw/registry.cpp:560 +#: ../src/msw/registry.cpp:568 #, c-format msgid "Failed to rename the registry key '%s' to '%s'." msgstr "Échec du renommage de la clé de registre « %s » en « %s »." -#: ../src/msw/clipbrd.cpp:506 +#: ../src/msw/clipbrd.cpp:503 msgid "Failed to retrieve data from the clipboard." msgstr "Échec de la récupération de données du presse-papiers." -#: ../src/common/filename.cpp:1984 +#: ../src/common/filename.cpp:2011 #, c-format msgid "Failed to retrieve file times for '%s'" msgstr "Échec de la récupération de la date du fichier « %s »" -#: ../src/msw/dialup.cpp:454 +#: ../src/msw/dialup.cpp:491 msgid "Failed to retrieve text of RAS error message" msgstr "Échec de la récupération du texte du message d'erreur RAS" -#: ../src/msw/clipbrd.cpp:753 +#: ../src/msw/clipbrd.cpp:760 msgid "Failed to retrieve the supported clipboard formats" msgstr "Échec de la récupération des formats de presse-papiers gérés" -#: ../src/msw/dib.cpp:345 +#: ../src/msw/dib.cpp:341 #, c-format msgid "Failed to save the bitmap image to file \"%s\"." msgstr "Échec de l'enregistrement de l'image bitmap dans le fichier « %s »" -#: ../src/msw/dde.cpp:697 +#: ../src/msw/dde.cpp:695 msgid "Failed to send DDE advise notification" msgstr "Échec de l'envoi d'une notification d'instructions au DDE" @@ -2042,7 +2157,7 @@ msgid "Failed to set FTP transfer mode to %s." msgstr "Échec de la configuration du mode de transfert FTP en %s." -#: ../src/msw/clipbrd.cpp:382 +#: ../src/msw/clipbrd.cpp:379 msgid "Failed to set clipboard data." msgstr "Échec de la configuration des données du presse-papiers." @@ -2051,11 +2166,11 @@ msgid "Failed to set permissions on lock file '%s'" msgstr "Échec de la configuration des permissions du fichier verrou « %s »" -#: ../src/common/file.cpp:525 +#: ../src/common/file.cpp:523 msgid "Failed to set temporary file permissions" msgstr "Échec de la configuration des permissions du fichier temporaire" -#: ../src/unix/threadpsx.cpp:1244 ../src/unix/threadpsx.cpp:1255 +#: ../src/unix/threadpsx.cpp:1245 ../src/unix/threadpsx.cpp:1256 #, c-format msgid "Failed to set thread priority %d." msgstr "Échec de la configuration de la priorité %d du processus." @@ -2066,21 +2181,21 @@ msgstr "Échec du stockage de l'image « %s » dans la mémoire VFS." #: ../src/mac/carbon/mpthread.cpp:1273 ../src/mac/carbon/thread.cpp:1465 -#: ../src/unix/threadpsx.cpp:1428 +#: ../src/unix/threadpsx.cpp:1429 msgid "Failed to terminate a thread." msgstr "Échec de la terminaison d'un processus." -#: ../src/msw/dde.cpp:671 +#: ../src/msw/dde.cpp:669 msgid "Failed to terminate the advise loop with DDE server" msgstr "" "Échec de la terminaison de la boucle d'instructions avec le serveur DDE" -#: ../src/msw/dialup.cpp:916 +#: ../src/msw/dialup.cpp:955 #, c-format msgid "Failed to terminate the dialup connection: %s" msgstr "Échec de la terminaison de la connexion : %s" -#: ../src/common/filename.cpp:1909 +#: ../src/common/filename.cpp:1933 #, c-format msgid "Failed to touch the file '%s'" msgstr "Échec de la mise à jour de la date du fichier « %s »" @@ -2090,16 +2205,16 @@ msgid "Failed to unlock lock file '%s'" msgstr "Échec du déverrouillage du fichier verrou « %s »" -#: ../src/msw/dde.cpp:321 +#: ../src/msw/dde.cpp:318 #, c-format msgid "Failed to unregister DDE server '%s'" msgstr "Échec du désenregistrement du serveur DDE « %s »" -#: ../src/common/fileconf.cpp:990 +#: ../src/common/fileconf.cpp:1023 msgid "Failed to update user configuration file." msgstr "Échec de la mise à jour du fichier de configuration utilisateur" -#: ../src/common/debugrpt.cpp:665 +#: ../src/common/debugrpt.cpp:679 #, c-format msgid "Failed to upload the debug report (error code %d)." msgstr "Échec de l'envoi du rapport de bogue (code d'erreur %d)." @@ -2109,11 +2224,11 @@ msgid "Failed to write to lock file '%s'" msgstr "Échec de l'écriture dans le fichier verrou « %s »" -#: ../src/generic/logg.cpp:395 +#: ../src/generic/logg.cpp:394 msgid "Fatal error" msgstr "Erreur fatale" -#: ../src/common/log.cpp:466 +#: ../src/common/log.cpp:465 msgid "Fatal error: " msgstr "Erreur fatale : " @@ -2126,12 +2241,12 @@ msgid "File %s does not exist." msgstr "Fichier « %s » inexistant." -#: ../src/generic/filedlgg.cpp:1285 ../src/gtk/filedlg.cpp:53 +#: ../src/generic/filedlgg.cpp:1316 ../src/gtk/filedlg.cpp:64 #, c-format msgid "File '%s' already exists, do you really want to overwrite it?" msgstr "Le fichier « %s » existe déjà, voulez-vous vraiment l'écraser ?" -#: ../src/os2/filedlg.cpp:307 +#: ../src/os2/filedlg.cpp:310 #, c-format msgid "" "File '%s' already exists.\n" @@ -2144,41 +2259,48 @@ msgid "File couldn't be loaded." msgstr "Le fichier n'a pas pu être chargé." -#: ../src/common/docview.cpp:551 ../src/common/docview.cpp:583 -#: ../src/common/docview.cpp:1557 +#: ../src/common/docview.cpp:571 ../src/common/docview.cpp:1596 msgid "File error" msgstr "Erreur fichier" -#: ../src/generic/dirctrlg.cpp:679 ../src/generic/filedlgg.cpp:757 +#: ../src/generic/dirctrlg.cpp:707 ../src/generic/filedlgg.cpp:758 msgid "File name exists already." msgstr "Nom de fichier existant." -#: ../src/common/filefn.cpp:1702 +#: ../src/motif/filedlg.cpp:226 +msgid "Files" +msgstr "Fichiers" + +#: ../src/common/filefn.cpp:1746 #, c-format msgid "Files (%s)" msgstr "Fichiers (%s)" -#: ../src/html/helpfrm.cpp:468 +#: ../src/motif/filedlg.cpp:224 +msgid "Filter" +msgstr "Filtre" + +#: ../src/html/helpfrm.cpp:491 msgid "Find" msgstr "Trouver" -#: ../src/html/helpfrm.cpp:1196 +#: ../src/html/helpfrm.cpp:1219 msgid "Fixed font:" msgstr "Police de taille fixe :" -#: ../src/html/helpfrm.cpp:1256 +#: ../src/html/helpfrm.cpp:1279 msgid "Fixed size face.
bold italic " msgstr "Police de taille fixe.
gras italique " -#: ../src/common/paper.cpp:128 +#: ../src/common/paper.cpp:118 msgid "Folio, 8 1/2 x 13 in" msgstr "Folio (8,5 x 13 pouces)" -#: ../src/html/helpfrm.cpp:1197 +#: ../src/html/helpfrm.cpp:1220 msgid "Font size:" msgstr "Taille de la police :" -#: ../src/unix/utilsunx.cpp:528 +#: ../src/unix/utilsunx.cpp:545 msgid "Fork failed" msgstr "Échec du clonage" @@ -2192,7 +2314,7 @@ msgid "Found " msgstr "A trouvé " -#: ../src/html/helpfrm.cpp:863 +#: ../src/html/helpfrm.cpp:886 #, c-format msgid "Found %i matches" msgstr "A trouvé %i correspondances" @@ -2225,55 +2347,55 @@ msgid "GTK+ theme" msgstr "Thème GTK+" -#: ../src/common/prntbase.cpp:229 +#: ../src/common/prntbase.cpp:228 msgid "Generic PostScript" msgstr "Fichier PostScript" -#: ../src/common/paper.cpp:152 +#: ../src/common/paper.cpp:142 msgid "German Legal Fanfold, 8 1/2 x 13 in" msgstr "Légal allemand en accordéon (8,5 x 13 pouces)" -#: ../src/common/paper.cpp:151 +#: ../src/common/paper.cpp:141 msgid "German Std Fanfold, 8 1/2 x 12 in" msgstr "Standard allemand en accordéon (8,5 x 12 pouces)" -#: ../include/wx/xti.h:843 +#: ../include/wx/xti.h:845 msgid "GetProperty called w/o valid getter" msgstr "GetProperty appelé sans récupérateur valable" -#: ../include/wx/xti.h:904 +#: ../include/wx/xti.h:906 msgid "GetPropertyCollection called on a generic accessor" msgstr "GetPropertyCollection appelé sur un assesseur générique" -#: ../include/wx/xti.h:851 +#: ../include/wx/xti.h:853 msgid "GetPropertyCollection called w/o valid collection getter" msgstr "GetPropertyCollection appelé sans récupérateur de collection valable" -#: ../src/html/helpfrm.cpp:628 +#: ../src/html/helpfrm.cpp:651 msgid "Go back" msgstr "Revenir" -#: ../src/html/helpfrm.cpp:631 +#: ../src/html/helpfrm.cpp:654 msgid "Go forward" msgstr "Continuer" -#: ../src/html/helpfrm.cpp:636 +#: ../src/html/helpfrm.cpp:659 msgid "Go one level up in document hierarchy" msgstr "Monter au niveau supérieur dans la hiérarchie du document" -#: ../src/generic/dirdlgg.cpp:147 ../src/generic/filedlgg.cpp:967 +#: ../src/generic/dirdlgg.cpp:145 ../src/generic/filedlgg.cpp:989 msgid "Go to home directory" msgstr "Aller au répertoire personnel" -#: ../src/generic/filedlgg.cpp:959 +#: ../src/generic/filedlgg.cpp:981 msgid "Go to parent directory" msgstr "Aller au répertoire parent" -#: ../src/common/prntbase.cpp:805 +#: ../src/common/prntbase.cpp:851 msgid "Goto Page" msgstr "Aller à la page" -#: ../src/common/fmapbase.cpp:109 +#: ../src/common/fmapbase.cpp:110 msgid "Greek (ISO-8859-7)" msgstr "Grec (ISO-8859-7)" @@ -2281,45 +2403,44 @@ msgid "Gzip not supported by this version of zlib" msgstr "Gzip n'est pas géré par cette version de zlib" -#: ../src/html/helpfrm.cpp:1560 +#: ../src/html/helpfrm.cpp:1574 msgid "HTML Help Project (*.hhp)|*.hhp|" msgstr "Projet d'aide HTML (*.hhp)|*.hhp|" -#: ../src/html/htmlwin.cpp:493 +#: ../src/html/htmlwin.cpp:498 #, c-format msgid "HTML anchor %s does not exist." msgstr "Ancre HTML %s inexistante." -#: ../src/html/helpfrm.cpp:1558 +#: ../src/html/helpfrm.cpp:1572 msgid "HTML files (*.html;*.htm)|*.html;*.htm|" msgstr "Fichiers HTML (*.html;*.htm)|*.html;*.htm|" -#: ../src/common/fmapbase.cpp:110 +#: ../src/common/fmapbase.cpp:111 msgid "Hebrew (ISO-8859-8)" msgstr "Hébreu (ISO-8859-8)" -#: ../src/generic/mdig.cpp:310 ../src/html/helpfrm.cpp:321 -#: ../src/msw/mdi.cpp:1380 ../contrib/src/deprecated/proplist.cpp:523 +#: ../src/html/helpfrm.cpp:337 ../contrib/src/deprecated/proplist.cpp:523 msgid "Help" msgstr "Aide" -#: ../src/html/helpfrm.cpp:1190 +#: ../src/html/helpfrm.cpp:1213 msgid "Help Browser Options" msgstr "Aide Options Navigateur" -#: ../src/generic/helpext.cpp:441 ../src/generic/helpext.cpp:442 +#: ../src/generic/helpext.cpp:442 ../src/generic/helpext.cpp:443 msgid "Help Index" msgstr "Aide Index" -#: ../src/html/helpfrm.cpp:1546 +#: ../src/html/helpfrm.cpp:1560 msgid "Help Printing" msgstr "Aide Impression" -#: ../src/html/helpfrm.cpp:791 +#: ../src/html/helpfrm.cpp:814 msgid "Help Topics" msgstr "Sujets Aide" -#: ../src/html/helpfrm.cpp:1559 +#: ../src/html/helpfrm.cpp:1573 msgid "Help books (*.htb)|*.htb|Help books (*.zip)|*.zip|" msgstr "Livres d'aide (*.htb)|*.htb|Help books (*.zip)|*.zip|" @@ -2328,15 +2449,15 @@ msgid "Help: %s" msgstr "Aide : %s" -#: ../src/generic/dirdlgg.cpp:107 +#: ../src/generic/dirdlgg.cpp:105 msgid "Home" msgstr "Répertoire personnel" -#: ../src/generic/dirctrlg.cpp:626 +#: ../src/generic/dirctrlg.cpp:654 msgid "Home directory" msgstr "Répertoire personnel" -#: ../include/wx/filefn.h:142 +#: ../include/wx/filefn.h:145 msgid "I64" msgstr "I64" @@ -2385,7 +2506,7 @@ msgid "Icon resource specification %s not found." msgstr "Spécification %s de la ressource de l'icône non trouvée." -#: ../src/generic/dbgrptg.cpp:325 +#: ../src/generic/dbgrptg.cpp:344 msgid "" "If you have any additional information pertaining to this bug\n" "report, please enter it here and it will be joined to it:" @@ -2393,7 +2514,7 @@ "Si vous avez des informations supplémentaires concernant ce rapport\n" "de bogue, veuillez les saisir ici pour qu'elles soient incluses :" -#: ../src/generic/dbgrptg.cpp:291 +#: ../src/generic/dbgrptg.cpp:310 msgid "" "If you wish to suppress this debug report completely, please choose the " "\"Cancel\" button,\n" @@ -2404,7 +2525,7 @@ "choisir le bouton « Annuler », mais cela peut empêcher l'amélioration du\n" "programme, donc veuillez si possible continuer la création de ce rapport.\n" -#: ../src/msw/registry.cpp:1281 +#: ../src/msw/registry.cpp:1304 #, c-format msgid "Ignoring value \"%s\" of the key \"%s\"." msgstr "Valeur « %s » de la clé « %s » ignorée." @@ -2418,32 +2539,32 @@ msgstr "" "Classe d'objet non valable en tant que source d'événement (Non-wxEvtHandler)" -#: ../include/wx/xti.h:1648 +#: ../include/wx/xti.h:1650 msgid "Illegal Parameter Count for ConstructObject Method" msgstr "Nombre de paramètres illégal pour la méthode ConstructObject" -#: ../include/wx/xti.h:1721 +#: ../include/wx/xti.h:1723 msgid "Illegal Parameter Count for Create Method" msgstr "Nombre de paramètres illégal pour la méthode Create" -#: ../src/generic/dirctrlg.cpp:661 ../src/generic/filedlgg.cpp:743 +#: ../src/generic/dirctrlg.cpp:689 ../src/generic/filedlgg.cpp:744 msgid "Illegal directory name." msgstr "Nom de répertoire illégal." -#: ../src/generic/filedlgg.cpp:1239 +#: ../src/generic/filedlgg.cpp:1269 msgid "Illegal file specification." msgstr "Spécification de fichier illégale." -#: ../src/common/image.cpp:969 +#: ../src/common/image.cpp:1192 msgid "Image and mask have different sizes." msgstr "L'image et le masque sont de tailles différentes." -#: ../src/common/image.cpp:1289 +#: ../src/common/image.cpp:1523 #, c-format msgid "Image file is not of type %d." msgstr "Le fichier image n'est pas du type %d." -#: ../src/msw/textctrl.cpp:330 +#: ../src/msw/textctrl.cpp:361 msgid "" "Impossible to create a rich edit control, using simple text control instead. " "Please reinstall riched32.dll" @@ -2451,21 +2572,21 @@ "Impossible de créer un contrôle d'édition riche, va utiliser un contrôle de " "texte simple à la place. Veuillez réinstaller riched32.dll" -#: ../src/unix/utilsunx.cpp:411 +#: ../src/unix/utilsunx.cpp:428 msgid "Impossible to get child process input" msgstr "Impossible d'obtenir l'entrée du processus fils" -#: ../src/common/filefn.cpp:1012 +#: ../src/common/filefn.cpp:1022 #, c-format msgid "Impossible to get permissions for file '%s'" msgstr "Impossible d'obtenir les permissions du fichier « %s »" -#: ../src/common/filefn.cpp:1026 +#: ../src/common/filefn.cpp:1036 #, c-format msgid "Impossible to overwrite the file '%s'" msgstr "Impossible d'écraser le fichier « %s »" -#: ../src/common/filefn.cpp:1070 +#: ../src/common/filefn.cpp:1080 #, c-format msgid "Impossible to set permissions for the file '%s'" msgstr "Impossible de configurer les permissions du fichier « %s »" @@ -2474,23 +2595,27 @@ msgid "Indent" msgstr "Indenter" -#: ../src/html/helpfrm.cpp:493 +#: ../src/html/helpfrm.cpp:516 msgid "Index" msgstr "Index" -#: ../src/common/fmapbase.cpp:114 +#: ../src/common/fmapbase.cpp:115 msgid "Indian (ISO-8859-12)" msgstr "Indien (ISO-8859-12)" +#: ../src/common/init.cpp:232 +msgid "Initialization failed in post init, aborting." +msgstr "Échec lors d'initialisation (en post init), abandon." + #: ../src/common/xtistrm.cpp:704 msgid "Internal error, illegal wxCustomTypeInfo" msgstr "Erreur interne : wxCustomTypeInfo illégal" -#: ../src/common/imagtiff.cpp:211 +#: ../src/common/imagtiff.cpp:227 msgid "Invalid TIFF image index." msgstr "Index d'image TIFF non valable." -#: ../src/xrc/xmlres.cpp:399 +#: ../src/xrc/xmlres.cpp:460 #, c-format msgid "Invalid XRC resource '%s': doesn't have root node 'resource'." msgstr "" @@ -2524,13 +2649,13 @@ msgid "Invalid regular expression '%s': %s" msgstr "Expression rationnelle « %s » non valable : %s" -#: ../src/generic/fontdlgg.cpp:231 +#: ../src/generic/fontdlgg.cpp:233 msgid "Italic" msgstr "Italique" -#: ../src/common/paper.cpp:147 +#: ../src/common/paper.cpp:137 msgid "Italy Envelope, 110 x 230 mm" -msgstr "Enveloppe italienne, 110 x 230 mm" +msgstr "Enveloppe italienne (110 x 230 mm)" #: ../src/common/imagjpeg.cpp:225 msgid "JPEG: Couldn't load - file is probably corrupted." @@ -2540,43 +2665,119 @@ msgid "JPEG: Couldn't save image." msgstr "JPEG : échec de la sauvegarde de l'image." +#: ../src/common/paper.cpp:170 +msgid "Japanese Double Postcard 200 x 148 mm" +msgstr "Carte Postale Japonaise (200 x 148 mm)" + +#: ../src/common/paper.cpp:174 +msgid "Japanese Envelope Chou #3" +msgstr "Enveloppe Japonaise Chou n° 3" + +#: ../src/common/paper.cpp:187 +msgid "Japanese Envelope Chou #3 Rotated" +msgstr "Enveloppe Japonaise Chou n° 3 Portrait" + +#: ../src/common/paper.cpp:175 +msgid "Japanese Envelope Chou #4" +msgstr "Enveloppe Japonaise Chou n° 4" + +#: ../src/common/paper.cpp:188 +msgid "Japanese Envelope Chou #4 Rotated" +msgstr "Enveloppe Japonaise Chou n° 4 Paysage" + +#: ../src/common/paper.cpp:172 +msgid "Japanese Envelope Kaku #2" +msgstr "Enveloppe Japonaise Kaku n° 2" + +#: ../src/common/paper.cpp:185 +msgid "Japanese Envelope Kaku #2 Rotated" +msgstr "Enveloppe Japonaise Kaku n° 2 Paysage" + +#: ../src/common/paper.cpp:173 +msgid "Japanese Envelope Kaku #3" +msgstr "Enveloppe Japonaise Kaku n° 3" + +#: ../src/common/paper.cpp:186 +msgid "Japanese Envelope Kaku #3 Rotated" +msgstr "Enveloppe Japonaise Kaku n° 3 Paysage" + +#: ../src/common/paper.cpp:192 +msgid "Japanese Envelope You #4" +msgstr "Enveloppe Japonaise You n° 4" + +#: ../src/common/paper.cpp:193 +msgid "Japanese Envelope You #4 Rotated" +msgstr "Enveloppe Japonaise You n° 4 Paysage" + +#: ../src/common/paper.cpp:145 +msgid "Japanese Postcard 100 x 148 mm" +msgstr "Carte Postale Japonaise (100 x 148 mm)" + +#: ../src/common/paper.cpp:182 +msgid "Japanese Postcard Rotated 148 x 100 mm" +msgstr "Carte Postale Japonaise Portrait (100 x 148 mm)" + #: ../src/common/stockitem.cpp:128 msgid "Justified" msgstr "Justifié" -#: ../src/common/fmapbase.cpp:118 +#: ../src/common/fmapbase.cpp:119 msgid "KOI8-R" msgstr "KOI8-R" -#: ../src/common/fmapbase.cpp:119 +#: ../src/common/fmapbase.cpp:120 msgid "KOI8-U" msgstr "KOI8-U" -#: ../src/generic/prntdlgg.cpp:605 ../src/generic/prntdlgg.cpp:863 +#: ../src/generic/prntdlgg.cpp:609 ../src/generic/prntdlgg.cpp:867 msgid "Landscape" msgstr "Paysage" -#: ../src/common/paper.cpp:120 +#: ../src/common/paper.cpp:110 msgid "Ledger, 17 x 11 in" msgstr "Grand livre (17 x 11 pouces)" -#: ../src/generic/prntdlgg.cpp:875 +#: ../src/generic/prntdlgg.cpp:879 msgid "Left margin (mm):" msgstr "Marge gauche (mm) :" -#: ../src/common/paper.cpp:113 +#: ../src/common/paper.cpp:151 +msgid "Legal Extra 9 1/2 x 15 in" +msgstr "Légal Extra (9,5 x 15 pouces)" + +#: ../src/common/paper.cpp:103 msgid "Legal, 8 1/2 x 14 in" msgstr "Légal (8,5 x 14 pouces)" -#: ../src/common/paper.cpp:118 +#: ../src/common/paper.cpp:150 +msgid "Letter Extra 9 1/2 x 12 in" +msgstr "Lettre (9,5 x 12 pouces)" + +#: ../src/common/paper.cpp:156 +msgid "Letter Extra Transverse 9.275 x 12 in" +msgstr "Lettre Extra Portrait( 9,275 x 12 pouces)" + +#: ../src/common/paper.cpp:159 +msgid "Letter Plus 8 1/2 x 12.69 in" +msgstr "Lettre Plus (8,5 x 12,69 pouces)" + +#: ../src/common/paper.cpp:176 +msgid "Letter Rotated 11 x 8 1/2 in" +msgstr "Lettre Paysage (11 x 8,5 pouces)" + +#: ../src/common/paper.cpp:108 msgid "Letter Small, 8 1/2 x 11 in" msgstr "Lettre réduite (8,5 x 11 pouces)" -#: ../src/common/paper.cpp:112 +#: ../src/common/paper.cpp:154 +msgid "Letter Transverse 8 1/2 x 11 in" +msgstr "Lettre Portrait (8,5 x 11 pouces)" + +#: ../src/common/paper.cpp:102 msgid "Letter, 8 1/2 x 11 in" msgstr "Lettre (8,5 x 11 pouces)" -#: ../src/generic/fontdlgg.cpp:234 +#: ../src/generic/fontdlgg.cpp:236 msgid "Light" msgstr "Léger" @@ -2584,27 +2785,15 @@ msgid "Link contained '//', converted to absolute link." msgstr "Le lien contenait « // » et a été converti en lien absolu." -#: ../src/common/fldlgcmn.cpp:248 +#: ../src/common/fldlgcmn.cpp:257 #, c-format msgid "Load %s file" msgstr "Charger le fichier %s" -#: ../src/html/htmlwin.cpp:411 +#: ../src/html/htmlwin.cpp:416 msgid "Loading : " msgstr "Chargement : " -#: ../src/common/imagpnm.cpp:72 -msgid "Loading Grey Ascii PNM image is not yet implemented." -msgstr "" -"Le chargement d'une image PNM ASCII en niveau de gris n'est pas encore " -"implémenté." - -#: ../src/common/imagpnm.cpp:75 -msgid "Loading Grey Raw PNM image is not yet implemented." -msgstr "" -"Le chargement d'une image PNM source en niveau de gris n'est pas encore " -"implémenté." - #: ../src/unix/snglinst.cpp:251 #, c-format msgid "Lock file '%s' has incorrect owner." @@ -2615,16 +2804,16 @@ msgid "Lock file '%s' has incorrect permissions." msgstr "Le fichier verrou « %s » a des permissions incorrectes." -#: ../src/generic/logg.cpp:571 +#: ../src/generic/logg.cpp:572 #, c-format msgid "Log saved to the file '%s'." msgstr "Journal sauvé dans le fichier « %s »." -#: ../include/wx/xti.h:500 ../include/wx/xti.h:504 +#: ../include/wx/xti.h:501 ../include/wx/xti.h:505 msgid "Long Conversions not supported" msgstr "Conversions longues non gérées" -#: ../src/gtk/mdi.cpp:461 +#: ../src/gtk/mdi.cpp:465 msgid "MDI child" msgstr "Fils MDI" @@ -2640,7 +2829,7 @@ "Les fonctions de l'aide MS HTML ne sont pas disponibles car la bibliothèque " "MS HTML Help n'est pas présente sur cette machine. Veuillez l'installer." -#: ../src/univ/themes/win32.cpp:4823 +#: ../src/univ/themes/win32.cpp:4929 msgid "Ma&ximize" msgstr "Ma&ximiser" @@ -2649,7 +2838,7 @@ msgid "Mailcap file %s, line %d: incomplete entry ignored." msgstr "Fichier mailcap %s, ligne %d : entrée incomplète ignorée." -#: ../src/generic/fdrepdlg.cpp:146 +#: ../src/generic/fdrepdlg.cpp:153 msgid "Match case" msgstr "Respecter la casse" @@ -2658,7 +2847,7 @@ msgid "Memory VFS already contains file '%s'!" msgstr "La mémoire VFS contient déjà le fichier « %s »." -#: ../src/msw/frame.cpp:345 +#: ../src/msw/frame.cpp:374 msgid "Menu" msgstr "Menu" @@ -2666,7 +2855,7 @@ msgid "Metal theme" msgstr "Thème métallique" -#: ../src/univ/themes/win32.cpp:4821 +#: ../src/univ/themes/win32.cpp:4927 msgid "Mi&nimize" msgstr "Mi&nimiser" @@ -2681,17 +2870,22 @@ msgid "Mode %ix%i-%i not available." msgstr "Le mode %ix%i-%i n'est pas disponible." -#: ../src/generic/fontdlgg.cpp:226 +#: ../src/generic/fontdlgg.cpp:228 msgid "Modern" msgstr "Moderne" -#: ../src/generic/filedlgg.cpp:433 +#: ../src/generic/filedlgg.cpp:434 msgid "Modified" msgstr "Modifié" -#: ../src/common/paper.cpp:148 +#: ../src/common/module.cpp:77 +#, c-format +msgid "Module \"%s\" initialization failed" +msgstr "Échec de l'initialisation du module « %s »" + +#: ../src/common/paper.cpp:138 msgid "Monarch Envelope, 3 7/8 x 7 1/2 in" -msgstr "Enveloppe monarchique (3,875 x 7,5 pouces)" +msgstr "Enveloppe Monarch (3,875 x 7,5 pouces)" #: ../contrib/src/gizmos/editlbox.cpp:162 msgid "Move down" @@ -2701,11 +2895,11 @@ msgid "Move up" msgstr "Monter" -#: ../src/generic/filedlgg.cpp:430 +#: ../src/generic/filedlgg.cpp:431 msgid "Name" msgstr "Nom" -#: ../src/generic/dirdlgg.cpp:111 +#: ../src/generic/dirdlgg.cpp:109 msgid "New directory" msgstr "Nouveau répertoire" @@ -2714,21 +2908,21 @@ msgstr "Nouvel élément" #: ../src/generic/dirdlgg.cpp:316 ../src/generic/dirdlgg.cpp:326 -#: ../src/generic/filedlgg.cpp:607 ../src/generic/filedlgg.cpp:616 +#: ../src/generic/filedlgg.cpp:608 ../src/generic/filedlgg.cpp:617 msgid "NewName" msgstr "NouveauNom" -#: ../src/generic/tipdlg.cpp:295 +#: ../src/generic/tipdlg.cpp:305 msgid "Next" msgstr "Suivant" -#: ../src/html/helpfrm.cpp:642 +#: ../src/html/helpfrm.cpp:665 msgid "Next page" msgstr "Page suivante" #: ../src/mac/carbon/msgdlg.cpp:58 ../src/mac/carbon/msgdlg.cpp:143 #: ../src/mac/classic/msgdlg.cpp:56 ../src/mac/classic/msgdlg.cpp:140 -#: ../src/motif/msgdlg.cpp:185 +#: ../src/motif/msgdlg.cpp:204 msgid "No" msgstr "Non" @@ -2741,11 +2935,11 @@ msgid "No XPM icon facility available!" msgstr "Aucune fonctionnalité disponible pour les icônes XPM." -#: ../src/generic/helpext.cpp:436 +#: ../src/generic/helpext.cpp:437 msgid "No entries found." msgstr "Aucune entrée trouvée." -#: ../src/common/fontmap.cpp:408 +#: ../src/common/fontmap.cpp:422 #, c-format msgid "" "No font for displaying text in encoding '%s' found,\n" @@ -2757,7 +2951,7 @@ "mais le codage similaire « %s » est disponible.\n" "Souhaitez-vous l'utiliser (sinon, vous devrez en choisir un autre) ?" -#: ../src/common/fontmap.cpp:413 +#: ../src/common/fontmap.cpp:427 #, c-format msgid "" "No font for displaying text in encoding '%s' found.\n" @@ -2768,28 +2962,28 @@ "Souhaitez-vous choisir une police à utiliser pour ce codage\n" "(sinon le texte avec ce codage n'apparaîtra pas correctement) ?" -#: ../src/xrc/xmlres.cpp:616 +#: ../src/xrc/xmlres.cpp:677 #, c-format msgid "No handler found for XML node '%s', class '%s'!" msgstr "" "Aucun gestionnaire trouvé pour le noeud XML « %s » de la classe « %s »." -#: ../src/common/image.cpp:1271 ../src/common/image.cpp:1314 +#: ../src/common/image.cpp:1505 ../src/common/image.cpp:1548 msgid "No handler found for image type." msgstr "Aucun gestionnaire trouvé pour le type d'image." -#: ../src/common/image.cpp:1279 ../src/common/image.cpp:1322 -#: ../src/common/image.cpp:1356 +#: ../src/common/image.cpp:1513 ../src/common/image.cpp:1556 +#: ../src/common/image.cpp:1589 #, c-format msgid "No image handler for type %d defined." msgstr "Aucun gestionnaire d'image défini pour le type %d." -#: ../src/common/image.cpp:1340 ../src/common/image.cpp:1372 +#: ../src/common/image.cpp:1574 ../src/common/image.cpp:1604 #, c-format msgid "No image handler for type %s defined." msgstr "Aucun gestionnaire d'image défini pour le type %s." -#: ../src/html/helpfrm.cpp:846 +#: ../src/html/helpfrm.cpp:869 msgid "No matching page found yet" msgstr "Aucune page correspondante n'a encore été trouvée" @@ -2797,35 +2991,35 @@ msgid "No sound" msgstr "Pas de son" -#: ../src/common/image.cpp:977 ../src/common/image.cpp:1016 +#: ../src/common/image.cpp:1200 ../src/common/image.cpp:1239 msgid "No unused colour in image being masked." msgstr "Aucune couleur n'est disponible dans l'image en cours de masquage." -#: ../src/common/image.cpp:1608 +#: ../src/common/image.cpp:1997 msgid "No unused colour in image." msgstr "Aucune couleur n'est disponible dans l'image." -#: ../src/common/fmapbase.cpp:112 +#: ../src/common/fmapbase.cpp:113 msgid "Nordic (ISO-8859-10)" msgstr "Nordique (ISO-8859-10)" -#: ../src/generic/fontdlgg.cpp:230 ../src/generic/fontdlgg.cpp:233 +#: ../src/generic/fontdlgg.cpp:232 ../src/generic/fontdlgg.cpp:235 msgid "Normal" msgstr "Normal" -#: ../src/html/helpfrm.cpp:1250 +#: ../src/html/helpfrm.cpp:1273 msgid "Normal face
and underlined. " msgstr "Normal
et souligné. " -#: ../src/html/helpfrm.cpp:1195 +#: ../src/html/helpfrm.cpp:1218 msgid "Normal font:" msgstr "Police normale :" -#: ../src/common/paper.cpp:132 +#: ../src/common/paper.cpp:122 msgid "Note, 8 1/2 x 11 in" msgstr "Note (8,5 x 11 pouces)" -#: ../src/gtk/fontdlg.cpp:141 ../src/msw/dialog.cpp:188 +#: ../src/gtk/fontdlg.cpp:147 ../src/msw/dialog.cpp:194 #: ../contrib/src/deprecated/proplist.cpp:506 msgid "OK" msgstr "Accepter" @@ -2834,21 +3028,21 @@ msgid "Objects must have an id attribute" msgstr "Les objets doivent avoir un attribut id" -#: ../src/common/docview.cpp:1252 ../src/common/docview.cpp:1580 +#: ../src/common/docview.cpp:1269 ../src/common/docview.cpp:1619 msgid "Open File" msgstr "Ouvrir un fichier" -#: ../src/html/helpfrm.cpp:650 ../src/html/helpfrm.cpp:1565 +#: ../src/html/helpfrm.cpp:673 ../src/html/helpfrm.cpp:1579 msgid "Open HTML document" msgstr "Ouvrir un document HTML" -#: ../src/generic/dbgrptg.cpp:147 +#: ../src/generic/dbgrptg.cpp:158 #, c-format msgid "Open file \"%s\"" msgstr "Ouvrir le fichier « %s »" -#: ../src/generic/dirctrlg.cpp:690 ../src/generic/dirdlgg.cpp:342 -#: ../src/generic/filedlgg.cpp:631 ../src/generic/filedlgg.cpp:771 +#: ../src/generic/dirctrlg.cpp:718 ../src/generic/dirdlgg.cpp:342 +#: ../src/generic/filedlgg.cpp:632 ../src/generic/filedlgg.cpp:772 msgid "Operation not permitted." msgstr "Opération interdite." @@ -2867,11 +3061,11 @@ msgid "Option '%s': '%s' cannot be converted to a date." msgstr "Option « %s » : « %s » ne peut pas être converti en date." -#: ../src/generic/dirdlgg.cpp:118 ../src/generic/prntdlgg.cpp:610 +#: ../src/generic/dirdlgg.cpp:116 ../src/generic/prntdlgg.cpp:614 msgid "Options" msgstr "Options" -#: ../src/generic/prntdlgg.cpp:607 ../src/generic/prntdlgg.cpp:864 +#: ../src/generic/prntdlgg.cpp:611 ../src/generic/prntdlgg.cpp:868 msgid "Orientation" msgstr "Orientation" @@ -2899,33 +3093,138 @@ msgid "PCX: version number too low" msgstr "PCX : numéro de version trop petit" -#: ../src/common/imagpnm.cpp:96 +#: ../src/common/imagpnm.cpp:92 msgid "PNM: Couldn't allocate memory." msgstr "PNM : impossible d'allouer de la mémoire." -#: ../src/common/imagpnm.cpp:80 +#: ../src/common/imagpnm.cpp:76 msgid "PNM: File format is not recognized." msgstr "PNM : le format de fichier n'est pas reconnu." -#: ../src/common/imagpnm.cpp:112 +#: ../src/common/imagpnm.cpp:108 ../src/common/imagpnm.cpp:125 +#: ../src/common/imagpnm.cpp:142 msgid "PNM: File seems truncated." msgstr "PNM : le fichier semble tronqué." -#: ../src/common/prntbase.cpp:1248 +#: ../src/common/paper.cpp:194 +msgid "PRC 16K 146 x 215 mm" +msgstr "PRC 16K (146 x 215 mm)" + +#: ../src/common/paper.cpp:207 +msgid "PRC 16K Rotated" +msgstr "PRC 16K Paysage" + +#: ../src/common/paper.cpp:195 +msgid "PRC 32K 97 x 151 mm" +msgstr "PRC 32K (97 x 151 mm)" + +#: ../src/common/paper.cpp:208 +msgid "PRC 32K Rotated" +msgstr "PRC 32K Paysage" + +#: ../src/common/paper.cpp:196 +msgid "PRC 32K(Big) 97 x 151 mm" +msgstr "PRC 32K Grand (97 x 151 mm)" + +#: ../src/common/paper.cpp:209 +msgid "PRC 32K(Big) Rotated" +msgstr "PRC 32K (Grand) Paysage" + +#: ../src/common/paper.cpp:197 +msgid "PRC Envelope #1 102 x 165 mm" +msgstr "Enveloppe PRC n° 1 (102 x 165 mm)" + +#: ../src/common/paper.cpp:210 +msgid "PRC Envelope #1 Rotated 165 x 102 mm" +msgstr "Enveloppe PRC n° 1 Paysage (165 x 102 mm)" + +#: ../src/common/paper.cpp:206 +msgid "PRC Envelope #10 324 x 458 mm" +msgstr "Enveloppe PRC n° 10 (324 x 458 mm)" + +#: ../src/common/paper.cpp:219 +msgid "PRC Envelope #10 Rotated 458 x 324 m" +msgstr "Enveloppe PRC n° 10 Paysage (458 x 324 m)" + +#: ../src/common/paper.cpp:198 +msgid "PRC Envelope #2 102 x 176 mm" +msgstr "Enveloppe PRC n° 2 (102 x 176 mm)" + +#: ../src/common/paper.cpp:211 +msgid "PRC Envelope #2 Rotated 176 x 102 mm" +msgstr "Enveloppe PRC n° 2 Paysage (176 x 102 mm)" + +#: ../src/common/paper.cpp:199 +msgid "PRC Envelope #3 125 x 176 mm" +msgstr "Enveloppe PRC n° 3 (125 x 176 mm)" + +#: ../src/common/paper.cpp:212 +msgid "PRC Envelope #3 Rotated 176 x 125 mm" +msgstr "Enveloppe PRC n° 3 Paysage (176 x 125 mm)" + +#: ../src/common/paper.cpp:200 +msgid "PRC Envelope #4 110 x 208 mm" +msgstr "Enveloppe PRC n° 4 (110 x 208 mm)" + +#: ../src/common/paper.cpp:213 +msgid "PRC Envelope #4 Rotated 208 x 110 mm" +msgstr "Enveloppe PRC n° 4 Paysage (208 x 110 mm)" + +#: ../src/common/paper.cpp:201 +msgid "PRC Envelope #5 110 x 220 mm" +msgstr "Enveloppe PRC n° 5 (110 x 220 mm)" + +#: ../src/common/paper.cpp:214 +msgid "PRC Envelope #5 Rotated 220 x 110 mm" +msgstr "Enveloppe PRC n° 5 Paysage (220 x 110 mm)" + +#: ../src/common/paper.cpp:202 +msgid "PRC Envelope #6 120 x 230 mm" +msgstr "Enveloppe PRC n° 6 (120 x 230 mm)" + +#: ../src/common/paper.cpp:215 +msgid "PRC Envelope #6 Rotated 230 x 120 mm" +msgstr "Enveloppe PRC n° 6 Paysage (230 x 120 mm)" + +#: ../src/common/paper.cpp:203 +msgid "PRC Envelope #7 160 x 230 mm" +msgstr "Enveloppe PRC n° 7 (160 x 230 mm)" + +#: ../src/common/paper.cpp:216 +msgid "PRC Envelope #7 Rotated 230 x 160 mm" +msgstr "Enveloppe PRC n° 7 Paysage (230 x 160 mm)" + +#: ../src/common/paper.cpp:204 +msgid "PRC Envelope #8 120 x 309 mm" +msgstr "Enveloppe PRC n° 8 (120 x 309 mm)" + +#: ../src/common/paper.cpp:217 +msgid "PRC Envelope #8 Rotated 309 x 120 mm" +msgstr "Enveloppe PRC n° 8 Paysage (309 x 120 mm)" + +#: ../src/common/paper.cpp:205 +msgid "PRC Envelope #9 229 x 324 mm" +msgstr "Enveloppe PRC n° 9 (229 x 324 mm)" + +#: ../src/common/paper.cpp:218 +msgid "PRC Envelope #9 Rotated 324 x 229 mm" +msgstr "Enveloppe PRC n° 9 Paysage (324 x 229 mm)" + +#: ../src/common/prntbase.cpp:1294 #, c-format msgid "Page %d" msgstr "Page %d" -#: ../src/common/prntbase.cpp:1246 +#: ../src/common/prntbase.cpp:1292 #, c-format msgid "Page %d of %d" msgstr "Page %d de %d" -#: ../src/generic/prntdlgg.cpp:823 +#: ../src/generic/prntdlgg.cpp:827 msgid "Page Setup" msgstr "Mise en page" -#: ../src/common/prntbase.cpp:452 ../src/gtk/gnome/gprint.cpp:533 +#: ../src/common/prntbase.cpp:451 ../src/gtk/gnome/gprint.cpp:540 msgid "Page setup" msgstr "Mise en page" @@ -2933,13 +3232,13 @@ msgid "Pages" msgstr "Pages" -#: ../src/generic/prntdlgg.cpp:796 ../src/generic/prntdlgg.cpp:850 -#: ../src/generic/prntdlgg.cpp:1052 +#: ../src/generic/prntdlgg.cpp:800 ../src/generic/prntdlgg.cpp:854 +#: ../src/generic/prntdlgg.cpp:1056 msgid "Paper Size" msgstr "Taille de la page" -#: ../src/generic/prntdlgg.cpp:594 ../src/generic/prntdlgg.cpp:837 -#: ../src/generic/prntdlgg.cpp:1047 +#: ../src/generic/prntdlgg.cpp:598 ../src/generic/prntdlgg.cpp:841 +#: ../src/generic/prntdlgg.cpp:1051 msgid "Paper size" msgstr "Taille de la page" @@ -2955,7 +3254,7 @@ msgid "Passing an unkown object to GetObject" msgstr "Objet inconnu indiqué à GetObject" -#: ../src/generic/filedlgg.cpp:436 +#: ../src/generic/filedlgg.cpp:437 msgid "Permissions" msgstr "Permissions" @@ -2963,23 +3262,23 @@ msgid "Pipe creation failed" msgstr "Échec de la création du tube" -#: ../src/gtk/fontdlg.cpp:78 +#: ../src/gtk/fontdlg.cpp:81 msgid "Please choose a valid font." msgstr "Choisissez une police valable." -#: ../src/generic/filedlgg.cpp:1294 ../src/gtk/filedlg.cpp:67 +#: ../src/generic/filedlgg.cpp:1325 msgid "Please choose an existing file." msgstr "Choisissez un fichier existant." -#: ../src/html/helpfrm.cpp:790 +#: ../src/html/helpfrm.cpp:813 msgid "Please choose the page to display:" msgstr "Choisissez la page à afficher :" -#: ../src/msw/dialup.cpp:750 +#: ../src/msw/dialup.cpp:787 msgid "Please choose which ISP do you want to connect to" msgstr "Veuillez choisir à quel FAI vous voulez vous connecter" -#: ../src/msw/listctrl.cpp:434 +#: ../src/msw/listctrl.cpp:444 #, c-format msgid "" "Please install a newer version of comctl32.dll\n" @@ -2990,11 +3289,11 @@ "(la version 4.70 au minimum est nécessaire, contre la version %d.%02d\n" "actuellement), sinon ce programme ne fonctionnera pas correctement." -#: ../src/common/prntbase.cpp:314 +#: ../src/common/prntbase.cpp:313 msgid "Please wait while printing\n" msgstr "Patientez pendant l'impression\n" -#: ../src/generic/prntdlgg.cpp:604 ../src/generic/prntdlgg.cpp:862 +#: ../src/generic/prntdlgg.cpp:608 ../src/generic/prntdlgg.cpp:866 msgid "Portrait" msgstr "Portrait" @@ -3002,25 +3301,25 @@ msgid "PostScript file" msgstr "Fichier PostScript" -#: ../src/generic/fontdlgg.cpp:341 ../src/html/helpfrm.cpp:1212 +#: ../src/generic/fontdlgg.cpp:348 ../src/html/helpfrm.cpp:1235 msgid "Preview:" msgstr "Aperçu :" -#: ../src/html/helpfrm.cpp:639 +#: ../src/html/helpfrm.cpp:662 msgid "Previous page" msgstr "Page précédente" -#: ../src/common/prntbase.cpp:394 ../src/generic/prntdlgg.cpp:138 -#: ../src/generic/prntdlgg.cpp:151 ../src/gtk/gnome/gprint.cpp:388 -#: ../src/gtk/gnome/gprint.cpp:400 +#: ../src/common/prntbase.cpp:393 ../src/generic/prntdlgg.cpp:138 +#: ../src/generic/prntdlgg.cpp:151 ../src/gtk/gnome/gprint.cpp:395 +#: ../src/gtk/gnome/gprint.cpp:407 msgid "Print" msgstr "Imprimer" -#: ../src/common/docview.cpp:1025 +#: ../src/common/docview.cpp:1032 msgid "Print Preview" msgstr "Aperçu avant impression" -#: ../src/common/prntbase.cpp:1200 ../src/common/prntbase.cpp:1226 +#: ../src/common/prntbase.cpp:1246 ../src/common/prntbase.cpp:1272 msgid "Print Preview Failure" msgstr "Erreur de l'aperçu avant impression" @@ -3032,7 +3331,7 @@ msgid "Print Setup" msgstr "Configuration de l'impression" -#: ../src/generic/prntdlgg.cpp:613 +#: ../src/generic/prntdlgg.cpp:617 msgid "Print in colour" msgstr "Imprimer en couleur" @@ -3040,15 +3339,15 @@ msgid "Print previe&w" msgstr "&Aperçu avant impression" -#: ../src/gtk/gnome/gprint.cpp:778 +#: ../src/gtk/gnome/gprint.cpp:785 msgid "Print preview" msgstr "Aperçu avant impression" -#: ../src/generic/prntdlgg.cpp:622 +#: ../src/generic/prntdlgg.cpp:626 msgid "Print spooling" msgstr "Queue d'impression" -#: ../src/html/helpfrm.cpp:656 +#: ../src/html/helpfrm.cpp:679 msgid "Print this page" msgstr "Imprimer cette page" @@ -3060,7 +3359,7 @@ msgid "Printer" msgstr "Imprimante" -#: ../src/generic/prntdlgg.cpp:625 +#: ../src/generic/prntdlgg.cpp:629 msgid "Printer command:" msgstr "Commande pour l'imprimante :" @@ -3068,11 +3367,11 @@ msgid "Printer options" msgstr "Options de l'imprimante" -#: ../src/generic/prntdlgg.cpp:637 +#: ../src/generic/prntdlgg.cpp:641 msgid "Printer options:" msgstr "Options de l'imprimante :" -#: ../src/generic/prntdlgg.cpp:911 +#: ../src/generic/prntdlgg.cpp:915 msgid "Printer..." msgstr "Imprimante..." @@ -3080,11 +3379,11 @@ msgid "Printer:" msgstr "Imprimante :" -#: ../src/common/prntbase.cpp:311 ../src/common/prntbase.cpp:532 +#: ../src/common/prntbase.cpp:310 ../src/common/prntbase.cpp:531 msgid "Printing " msgstr "Impression en cours" -#: ../src/common/prntbase.cpp:328 +#: ../src/common/prntbase.cpp:327 msgid "Printing Error" msgstr "Erreur d'impression" @@ -3097,7 +3396,7 @@ msgid "Printing..." msgstr "Impression en cours..." -#: ../src/common/debugrpt.cpp:524 +#: ../src/common/debugrpt.cpp:546 #, c-format msgid "" "Processing debug report has failed, leaving the files in \"%s\" directory." @@ -3105,28 +3404,28 @@ "Échec du traitement du rapport de débogage, les fichiers sont maintenus dans " "le répertoire « %s »." -#: ../src/common/log.cpp:467 +#: ../src/common/log.cpp:466 msgid "Program aborted." msgstr "Programme interrompu." -#: ../src/common/paper.cpp:129 +#: ../src/common/paper.cpp:119 msgid "Quarto, 215 x 275 mm" -msgstr "Quarto, 215 x 275 mm" +msgstr "Quarto (215 x 275 mm)" -#: ../src/generic/logg.cpp:1102 +#: ../src/generic/logg.cpp:1165 msgid "Question" msgstr "Question" -#: ../src/common/ffile.cpp:126 ../src/common/ffile.cpp:147 +#: ../src/common/ffile.cpp:125 ../src/common/ffile.cpp:144 #, c-format msgid "Read error on file '%s'" msgstr "Erreur de lecture dans le fichier « %s »" -#: ../src/common/prntbase.cpp:243 +#: ../src/common/prntbase.cpp:242 msgid "Ready" msgstr "Prêt" -#: ../src/xrc/xmlres.cpp:582 +#: ../src/xrc/xmlres.cpp:643 #, c-format msgid "Referenced object node with ref=\"%s\" not found!" msgstr "Le noeud objet référencé par ref=\"%s\" est introuvable." @@ -3135,18 +3434,18 @@ msgid "Refresh" msgstr "Actualiser" -#: ../src/msw/registry.cpp:552 +#: ../src/msw/registry.cpp:560 #, c-format msgid "Registry key '%s' already exists." msgstr "La clé de registre « %s » existe déjà." -#: ../src/msw/registry.cpp:521 +#: ../src/msw/registry.cpp:529 #, c-format msgid "Registry key '%s' does not exist, cannot rename it." msgstr "" "Impossible de renommer la clé de registre « %s », celle-ci n'existe pas." -#: ../src/msw/registry.cpp:653 +#: ../src/msw/registry.cpp:661 #, c-format msgid "" "Registry key '%s' is needed for normal system operation,\n" @@ -3157,16 +3456,16 @@ "du système ; sa suppression laissera votre système inutilisable :\n" "opération abandonnée." -#: ../src/msw/registry.cpp:448 +#: ../src/msw/registry.cpp:456 #, c-format msgid "Registry value '%s' already exists." msgstr "La valeur de registre « %s » existe déjà." -#: ../src/generic/helpext.cpp:441 +#: ../src/generic/helpext.cpp:442 msgid "Relevant entries:" msgstr "Entrées pertinentes :" -#: ../src/generic/progdlgg.cpp:208 +#: ../src/generic/progdlgg.cpp:210 msgid "Remaining time : " msgstr "Temps restant : " @@ -3174,11 +3473,11 @@ msgid "Remove" msgstr "Supprimer" -#: ../src/html/helpfrm.cpp:429 +#: ../src/html/helpfrm.cpp:445 msgid "Remove current page from bookmarks" msgstr "Retirer la page courante de vos signets" -#: ../src/common/rendcmn.cpp:193 +#: ../src/common/rendcmn.cpp:196 #, c-format msgid "Renderer \"%s\" has incompatible version %d.%d and couldn't be loaded." msgstr "" @@ -3189,15 +3488,15 @@ msgid "Rep&lace" msgstr "Remp&lacer" -#: ../src/generic/fdrepdlg.cpp:171 +#: ../src/generic/fdrepdlg.cpp:188 msgid "Replace &all" msgstr "Rempl&acer tout" -#: ../src/generic/fdrepdlg.cpp:123 +#: ../src/generic/fdrepdlg.cpp:130 msgid "Replace with:" msgstr "Remplacer par :" -#: ../src/xrc/xmlres.cpp:418 +#: ../src/xrc/xmlres.cpp:479 msgid "Resource files must have same version number!" msgstr "Les fichiers de ressource doivent avoir le même numéro de version." @@ -3205,19 +3504,19 @@ msgid "Revert to Saved" msgstr "Changer en enregistré" -#: ../src/generic/prntdlgg.cpp:887 +#: ../src/generic/prntdlgg.cpp:891 msgid "Right margin (mm):" msgstr "Marge droite (mm) :" -#: ../src/generic/fontdlgg.cpp:224 +#: ../src/generic/fontdlgg.cpp:226 msgid "Roman" msgstr "Roman" -#: ../src/common/sizer.cpp:1757 +#: ../src/common/sizer.cpp:1838 msgid "Save" msgstr "Enregistrer" -#: ../src/common/fldlgcmn.cpp:250 +#: ../src/common/fldlgcmn.cpp:259 #, c-format msgid "Save %s file" msgstr "Enregistrer le fichier %s" @@ -3226,23 +3525,23 @@ msgid "Save &As..." msgstr "Enregistrer &sous..." -#: ../src/common/docview.cpp:285 +#: ../src/common/docview.cpp:305 msgid "Save as" msgstr "Enregistrer sous" -#: ../src/generic/logg.cpp:504 +#: ../src/generic/logg.cpp:505 msgid "Save log contents to file" msgstr "Enregistrer le contenu du journal dans un fichier" -#: ../src/generic/fontdlgg.cpp:227 +#: ../src/generic/fontdlgg.cpp:229 msgid "Script" msgstr "Script" -#: ../src/html/helpfrm.cpp:513 ../src/html/helpfrm.cpp:528 +#: ../src/html/helpfrm.cpp:536 ../src/html/helpfrm.cpp:551 msgid "Search" msgstr "Chercher" -#: ../src/html/helpfrm.cpp:515 +#: ../src/html/helpfrm.cpp:538 msgid "" "Search contents of help book(s) for all occurences of the text you typed " "above" @@ -3250,60 +3549,64 @@ "Rechercher dans la table des matières du/des manuel(s) d'aide toutes les " "occurrences du texte que vous avez tapé ci-dessus" -#: ../src/generic/fdrepdlg.cpp:152 +#: ../src/generic/fdrepdlg.cpp:166 msgid "Search direction" msgstr "Direction de la recherche" -#: ../src/generic/fdrepdlg.cpp:111 +#: ../src/generic/fdrepdlg.cpp:118 msgid "Search for:" msgstr "Chercher :" -#: ../src/html/helpfrm.cpp:1037 +#: ../src/html/helpfrm.cpp:1060 msgid "Search in all books" msgstr "Chercher dans tous les manuels" -#: ../src/html/helpfrm.cpp:845 +#: ../src/html/helpfrm.cpp:868 msgid "Searching..." msgstr "Recherche..." -#: ../src/generic/dirctrlg.cpp:550 +#: ../src/generic/dirctrlg.cpp:592 msgid "Sections" msgstr "Sections" -#: ../src/common/ffile.cpp:225 +#: ../src/common/ffile.cpp:222 #, c-format msgid "Seek error on file '%s'" msgstr "Erreur de recherche dans le fichier « %s »" -#: ../src/common/ffile.cpp:215 +#: ../src/common/ffile.cpp:212 #, c-format msgid "Seek error on file '%s' (large files not supported by stdio)" msgstr "" "Erreur de recherche dans le fichier « %s » (les fichiers importants ne sont " "pas gérés par stdio)" -#: ../src/msw/textctrl.cpp:2062 +#: ../src/mac/carbon/textctrl.cpp:1078 ../src/msw/textctrl.cpp:2068 msgid "Select &All" msgstr "&Tout sélectionner" -#: ../src/common/docview.cpp:1660 +#: ../src/common/docview.cpp:1699 msgid "Select a document template" msgstr "Sélectionner un modèle de document" -#: ../src/common/docview.cpp:1737 +#: ../src/common/docview.cpp:1776 msgid "Select a document view" msgstr "Sélectionner une vue du document" -#: ../src/common/docview.cpp:1540 +#: ../src/common/docview.cpp:1579 msgid "Select a file" msgstr "Sélectionner un fichier" +#: ../src/motif/filedlg.cpp:226 +msgid "Selection" +msgstr "Sélection" + #: ../src/common/cmdline.cpp:739 #, c-format msgid "Separator expected after the option '%s'." msgstr "Séparateur attendu après l'option « %s »." -#: ../include/wx/xti.h:839 +#: ../include/wx/xti.h:841 msgid "SetProperty called w/o valid setter" msgstr "SetProperty appelé sans monteur valable" @@ -3311,69 +3614,68 @@ msgid "Setup..." msgstr "Configurer..." -#: ../src/msw/dialup.cpp:530 +#: ../src/msw/dialup.cpp:567 msgid "Several active dialup connections found, choosing one randomly." msgstr "Plusieurs connexions actives trouvées, sélection unique aléatoire." -#: ../src/html/helpfrm.cpp:470 +#: ../src/html/helpfrm.cpp:493 msgid "Show all" msgstr "Tout montrer" -#: ../src/html/helpfrm.cpp:481 +#: ../src/html/helpfrm.cpp:504 msgid "Show all items in index" msgstr "Montrer tous les éléments de l'index" -#: ../src/generic/dirdlgg.cpp:114 ../src/generic/dirdlgg.cpp:177 +#: ../src/generic/dirdlgg.cpp:112 ../src/generic/dirdlgg.cpp:175 msgid "Show hidden directories" msgstr "Montrer les répertoires cachés" -#: ../src/generic/filedlgg.cpp:1034 +#: ../src/generic/filedlgg.cpp:1056 msgid "Show hidden files" msgstr "Montrer les fichiers cachés" -#: ../src/html/helpfrm.cpp:623 +#: ../src/html/helpfrm.cpp:646 msgid "Show/hide navigation panel" msgstr "Montrer/cacher le panneau de navigation" -#: ../src/generic/fontdlgg.cpp:346 ../src/generic/fontdlgg.cpp:348 +#: ../src/generic/fontdlgg.cpp:353 ../src/generic/fontdlgg.cpp:355 msgid "Shows the font preview." msgstr "Montrer un aperçu des polices." -#: ../src/generic/filedlgg.cpp:431 +#: ../src/generic/filedlgg.cpp:432 msgid "Size" msgstr "Taille" -#: ../src/generic/progdlgg.cpp:220 ../src/generic/progdlgg.cpp:238 -#: ../src/generic/progdlgg.cpp:593 +#: ../src/generic/progdlgg.cpp:222 ../src/generic/progdlgg.cpp:240 +#: ../src/generic/progdlgg.cpp:598 msgid "Skip" msgstr "Sauter" -#: ../src/generic/fontdlgg.cpp:232 +#: ../src/generic/fontdlgg.cpp:234 msgid "Slant" msgstr "Incliné" -#: ../src/common/docview.cpp:561 +#: ../src/common/docview.cpp:581 msgid "Sorry, could not open this file for saving." msgstr "Impossible d'ouvrir ce fichier pour l'enregistrement." -#: ../src/common/docview.cpp:593 ../src/common/docview.cpp:606 -#: ../src/common/docview.cpp:1559 +#: ../src/common/docview.cpp:617 ../src/common/docview.cpp:1598 msgid "Sorry, could not open this file." msgstr "Impossible d'ouvrir ce fichier." -#: ../src/common/docview.cpp:568 +#: ../src/common/docview.cpp:588 msgid "Sorry, could not save this file." msgstr "Impossible d'enregistrer ce fichier." -#: ../src/common/prntbase.cpp:1200 +#: ../src/common/prntbase.cpp:1246 msgid "Sorry, not enough memory to create a preview." msgstr "Mémoire insuffisante pour créer un aperçu." -#: ../src/common/docview.cpp:1021 +#: ../src/common/docview.cpp:1028 msgid "Sorry, print preview needs a printer to be installed." msgstr "L'aperçu avant impression nécessite une imprimante installée." -#: ../src/common/docview.cpp:1251 ../src/common/docview.cpp:1579 +#: ../src/common/docview.cpp:1268 ../src/common/docview.cpp:1618 msgid "Sorry, the format for this file is unknown." msgstr "Format de fichier inconnu." @@ -3386,7 +3688,7 @@ msgid "Sound file '%s' is in unsupported format." msgstr "Format du fichier sonore « %s » non géré." -#: ../src/common/paper.cpp:121 +#: ../src/common/paper.cpp:111 msgid "Statement, 5 1/2 x 8 1/2 in" msgstr "Communiqué (5,5 x 8,5 pouces)" @@ -3394,7 +3696,7 @@ msgid "Status:" msgstr "État :" -#: ../src/generic/logg.cpp:621 +#: ../src/generic/logg.cpp:622 msgid "Status: " msgstr "État : " @@ -3411,55 +3713,75 @@ "Conversion de chaîne en couleur : spécification de la couleur non valable : %" "s" -#: ../include/wx/xti.h:427 ../include/wx/xti.h:431 +#: ../include/wx/xti.h:428 ../include/wx/xti.h:432 msgid "String conversions not supported" msgstr "Conversion des chaînes non gérée" -#: ../src/xrc/xmlres.cpp:689 +#: ../src/xrc/xmlres.cpp:750 #, c-format msgid "Subclass '%s' not found for resource '%s', not subclassing!" msgstr "" "Sous-classe « %s » non trouvée pour la ressource « %s », pas de sous-" "classement." -#: ../src/generic/fontdlgg.cpp:228 +#: ../src/common/paper.cpp:157 +msgid "SuperA/SuperA/A4 227 x 356 mm" +msgstr "SuperA/SuperA/A4 (227 x 356 mm)" + +#: ../src/common/paper.cpp:158 +msgid "SuperB/SuperB/A3 305 x 487 mm" +msgstr "SuperB/SuperB/A3 (305 x 487 mm)" + +#: ../src/generic/fontdlgg.cpp:230 msgid "Swiss" msgstr "Suisse" -#: ../src/common/imagtiff.cpp:232 ../src/common/imagtiff.cpp:243 -#: ../src/common/imagtiff.cpp:354 +#: ../src/common/imagtiff.cpp:165 +msgid "TIFF library error." +msgstr "Erreur de la bibliothèque TIFF." + +#: ../src/common/imagtiff.cpp:149 +msgid "TIFF library warning." +msgstr "Avertissement de la bibliothèque TIFF." + +#: ../src/common/imagtiff.cpp:248 ../src/common/imagtiff.cpp:259 +#: ../src/common/imagtiff.cpp:399 msgid "TIFF: Couldn't allocate memory." msgstr "TIFF : allocation de mémoire impossible." -#: ../src/common/imagtiff.cpp:203 +#: ../src/common/imagtiff.cpp:219 msgid "TIFF: Error loading image." msgstr "TIFF : erreur au chargement de l'image." -#: ../src/common/imagtiff.cpp:254 +#: ../src/common/imagtiff.cpp:270 msgid "TIFF: Error reading image." msgstr "TIFF : erreur à la lecture de l'image." -#: ../src/common/imagtiff.cpp:331 +#: ../src/common/imagtiff.cpp:347 msgid "TIFF: Error saving image." msgstr "TIFF : erreur à la sauvegarde de l'image." -#: ../src/common/imagtiff.cpp:378 +#: ../src/common/imagtiff.cpp:445 msgid "TIFF: Error writing image." msgstr "TIFF : erreur à l'écriture de l'image." -#: ../src/common/paper.cpp:119 +#: ../src/common/paper.cpp:152 +msgid "Tabloid Extra 11.69 x 18 in" +msgstr "Tabloïd Extra (11,69 x 18 pouces)" + +#: ../src/common/paper.cpp:109 msgid "Tabloid, 11 x 17 in" -msgstr "Tabloïde (11 x 17 pouces)" +msgstr "Tabloïd (11 x 17 pouces)" -#: ../src/generic/fontdlgg.cpp:229 +#: ../src/generic/fontdlgg.cpp:231 msgid "Teletype" msgstr "Télétype" -#: ../src/common/docview.cpp:1661 +#: ../src/common/docview.cpp:1700 msgid "Templates" msgstr "Modèles" -#: ../src/common/fmapbase.cpp:113 +#: ../src/common/fmapbase.cpp:114 msgid "Thai (ISO-8859-11)" msgstr "Thaï (ISO-8859-11)" @@ -3471,7 +3793,7 @@ msgid "The FTP server doesn't support the PORT command." msgstr "Commande PORT non gérée par le serveur FTP." -#: ../src/common/fontmap.cpp:190 +#: ../src/common/fontmap.cpp:204 #, c-format msgid "" "The charset '%s' is unknown. You may select\n" @@ -3495,7 +3817,7 @@ "Répertoire « %s » inexistant\n" "Le créer maintenant ?" -#: ../src/common/docview.cpp:1910 +#: ../src/common/docview.cpp:1949 #, c-format msgid "" "The file '%s' couldn't be opened.\n" @@ -3504,7 +3826,7 @@ "Le fichier « %s » n'a pas pu être ouvert et a été retiré\n" "de la liste des fichiers récemment utilisés." -#: ../src/common/docview.cpp:1920 +#: ../src/common/docview.cpp:1959 #, c-format msgid "" "The file '%s' doesn't exist and couldn't be opened.\n" @@ -3513,32 +3835,32 @@ "Le fichier « %s » n'existe pas et n'a pas pu être ouvert.\n" "Il a été retiré de la liste des fichiers récemment utilisés." -#: ../src/generic/fontdlgg.cpp:310 ../src/generic/fontdlgg.cpp:312 +#: ../src/generic/fontdlgg.cpp:316 ../src/generic/fontdlgg.cpp:318 msgid "The font colour." msgstr "Couleur de police." -#: ../src/generic/fontdlgg.cpp:275 ../src/generic/fontdlgg.cpp:277 +#: ../src/generic/fontdlgg.cpp:277 ../src/generic/fontdlgg.cpp:279 msgid "The font family." msgstr "Famille de police." -#: ../src/generic/fontdlgg.cpp:322 ../src/generic/fontdlgg.cpp:324 +#: ../src/generic/fontdlgg.cpp:328 ../src/generic/fontdlgg.cpp:330 msgid "The font point size." msgstr "Taille du point de la police." -#: ../src/generic/fontdlgg.cpp:286 ../src/generic/fontdlgg.cpp:288 +#: ../src/generic/fontdlgg.cpp:288 ../src/generic/fontdlgg.cpp:290 msgid "The font style." msgstr "Style de police." -#: ../src/generic/fontdlgg.cpp:297 ../src/generic/fontdlgg.cpp:299 +#: ../src/generic/fontdlgg.cpp:299 ../src/generic/fontdlgg.cpp:301 msgid "The font weight." msgstr "Largeur de police." -#: ../src/common/filename.cpp:952 +#: ../src/common/filename.cpp:966 #, c-format msgid "The path '%s' contains too many \"..\"!" msgstr "Le chemin « %s » contient trop de « .. »." -#: ../src/generic/dbgrptg.cpp:289 +#: ../src/generic/dbgrptg.cpp:308 msgid "" "The report contains the files listed below. If any of these files contain " "private information,\n" @@ -3562,7 +3884,7 @@ msgid "The value for the option '%s' must be specified." msgstr "La valeur de l'option « %s » doit être précisée." -#: ../src/msw/dialup.cpp:418 +#: ../src/msw/dialup.cpp:455 #, c-format msgid "" "The version of remote access service (RAS) installed on this machine is " @@ -3579,7 +3901,7 @@ "Un problème est apparu lors de la mise en page : la configuration d'une " "imprimante par défaut peut être nécessaire." -#: ../src/msw/datectrl.cpp:116 +#: ../src/msw/datectrl.cpp:109 msgid "" "This system doesn't support date picker control, please upgrade your version " "of comctl32.dll" @@ -3587,7 +3909,7 @@ "Ce système ne gère pas le contrôle des ramasseurs de données, veuillez " "mettre à niveau votre version de comctl32.dll" -#: ../src/msw/thread.cpp:1210 +#: ../src/msw/thread.cpp:1206 msgid "" "Thread module initialization failed: can not store value in thread local " "storage" @@ -3595,13 +3917,13 @@ "Échec de l'initialisation du module du processus : enregistrement impossible " "de la valeur dans le stockage local des processus" -#: ../src/unix/threadpsx.cpp:1602 +#: ../src/unix/threadpsx.cpp:1603 msgid "Thread module initialization failed: failed to create thread key" msgstr "" "Échec de l'initialisation du module du processus : échec de la création de " "la clé du processus" -#: ../src/msw/thread.cpp:1198 +#: ../src/msw/thread.cpp:1194 msgid "" "Thread module initialization failed: impossible to allocate index in thread " "local storage" @@ -3609,22 +3931,22 @@ "Échec de l'initialisation du module du processus : impossible d'allouer un " "index dans le stockage local des processus" -#: ../src/unix/threadpsx.cpp:1107 +#: ../src/unix/threadpsx.cpp:1108 msgid "Thread priority setting is ignored." msgstr "La priorité donnée au processus est ignorée." -#: ../src/msw/mdi.cpp:187 +#: ../src/msw/mdi.cpp:184 msgid "Tile &Horizontally" msgstr "Répartir &horizontalement" -#: ../src/msw/mdi.cpp:188 +#: ../src/msw/mdi.cpp:185 msgid "Tile &Vertically" msgstr "Répartir &verticalement" #: ../src/common/ftp.cpp:635 msgid "Timeout while waiting for FTP server to connect, try passive mode." msgstr "" -"Temps dépassé lors de la connexion du serveur FTP, essai du mode passif." +"Temps dépassé lors de la connexion du serveur FTP, essayez en mode passif." #: ../src/msw/timer.cpp:116 ../src/os2/timer.cpp:141 msgid "Timer creation failed." @@ -3646,7 +3968,7 @@ msgid "Too many colours in PNG, the image may be slightly blurred." msgstr "Trop de couleurs dans l'image PNG, elle peut être légèrement trouble." -#: ../src/generic/prntdlgg.cpp:876 +#: ../src/generic/prntdlgg.cpp:880 msgid "Top margin (mm):" msgstr "Marge de haut de page (mm) :" @@ -3661,11 +3983,11 @@ msgid "Trying to solve a NULL hostname: giving up" msgstr "Tentative de résoudre le nom d'hôte NULL : abandon" -#: ../src/common/fmapbase.cpp:111 +#: ../src/common/fmapbase.cpp:112 msgid "Turkish (ISO-8859-9)" msgstr "Turc (ISO-8859-9)" -#: ../src/generic/filedlgg.cpp:432 +#: ../src/generic/filedlgg.cpp:433 msgid "Type" msgstr "Type" @@ -3674,11 +3996,11 @@ msgid "Type must have enum - long conversion" msgstr "Le type doit être énumérable - conversion longue" -#: ../src/common/paper.cpp:150 +#: ../src/common/paper.cpp:140 msgid "US Std Fanfold, 14 7/8 x 11 in" msgstr "Standard US en accordéon (14,875 x 11 pouces)" -#: ../src/html/htmlwin.cpp:398 +#: ../src/html/htmlwin.cpp:403 #, c-format msgid "Unable to open requested HTML document: %s" msgstr "Impossible d'ouvrir le document HTML demandé : %s" @@ -3711,39 +4033,39 @@ msgid "Unexpected parameter '%s'" msgstr "Paramètre « %s » inattendu" -#: ../src/common/fmapbase.cpp:135 +#: ../src/common/fmapbase.cpp:137 msgid "Unicode 16 bit (UTF-16)" msgstr "Unicode 16 bit (UTF-16)" -#: ../src/common/fmapbase.cpp:136 +#: ../src/common/fmapbase.cpp:138 msgid "Unicode 16 bit Big Endian (UTF-16BE)" msgstr "Unicode 16 bit gros-boutiste (UTF-16BE)" -#: ../src/common/fmapbase.cpp:137 +#: ../src/common/fmapbase.cpp:139 msgid "Unicode 16 bit Little Endian (UTF-16LE)" msgstr "Unicode 16 bit petit-boutiste (UTF-16LE)" -#: ../src/common/fmapbase.cpp:138 +#: ../src/common/fmapbase.cpp:140 msgid "Unicode 32 bit (UTF-32)" msgstr "Unicode 32 bit (UTF-32)" -#: ../src/common/fmapbase.cpp:139 +#: ../src/common/fmapbase.cpp:141 msgid "Unicode 32 bit Big Endian (UTF-32BE)" msgstr "Unicode 32 bit gros-boutiste (UTF-32BE)" -#: ../src/common/fmapbase.cpp:140 +#: ../src/common/fmapbase.cpp:142 msgid "Unicode 32 bit Little Endian (UTF-32LE)" msgstr "Unicode 32 bit petit-boutiste (UTF-8)" -#: ../src/common/fmapbase.cpp:133 +#: ../src/common/fmapbase.cpp:135 msgid "Unicode 7 bit (UTF-7)" msgstr "Unicode 7 bit (UTF-7)" -#: ../src/common/fmapbase.cpp:134 +#: ../src/common/fmapbase.cpp:136 msgid "Unicode 8 bit (UTF-8)" msgstr "Unicode 8 bit (UTF-8)" -#: ../src/msw/dde.cpp:1092 +#: ../src/msw/dde.cpp:1093 #, c-format msgid "Unknown DDE error %08x" msgstr "Erreur DDE inconnue : %08x" @@ -3752,11 +4074,11 @@ msgid "Unknown Object passed to GetObjectClassInfo" msgstr "Objet inconnu indiqué à GetObjectClassInfo" -#: ../src/unix/dlunix.cpp:282 +#: ../src/unix/dlunix.cpp:275 msgid "Unknown dynamic library error" msgstr "Erreur de bibliothèque dynamique inconnue" -#: ../src/common/fmapbase.cpp:685 +#: ../src/common/fmapbase.cpp:695 #, c-format msgid "Unknown encoding (%d)" msgstr "Codage inconnu (%d)" @@ -3776,7 +4098,7 @@ msgid "Unknown option '%s'" msgstr "Option « %s » inconnue" -#: ../src/xrc/xmlres.cpp:760 +#: ../src/xrc/xmlres.cpp:823 msgid "Unknown style flag " msgstr "Indicateur de style inconnu" @@ -3785,13 +4107,13 @@ msgid "Unkown Property %s" msgstr "Option « %s » inconnue" -#: ../src/common/mimecmn.cpp:161 +#: ../src/common/mimecmn.cpp:163 #, c-format msgid "Unmatched '{' in an entry for mime type %s." msgstr "Symbole « { » non assorti dans une entrée pour le type mime %s." -#: ../src/common/cmdproc.cpp:252 ../src/common/cmdproc.cpp:278 -#: ../src/common/cmdproc.cpp:298 +#: ../src/common/cmdproc.cpp:261 ../src/common/cmdproc.cpp:287 +#: ../src/common/cmdproc.cpp:307 msgid "Unnamed command" msgstr "Commande sans nom" @@ -3800,8 +4122,8 @@ msgid "Unrecognized style %s while parsing resource." msgstr "Style %s non reconnu pendant l'analyse des ressources." -#: ../src/mac/carbon/clipbrd.cpp:66 ../src/mac/classic/clipbrd.cpp:64 -#: ../src/msw/clipbrd.cpp:276 ../src/msw/clipbrd.cpp:448 +#: ../src/mac/carbon/clipbrd.cpp:68 ../src/mac/classic/clipbrd.cpp:64 +#: ../src/msw/clipbrd.cpp:273 ../src/msw/clipbrd.cpp:445 msgid "Unsupported clipboard format." msgstr "Format de presse-papiers non géré." @@ -3810,11 +4132,11 @@ msgid "Unsupported theme '%s'." msgstr "Thème « %s » non géré." -#: ../src/generic/fdrepdlg.cpp:151 +#: ../src/generic/fdrepdlg.cpp:158 msgid "Up" msgstr "Haut" -#: ../src/common/cmdline.cpp:953 +#: ../src/common/cmdline.cpp:954 #, c-format msgid "Usage: %s" msgstr "Utilisation : %s" @@ -3827,15 +4149,15 @@ msgid "Video Output" msgstr "Sortie vidéo" -#: ../src/generic/filedlgg.cpp:950 +#: ../src/generic/filedlgg.cpp:972 msgid "View files as a detailed view" msgstr "Voir les fichiers - vue détaillée" -#: ../src/generic/filedlgg.cpp:943 +#: ../src/generic/filedlgg.cpp:965 msgid "View files as a list view" msgstr "Voir les fichiers - liste" -#: ../src/common/docview.cpp:1738 +#: ../src/common/docview.cpp:1777 msgid "Views" msgstr "Vues" @@ -3843,37 +4165,37 @@ msgid "Waiting for subprocess termination failed" msgstr "Échec de l'attente de fin du sous-processus" -#: ../src/common/docview.cpp:441 +#: ../src/common/docview.cpp:461 msgid "Warning" msgstr "Avertissement" -#: ../src/common/log.cpp:481 +#: ../src/common/log.cpp:480 msgid "Warning: " msgstr "Avertissement :" -#: ../src/html/htmlpars.cpp:395 +#: ../src/html/htmlpars.cpp:391 msgid "Warning: attempt to remove HTML tag handler from empty stack." msgstr "" "Avertissement : tentative de suppression d'un gestionnaire d'étiquette HTML " "d'une pile vide." -#: ../src/common/fmapbase.cpp:103 +#: ../src/common/fmapbase.cpp:104 msgid "Western European (ISO-8859-1)" msgstr "Europe de l'Ouest (ISO-8859-1)" -#: ../src/common/fmapbase.cpp:117 +#: ../src/common/fmapbase.cpp:118 msgid "Western European with Euro (ISO-8859-15)" msgstr "Europe de l'Ouest avec l'Euro (ISO-8859-15)" -#: ../src/generic/fontdlgg.cpp:333 ../src/generic/fontdlgg.cpp:335 +#: ../src/generic/fontdlgg.cpp:339 ../src/generic/fontdlgg.cpp:341 msgid "Whether the font is underlined." msgstr "Si la police est soulignée." -#: ../src/generic/fdrepdlg.cpp:143 +#: ../src/generic/fdrepdlg.cpp:150 msgid "Whole word" msgstr "Mot complet" -#: ../src/html/helpfrm.cpp:512 +#: ../src/html/helpfrm.cpp:535 msgid "Whole words only" msgstr "Mots complets seulement" @@ -3881,138 +4203,142 @@ msgid "Win32 theme" msgstr "Thème Win32" -#: ../src/msw/utils.cpp:1085 +#: ../src/msw/utils.cpp:1063 msgid "Win32s on Windows 3.1" msgstr "Win32s sur Windows 3.1" -#: ../src/msw/utils.cpp:1134 +#: ../src/msw/utils.cpp:1112 #, c-format msgid "Windows 2000 (build %lu" msgstr "Windows 2000 (construction %lu" -#: ../src/msw/utils.cpp:1099 +#: ../src/msw/utils.cpp:1077 msgid "Windows 95" msgstr "Windows 95" -#: ../src/msw/utils.cpp:1095 +#: ../src/msw/utils.cpp:1073 msgid "Windows 95 OSR2" msgstr "Windows 95 OSR2" -#: ../src/msw/utils.cpp:1110 +#: ../src/msw/utils.cpp:1088 msgid "Windows 98" msgstr "Windows 98" -#: ../src/msw/utils.cpp:1106 +#: ../src/msw/utils.cpp:1084 msgid "Windows 98 SE" msgstr "Windows 98 SE" -#: ../src/msw/utils.cpp:1117 +#: ../src/msw/utils.cpp:1095 #, c-format msgid "Windows 9x (%d.%d)" msgstr "Windows 9x (%d.%d)" -#: ../src/common/fmapbase.cpp:130 +#: ../src/common/fmapbase.cpp:132 msgid "Windows Arabic (CP 1256)" msgstr "Arabe limité à Windows (CP 1256)" -#: ../src/common/fmapbase.cpp:131 +#: ../src/common/fmapbase.cpp:133 msgid "Windows Baltic (CP 1257)" msgstr "Balte limité à Windows (CP 1257)" -#: ../src/common/fmapbase.cpp:124 +#: ../src/common/fmapbase.cpp:126 msgid "Windows Central European (CP 1250)" msgstr "Européen central limité à Windows (CP 1255)" -#: ../src/common/fmapbase.cpp:121 +#: ../src/common/fmapbase.cpp:123 msgid "Windows Chinese Simplified (CP 936)" msgstr "Chinois simplifié limité à Windows (CP 936)" -#: ../src/common/fmapbase.cpp:123 +#: ../src/common/fmapbase.cpp:125 msgid "Windows Chinese Traditional (CP 950)" msgstr "Chinois traditionnel limité à Windows (CP 950)" -#: ../src/common/fmapbase.cpp:125 +#: ../src/common/fmapbase.cpp:127 msgid "Windows Cyrillic (CP 1251)" msgstr "Cyrillique limité à Windows (CP 1251)" -#: ../src/common/fmapbase.cpp:127 +#: ../src/common/fmapbase.cpp:129 msgid "Windows Greek (CP 1253)" msgstr "Grec limité à Windows (CP 1253)" -#: ../src/common/fmapbase.cpp:129 +#: ../src/common/fmapbase.cpp:131 msgid "Windows Hebrew (CP 1255)" msgstr "Hébreu limité à Windows (CP 1255)" -#: ../src/common/fmapbase.cpp:120 +#: ../src/common/fmapbase.cpp:122 msgid "Windows Japanese (CP 932)" msgstr "Japonais limité à Windows (CP 932)" -#: ../src/common/fmapbase.cpp:122 +#: ../src/common/fmapbase.cpp:124 msgid "Windows Korean (CP 949)" msgstr "Coréen limité à Windows (CP 949)" -#: ../src/msw/utils.cpp:1114 +#: ../src/msw/utils.cpp:1092 msgid "Windows ME" msgstr "Windows ME" -#: ../src/msw/utils.cpp:1149 +#: ../src/msw/utils.cpp:1127 #, c-format msgid "Windows NT %lu.%lu (build %lu" msgstr "Windows NT %lu.%lu (construction %lu" -#: ../src/msw/utils.cpp:1142 +#: ../src/msw/utils.cpp:1120 #, c-format msgid "Windows Server 2003 (build %lu" msgstr "Windows Server 2003 (construction %lu" -#: ../src/common/fmapbase.cpp:128 +#: ../src/common/fmapbase.cpp:121 +msgid "Windows Thai (CP 874)" +msgstr "Thaï limité à Windows (CP 874)" + +#: ../src/common/fmapbase.cpp:130 msgid "Windows Turkish (CP 1254)" msgstr "Turc limité à Windows (CP 1254)" -#: ../src/common/fmapbase.cpp:126 +#: ../src/common/fmapbase.cpp:128 msgid "Windows Western European (CP 1252)" msgstr "Européen occidental limité à Windows (CP 1252 )" -#: ../src/msw/utils.cpp:1138 +#: ../src/msw/utils.cpp:1116 #, c-format msgid "Windows XP (build %lu" msgstr "Windows XP (construction %lu" -#: ../src/common/fmapbase.cpp:132 +#: ../src/common/fmapbase.cpp:134 msgid "Windows/DOS OEM (CP 437)" msgstr "Windows/DOS OEM (CP 437)" -#: ../src/common/ffile.cpp:161 +#: ../src/common/ffile.cpp:158 #, c-format msgid "Write error on file '%s'" msgstr "Erreur d'écriture dans le fichier « %s »" -#: ../src/xml/xml.cpp:550 +#: ../src/xml/xml.cpp:562 #, c-format msgid "XML parsing error: '%s' at line %d" msgstr "Erreur d'analyse XML : « %s » à la ligne %d" -#: ../src/common/xpmdecod.cpp:776 +#: ../src/common/xpmdecod.cpp:774 msgid "XPM: Malformed pixel data!" msgstr "XPM : données de pixel malformées." -#: ../src/common/xpmdecod.cpp:711 ../src/common/xpmdecod.cpp:721 +#: ../src/common/xpmdecod.cpp:712 ../src/common/xpmdecod.cpp:721 #, c-format msgid "XPM: malformed colour definition '%s'!" msgstr "XPM : définition de couleur « %s » malformée." -#: ../src/xrc/xmlres.cpp:518 +#: ../src/xrc/xmlres.cpp:579 #, c-format msgid "XRC resource '%s' (class '%s') not found!" msgstr "Ressource XRC « %s » (classe « %s ») introuvable." -#: ../src/xrc/xmlres.cpp:1017 ../src/xrc/xmlres.cpp:1029 +#: ../src/xrc/xmlres.cpp:1080 ../src/xrc/xmlres.cpp:1092 #, c-format msgid "XRC resource: Cannot create bitmap from '%s'." msgstr "" "Ressource XRC : impossible de créer une image bitmap à partir de « %s »." -#: ../src/xrc/xmlres.cpp:973 +#: ../src/xrc/xmlres.cpp:1036 #, c-format msgid "XRC resource: Incorrect colour specification '%s' for property '%s'." msgstr "" @@ -4021,7 +4347,7 @@ #: ../src/mac/carbon/msgdlg.cpp:59 ../src/mac/carbon/msgdlg.cpp:142 #: ../src/mac/classic/msgdlg.cpp:57 ../src/mac/classic/msgdlg.cpp:139 -#: ../src/motif/msgdlg.cpp:185 +#: ../src/motif/msgdlg.cpp:204 msgid "Yes" msgstr "Oui" @@ -4041,15 +4367,15 @@ msgid "Zoom to &Fit" msgstr "Zoom a&justé" -#: ../src/common/docview.cpp:2094 +#: ../src/common/docview.cpp:2133 msgid "[EMPTY]" msgstr "[VIDE]" -#: ../src/msw/dde.cpp:1059 +#: ../src/msw/dde.cpp:1060 msgid "a DDEML application has created a prolonged race condition." msgstr "une application DDEML a créé une situation de concurrence prolongée." -#: ../src/msw/dde.cpp:1047 +#: ../src/msw/dde.cpp:1048 msgid "" "a DDEML function was called without first calling the DdeInitialize " "function,\n" @@ -4060,39 +4386,39 @@ "DdeInitialize, ou un identifiant non valable a été fourni à la fonction\n" "DDEML." -#: ../src/msw/dde.cpp:1065 +#: ../src/msw/dde.cpp:1066 msgid "a client's attempt to establish a conversation has failed." msgstr "une tentative d'un client pour établir une conversation a échoué." -#: ../src/msw/dde.cpp:1062 +#: ../src/msw/dde.cpp:1063 msgid "a memory allocation failed." msgstr "une allocation de mémoire a échoué." -#: ../src/msw/dde.cpp:1056 +#: ../src/msw/dde.cpp:1057 msgid "a parameter failed to be validated by the DDEML." msgstr "un paramètre n'a pas pu être validé par la DDEML." -#: ../src/msw/dde.cpp:1038 +#: ../src/msw/dde.cpp:1039 msgid "a request for a synchronous advise transaction has timed out." msgstr "une demande de transaction synchrone d'instructions a expiré." -#: ../src/msw/dde.cpp:1044 +#: ../src/msw/dde.cpp:1045 msgid "a request for a synchronous data transaction has timed out." msgstr "une demande de transaction synchrone de données a expiré." -#: ../src/msw/dde.cpp:1053 +#: ../src/msw/dde.cpp:1054 msgid "a request for a synchronous execute transaction has timed out." msgstr "une demande de transaction synchrone d'exécutions a expiré." -#: ../src/msw/dde.cpp:1071 +#: ../src/msw/dde.cpp:1072 msgid "a request for a synchronous poke transaction has timed out." msgstr "une demande de transaction synchrone de stockage a expiré." -#: ../src/msw/dde.cpp:1086 +#: ../src/msw/dde.cpp:1087 msgid "a request to end an advise transaction has timed out." msgstr "une demande pour terminer une transaction d'instructions a expiré." -#: ../src/msw/dde.cpp:1080 +#: ../src/msw/dde.cpp:1081 msgid "" "a server-side transaction was attempted on a conversation\n" "that was terminated by the client, or the server\n" @@ -4101,7 +4427,7 @@ "une transaction a été tentée du côté serveur lors d'une conversation déjà\n" "terminée par le client, ou le serveur a achevé la transaction avant la fin." -#: ../src/msw/dde.cpp:1068 +#: ../src/msw/dde.cpp:1069 msgid "a transaction failed." msgstr "une transaction a échoué." @@ -4109,7 +4435,7 @@ msgid "alt" msgstr "alt" -#: ../src/msw/dde.cpp:1050 +#: ../src/msw/dde.cpp:1051 msgid "" "an application initialized as APPCLASS_MONITOR has\n" "attempted to perform a DDE transaction,\n" @@ -4120,15 +4446,15 @@ "d'effectuer une transaction DDE, ou une application initialisée en tant\n" "que APPCMD_CLIENTONLY a tenté d'effectuer des transactions serveur." -#: ../src/msw/dde.cpp:1074 +#: ../src/msw/dde.cpp:1075 msgid "an internal call to the PostMessage function has failed. " msgstr "un appel interne à la fonction PostMessage a échoué." -#: ../src/msw/dde.cpp:1083 +#: ../src/msw/dde.cpp:1084 msgid "an internal error has occurred in the DDEML." msgstr "une erreur interne s'est produite dans le DDEML." -#: ../src/msw/dde.cpp:1089 +#: ../src/msw/dde.cpp:1090 msgid "" "an invalid transaction identifier was passed to a DDEML function.\n" "Once the application has returned from an XTYP_XACT_COMPLETE callback,\n" @@ -4138,11 +4464,11 @@ "Quand l'application sort d'un rappel XTYP_XACT_COMPLETE, l'identifiant de\n" "transaction pour ce rappel n'est plus valable." -#: ../src/common/zipstrm.cpp:1317 +#: ../src/common/zipstrm.cpp:1330 msgid "assuming this is a multi-part zip concatenated" msgstr "suppose qu'il s'agit d'un zip recombiné" -#: ../src/common/fileconf.cpp:1804 +#: ../src/common/fileconf.cpp:1847 #, c-format msgid "attempt to change immutable key '%s' ignored." msgstr "tentative de modifier la touche non configurable « %s » ignorée." @@ -4155,7 +4481,7 @@ msgid "bad signature" msgstr "mauvaise signature" -#: ../src/common/zipstrm.cpp:1567 +#: ../src/common/zipstrm.cpp:1580 msgid "bad zipfile offset to entry" msgstr "Mauvais décalage de fichier zip dans l'entrée" @@ -4163,14 +4489,18 @@ msgid "binary" msgstr "binaire" -#: ../src/common/fontcmn.cpp:645 +#: ../src/common/fontcmn.cpp:646 msgid "bold" msgstr "gras" -#: ../src/common/fontcmn.cpp:569 +#: ../src/common/fontcmn.cpp:570 msgid "bold " msgstr "gras " +#: ../src/os2/iniconf.cpp:451 +msgid "buffer is too small for Windows directory." +msgstr "tampon trop petit pour le répertoire Windows." + #: ../src/common/ffile.cpp:91 #, c-format msgid "can't close file '%s'" @@ -4181,7 +4511,7 @@ msgid "can't close file descriptor %d" msgstr "impossible de fermer le descripteur de fichier %d" -#: ../src/common/file.cpp:553 +#: ../src/common/file.cpp:551 #, c-format msgid "can't commit changes to file '%s'" msgstr "impossible d'appliquer les changements au fichier « %s »" @@ -4191,29 +4521,34 @@ msgid "can't create file '%s'" msgstr "impossible de créer le fichier « %s »" -#: ../src/common/fileconf.cpp:1123 +#: ../src/common/fileconf.cpp:1159 #, c-format msgid "can't delete user configuration file '%s'" msgstr "impossible d'effacer le fichier de configuration utilisateur « %s »" -#: ../src/common/file.cpp:459 +#: ../src/common/file.cpp:457 #, c-format msgid "can't determine if the end of file is reached on descriptor %d" msgstr "" "impossible de déterminer si la fin du fichier est atteinte dans le " "descripteur %d" -#: ../src/common/zipstrm.cpp:1344 +#: ../src/msdos/utilsdos.cpp:307 ../src/msdos/utilsdos.cpp:466 +#, c-format +msgid "can't execute '%s'" +msgstr "impossible d'exécuter « %s »" + +#: ../src/common/zipstrm.cpp:1357 msgid "can't find central directory in zip" msgstr "impossible de trouver le répertoire principale dans le zip" -#: ../src/common/file.cpp:429 +#: ../src/common/file.cpp:427 #, c-format msgid "can't find length of file on file descriptor %d" msgstr "" "impossible de trouver la taille du fichier dans le descripteur de fichier %d" -#: ../src/msw/utils.cpp:367 +#: ../src/msw/utils.cpp:380 msgid "can't find user's HOME, using current directory." msgstr "" "impossible de trouver le répertoire HOME de l'utilisateur - utilisation du " @@ -4225,14 +4560,14 @@ msgstr "" "impossible de forcer l'écriture sur disque du descripteur de fichier %d" -#: ../src/common/file.cpp:401 ../src/msw/wince/filefnwce.cpp:202 +#: ../src/common/file.cpp:399 ../src/msw/wince/filefnwce.cpp:202 #, c-format msgid "can't get seek position on file descriptor %d" msgstr "" "impossible de trouver la position de recherche sur le descripteur de fichier " "%d" -#: ../src/common/fontmap.cpp:312 +#: ../src/common/fontmap.cpp:326 msgid "can't load any font, aborting" msgstr "impossible de charger une police de caractères - abandon" @@ -4241,31 +4576,31 @@ msgid "can't open file '%s'" msgstr "impossible d'ouvrir le fichier « %s »" -#: ../src/common/fileconf.cpp:401 +#: ../src/common/fileconf.cpp:404 #, c-format msgid "can't open global configuration file '%s'." msgstr "impossible d'ouvrir le fichier de configuration global « %s »." -#: ../src/common/fileconf.cpp:416 +#: ../src/common/fileconf.cpp:419 #, c-format msgid "can't open user configuration file '%s'." msgstr "impossible d'ouvrir le fichier de configuration utilisateur « %s »." -#: ../src/common/fileconf.cpp:972 +#: ../src/common/fileconf.cpp:1005 msgid "can't open user configuration file." msgstr "impossible d'ouvrir le fichier de configuration utilisateur." -#: ../src/common/dynlib.cpp:252 +#: ../src/common/dynlib.cpp:253 msgid "can't query for GUI plugins name in console applications" msgstr "" "ne peut chercher des noms de greffon graphique dans les applications en " "console" -#: ../src/common/zipstrm.cpp:432 +#: ../src/common/zipstrm.cpp:436 msgid "can't re-initialize zlib deflate stream" msgstr "impossible de réinitialiser le flux de déchargement de zlib" -#: ../src/common/zipstrm.cpp:457 +#: ../src/common/zipstrm.cpp:461 msgid "can't re-initialize zlib inflate stream" msgstr "impossible de réinitialiser le flux de chargement de zlib" @@ -4274,17 +4609,17 @@ msgid "can't read from file descriptor %d" msgstr "impossible de lire le descripteur de fichier %d" -#: ../src/common/file.cpp:548 +#: ../src/common/file.cpp:546 #, c-format msgid "can't remove file '%s'" msgstr "impossible de supprimer le fichier « %s »" -#: ../src/common/file.cpp:564 +#: ../src/common/file.cpp:562 #, c-format msgid "can't remove temporary file '%s'" msgstr "impossible de supprimer le fichier temporaire « %s »" -#: ../src/common/file.cpp:387 ../src/msw/wince/filefnwce.cpp:189 +#: ../src/common/file.cpp:385 ../src/msw/wince/filefnwce.cpp:189 #, c-format msgid "can't seek on file descriptor %d" msgstr "recherche impossible sur le descripteur de fichier %d" @@ -4299,11 +4634,11 @@ msgid "can't write to file descriptor %d" msgstr "impossible d'écrire dans le descripteur de fichier %d" -#: ../src/common/fileconf.cpp:983 +#: ../src/common/fileconf.cpp:1016 msgid "can't write user configuration file." msgstr "impossible d'écrire le fichier de configuration utilisateur." -#: ../src/common/intl.cpp:1114 +#: ../src/common/intl.cpp:1110 #, c-format msgid "catalog file for domain '%s' not found." msgstr "fichier catalogue introuvable pour le domaine « %s »." @@ -4324,7 +4659,7 @@ msgid "ctrl" msgstr "ctrl" -#: ../src/common/cmdline.cpp:1093 +#: ../src/common/cmdline.cpp:1094 msgid "date" msgstr "date" @@ -4332,7 +4667,7 @@ msgid "decompression error" msgstr "erreur de décompression" -#: ../src/common/fmapbase.cpp:695 ../src/common/fmapbase.cpp:727 +#: ../src/common/fmapbase.cpp:705 ../src/common/fmapbase.cpp:737 msgid "default" msgstr "défaut" @@ -4340,27 +4675,28 @@ msgid "delegate has no type info" msgstr "Le délégué n'a pas d'information sur le type" -#: ../src/common/debugrpt.cpp:502 +#: ../src/common/debugrpt.cpp:524 msgid "dump of the process state (binary)" msgstr "Décharger l'état du processus (binaire)" -#: ../src/common/datetime.cpp:3674 +#: ../src/common/datetime.cpp:3882 msgid "eighteenth" msgstr "dix-huitième" -#: ../src/common/datetime.cpp:3664 +#: ../src/common/datetime.cpp:3872 msgid "eighth" msgstr "huitième" -#: ../src/common/datetime.cpp:3667 +#: ../src/common/datetime.cpp:3875 msgid "eleventh" msgstr "onzième" -#: ../src/common/strconv.cpp:2487 +#: ../src/common/strconv.cpp:2671 +#, c-format msgid "encoding %s" msgstr "codage %s" -#: ../src/common/fileconf.cpp:1790 +#: ../src/common/fileconf.cpp:1833 #, c-format msgid "entry '%s' appears more than once in group '%s'" msgstr "l'entrée « %s » apparaît plus d'une fois dans le groupe « %s »" @@ -4369,85 +4705,91 @@ msgid "error in data format" msgstr "erreur dans le format des données" +#: ../src/msdos/utilsdos.cpp:407 +#, c-format +msgid "error opening '%s'" +msgstr "erreur à l'ouverture de « %s »" + #: ../src/html/chm.cpp:332 msgid "error opening file" msgstr "erreur à l'ouverture du fichier" -#: ../src/common/zipstrm.cpp:1429 +#: ../src/common/zipstrm.cpp:1442 msgid "error reading zip central directory" msgstr "erreur à la lecture du répertoire principale du zip" -#: ../src/common/zipstrm.cpp:1507 +#: ../src/common/zipstrm.cpp:1520 msgid "error reading zip local header" msgstr "erreur à la lecture de l'en-tête local du zip" -#: ../src/common/zipstrm.cpp:2208 +#: ../src/common/zipstrm.cpp:2236 #, c-format msgid "error writing zip entry '%s': bad crc or length" msgstr "erreur à l'écriture de l'entrée zip « %s » : mauvaise crc ou longueur" -#: ../src/msw/dialup.cpp:844 +#: ../src/msw/dialup.cpp:881 msgid "establish" msgstr "établir" -#: ../src/common/ffile.cpp:175 +#: ../src/common/ffile.cpp:172 #, c-format msgid "failed to flush the file '%s'" msgstr "échec de la mise à jour du fichier « %s »" -#: ../src/common/datetime.cpp:3671 +#: ../src/common/datetime.cpp:3879 msgid "fifteenth" msgstr "quinzième" -#: ../src/common/datetime.cpp:3661 +#: ../src/common/datetime.cpp:3869 msgid "fifth" msgstr "cinquième" -#: ../src/common/fileconf.cpp:655 +#: ../src/common/fileconf.cpp:664 #, c-format msgid "file '%s', line %d: '%s' ignored after group header." -msgstr "fichier « %s », ligne %d : « %s » est ignoré après l'en-tête de groupe." +msgstr "" +"fichier « %s », ligne %d : « %s » est ignoré après l'en-tête de groupe." -#: ../src/common/fileconf.cpp:684 +#: ../src/common/fileconf.cpp:693 #, c-format msgid "file '%s', line %d: '=' expected." msgstr "fichier « %s », ligne %d : symbole « = » attendu." -#: ../src/common/fileconf.cpp:707 +#: ../src/common/fileconf.cpp:716 #, c-format msgid "file '%s', line %d: key '%s' was first found at line %d." msgstr "" "fichier « %s », ligne %d : première occurrence de la clé %s à la ligne %d." -#: ../src/common/fileconf.cpp:697 +#: ../src/common/fileconf.cpp:706 #, c-format msgid "file '%s', line %d: value for immutable key '%s' ignored." msgstr "" "fichier « %s », ligne %d : valeur pour la touche non configurable « %s » " "ignorée." -#: ../src/common/fileconf.cpp:619 +#: ../src/common/fileconf.cpp:628 #, c-format msgid "file '%s': unexpected character %c at line %d." msgstr "fichier %s : caractère %c inattendu a la ligne %d." -#: ../src/common/datetime.cpp:3657 +#: ../src/common/datetime.cpp:3865 msgid "first" msgstr "premier" -#: ../src/html/helpfrm.cpp:1239 +#: ../src/html/helpfrm.cpp:1262 msgid "font size" msgstr "taille de police" -#: ../src/common/datetime.cpp:3670 +#: ../src/common/datetime.cpp:3878 msgid "fourteenth" msgstr "quatorzième" -#: ../src/common/datetime.cpp:3660 +#: ../src/common/datetime.cpp:3868 msgid "fourth" msgstr "quatrième" -#: ../src/common/appbase.cpp:350 +#: ../src/common/appbase.cpp:367 msgid "generate verbose log messages" msgstr "créer des messages de journalisation verbeux" @@ -4455,57 +4797,57 @@ msgid "incorrect event handler string, missing dot" msgstr "chaîne de gestion des événements non valable, point manquant" -#: ../src/msw/dialup.cpp:844 +#: ../src/msw/dialup.cpp:881 msgid "initiate" msgstr "initialiser" -#: ../src/common/file.cpp:461 +#: ../src/common/file.cpp:459 msgid "invalid eof() return value." msgstr "eof() a renvoyé une valeur non valable." -#: ../src/generic/logg.cpp:1116 +#: ../src/generic/logg.cpp:1179 msgid "invalid message box return value" msgstr "la boîte de message a renvoyé une valeur non valable" -#: ../src/common/zipstrm.cpp:1293 +#: ../src/common/zipstrm.cpp:1306 msgid "invalid zip file" msgstr "fichier zip non valable" -#: ../src/common/fontcmn.cpp:585 ../src/common/fontcmn.cpp:649 +#: ../src/common/fontcmn.cpp:586 ../src/common/fontcmn.cpp:650 msgid "italic" msgstr "italique" -#: ../src/common/fontcmn.cpp:641 +#: ../src/common/fontcmn.cpp:642 msgid "light" msgstr "léger" -#: ../src/common/fontcmn.cpp:565 +#: ../src/common/fontcmn.cpp:566 msgid "light " msgstr "léger " -#: ../src/common/intl.cpp:1461 +#: ../src/common/intl.cpp:1456 #, c-format msgid "locale '%s' can not be set." msgstr "la locale « %s » ne peut pas être spécifiée." -#: ../src/common/intl.cpp:1109 +#: ../src/common/intl.cpp:1103 #, c-format msgid "looking for catalog '%s' in path '%s'." msgstr "recherche le catalogue « %s » dans « %s »." -#: ../src/common/datetime.cpp:3821 +#: ../src/common/datetime.cpp:4029 msgid "midnight" msgstr "minuit" -#: ../src/common/datetime.cpp:3675 +#: ../src/common/datetime.cpp:3883 msgid "nineteenth" msgstr "dix-neuvième" -#: ../src/common/datetime.cpp:3665 +#: ../src/common/datetime.cpp:3873 msgid "ninth" msgstr "neuvième" -#: ../src/msw/dde.cpp:1034 +#: ../src/msw/dde.cpp:1035 msgid "no DDE error." msgstr "erreur - pas de DDE." @@ -4517,11 +4859,11 @@ msgid "noname" msgstr "pas de nom" -#: ../src/common/datetime.cpp:3820 +#: ../src/common/datetime.cpp:4028 msgid "noon" msgstr "midi" -#: ../src/common/cmdline.cpp:1089 +#: ../src/common/cmdline.cpp:1090 msgid "num" msgstr "num" @@ -4533,7 +4875,7 @@ msgid "out of memory" msgstr "capacité mémoire dépassée" -#: ../src/common/debugrpt.cpp:478 +#: ../src/common/debugrpt.cpp:500 msgid "process context description" msgstr "description du contexte du processus" @@ -4545,21 +4887,21 @@ msgid "reading" msgstr "lecture" -#: ../src/common/zipstrm.cpp:1730 +#: ../src/common/zipstrm.cpp:1743 #, c-format msgid "reading zip stream (entry %s): bad crc" msgstr "lecture du flux zip (entrée %s) : mauvaise crc" -#: ../src/common/zipstrm.cpp:1727 +#: ../src/common/zipstrm.cpp:1740 #, c-format msgid "reading zip stream (entry %s): bad length" msgstr "lecture du flux zip (entrée %s) : mauvaise longueur" -#: ../src/msw/dde.cpp:1077 +#: ../src/msw/dde.cpp:1078 msgid "reentrancy problem." msgstr "problème de double entrée." -#: ../src/common/datetime.cpp:3658 +#: ../src/common/datetime.cpp:3866 msgid "second" msgstr "deuxième" @@ -4567,11 +4909,11 @@ msgid "seek error" msgstr "erreur de recherche" -#: ../src/common/datetime.cpp:3673 +#: ../src/common/datetime.cpp:3881 msgid "seventeenth" msgstr "dix-septième" -#: ../src/common/datetime.cpp:3663 +#: ../src/common/datetime.cpp:3871 msgid "seventh" msgstr "septième" @@ -4579,15 +4921,15 @@ msgid "shift" msgstr "majuscule" -#: ../src/common/appbase.cpp:340 +#: ../src/common/appbase.cpp:357 msgid "show this help message" msgstr "montrer ce message d'aide" -#: ../src/common/datetime.cpp:3672 +#: ../src/common/datetime.cpp:3880 msgid "sixteenth" msgstr "seizième" -#: ../src/common/datetime.cpp:3662 +#: ../src/common/datetime.cpp:3870 msgid "sixth" msgstr "sixième" @@ -4599,66 +4941,66 @@ msgid "specify the theme to use" msgstr "spécifier le thème à utiliser" -#: ../src/common/zipstrm.cpp:1633 +#: ../src/common/zipstrm.cpp:1646 msgid "stored file length not in Zip header" msgstr "longueur du fichier enregistré absente de l'en-tête du Zip" -#: ../src/common/cmdline.cpp:1085 +#: ../src/common/cmdline.cpp:1086 msgid "str" msgstr "str" -#: ../src/common/datetime.cpp:3666 +#: ../src/common/datetime.cpp:3874 msgid "tenth" msgstr "dixième" -#: ../src/msw/dde.cpp:1041 +#: ../src/msw/dde.cpp:1042 msgid "the response to the transaction caused the DDE_FBUSY bit to be set." msgstr "" "la réponse à la transaction a provoqué la spécification du bit DDE_FBUSY." -#: ../src/common/datetime.cpp:3659 +#: ../src/common/datetime.cpp:3867 msgid "third" msgstr "troisième" -#: ../src/common/datetime.cpp:3669 +#: ../src/common/datetime.cpp:3877 msgid "thirteenth" msgstr "treizième" -#: ../src/common/imagtiff.cpp:143 ../src/common/imagtiff.cpp:151 +#: ../src/common/imagtiff.cpp:145 ../src/common/imagtiff.cpp:161 #, c-format msgid "tiff module: %s" msgstr "module tiff : %s" -#: ../src/common/datetime.cpp:3486 +#: ../src/common/datetime.cpp:3694 msgid "today" msgstr "aujourd'hui" -#: ../src/common/datetime.cpp:3488 +#: ../src/common/datetime.cpp:3696 msgid "tomorrow" msgstr "demain" -#: ../src/common/datetime.cpp:3668 +#: ../src/common/datetime.cpp:3876 msgid "twelfth" msgstr "douzième" -#: ../src/common/datetime.cpp:3676 +#: ../src/common/datetime.cpp:3884 msgid "twentieth" msgstr "vingtième" -#: ../src/common/fontcmn.cpp:637 +#: ../src/common/fontcmn.cpp:638 msgid "underlined" msgstr "souligné" -#: ../src/common/fontcmn.cpp:552 +#: ../src/common/fontcmn.cpp:553 msgid "underlined " msgstr "souligné " -#: ../src/common/fileconf.cpp:1926 +#: ../src/common/fileconf.cpp:1960 #, c-format msgid "unexpected \" at position %d in '%s'." msgstr "symbole \" inattendu à la position %d dans « %s »." -#: ../src/generic/progdlgg.cpp:302 +#: ../src/generic/progdlgg.cpp:307 msgid "unknown" msgstr "inconnu" @@ -4671,7 +5013,7 @@ msgid "unknown error" msgstr "erreur inconnue" -#: ../src/msw/dialup.cpp:457 +#: ../src/msw/dialup.cpp:494 #, c-format msgid "unknown error (error code %08x)." msgstr "erreur inconnue (code d'erreur %08x)." @@ -4680,33 +5022,33 @@ msgid "unknown line terminator" msgstr "fin de ligne inconnue" -#: ../src/common/file.cpp:364 ../src/msw/wince/filefnwce.cpp:170 +#: ../src/common/file.cpp:367 ../src/msw/wince/filefnwce.cpp:170 msgid "unknown seek origin" msgstr "origine de la recherche inconnue" -#: ../src/common/fmapbase.cpp:709 +#: ../src/common/fmapbase.cpp:719 #, c-format msgid "unknown-%d" msgstr "inconnu-%d" -#: ../src/common/docview.cpp:410 +#: ../src/common/docview.cpp:430 msgid "unnamed" msgstr "sans nom" -#: ../src/common/docview.cpp:1362 +#: ../src/common/docview.cpp:1401 #, c-format msgid "unnamed%d" msgstr "sans nom %d" -#: ../src/common/zipstrm.cpp:1647 ../src/common/zipstrm.cpp:2002 +#: ../src/common/zipstrm.cpp:1660 ../src/common/zipstrm.cpp:2030 msgid "unsupported Zip compression method" msgstr "méthode de compression zip non gérée" -#: ../src/common/zipstrm.cpp:1137 +#: ../src/common/zipstrm.cpp:1142 msgid "unsupported zip archive" msgstr "archive zip non gérée" -#: ../src/common/intl.cpp:1119 +#: ../src/common/intl.cpp:1115 #, c-format msgid "using catalog '%s' from '%s'." msgstr "utilisation du catalogue « %s » de « %s »." @@ -4719,20 +5061,20 @@ msgid "writing" msgstr "écriture" -#: ../src/common/stopwatch.cpp:235 +#: ../src/common/stopwatch.cpp:291 msgid "wxGetTimeOfDay failed." msgstr "wxGetTimeOfDay a échoué." -#: ../src/common/socket.cpp:414 ../src/common/socket.cpp:468 +#: ../src/common/socket.cpp:415 ../src/common/socket.cpp:469 #: ../src/mac/carbon/cfsocket.cpp:452 ../src/mac/carbon/cfsocket.cpp:506 msgid "wxSocket: invalid signature in ReadMsg." msgstr "wxSocket : signature non valable dans ReadMsg." -#: ../src/common/socket.cpp:965 ../src/mac/carbon/cfsocket.cpp:1006 +#: ../src/common/socket.cpp:966 ../src/mac/carbon/cfsocket.cpp:1006 msgid "wxSocket: unknown event!." msgstr "wxSocket : événement inconnu." -#: ../src/motif/app.cpp:210 +#: ../src/motif/app.cpp:214 #, c-format msgid "wxWidgets could not open display for '%s': exiting." msgstr "wxWidgets n'a pas pu ouvrir d'affichage pour %s : abandon." @@ -4741,7 +5083,7 @@ msgid "wxWidgets could not open display. Exiting." msgstr "wxWidgets n'a pas pu ouvrir d'affichage : abandon." -#: ../src/common/datetime.cpp:3487 +#: ../src/common/datetime.cpp:3695 msgid "yesterday" msgstr "hier" @@ -4750,7 +5092,6 @@ msgid "zlib error %d" msgstr "erreur zlib %d" -#: ../src/common/prntbase.cpp:840 +#: ../src/common/prntbase.cpp:886 msgid "|<<" msgstr "|<<" - --- wxwidgets2.6-2.6.3.2.2.orig/locale/de.po +++ wxwidgets2.6-2.6.3.2.2/locale/de.po @@ -28,7 +28,8 @@ #: ../src/generic/dbgrptg.cpp:312 msgid " Thank you and we're sorry for the inconvenience!\n" -msgstr " Vielen Dank und entschuldigen Sie die Unannehmlichkeiten!\n" +msgstr "" +" Vielen Dank und entschuldigen Sie die Unannehmlichkeiten!\n" #: ../src/common/log.cpp:321 #, c-format @@ -462,7 +463,8 @@ msgid "" ", expected static, #include or #define\n" "while parsing resource." -msgstr ", erwartete static, #include oder #define\n" +msgstr "" +", erwartete static, #include oder #define\n" "bei Abfrage einer Ressource." #: ../src/generic/dirctrlg.cpp:683 ../src/generic/filedlgg.cpp:740 @@ -1327,7 +1329,8 @@ "Could not resolve control class or id '%s'. Use (non-zero) integer instead\n" " or provide #define (see manual for caveats)" msgstr "" -"Konnte Kontroll-Klasse oder ID '%s' nicht auflösen. Benutzen Sie statt dessen\n" +"Konnte Kontroll-Klasse oder ID '%s' nicht auflösen. Benutzen Sie statt " +"dessen\n" "einen Integer (nicht Null) oder #define (siehe Handbuch für Widersprüche)" #: ../contrib/src/deprecated/resource.cpp:1278 @@ -1647,8 +1650,8 @@ msgid "" "Environment variables expansion failed: missing '%c' at position %u in '%s'." msgstr "" -"Einsetzen der Umgebungsvariablen schlug fehl. Es fehlt '%c' an Position %d in " -"'%s'." +"Einsetzen der Umgebungsvariablen schlug fehl. Es fehlt '%c' an Position %d " +"in '%s'." #: ../src/generic/dirctrlg.cpp:689 ../src/generic/dirctrlg.cpp:707 #: ../src/generic/dirctrlg.cpp:718 ../src/generic/dirdlgg.cpp:342 @@ -1737,8 +1740,8 @@ msgid "" "Exporting registry key: file \"%s\" already exists and won't be overwritten." msgstr "" -"Exportieren von Registrierschlüssel: Datei '%s' besteht bereits und" -"wird nicht überschrieben." +"Exportieren von Registrierschlüssel: Datei '%s' besteht bereits undwird " +"nicht überschrieben." #: ../src/common/fmapbase.cpp:143 msgid "Extended Unix Codepage for Japanese (EUC-JP)" @@ -2169,9 +2172,9 @@ msgid "Failed to terminate the dialup connection: %s" msgstr "Versuch gescheitert, die DFÜ-Verbindung zu beenden: %s" +# see man touch #: ../src/common/filename.cpp:1933 #, c-format -# see man touch msgid "Failed to touch the file '%s'" msgstr "Konnte die Datei '%s' nicht erzeugen" @@ -2496,9 +2499,11 @@ "but be warned that it may hinder improving the program, so if\n" "at all possible please do continue with the report generation.\n" msgstr "" -"Wenn Sie den Fehlerbericht komplett verwerfen möchten, drücken Sie 'Cancel',\n" +"Wenn Sie den Fehlerbericht komplett verwerfen möchten, drücken Sie " +"'Cancel',\n" "aber seien Sie gewarnt: dies verhindert vielleicht die Verbesserung des\n" -"Programms, also setzen Sie das Erstellen des Fehlerberichts nach Möglichkeit fort.\n" +"Programms, also setzen Sie das Erstellen des Fehlerberichts nach Möglichkeit " +"fort.\n" #: ../src/msw/registry.cpp:1304 #, c-format @@ -3373,8 +3378,8 @@ msgid "" "Processing debug report has failed, leaving the files in \"%s\" directory." msgstr "" -"Verarbeitung des Fehlerberichts fehlgeschlagen, lasse die Dateien im " -"'%s'-Verzeichnis." +"Verarbeitung des Fehlerberichts fehlgeschlagen, lasse die Dateien im '%s'-" +"Verzeichnis." #: ../src/common/log.cpp:466 msgid "Program aborted." @@ -3547,8 +3552,8 @@ #: ../src/common/ffile.cpp:212 #, c-format msgid "Seek error on file '%s' (large files not supported by stdio)" -msgstr "Suchfehler in Datei '%s' (grosse Dateien werden von stdio " -"nicht unterstützt)" +msgstr "" +"Suchfehler in Datei '%s' (grosse Dateien werden von stdio nicht unterstützt)" #: ../src/mac/carbon/textctrl.cpp:1078 ../src/msw/textctrl.cpp:2068 msgid "Select &All" --- wxwidgets2.6-2.6.3.2.2.orig/build/aclocal/bakefile.m4 +++ wxwidgets2.6-2.6.3.2.2/build/aclocal/bakefile.m4 @@ -420,7 +420,7 @@ ;; powerpc-apple-macos* | \ - *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-k*bsd*-gnu | \ + *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-gnu* | *-*-k*bsd*-gnu | \ *-*-sunos4* | \ *-*-osf* | \ *-*-dgux5* | \ @@ -470,7 +470,7 @@ SONAME_FLAG= case "${BAKEFILE_HOST}" in - *-*-linux* | *-*-freebsd* | *-*-k*bsd*-gnu ) + *-*-linux* | *-*-freebsd* | *-*-gnu* | *-*-k*bsd*-gnu ) SONAME_FLAG="-Wl,-soname," USE_SOVERSION=1 USE_SOVERLINUX=1 --- wxwidgets2.6-2.6.3.2.2.orig/wxPython/config.py +++ wxwidgets2.6-2.6.3.2.2/wxPython/config.py @@ -777,11 +777,12 @@ cflags = os.popen(WX_CONFIG + ' --cxxflags', 'r').read()[:-1] cflags = cflags.split() - if debug: - cflags.append('-g') - cflags.append('-O0') - else: - cflags.append('-O3') + # Use the default python flags + #if debug: + # cflags.append('-g') + # cflags.append('-O0') + #else: + # cflags.append('-O3') lflags = os.popen(WX_CONFIG + ' --libs', 'r').read()[:-1] lflags = lflags.split() --- wxwidgets2.6-2.6.3.2.2.orig/wxPython/src/gtk/_core_wrap.cpp +++ wxwidgets2.6-2.6.3.2.2/wxPython/src/gtk/_core_wrap.cpp @@ -1228,7 +1228,7 @@ obj = pyobj; if (PyCFunction_Check(obj)) { /* here we get the method pointer for callbacks */ - char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc); + const char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc); c = doc ? strstr(doc, "swig_ptr: ") : 0; if (c) { c = ty ? SWIG_UnpackVoidPtr(c + 10, &vptr, ty->name) : 0; @@ -49116,11 +49116,11 @@ swig_type_info **types_initial) { size_t i; for (i = 0; methods[i].ml_name; ++i) { - char *c = methods[i].ml_doc; + const char *c = methods[i].ml_doc; if (c && (c = strstr(c, "swig_ptr: "))) { int j; swig_const_info *ci = 0; - char *name = c + 10; + const char *name = c + 10; for (j = 0; const_table[j].type; ++j) { if (strncmp(const_table[j].name, name, strlen(const_table[j].name)) == 0) { --- wxwidgets2.6-2.6.3.2.2.orig/wxPython/src/gtk/_controls_wrap.cpp +++ wxwidgets2.6-2.6.3.2.2/wxPython/src/gtk/_controls_wrap.cpp @@ -1228,7 +1228,7 @@ obj = pyobj; if (PyCFunction_Check(obj)) { /* here we get the method pointer for callbacks */ - char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc); + const char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc); c = doc ? strstr(doc, "swig_ptr: ") : 0; if (c) { c = ty ? SWIG_UnpackVoidPtr(c + 10, &vptr, ty->name) : 0; @@ -38325,11 +38325,11 @@ swig_type_info **types_initial) { size_t i; for (i = 0; methods[i].ml_name; ++i) { - char *c = methods[i].ml_doc; + const char *c = methods[i].ml_doc; if (c && (c = strstr(c, "swig_ptr: "))) { int j; swig_const_info *ci = 0; - char *name = c + 10; + const char *name = c + 10; for (j = 0; const_table[j].type; ++j) { if (strncmp(const_table[j].name, name, strlen(const_table[j].name)) == 0) { --- wxwidgets2.6-2.6.3.2.2.orig/wxPython/src/gtk/_misc_wrap.cpp +++ wxwidgets2.6-2.6.3.2.2/wxPython/src/gtk/_misc_wrap.cpp @@ -1228,7 +1228,7 @@ obj = pyobj; if (PyCFunction_Check(obj)) { /* here we get the method pointer for callbacks */ - char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc); + const char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc); c = doc ? strstr(doc, "swig_ptr: ") : 0; if (c) { c = ty ? SWIG_UnpackVoidPtr(c + 10, &vptr, ty->name) : 0; @@ -35257,11 +35257,11 @@ swig_type_info **types_initial) { size_t i; for (i = 0; methods[i].ml_name; ++i) { - char *c = methods[i].ml_doc; + const char *c = methods[i].ml_doc; if (c && (c = strstr(c, "swig_ptr: "))) { int j; swig_const_info *ci = 0; - char *name = c + 10; + const char *name = c + 10; for (j = 0; const_table[j].type; ++j) { if (strncmp(const_table[j].name, name, strlen(const_table[j].name)) == 0) { --- wxwidgets2.6-2.6.3.2.2.orig/wxPython/src/gtk/media_wrap.cpp +++ wxwidgets2.6-2.6.3.2.2/wxPython/src/gtk/media_wrap.cpp @@ -1228,7 +1228,7 @@ obj = pyobj; if (PyCFunction_Check(obj)) { /* here we get the method pointer for callbacks */ - char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc); + const char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc); c = doc ? strstr(doc, "swig_ptr: ") : 0; if (c) { c = ty ? SWIG_UnpackVoidPtr(c + 10, &vptr, ty->name) : 0; @@ -4024,11 +4024,11 @@ swig_type_info **types_initial) { size_t i; for (i = 0; methods[i].ml_name; ++i) { - char *c = methods[i].ml_doc; + const char *c = methods[i].ml_doc; if (c && (c = strstr(c, "swig_ptr: "))) { int j; swig_const_info *ci = 0; - char *name = c + 10; + const char *name = c + 10; for (j = 0; const_table[j].type; ++j) { if (strncmp(const_table[j].name, name, strlen(const_table[j].name)) == 0) { --- wxwidgets2.6-2.6.3.2.2.orig/wxPython/src/gtk/_windows_wrap.cpp +++ wxwidgets2.6-2.6.3.2.2/wxPython/src/gtk/_windows_wrap.cpp @@ -1228,7 +1228,7 @@ obj = pyobj; if (PyCFunction_Check(obj)) { /* here we get the method pointer for callbacks */ - char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc); + const char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc); c = doc ? strstr(doc, "swig_ptr: ") : 0; if (c) { c = ty ? SWIG_UnpackVoidPtr(c + 10, &vptr, ty->name) : 0; @@ -31077,11 +31077,11 @@ swig_type_info **types_initial) { size_t i; for (i = 0; methods[i].ml_name; ++i) { - char *c = methods[i].ml_doc; + const char *c = methods[i].ml_doc; if (c && (c = strstr(c, "swig_ptr: "))) { int j; swig_const_info *ci = 0; - char *name = c + 10; + const char *name = c + 10; for (j = 0; const_table[j].type; ++j) { if (strncmp(const_table[j].name, name, strlen(const_table[j].name)) == 0) { --- wxwidgets2.6-2.6.3.2.2.orig/wxPython/src/gtk/webkit_wrap.cpp +++ wxwidgets2.6-2.6.3.2.2/wxPython/src/gtk/webkit_wrap.cpp @@ -1228,7 +1228,7 @@ obj = pyobj; if (PyCFunction_Check(obj)) { /* here we get the method pointer for callbacks */ - char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc); + const char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc); c = doc ? strstr(doc, "swig_ptr: ") : 0; if (c) { c = ty ? SWIG_UnpackVoidPtr(c + 10, &vptr, ty->name) : 0; @@ -3827,11 +3827,11 @@ swig_type_info **types_initial) { size_t i; for (i = 0; methods[i].ml_name; ++i) { - char *c = methods[i].ml_doc; + const char *c = methods[i].ml_doc; if (c && (c = strstr(c, "swig_ptr: "))) { int j; swig_const_info *ci = 0; - char *name = c + 10; + const char *name = c + 10; for (j = 0; const_table[j].type; ++j) { if (strncmp(const_table[j].name, name, strlen(const_table[j].name)) == 0) { --- wxwidgets2.6-2.6.3.2.2.orig/wxPython/src/gtk/html_wrap.cpp +++ wxwidgets2.6-2.6.3.2.2/wxPython/src/gtk/html_wrap.cpp @@ -1228,7 +1228,7 @@ obj = pyobj; if (PyCFunction_Check(obj)) { /* here we get the method pointer for callbacks */ - char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc); + const char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc); c = doc ? strstr(doc, "swig_ptr: ") : 0; if (c) { c = ty ? SWIG_UnpackVoidPtr(c + 10, &vptr, ty->name) : 0; @@ -15178,11 +15178,11 @@ swig_type_info **types_initial) { size_t i; for (i = 0; methods[i].ml_name; ++i) { - char *c = methods[i].ml_doc; + const char *c = methods[i].ml_doc; if (c && (c = strstr(c, "swig_ptr: "))) { int j; swig_const_info *ci = 0; - char *name = c + 10; + const char *name = c + 10; for (j = 0; const_table[j].type; ++j) { if (strncmp(const_table[j].name, name, strlen(const_table[j].name)) == 0) { --- wxwidgets2.6-2.6.3.2.2.orig/wxPython/src/gtk/calendar_wrap.cpp +++ wxwidgets2.6-2.6.3.2.2/wxPython/src/gtk/calendar_wrap.cpp @@ -1228,7 +1228,7 @@ obj = pyobj; if (PyCFunction_Check(obj)) { /* here we get the method pointer for callbacks */ - char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc); + const char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc); c = doc ? strstr(doc, "swig_ptr: ") : 0; if (c) { c = ty ? SWIG_UnpackVoidPtr(c + 10, &vptr, ty->name) : 0; @@ -4993,11 +4993,11 @@ swig_type_info **types_initial) { size_t i; for (i = 0; methods[i].ml_name; ++i) { - char *c = methods[i].ml_doc; + const char *c = methods[i].ml_doc; if (c && (c = strstr(c, "swig_ptr: "))) { int j; swig_const_info *ci = 0; - char *name = c + 10; + const char *name = c + 10; for (j = 0; const_table[j].type; ++j) { if (strncmp(const_table[j].name, name, strlen(const_table[j].name)) == 0) { --- wxwidgets2.6-2.6.3.2.2.orig/wxPython/src/gtk/_gdi_wrap.cpp +++ wxwidgets2.6-2.6.3.2.2/wxPython/src/gtk/_gdi_wrap.cpp @@ -96,6 +96,10 @@ #include +#if PY_VERSION_HEX < 0x02050000 +typedef int Py_ssize_t; +#endif + /*********************************************************************** * swigrun.swg * @@ -1228,7 +1232,7 @@ obj = pyobj; if (PyCFunction_Check(obj)) { /* here we get the method pointer for callbacks */ - char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc); + const char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc); c = doc ? strstr(doc, "swig_ptr: ") : 0; if (c) { c = ty ? SWIG_UnpackVoidPtr(c + 10, &vptr, ty->name) : 0; @@ -1978,7 +1982,7 @@ } static wxBitmap *new_wxBitmap(PyObject *bits,int width,int height,int depth=1){ char* buf; - int length; + Py_ssize_t length; PyString_AsStringAndSize(bits, &buf, &length); return new wxBitmap(buf, width, height, depth); } @@ -23657,11 +23661,11 @@ swig_type_info **types_initial) { size_t i; for (i = 0; methods[i].ml_name; ++i) { - char *c = methods[i].ml_doc; + const char *c = methods[i].ml_doc; if (c && (c = strstr(c, "swig_ptr: "))) { int j; swig_const_info *ci = 0; - char *name = c + 10; + const char *name = c + 10; for (j = 0; const_table[j].type; ++j) { if (strncmp(const_table[j].name, name, strlen(const_table[j].name)) == 0) { --- wxwidgets2.6-2.6.3.2.2.orig/wxPython/src/gtk/wizard_wrap.cpp +++ wxwidgets2.6-2.6.3.2.2/wxPython/src/gtk/wizard_wrap.cpp @@ -1228,7 +1228,7 @@ obj = pyobj; if (PyCFunction_Check(obj)) { /* here we get the method pointer for callbacks */ - char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc); + const char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc); c = doc ? strstr(doc, "swig_ptr: ") : 0; if (c) { c = ty ? SWIG_UnpackVoidPtr(c + 10, &vptr, ty->name) : 0; @@ -5913,11 +5913,11 @@ swig_type_info **types_initial) { size_t i; for (i = 0; methods[i].ml_name; ++i) { - char *c = methods[i].ml_doc; + const char *c = methods[i].ml_doc; if (c && (c = strstr(c, "swig_ptr: "))) { int j; swig_const_info *ci = 0; - char *name = c + 10; + const char *name = c + 10; for (j = 0; const_table[j].type; ++j) { if (strncmp(const_table[j].name, name, strlen(const_table[j].name)) == 0) { --- wxwidgets2.6-2.6.3.2.2.orig/wxPython/src/gtk/xrc_wrap.cpp +++ wxwidgets2.6-2.6.3.2.2/wxPython/src/gtk/xrc_wrap.cpp @@ -1228,7 +1228,7 @@ obj = pyobj; if (PyCFunction_Check(obj)) { /* here we get the method pointer for callbacks */ - char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc); + const char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc); c = doc ? strstr(doc, "swig_ptr: ") : 0; if (c) { c = ty ? SWIG_UnpackVoidPtr(c + 10, &vptr, ty->name) : 0; @@ -7951,11 +7951,11 @@ swig_type_info **types_initial) { size_t i; for (i = 0; methods[i].ml_name; ++i) { - char *c = methods[i].ml_doc; + const char *c = methods[i].ml_doc; if (c && (c = strstr(c, "swig_ptr: "))) { int j; swig_const_info *ci = 0; - char *name = c + 10; + const char *name = c + 10; for (j = 0; const_table[j].type; ++j) { if (strncmp(const_table[j].name, name, strlen(const_table[j].name)) == 0) { --- wxwidgets2.6-2.6.3.2.2.orig/wxPython/src/gtk/grid_wrap.cpp +++ wxwidgets2.6-2.6.3.2.2/wxPython/src/gtk/grid_wrap.cpp @@ -1228,7 +1228,7 @@ obj = pyobj; if (PyCFunction_Check(obj)) { /* here we get the method pointer for callbacks */ - char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc); + const char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc); c = doc ? strstr(doc, "swig_ptr: ") : 0; if (c) { c = ty ? SWIG_UnpackVoidPtr(c + 10, &vptr, ty->name) : 0; @@ -20837,11 +20837,11 @@ swig_type_info **types_initial) { size_t i; for (i = 0; methods[i].ml_name; ++i) { - char *c = methods[i].ml_doc; + const char *c = methods[i].ml_doc; if (c && (c = strstr(c, "swig_ptr: "))) { int j; swig_const_info *ci = 0; - char *name = c + 10; + const char *name = c + 10; for (j = 0; const_table[j].type; ++j) { if (strncmp(const_table[j].name, name, strlen(const_table[j].name)) == 0) { --- wxwidgets2.6-2.6.3.2.2.orig/wxPython/contrib/animate/gtk/animate_wrap.cpp +++ wxwidgets2.6-2.6.3.2.2/wxPython/contrib/animate/gtk/animate_wrap.cpp @@ -1228,7 +1228,7 @@ obj = pyobj; if (PyCFunction_Check(obj)) { /* here we get the method pointer for callbacks */ - char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc); + const char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc); c = doc ? strstr(doc, "swig_ptr: ") : 0; if (c) { c = ty ? SWIG_UnpackVoidPtr(c + 10, &vptr, ty->name) : 0; @@ -5601,11 +5601,11 @@ swig_type_info **types_initial) { size_t i; for (i = 0; methods[i].ml_name; ++i) { - char *c = methods[i].ml_doc; + const char *c = methods[i].ml_doc; if (c && (c = strstr(c, "swig_ptr: "))) { int j; swig_const_info *ci = 0; - char *name = c + 10; + const char *name = c + 10; for (j = 0; const_table[j].type; ++j) { if (strncmp(const_table[j].name, name, strlen(const_table[j].name)) == 0) { --- wxwidgets2.6-2.6.3.2.2.orig/wxPython/contrib/activex/activex_wrap.cpp +++ wxwidgets2.6-2.6.3.2.2/wxPython/contrib/activex/activex_wrap.cpp @@ -1228,7 +1228,7 @@ obj = pyobj; if (PyCFunction_Check(obj)) { /* here we get the method pointer for callbacks */ - char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc); + const char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc); c = doc ? strstr(doc, "swig_ptr: ") : 0; if (c) { c = ty ? SWIG_UnpackVoidPtr(c + 10, &vptr, ty->name) : 0; @@ -6001,11 +6001,11 @@ swig_type_info **types_initial) { size_t i; for (i = 0; methods[i].ml_name; ++i) { - char *c = methods[i].ml_doc; + const char *c = methods[i].ml_doc; if (c && (c = strstr(c, "swig_ptr: "))) { int j; swig_const_info *ci = 0; - char *name = c + 10; + const char *name = c + 10; for (j = 0; const_table[j].type; ++j) { if (strncmp(const_table[j].name, name, strlen(const_table[j].name)) == 0) { --- wxwidgets2.6-2.6.3.2.2.orig/wxPython/contrib/stc/gtk/stc_wrap.cpp +++ wxwidgets2.6-2.6.3.2.2/wxPython/contrib/stc/gtk/stc_wrap.cpp @@ -1228,7 +1228,7 @@ obj = pyobj; if (PyCFunction_Check(obj)) { /* here we get the method pointer for callbacks */ - char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc); + const char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc); c = doc ? strstr(doc, "swig_ptr: ") : 0; if (c) { c = ty ? SWIG_UnpackVoidPtr(c + 10, &vptr, ty->name) : 0; @@ -19592,11 +19592,11 @@ swig_type_info **types_initial) { size_t i; for (i = 0; methods[i].ml_name; ++i) { - char *c = methods[i].ml_doc; + const char *c = methods[i].ml_doc; if (c && (c = strstr(c, "swig_ptr: "))) { int j; swig_const_info *ci = 0; - char *name = c + 10; + const char *name = c + 10; for (j = 0; const_table[j].type; ++j) { if (strncmp(const_table[j].name, name, strlen(const_table[j].name)) == 0) { --- wxwidgets2.6-2.6.3.2.2.orig/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp +++ wxwidgets2.6-2.6.3.2.2/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp @@ -1228,7 +1228,7 @@ obj = pyobj; if (PyCFunction_Check(obj)) { /* here we get the method pointer for callbacks */ - char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc); + const char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc); c = doc ? strstr(doc, "swig_ptr: ") : 0; if (c) { c = ty ? SWIG_UnpackVoidPtr(c + 10, &vptr, ty->name) : 0; @@ -11968,11 +11968,11 @@ swig_type_info **types_initial) { size_t i; for (i = 0; methods[i].ml_name; ++i) { - char *c = methods[i].ml_doc; + const char *c = methods[i].ml_doc; if (c && (c = strstr(c, "swig_ptr: "))) { int j; swig_const_info *ci = 0; - char *name = c + 10; + const char *name = c + 10; for (j = 0; const_table[j].type; ++j) { if (strncmp(const_table[j].name, name, strlen(const_table[j].name)) == 0) { --- wxwidgets2.6-2.6.3.2.2.orig/wxPython/contrib/ogl/gtk/ogl_wrap.cpp +++ wxwidgets2.6-2.6.3.2.2/wxPython/contrib/ogl/gtk/ogl_wrap.cpp @@ -1174,7 +1174,7 @@ obj = pyobj; if (PyCFunction_Check(obj)) { /* here we get the method pointer for callbacks */ - char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc); + const char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc); c = doc ? strstr(doc, "swig_ptr: ") : 0; if (c) { c = SWIG_UnpackVoidPtr(c + 10, &vptr, ty->name); @@ -38701,11 +38701,11 @@ swig_type_info **types_initial) { size_t i; for (i = 0; methods[i].ml_name; ++i) { - char *c = methods[i].ml_doc; + const char *c = methods[i].ml_doc; if (c && (c = strstr(c, "swig_ptr: "))) { int j; swig_const_info *ci = 0; - char *name = c + 10; + const char *name = c + 10; for (j = 0; const_table[j].type; j++) { if (strncmp(const_table[j].name, name, strlen(const_table[j].name)) == 0) { --- wxwidgets2.6-2.6.3.2.2.orig/wxPython/contrib/glcanvas/gtk/glcanvas_wrap.cpp +++ wxwidgets2.6-2.6.3.2.2/wxPython/contrib/glcanvas/gtk/glcanvas_wrap.cpp @@ -1228,7 +1228,7 @@ obj = pyobj; if (PyCFunction_Check(obj)) { /* here we get the method pointer for callbacks */ - char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc); + const char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc); c = doc ? strstr(doc, "swig_ptr: ") : 0; if (c) { c = ty ? SWIG_UnpackVoidPtr(c + 10, &vptr, ty->name) : 0; @@ -3517,11 +3517,11 @@ swig_type_info **types_initial) { size_t i; for (i = 0; methods[i].ml_name; ++i) { - char *c = methods[i].ml_doc; + const char *c = methods[i].ml_doc; if (c && (c = strstr(c, "swig_ptr: "))) { int j; swig_const_info *ci = 0; - char *name = c + 10; + const char *name = c + 10; for (j = 0; const_table[j].type; ++j) { if (strncmp(const_table[j].name, name, strlen(const_table[j].name)) == 0) { --- wxwidgets2.6-2.6.3.2.2.orig/wxPython/wx/py/introspect.py +++ wxwidgets2.6-2.6.3.2.2/wxPython/wx/py/introspect.py @@ -1,12 +1,12 @@ """Provides a variety of introspective-type support functions for things like call tips and command auto completion.""" +from __future__ import nested_scopes + __author__ = "Patrick K. O'Brien " __cvsid__ = "$Id: introspect.py,v 1.11 2005/03/25 20:34:52 RD Exp $" __revision__ = "$Revision: 1.11 $"[11:-2] -from __future__ import nested_scopes - import cStringIO import inspect import sys