diff options
77 files changed, 11661 insertions, 13810 deletions
@@ -1,155 +1,356 @@ -2009-02-08 + +2009-09-09 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Add maintainer script to help releasing process + * Document previous import + * Import translations from launchpad + +2009-08-20 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Update translations from launchpad + +2009-08-18 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Auto-Generation of ChangeLog file + * Add a script to compute po/ChangeLog fragment + * Update administrative file + * Import current Launchpad translations + +2009-08-18 +Tal <tal.bav@gmail.com>: + * Fix #2163652: GPX file with byte order mark not parsed + +2009-08-18 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Add src/mapcache.c as source file containing translatable strings + +2009-07-28 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Fix #2766609: Don't use gpsd_units() + +2009-07-28 +Jocelyn Jaubert <jocelyn.jaubert@gmail.com>: + * Add missing (VikLayerFuncPostRead) in structs VikLayerInterface + +2009-07-26 +Herm <hermk@users.sourceforge.net>: + * Fix #2812856: Change SRTM URL + +2009-07-26 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Fix #2818818: unset langage preset while opening external Google + * Fix copyright in --version output + +2009-07-25 +Herm <hermk@users.sourceforge.net>: + * Fix SRTM Server change + +2009-07-22 +Jocelyn Jaubert <jocelyn.jaubert@gmail.com>: + * Fix memory leaks found with cppcheck + +2009-07-21 +Jocelyn Jaubert <jocelyn.jaubert@gmail.com>: + * Fix warning in call to MD5Update() in function md5_hash() + +2009-07-19 +Jocelyn Jaubert <jocelyn.jaubert@gmail.com>: + * Add .gitignore + +2009-06-19 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Complete 376c917751b680fd238cd85511bab4ed26727c0f + * Document previous patches from Jonas Norling + +2009-06-19 +Jonas Norling <norling@lysator.liu.se>: + * Don't crash when jobs are cancelled via the background jobs dialog. + * Join common code in zoom in and zoom out cases. + * Filter out irrelevant modifiers. + +2009-06-02 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Upgrade OSM-traces support to 0.6 API + +2009-05-22 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Document previous patches + * Fix previous patch + +2009-05-22 +Tal B <tal.bav@gmail.com>: + * use default values VIK_DEFAULT_DOP, VIK_DEFAULT_ALTITUDE + * remove _VikTrackpoint.extended field. + * Document when field in _VikTrackpoint are considered unavailable. + * gpx_write_trackpoint(): + * vdop, hdop, pdop, nsats and fix_mode values were not shown + * hdop,vdop,pdop,nsat + +2009-05-22 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Remove unused (and buggy) feature + +2009-05-22 +Jocelyn Jaubert <jocelyn.jaubert@gmail.com>: + * Fix #570956: change saved_width to 1 + +2009-05-09 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Document previous merge + * Merge improvement of map cache made by Jocelyn Jaubert + +2009-05-09 +Tal <tal.bav@gmail.com>: + * Replace g_strtod by g_ascii_strtod + +2009-05-06 +Jocelyn Jaubert <jocelyn.jaubert@gmail.com>: + * Add a viking parameter for mapcache memory size + * Move VIK_CONFIG_MAPCACHE_SIZE to a variable + * Add menu option to flush mapcache, and reduce viking memory footprint + * Add a_mapcache_flush() to completely flush the mapcache + +2009-05-06 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Add a TODO + * Document previous merge + * Merge 'thread-pool' features from Jocelyn Jaubert + +2009-05-06 +Jocelyn Jaubert <jocelyn.jaubert@gmail.com>: + * Stop all curl downloads on quit + +2009-04-25 +Jocelyn Jaubert <jocelyn.jaubert@gmail.com>: + * Wait for all threads to finish before exiting viking + * Replace g_thread by g_thread_pool + +2009-04-17 +Lixus Zoran <gps@muellers.ms>: + * Example file: OpenStreetMap + +2009-04-17 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Avoid crash + +2009-04-15 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Fix build problem + +2009-04-13 +Jocelyn Jaubert <jocelyn.jaubert@gmail.com>: + * Show path used for map directory in options even when using default one + +2009-04-13 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Change dependencies checking + +2009-04-04 +Jocelyn Jaubert <jocelyn.jaubert@gmail.com>: + * Add missing include glib/gprintf.h + +2009-04-04 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Document previous patch + +2009-04-04 +Jocelyn Jaubert <jocelyn.jaubert@gmail.com>: + * Fix bug #2481237: Maps directory file chooser should look for directory + +2009-04-04 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Document previous patch + +2009-04-04 +Jocelyn Jaubert <jocelyn.jaubert@gmail.com>: + * libcurl update: replace deprecated CURLOPT_FILE by CURLOPT_WRITEDATA + +2009-04-04 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Documenting previous patch + +2009-04-04 +Jocelyn Jaubert <jocelyn.jaubert@gmail.com>: + * Include full libcurl version in user agent + +2009-02-13 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Release 0.9.8 + * Update translations for 0.9.8 + +2009-02-02 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * Update translations * Release 0.9.8 +2009-01-31 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Finish to remove Google + +2009-01-22 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Document previous patch + 2009-01-22 Mathieu Albinet <mathieu17@gmail.com>: - * Fix loading of world map file + * Fix loading a world file + +2009-01-22 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Enforce memory free 2009-01-22 -Rob Norris <robbieonsea@users.sourceforge.net>: - * Fix 2249398: Fix some memory leaks +Robert Norris <rw_norris@hotmail.com>: + * Fix some memory leaks. 2009-01-18 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * configure.ac: allow to enable/disable geonames and select the search method + * Document previous commits + * Allow to select between Google and Geonames for searching method + * Add conditional compilation for geonames 2009-01-18 Hein Ragas <viking@ragas.nl>: - * Add GeoNames support (both for search and for POI import from Geonames+Wikipedia) + * Documenting previous patches from Hein Ragas + * Geonames et Wikipedia search + * Better GeoNames.org implementation + * a patch to use GeoNames.org instead of Google for the 'Go to'-functionality. 2009-01-15 Mathieu Albinet <mathieu17@gmail.com>: - * Windows port: avoid "\\" in URL + * Windows port 2008-12-20 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * Remove Google's map tiles + * Remove Google's map-tiles -2008-12-17 +2008-12-18 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: * Remove old Google stuff + * Add configuration options for OpenAerial and BlueMarble 2008-12-13 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * Add external tools framework - * Add OpenStreetMap and Google web tools + * News feature: external tools + * QA: improve portability -2008-12-07 +2008-12-06 Quy Tonthat <qtonthat@gmail.com>: - * Clicking on "vivisble" tick no longer makes the layer selected. + * Clicking on "vivisble" tick of a layer no longer makes the layer selected. 2008-12-03 -Hein Ragas <viking@ragas.nl> - * GPX export: sort track by time. Some application can make use - of this feature when reading gpx files. +Hein Ragas <viking@ragas.nl>: + * GPX export: sort track by time. (By Hein Ragas). -2008-11-22 +2008-11-21 Quy Tonthat <qtonthat@gmail.com>: - * Merging tracks by name. Users can now select more than one tracks to - merge with. * Fix bugs that caused magic scissors not working. + * Merging track: Merge with more than one tracks at a time. -2008-11-19 +2008-11-18 Quy Tonthat <qtonthat@gmail.com>: - * Merging tracks by name. As submitted by Hein Ragas <viking@ragas.nl> - * Merging tracks by name. Tracks can only be merged if they have - timestamps. Make sure users won't cause damage to themselves by - merging tracks without timestamps. Also a few bug fixes and - optimisation. + * Merging track. Few safegards, enhance and bug fixes. + +2008-11-18 +Hein Ragas <viking@ragas.nl>: + * Merging track by name. As submitted by Hein Ragas <viking@ragas.nl> 2008-11-13 Quy Tonthat <qtonthat@gmail.com>: - * Viking no longer support Google satellite maps due to requests - from Google. + * No longer provide support for google satellite maps. 2008-10-31 Quy Tonthat <qtonthat@gmail.com>: - * Tittle waypoint properties dialog as "Waypoint Properties" - not "Create". + * Change Title of Waypoint Properties dialog to "Waypoint Properties" 2008-10-30 Quy Tonthat <qtonthat@gmail.com>: - * Add larger size waypoint symbols (icons) that look similar to - the ones used in Garmin GPS. - * The larger symbols are now used by default. To switch back to the - old smaller icons, use command line option "-s" or "--small_waypoint". - * Waypoint Property Dialog: The combo box "symbol" (used for selecting - waypoint symbol) now has tooltip that shows the name of the selected - symbol. - * src/icons/Makefile.am: Make sure we won't pick up unwanted _pixmap.h - files - * Waypoint names are now displayed at the top of waypoint symbol - and no longer overlap symbols. + * Change how waypoint names are displayed. + * Make sure we won't pick up unwanted _pixmap.h files + * Larger waypoint symbols 2008-10-28 Quy Tonthat <qtonthat@gmail.com>: - * Waypoint symbols: Use Garmin waypoit names so that waypoint has - proper symbols on GPS after upload (and on Viking after download). - Old viking files still works the way they did. + * Waypoint icons are now compatible with GPS. 2008-10-22 Quy Tonthat <qtonthat@gmail.com>: - * Fix compatibility problem for windows caused by - g_shell_parse_argv() + * Fix compatibility problem for windows. 2008-10-20 Quy Tonthat <qtonthat@gmail.com>: - * New server for OSM cycle map. + * New server for OSM cycle map + +2008-10-14 +Evan Battaglia <gtoevan@gmx.net>: + * minor fix in gcget. + * Update gcget to adapt to changes at geocaching.com 2008-10-13 Quy Tonthat <qtonthat@gmail.com>: - * GPS realtime tracking: Keep retrying when fail to connect - to gpsd, either because gpsd is not (yet) running or gpsd - disconnect (eg. gps unplugged). + * Make warning messages a bit more informative. + * g_timeout_add_seconds() did not exist until glib 2.14 + * gps realtime tracking: retry on connection to gpsd. 2008-10-12 Jon Burgess <jburgess777@googlemail.com>: - * fix implicit declaration of maps_layer_default_dir() - * fix missing status return in spawn_command_line_async() * fix curl error buffer usage + * fix missing status return in spawn_command_line_async() + * fix implicit declaration of maps_layer_default_dir() 2008-10-12 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Typo * Release 0.9.7 2008-10-12 -Rob Norris <robbieonsea@users.sourceforge.net>: - * Fix 2161310: Fix some more compiler warnings +Robert Norris <rw_norris@hotmail.com>: + * Fix some more compiler warnings + +2008-10-12 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Rename test files 2008-10-12 -Jon Burgess <jburgess777@users.sourceforge.net>: - * Fix 2134452: Properties of some tracks show as NaN +Jon Burgess <jburgess777@googlemail.com>: + * Properties of some tracks show as NaN -2008-10-11 +2008-10-10 Quy Tonthat <qtonthat@gmail.com>: - * Fix segfault in realtime tracking. - * Add new moving map method for realtime tracking. + * Realtime tracking: Add new moving map method. + * gps realtime tracking: fixed segfault. 2008-09-30 Stanislav Brabec <sbrabec@users.sourceforge.net>: - * Rename icon: viking_icon.png -> viking.png + * Fix icon target dir + * Improve viking.desktop * Fix missing files in po/POTFILES.in - * src/viking.desktop.in: add GenericName and revise Categories - * viking.spec.in, src/icons/Makefile.am: Fix icon target dir + * Rename icon: viking_icon.png -> viking.png -2008-09-22 +2008-09-30 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Note TODO + * Document Fix #1947260 + +2008-09-21 Quy Tonthat <qtonthat@gmail.com>: * Change "Zoom To" short cut to avoid conflict with "Zoom Tool". 2008-09-16 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Typos * Update translations + * Update translations from launchpad -2008-09-07 +2008-09-06 Quy Tonthat <qtonthat@gmail.com>: - * fix parallel build (make -j8) on multi-processor machines. Based - on a patch from sbrabec. Thanks. + * Fix parallel build (make -j8) on multi-processor machines. Based on a patch from sbrabec. 2008-09-03 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * QA: cleanning old stuff + * QA: cleanning unused stuff + * QA: un-needed external reference + * Portability + * QA: homogeneous way of doing stuff 2008-09-01 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: @@ -159,57 +360,95 @@ Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: Quy Tonthat <qtonthat@gmail.com>: * Google search adapting changes from Google. -2008-09-01 +2008-08-31 Quy Tonthat <qtonthat@gmail.com>: - * Fixed crashes when creating new layers. + * Fix crashes when creating new layers. 2008-08-30 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Typo: removing trailing double-colon on ChangeLog + * Removing critical message * QA: removing specific GtkCellRenderer + * Documenting previous patch + I18N updates + +2008-08-30 +Armin Moser <armin.moser@student.tugraz.at>: + * added a menu entry to extend an existing track using magic scissors + +2008-08-30 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Documenting previous patch 2008-08-30 Armin Moser <armin.moser@student.tugraz.at>: - * add osm cycle layer support - * add a menu entry to extend an existing track using magic scissors + * osm cycle layer support + +2008-08-30 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Fix typo + * Document previous patch and fix typo 2008-08-30 -anonymous: +anonymous <>: * Patch #2009666: OpenAerialMap 2008-08-30 -Rob Norris <robbieonsea@users.sourceforge.net>: - * Fix #1952523: mode_button assertion loading old datafile +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * QA: avoid segfault + * Replace GTK_STOCK_GO_FORWARD with GTK_STOCK_JUMP_TO + * Document previous fix and add data to reproduce problem + * QA + * Synchronise vikwindow.c and menu.xml around mode handling + +2008-08-30 +Robert Norris <rw_norris@hotmail.com>: + * Fix 1952523 + +2008-08-29 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Relocate current data field + * Textual properties go in a dedicated tab 2008-08-25 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Typo + * QA: use standard function instead of viking specific * Add preferences to select how degrees are displayed 2008-08-24 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * Fix: update layer after applying properties + * Update layer after modifying properties + * QA: Unused code + * Add documentation and test file for previous patch -2008-06-24 +2008-08-24 Mathieu Albinet <mathieu17@gmail.com>: * Color picker button for the Coordlayer properties dialog 2008-08-23 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * Cut/Copy/Paste empty selection is not critical + * Acting (Cut, Copy, Paste) when nothing selected is not critical + * QA: more generic way of computing size of an array + * Add tooltips to some actions + * Documenting previous patch -2008-06-23 +2008-08-23 Mathieu Albinet <mathieu17@gmail.com>: * Layers panel UI improvements 2008-08-22 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * Replace specific about dialog by GtkAboutDialog - * Replace some g_warning by g_debug * Homogeneous icons management. + * Replace some g_warning by g_debug + * Add email support in about dialog + * Replace specific about dialog by GtkAboutDialog + * Add dependencies between built sources and Makefile.am 2008-08-17 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * Add preferences to store OSM login/password + * Use the new widget to hide OSM's password * Add a password entry widget + * Create preferences for OSM traces module 2008-08-16 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: @@ -217,12 +456,12 @@ Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: 2008-08-13 Quy Tonthat <qtonthat@gmail.com>: - * Fixed google map download problem. + * Fixed Google map download problem. 2008-07-31 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * Release Viking 0.9.6 - * Fix unecessary (and probably) Makefile.am directive + * Releasing 0.9.6 + * Remove unecessary directive 2008-07-28 Quy Tonthat <qtonthat@gmail.com>: @@ -230,85 +469,133 @@ Quy Tonthat <qtonthat@gmail.com>: 2008-07-22 Quy Tonthat <qtonthat@gmail.com>: - * Google maps no longer worked due to changes made by Google. - The Problems now fixed. + * Google maps no longer worked due to changes by Google. Problems now fixed. + +2008-07-22 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Releasing 0.9.5 + * Delete duplicates + * Add directives to clean + * Automatic update + * Update AUTHORS list + * Fix suggested by Jocelyn + * Document recent activities + * Automatic update + * Update from Launchpad -2008-07-21 +2008-07-19 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * Release Viking 0.9.5 + * Automatically disable man pages generation 2008-07-18 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * Install man pages - * Update translations + * Convert and install man pages + +2008-07-15 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Better integration of .desktop file + * Comment 2008-07-15 Quy Tonthat <qtonthat@gmail.com>: - * Added viking.desktop + * Add viking.desktop file + +2008-07-14 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Documenting recent patch + * QA: Remove some more warnings -2008-07-13 -Rob Norris <robbieonsea@users.sourceforge.net>: - * Fix #1947456: Compiler warning fixes +2008-07-14 +Robert Norris <rw_norris@hotmail.com>: + * Compiler warning fixes + +2008-07-14 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Package new languages + * Translation update (automatic) 2008-07-09 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: * Update translations -2008-07-02 +2008-07-01 Quy Tonthat <qtonthat@gmail.com>: * Track properties: split track at marker. -2008-06-30 -Quy Tonthat <qtonthat@gmail.com>: - * Track properties: Keep markers of the graphs in sync with each - other. - 2008-06-29 -Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * Windows port: fallback temporary file +Quy Tonthat <qtonthat@gmail.com>: + * Track Properties: Keep markers of the graphs in sync with each other. 2008-06-29 Mathieu Albinet <mathieu17@gmail.com>: + * Windows port: fallback temporary file * Windows port: typo in util.c 2008-06-24 Quy Tonthat <qtonthat@gmail.com>: * Track graph marker now works again. -2008-06-22 +2008-06-21 Quy Tonthat <qtonthat@gmail.com>: * Fix google version number. 2008-06-15 Quy Tonthat <qtonthat@gmail.com>: - * RELEASE: Test release 0.9.4.20080614 (by Guilhem) + * Mark release 0.9.4.20080614 in ChangeLog + +2008-06-14 +Mathieu Albinet <mathieu17@gmail.com>: + * Windows port: use as many directories as POSIX version + * Windows: home dir define via GLib + * Recursive mkdir: use dedicated GLib function + * strtod -> g_strtod + * Windows port: add serial port + * Windows port: calling gpsbabel from windows 2008-06-09 Mathieu Albinet <mathieu17@gmail.com>: * Windows port: redefine LOCALEDIR -2008-06-06 +2008-06-05 Quy Tonthat <qtonthat@gmail.com>: - * viking no longer converts waypoint names to uppercase. Waypoint names - are now case insensitive. + * Do not convert waypoint names to uppercase. Make them case insensitive. -2008-06-02 +2008-06-03 Mathieu Albinet <mathieu17@gmail.com>: - * Portability: remove "/dev/null" use + * Portability: remove "/dev/null" reference + +2008-05-09 +Jon Burgess <jburgess777@googlemail.com>: + * Fix compilation issue 2008-05-08 Mathieu Albinet <mathieu17@gmail.com>: - * Windows port: rename interface to source_interface - * Portability: replace mmap functions by g_mapped_file* * Portability: use of g_ascii_dtostr to format google url -2008-05-02 +2008-05-08 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Improve error handling + I18N + +2008-05-08 +Mathieu Albinet <mathieu17@gmail.com>: + * Portability: replace mmap functions by g_mapped_file* + * Windows port: rename interface to source_interface + +2008-05-08 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: * Update man page + * Storing manpages + +2008-05-02 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Moving manpage upstream + * Moving manpage upstream 2008-05-01 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: * Add file content checking process + * Use a more generic error message + * Improve error handling 2008-05-01 Mathieu Albinet <mathieu17@gmail.com>: @@ -318,117 +605,180 @@ Mathieu Albinet <mathieu17@gmail.com>: Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: * Adding --debug and --verbose command line option -2008-04-26 +2008-04-27 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * Fix pipe leaks + * Portability: conditional sys/wait.h + * Cosmetic change + * Cosmetic change -2008-04-26 +2008-04-27 Mathieu Albinet <mathieu17@gmail.com>: + * Fix pipe leaks * Portability: provide our own curl WRITE function 2008-04-22 Robert Norris <rw_norris@hotmail.com>: - * Fix: Initalize tv_usec field. * Fix for implicit declaration of function 'g_fopen' + * Fix: Initalize tv_usec field 2008-04-21 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * Bug #1915121: add an utility to reproduce (test/gpx2gpx) - * Fix #1915121: use GLib functions to handle ISO8601 dates + * Read/Write ISO date in GLib's way + * Add a GPX non regression utility -2008-04-16 +2008-04-19 Tim Scofield <nospam546@comcast.net>: - * Fix: typo false -> FALSE + * Fix: typo -2008-04-12 -Mathieu Albinet <mathieu17@gmail.com>: +2008-04-15 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: * M_PI already defined 2008-04-12 -Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: Mathieu Albinet <mathieu17@gmail.com>: - * Portability: reduce unistd.h dependency - * Portability: replace mkdir by g_mkdir - * Portability: replace deprecated bzero function by memset * Portability: remove dirname needs with g_mkdir_with_parents + * Portability: replace deprecated bzero function by memset + * Portability: use Glib function related to stdio.h + * Portability: replace mkdir by g_mkdir + * Portability: reduce unistd.h dependency -2008-03-27 +2008-04-12 +Evan Battaglia <gtoevan@gmx.net>: + * add copyright in dem files + * Add chinese translation from Zhang Jun + +2008-04-01 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Revert "Declare the need of C99 compliant compiler" + +2008-03-30 Mathieu Albinet <mathieu17@gmail.com>: * Replace GtkFileSelection by GtkFileChooser +2008-03-25 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Declare the need of C99 compliant compiler + * Update authors list + 2008-03-24 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * Merge icons in a single binary object + * Make all icons in a single .o + +2008-03-16 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Store cursor info directly into tool struct 2008-03-15 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Pan tool (as default) + * Extract pan related codes * Fix: [ 1839948 ] Maximize/Restore changes current cursor - * Add panning tool as default + * Comment typo + +2008-02-27 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Typo + * Improve form to simplify automatic extractions 2008-02-25 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * po/ChangeLog: needed file for distribution + * Releasing 0.9.4 + * Add missing file + * Remove debug trace + * Rename func a_array_to_glist to str_array_to_glist (due to current interface) 2008-02-25 -Rob Norris <robbieonsea@users.sourceforge.net>: - * Fix: autogen can generate broken configure file (SF#1881475) +Robert Norris <rw_norris@hotmail.com>: * Fix some compiler warnings (SF#1888407) + * Fix 1881475 autogen can generate broken configure file + +2008-02-25 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Documenting previous commit 2008-02-24 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * Change OSM's tiles URL + * Correct OSM URL -2008-02-22 -Michael A. Peters <mpeters@mac.com>: +2008-02-21 +Quy Tonthat <qtonthat@gmail.com>: * viking.spec: Correct license, required packages and local. 2008-02-20 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: * Update translations + * State of LaunchPad contributions + * Update french translation + * Typo + * Update french translation + * Typo + * Update French translation + * Update from fresh .pot file + * Update French translation + * Correct famous sentence + * Remove trailing '\n' in g_message calls 2008-02-16 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * main.c: I18N improvements - * French translation update + * Update french translation + * Marking translatable string in main.c + * Documenting Jocelyn's patches + * Patch fr translation + * I18N improvement -2008-02-16 -Jocelyn Jaubert <jocelyn.jaubert@gmail.com>: - * I18N improvements - * French translation update - (both submitted the 2008-01-12 on mailing-list) +2008-01-25 +Alex Foobarian <foobarian@gmail.com>: + * Sort out the viewport header file a bit for better readability and in preparation for a cairo branch. 2008-01-22 Alex Foobarian <foobarian@gmail.com>: - * Fix a crash bug in merge-by-time reported by Evan <gtoevan@gmx.net> + * fix a crash bug in the merge-by-time function 2008-01-18 Quy Tonthat <qtonthat@gmail.com>: + * Added mutex to protect map pixbuf cache from being corrupted. + +2008-01-17 +Quy Tonthat <qtonthat@gmail.com>: * Fix a crash bug in mapcache reported by Jocelyn <jocelyn.jaubert@gmail.com> - * Added mutex to protect mapcache from being corrupted by threads. + +2008-01-15 +Christoph Eckert <ce@christeck.de>: + * bugfix (thanks Christoph Eckert) + +2008-01-12 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Fix: remove unused + * Fix: remove warnings 2008-01-04 Alex Foobarian <foobarian@gmail.com>: - * Tuned the v-t diagram drawing - + * Adjusted v-t drawing + 2007-12-27 Evan Battaglia <gtoevan@gmx.net>: - * Minor fixes/debugging to gcget. Add gcget-perl - * Full screen mode. - * Bugfix for prefernces -- don't cut off last character of password + * Bugfix for preferences + * DEBUG option for gcget. + * gcget-perl + * fix remove duplicates gpsbabel filter. full screen mode. + * one bugfix for gcget. there may be another bug out there. 2007-12-27 -Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: +Oddgeir Kvien <oddgeir@oddgeirkvien.com>: * Add GpxWritingOptions to control GPX file writing + * Add default values to ele and time fields (due to OSM) 2007-12-23 -Oddgeir Kvien <oddgeir@oddgeirkvien.com>: - * Add default values to ele and time fields (due to OSM) +Evan Battaglia <gtoevan@gmx.net>: + * Don't scare off users from trying geocache support. -2007-12-21 +2007-12-22 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Update french plural form + +2007-12-22 Evan Battaglia <gtoevan@gmx.net>: - * Preferences groups/tabs - * Fix gcget to accept username and password. Pass this in to gcget. - * Oops! Reading preferences from the file wasn't working. Fixed. + * preferences / geocaching update 2007-12-21 Jocelyn Jaubert <jocelyn.jaubert@gmail.com>: @@ -438,144 +788,162 @@ Jocelyn Jaubert <jocelyn.jaubert@gmail.com>: Christoph Eckert <ce@christeck.de>: * Update source for OSM/Osmarender tiles -2007-12-20 +2007-12-21 Evan Battaglia <gtoevan@gmx.net>: - * Preferences in ~/.viking/viking.prefs, this will soon allow geocaching support to go mainstream, (hopefully) + * Preferences: include the file. oops. + * Preferences!!!! Make way for the Geocachers. -2007-12-20 +2007-12-19 Quy Tonthat <qtonthat@gmail.com>: - * Revert a previous change that disabled realtime tracking if libgps - does not exist. + * Revert a previous change that disabled realtime tracking if libgps does not exist. 2007-12-17 Jocelyn Jaubert <jocelyn.jaubert@gmail.com>: * Use specific gettext call for plural form -2007-12-16 +2007-12-17 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Fix contribution dates + +2007-12-17 Evan Battaglia <gtoevan@gmx.net>: - * Sort waypoints in GPX output. - * Use the "next unused" (not really) waypoint number as default. + * "Highest unused" (not really) waypoint number as deafult name for waypoint. + * Sort waypoints in GPX output + +2007-12-15 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Fix: ensure config.h is included conditionnaly + +2007-12-15 +Jocelyn Jaubert <jocelyn.jaubert@gmail.com>: + * Update french translation + * Mark many strings translatable 2007-12-15 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * Fix compilation under HURD (missing MAXPATHLEN macro) * Fix: if libgps is missing, Realtime GPS Tracking is disabled + * Fix compilation under HURD (missing MAXPATHLEN macro) 2007-12-15 Jocelyn Jaubert <jocelyn.jaubert@gmail.com>: * Make menu entries translatable - * Mark many strings translatable - * Update french translation -2007-12-12 +2007-12-13 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * Marking translatable strings * First french translation (incomplete) + * Marking translatable strings. 2007-12-12 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * Fix warning: underquoted definition of AM_WITH_EXPAT * Fix bug: "config.status: error: cannot find input file: Makefile.in" + * Fix warning: underquoted definition of AM_WITH_EXPAT -2007-12-07 +2007-12-10 Quy Tonthat <qtonthat@gmail.com>: - * Fix autogen.sh to remove the assumption that version 1.9 of automake - is available on all systems. * Now that autogen.sh runs configure, "make full" should not. + * Fix autogen.sh to remove the assumption that version 1.9 of automake is available on all systems. -2007-12-07 +2007-12-08 Evan Battaglia <gtoevan@gmx.net>: - * BlueMarble tiles: http://mike.teczno.com/notes/blue-marble-tiles.html - * Google Terrain maps - * Disable printing to make Viking compile for GTK < 2.10 + * disable printing & let viking compile for gtk < 2.10.0 + * Google terrain maps. + * BlueMarble tile + +2007-12-01 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Renaming AC_PROG_INTLTOOL (deprecated) with IT_PROG_INTLTOOL 2007-11-27 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * util.c: Use a list of possible browsers. + * Use a list of possible browsers. + * Forgot incremental rebuild -2007-11-20 -Quy Tonthat <qtonthat@gmail.com>: - * Fix a bug that can potentially cause segfault. +2007-11-26 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * I18N: Adding minimal stuff + * I18N: Using standard autogen.sh 2007-11-19 Quy Tonthat <qtonthat@gmail.com>: + * Fix a bug that can potentially cause segfault. * Improve track graphs. Some tracks looked too flat. -2007-11-09 +2007-11-13 Evan Battaglia <gtoevan@gmx.net>: - * GPSBabel filter work I've been sitting on for a while now. - * Draw circle for downloading geocaches. Constrain by maximum distance. + * add another missing file + * adding forgotten uibulder code... -2007-11-08 +2007-11-10 +Evan Battaglia <gtoevan@gmx.net>: + * gctrackbyarc script + * Filters filters oh my + +2007-11-07 Quy Tonthat <qtonthat@gmail.com>: - * Printing support + * New feature: map printing. -2007-11-01 +2007-10-31 Quy Tonthat <qtonthat@gmail.com>: * Fix bug that caused Old Google maps not being disabled by default. 2007-10-24 Quy Tonthat <qtonthat@gmail.com>: - * Fix crashes on elev graph for some tracks. - * Make low alt tracks look more visible on elev graph. * Fix "incompatible pointer type" warnings. + * Make elev graph show better graph for low altitude tracks. + * Fix a bug that caused crashes when displaying elev graph for some track. -2007-10-23 -Quy Tonthat <qtonthat@gmail.com>: +2007-10-22 +Bernd Zeimetz <bernd@bzed.de>: + * Fixing the implicit declaration completely, thanks to dann frazier <dannf@debian.org> Debian #447662 + * Fixing another implicit declaration. * Missing declaration. Thanks to Bernd Zeimetz <bernd@bzed.de> -2007-10-20 +2007-10-21 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: * Releasing 0.9.3 + * Add "version" option 2007-10-20 Evan Battaglia <gtoevan@gmx.net>: - * Fixing minor typo in vikdemlayer.c which could cause crashes + * Fixing minor typo which caused crashes for me recently, unknown why it didn't crash before 2007-10-20 Quy Tonthat <qtonthat@gmail.com>: - * Track Properties Dialog no longer blocks interaction of the main - window. - * Draw position marker on track elev/speed graphs at mouse click. + * Added track name to title of properties dialog. * Diasable buttons on Track Properties Dialog when not needed. - * Display track name on title of track property dialog. Now that - viking allows multiple dialogs displayed simultaneously. + * Draw position marker on track elev/speed graphs at mouse click + * Track Properties Dialog no longer blocks interaction of the main window. 2007-10-17 Evan Battaglia <gtoevan@gmx.net>: - * Fix problem with extraneous waypoints being plotted (wrap around problem). May still be problems in UTM mode. + * Minor bugfix (one_zone is 0 for non-UTM projections) 2007-10-16 Evan Battaglia <gtoevan@gmx.net>: - * Fix Google version parsing. Google no longer uses '=' and '&' but hex equivalents to describe the URI. Not sure if this will last :/ - -2007-10-16 -Quy Tonthat <qtonthat@gmail.com>: - * Interpolating DEM data in 3 different methods. Track data, - elevation-distance graph and elevation info on status bar now make use - of interpolation. + * Fix Google parsing. Should probably change default number to "2.61" too. 2007-10-15 Quy Tonthat <qtonthat@gmail.com>: - * Add more room to the top of elevation-distance graph. + * Cosmetic changes and cleanup + * Interpolating DEM data. + * Interpolating DEM data. + * Add more room to the top of altitude-distance graph. -2007-10-14 +2007-10-15 Evan Battaglia <gtoevan@gmx.net>: - * Fix plotting of DEM elevation data (subtract min altitude) + * fix plotting of DEM data on elevation graph 2007-10-12 Evan Battaglia <gtoevan@gmx.net>: - * Fix Esc and Backspace to work only when VikViewport has focus. - * VikViewport grabs focus on click or release events, or when a - tool move event returns VIK_LAYER_TOOL_ACK_GRAB_FOCUS. + * Fix tool keypresses to work only when Viewport has focus. 2007-10-12 Quy Tonthat <qtonthat@gmail.com>: - * Make use of DEM elevation data and GPS speed for track graphs. + * Make use of DEM elevation data and GPS speed data for track graphs. -2007-10-11 -Evan Battaglia - * Key press framework for tools. Esc to stop track. Backspace to end track. +2007-10-12 +Evan Battaglia <gtoevan@gmx.net>: + * keypress framework for tools, Esc & Backspace 2007-10-11 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: @@ -583,1308 +951,1019 @@ Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: 2007-10-11 Quy Tonthat <qtonthat@gmail.com>: - * Make Realtime Tracking a feature that can be disabled at configure - time. Do not quietly disable it beacause libgps is not available - at compiling time. - * Extra data from GPS in realtime mode are now stored in trackpoints. + * Added new fields to trackpoints for data from GPS in realtime mode. 2007-10-10 Quy Tonthat <qtonthat@gmail.com>: - * Fix a crash bug caused by operation on variable inside a macro. + * Make Realtime Tracking a feature that can be disabled at configure time. -2007-10-09 +2007-10-10 Evan Battaglia <gtoevan@gmx.net>: - * Ctrl-shift-scroll to zoom like Google. Just scroll zooms like before. - * Show currently edited track in red-dashed line. This makes it easier - to tell if we've ended the track. - * When using new track tool, draw a line before making a point to - preview the new point. * Use $BROWSER environment variable (for viewing geocache pages) +2007-10-09 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * libgps is no more mandatory + +2007-10-09 +Evan Battaglia <gtoevan@gmx.net>: + * Implement g_hash_table_remove_all in file.c too (for early glib versions) + * Preview adding a trackpoint by drawing a line when moving mouse + +2007-10-09 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Relax dependencies about glib + +2007-10-09 +Evan Battaglia <gtoevan@gmx.net>: + * Color current track red with dashed lines. (Better feedback) + * Ctrl-shift-scroll to zoom like google, scroll to zoom w/o changing center + +2007-10-09 +Quy Tonthat <qtonthat@gmail.com>: + * Fix a crash bug caused by operation on variable inside a macro. + 2007-10-08 Quy Tonthat <qtonthat@gmail.com>: * Fix compiling breakage caused by missing icon file from the list. 2007-10-07 -Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * libgps is no more mandatory - -2007-10-07 Evan Battaglia <gtoevan@gmx.net>: - * Scroll zoom keeps cursor over same spot on map (like Google, QLandKarte) - * Cursors for tools. - * Undo magic scissors by right-clicking. - * Extend a track by right-clicking on it. - * Experiment: "Begin track" tool + * Experimental "begin track" tool + * Extend track + * Undo Magic Scissors by right clicking. + * Remove debug line from last commit + * Cursors! + * Scroll zoom keeps cursor over same spot on map 2007-10-07 Quy Tonthat <qtonthat@gmail.com>: - * Correctly calculate position (based on time instead of distance) - when clicking on speed-time graph. - * Added km/h to speed entries of the track properties dialog. - * The "Selected Time" on track properties dialog is now correct. - * Track Properties: now displays track distance/time instead of - "Selected Time". + * Track Properties: now displays track distance/time instead of "Selected Time". 2007-10-06 Quy Tonthat <qtonthat@gmail.com>: - * Fix bugs that caused odd display of time on track properties dialog. + * The "Selected Time" on track properties dialog is now correct. + * Correctly calculate position when click on speed-time graph. * Pop a message when failed to connect to gpsd. + * Fix bugs that caused odd display of date/time on track properties dialog. 2007-10-05 Quy Tonthat <qtonthat@gmail.com>: - * Fix a segfault caused by (mistakenly) adding a new layer to gps - layer. * Be more selective in collecting realtime trackpoints. + * Fix a segfault caused by (mistakenly) adding a new layer to gps layer. 2007-10-04 Quy Tonthat <qtonthat@gmail.com>: - * Improvements for GPS layer's "realtime tracking". + * Improvements for GPS layer's "Realtime tracking". + +2007-10-03 +Evan Battaglia <gtoevan@gmx.net>: + * Removing GPSDLayer (functionality now in gpslayer) 2007-10-02 Quy Tonthat <qtonthat@gmail.com>: - * Fix crashes caused by emitting update too early at layer creation. + * Cleanup and cosmetic changes. + * Fix half-drawn problem for gps layer * Add realtime tracking to GPS layer. - * fix half-drawn problems for GPS layer. - -2007-10-01 -Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * Relax dependencies about glib by implementing - g_hash_table_remove_all ourselves (Evan's patch) 2007-10-01 Quy Tonthat <qtonthat@gmail.com>: - * Disable half-drawn update when the center is moved. Avoid using - static "trigger" in viklayer.c which causes problems when viking - has more than one windows. + * Fix crashes caused by emitting update too early at layer creation. + * Disable half-drawn update mode when the center is moved. 2007-09-28 Quy Tonthat <qtonthat@gmail.com>: - * Fix bug that caused Elevation graph not working properly with some - tracks. + * ChangeLog entry + * Fix a long lasting bug that causes track property not working properly. -2007-09-27 +2007-09-28 Evan Battaglia <gtoevan@gmx.net>: - * GPSD Layer -- draw an arrow. - * Minimum elevation for DEM layer. - * Half-drawn hack to only draw layers on top of the one that has - recently changed. A must for realtime GPS. + * Half-drawn hack + * Draw arrow in Gpsdlayer DEM Layer -- minimum elevation + +2007-09-26 +Evan Battaglia <gtoevan@gmx.net>: + * gpsdlayer -- gps_close() the connection. 2007-09-25 Quy Tonthat <qtonthat@gmail.com>: * SRTM download now works for regions outside North_America too. +2007-09-24 +Evan Battaglia <gtoevan@gmx.net>: + * Experimental VikGpsdLayer + 2007-09-23 Evan Battaglia <gtoevan@gmx.net>: - * Fix copy & pasting DEM layers -- new serializing string list code. - * Don't crash if using tool on wrong type of layer / no layer. - Although I really want to know what happened to "use the top visible layer", - and return TRUE if the tool "accepts" the use... - editing lots of TRWLayers was way easier that way... - * Remove unused vik_layer_copy() code + * Magic Scissors goodies * Add Magic Scissors icon (from GIMP) - * Add comment when making a Google Route. - * Continue a magic scissors route by holding down control. Continue the comment too. - * Right-click a route created by google route (multiple or single) to see the Google directions web page which created it. Useful for creating a route w/ Viking, then seeing the verbal directions (left here, right there) - * Experimental GPSD support (VikGpsdLayer) + * Remove unused vik_layer_copy code + * Fix crashes on using wrong tools + * Serialize string lists / fix DEM Layer copy/paste + * * Pan Accelerators (Ctrl+Left, etc) * Ctrl-Scroll and Ctrl-Shift-Scroll to pan, kind of like Gimp. * Add a RADIOGROUP_STATIC properties factory type to make it easy for new layers. Uses an array list (like before) instead of a GList. * DEM US 10m (dem24k) source! Option in DEM Layer & ./configure * (copying & pasting DEM layers is broken, will fix later) + * Download&import SRTM 90m data (more work needed) Fix right-click geocache->goto geocaching.com web page -2007-09-22 -Evan Battaglia <gtoevan@gmx.net>: - * Pan Accelerators (Ctrl+Left, etc) - * Ctrl-Scroll and Ctrl-Shift-Scroll to pan, kind of like Gimp. - * Add a RADIOGROUP_STATIC properties factory type to make it easy - for new layers. Uses an array list (like before) - instead of a GList. - * DEM US 10m (dem24k) source! Option in DEM Layer & ./configure - * (copying & pasting DEM layers is broken, will fix later) - -2007-09-21 -Evan Battaglia <gtoevan@gmx.net>: - * Fix right-click on geocache to work with new geocache names. - * Download & import SRTM 90m DEM data (still working on US 10m) +2007-09-18 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Refactoring: really minor change + * Refactoring: minor changes -2007-09-17 +2007-09-18 Evan Battaglia <gtoevan@gmx.net>: - * Draw lines to show file existence for MapsLayer for very zoomed out maps. It's faster that actually showing the maps but still gets slow at a certain level. + * Saner vikfilelist.c -- allow multiple selections when adding DEM files + * Fix optional geocaching -- include config.h to compile + * Update ChangeLog + * Draw lines for file existence at very-zoomed out levels 2007-09-09 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: * Removing unused files (*.png.h). - -2007-09-08 -Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: * Fix #1789550: define MAX macro if not defined on ALL systems + * g_*ify a path building 2007-09-08 Quy Tonthat <qtonthat@gmail.com>: - * AUtomatically fetching google version number. + * Automatically fetching google version numbers. 2007-09-07 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * Fix #1789550: mkdtemp usage is conditioned, so it is possible - to build viking on system not offering such feature. + * Fix #1789550: mkdtemp usage is conditioned + * QA: remove a warning + * g_*ify maps_layer_default_dir function and code related to maps cache + * g_*ify a_get_viking_dir function 2007-09-06 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: * Adding command line option framework. -2007-09-06 +2007-09-05 Quy Tonthat <qtonthat@gmail.com>: + * Fix a bug that causes crashes when using "Maps Download" tool. * Make viking's default start location somewhere more likely has maps. - * Fix crash when using "Maps Download" tools right after viking is - started (without a viking file). -2007-09-05 -Quy Tonthat <qtonthat@gmail.com>: - * Viking 0.9.2 (By Guilhem Bonnefille <guilhem.bonnefille@gmail.com>) +2007-09-04 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Releasing 0.9.2 + * QA: removing warning 2007-09-03 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * Fix: crash when "applying" a map layer property dialog. - * QA: strong type the second argument of the *_post_read functions. - * Preset filename when exporting a TrwLayer. - * Refactoring: retrieve the VikWindow from the VikViewport via its - GtkWidget nature. - * Use $EMAIL to initialise email field for OSM upload. - * Do not warn about drawmode inconsistency while reading file. * Hide Expedia view mode when expedia is not built in. + * Do not warn about drawmode inconsistency while reading file. + * Do not warn about drawmode inconsistency while reading file. + * Use $EMAIL to initialise email field for OSM upload. + * Refactoring: retrieve the VikWindow from the VikViewport via its GtkWidget nature + * Preset filename when exporting a TrwLayer. + * QA: strong type the second argument of the *_post_read functions. + * Fix: crash when "applying" a map layer property dialog + +2007-09-02 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Releasing 0.9.1 2007-09-01 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * Disable Expedia map layer by default (as it is not working). + * Disable Expedia map layer by default (as it is not working) 2007-08-30 Bernd Zeimetz <bernd@bzed.de>: - * Add redirect support (for Expedia map layer). + * Add redirect support (for Expedia map layer) 2007-08-30 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * Add ability to upload a single track. + * Add ability to upload a single track + * QA: Remove warnings 2007-08-28 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * Check current drawmode after creating a new MapsLayer. + * Check current drawmode after creating a new MapsLayer + * QA: testing NULL before *free is not necessary + * Refactoring: compute drawmode name by getting menu entry label + * Allow to retrieve VikWindow from VikViewport -2007-08-25 +2007-08-24 Quy Tonthat <qtonthat@gmail.com>: - * New google version number. - * Better checking to detect downloaded text instead of images. - * Give more instructive message for attempting to download maps in - wrong mapmode. + * Give more instructive message for attempting to download maps in wrong mapmode + * Better checking to detect downloaded text instead of images + * New google version number + +2007-08-22 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Adding the ability to upload to OSM. 2007-08-20 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Small target to easy multi-branch developer's work * libcurl is a requirement 2007-08-20 Quy Tonthat <qtonthat@gmail.com>: + * Fix bug in Google search that caused viking jump to wrong location when Google can not find the match. + +2007-08-19 +Quy Tonthat <qtonthat@gmail.com>: * Fix bugs that cause crashes on layers copy/paste/delete. - * Fix bug in Google search that caused viking jump to wrong location - when Google can not find the match. -2007-08-16 +2007-08-15 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * Group "Export Layer..." entries in a sub-menu. + * Group "Export Layer" entries in a submenu -2007-08-16 +2007-08-15 Quy Tonthat <qtonthat@gmail.com>: - * Clean up and eliminate compiler warning. + * Clean up and get rid of compiler warnings. + * Old google modes are now disabled by default. -2007-08-15 +2007-08-14 Quy Tonthat <qtonthat@gmail.com>: * Fix bug in creating temporary HOME when HOME is not set. - * Added --enable-old-google to configure script. Old google modes are - now disabled by default. - * Default mode for new maps is Google Maps. -2007-08-09 +2007-08-14 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Adding "name" accessor + +2007-08-08 Quy Tonthat <qtonthat@gmail.com>: * Make Google Map default map type. -2007-08-02 +2007-08-04 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Refactoring + +2007-08-01 Quy Tonthat <qtonthat@gmail.com>: - * DEM module can now read hgt.zip files directly (no need to unzip - them). - * DEM module can now process 1 arc sec hgt(.zip) files (mainly for USA - regions). + * Read hgt.zip files directly. Process correctly 1 arc sec hgt(.zip) files 2007-07-27 Quy Tonthat <qtonthat@gmail.com>: - * Plug filedescriptor leak in dem.c + * Plug file descriptor leak 2007-07-26 Quy Tonthat <qtonthat@gmail.com>: - * Display on status bar altitude at cursor using data from DEM layer(s). + * Display altitude at the cursor position, on status bar. 2007-07-25 Quy Tonthat <qtonthat@gmail.com>: - * New google version numbers. + * New google version number 2007-07-24 Quy Tonthat <qtonthat@gmail.com>: - * Disable GeoCache Acquire since it nolonger works. Can be enabled - again using configure --enable-geocaches. + * Disable Geocaches Acquire. -2007-07-18 -Quy Tonthat <qtonthat@gmail.com>: - * Remove (my) debug messages which are no longer needed. +2007-07-17 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Adding copyright + * Solving a regression But Viking don't compile without libcurl, even with this modification -2007-07-15 +2007-07-17 Quy Tonthat <qtonthat@gmail.com>: - * Missing a few changes here. - * release 0.9 (by Guilhem) + * Clean up (my) degug messages + +2007-07-16 +Bernd Zeimetz <bernd@bzed.de>: + * moving trunk/debian into the pkg-deb directory, adding tags/branches dirs + +2007-07-14 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Converting printf calls + +2007-07-13 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Releasing 0.9 + * Declaring vikdemlayer_pixmap.h to automake + * Removing Reid from AUTHORS file. + * Revert "Add debian subdirectory to automaked tarball" + * Declaring new icon for Debian package 2007-07-13 Quy Tonthat <qtonthat@gmail.com>: - * Eliminate the needs of entering DEM files for every single - track/waypoint layer. + * ChangeLog entry + * Eliminate the needs of entering DEM files for every single track/waypoint layer. 2007-07-07 Quy Tonthat <qtonthat@gmail.com>: - * Fixed typo in Makefile.am + * Fixed typo. 2007-07-06 Evan Battaglia <gtoevan@gmx.net>: - * Merge DEM Branch + * DEM: fix vertical units + * Fix invalid elevation + * Merge DEM branch 2007-07-04 Quy Tonthat <qtonthat@gmail.com>: - * Bug fix: View Mode displayed wrong setting on start up + * ChangeLog entry + * Bug fix: View Mode displayed wrong setting on startup. 2007-07-03 Quy Tonthat <qtonthat@gmail.com>: - * Fixed bugs that caused draw_scale and draw_centermark status not being - consistent among View menu, viewport and loaded files. - -2007-07-02 -Evan Battaglia <gtoevan@gmx.net>: - * DEM Branch: Trying to fix/cleanup various DEM things - * DEM Branch: Support for SRTM 3 arcsecond _global_ DEM data from http://www2.jpl.nasa.gov/srtm/ + * ChangeLog entry + * Fixed bugs that caused "draw_scale" and "draw_centermark" not consistent. 2007-07-02 Quy Tonthat <qtonthat@gmail.com>: - * Fixed bugs that caused crashes during GPS upload/download. + * ChangeLog entry + * Fix bugs that caused crashes on gps download/upload. 2007-07-01 Quy Tonthat <qtonthat@gmail.com>: + * ChangeLog entry * Make "Save Image" and "Save Image Directory" dialogs reusable. +2007-06-28 +Quy Tonthat <qtonthat@gmail.com>: + * Really using the new icon. + +2007-06-27 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Using the new icon + +2007-06-27 +Mark Coulter <i_offroad@yahoo.com>: + * Added Viking icon provided by Mark Coulter <i_offroad@yahoo.com> + 2007-06-24 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * Merging with Ralf's work around debianization - * INSTALL: refreshed + * Refreshing INSTALL + * Removing old (and no more functional) Makefile + * Add debian subdirectory to automaked tarball + +2007-06-24 +Ralf Meyer <ranfyy@gmail.com>: + * Merging with Ralf debianization 2007-06-23 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Unused variable + * Add include to avoid implicit declaration + * Initialisation to avoid warning + * Explicit donw-casting + * Correct declaration + * Unused variables + * Correct some erroneous declarations + * Use g_mkdir instead of native mkdir + * Use g_free as free function + * Add requested sentinel and correct gdk_pixbuf_save call + * Declare usage of math.h include + * Suppress warning about backslashed newline at end of line + * Dynamic version in User-Agent + * Add referer to DownloadOptions + +2007-06-23 +Tim Scofield <nospam546@comcast.net>: * Minor change to avoid SEGFAULT on x86_64 - * Add DownloadOptions type to specify referer per map source + +2007-06-23 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Adding a DownloadOptions type. + +2007-06-20 +Quy Tonthat <qtonthat@gmail.com>: + * ChangeLog + * Google Search: fixed to work with new Google output. + +2007-06-19 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Moving acinclude.m4 as expat.m4 + * File forgotten on commit trunk@289 2007-06-19 Quy Tonthat <qtonthat@gmail.com>: - * Fix bugs that causes "drawcentermark" not recognised when reading - from files. - * Fix a wild pointer bug that can cause crashes + * Fix a wild pointer bug that can cause crashes. + * Fix bugs that causes "drawcentermark" not recognised when reading from files. 2007-06-18 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * Copying libcurl.m4 as it is needed everywhere + * Declaring curl_download_init function. + * Copying libcurl.m4 2007-06-18 Quy Tonthat <qtonthat@gmail.com>: - * New google version numbers. - * Make scale more visible. + * Release 0.1.3-20070618 + * Download maps along track: maps between far apart trackpoints. + * Download maps along a track. + * New Google version numbers. + * Add User-Agent to http request header. + * Make the center mark look a bit better. * Add center mark which can be turn on/off in View menu. - * Viking now uses cookies for http requests. Some server(s) is quite - picky about this. (With great help from Lixus <gps@muellers.ms>) - * Download maps along a track. Right click on a track layer, select map - type and zoom level, viking will do the rest. - * release 0.1.3-20070618 + * Make the scale more visible on dark maps. + * Added cookies to google requests. + * New google version number + +2007-06-13 +Ralf Meyer <ranfyy@gmail.com>: + * Adding an icon for the entry menu (Debian package only) 2007-06-13 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * Adding an icon (suggested by Ralf Meyer <ranfyy@gmail.com>) + * Correct the man pages generation + * Adding an icon -2007-06-8 +2007-06-08 Quy Tonthat <qtonthat@gmail.com>: - * Fix a bug that causes segfault when viewing properties of a - waypoint. + * ChangLog entries + * Fix a bug that causes segfault on trackpoint properties dialog. -2007-06-1 +2007-06-01 Quy Tonthat <qtonthat@gmail.com>: - * Fix a bug that causes segfault when viewing properties of a track - that has only one trackpoint with elevation information. - * Backport Evan's magic scissors from DEM branch. + * Bacported Evan's magic scissors from DEM branch. + * Fix a segfault on track properties dialog. 2007-05-31 Quy Tonthat <qtonthat@gmail.com>: - * Add Google Maps search to View menu and Toolbar - * Waypoint created right after the search will pick up the search - string as comment. (Use TrackWaypoint Layer menu, not toolbar, to - create waypoint). + * ChangeLog entry. + * Use google maps search string as comment for new immediately created waypoint. + * Add Google Maps search to toolbar. + * Google Maps search: code clean up. + * Go to location using Google Maps search. + * Cosmetic changes: fix compiler warnings. 2007-05-26 Mark Coulter <i_offroad@yahoo.com>: - * new waypoint symbols. + * Many new waypoint symbols created by Mark Coulter. 2007-05-26 Quy Tonthat <qtonthat@gmail.com>: + * viking 0.1.3.20070526 + * ChangeLog entries * Fix intermittent problem of map redraw. - * Mapslayer: Fixed bugs that cause in some cases, map display can not - be refreshed without downloading. + * Handle cases that only need redraw (without downloading). 2007-05-24 -Ralf Meyer <ranfyy@gmail.com>: - * Adding man pages. +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Removing generated files + * Adding man pages 2007-05-24 Quy Tonthat <qtonthat@gmail.com>: - * Maps layer: Improve performance for map autodownload. - * Make dimensions easier to be found and changed to suit own tastes. + * Make window dimensions easier to be changed. * Small touches on the look. + * Maps layer: Improve performance for map autodownload. 2007-05-23 Quy Tonthat <qtonthat@gmail.com>: - * New GPS layer menu items: "empty upload", "empty download", "empty - all" - * acquire->Google Directions now record and display previous queries - fo "From"/"To" entries. - * Position Google Directions dialogs at the center of Viking window. + * ChangeLog entries + * Put Google Directions dialogs at the center of viking window. + * Google Directions now remembers previous query (from/to entries). + * ChangeLog Entries + * Gpslayer: New menu items to remove all tracks and waypoints in GPS folders. 2007-05-22 Quy Tonthat <qtonthat@gmail.com>: - * GPS layer track and waypoint data can now be saved. - * Disable prompt for save before exit. * Add "Save and Exit" to File menu. + * Disable temporarily prompt for saving on exit. -2007-05-20 -Evan Battaglia <gtoevan@gmx.net>: - * DEM Branch +2007-05-21 +Quy Tonthat <qtonthat@gmail.com>: + * ChangeLog entry + * Save function for GPS layer (part 2: read) + * Save function for GPS layer (part 1: write only) 2007-05-20 +Alex Foobarian <foobarian@gmail.com>: + * edit waypoint fix + +2007-05-19 Quy Tonthat <qtonthat@gmail.com>: + * ChangeLog entry for autodownload fixes + * osm now reports download error status. + * Terraserver now reports download error status. + * Expedia now reports download error status. * Stop autodownload from running forever on map downloading errors. 2007-05-18 Quy Tonthat <qtonthat@gmail.com>: - * Add curl-devel to spec file. - * Map tool: Left click can now refresh display of map tiles. + * Add curl-devel to spec file + +2007-05-17 +Quy Tonthat <qtonthat@gmail.com>: + * ChangeLog entry * Check for non-displayable data after downloading map. + * ChangeLog entry + * Map tool: Left click can now refresh display of map tiles. + +2007-05-17 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Releasing 0.1.3 2007-05-17 Quy Tonthat <qtonthat@gmail.com>: - * Fix problems in map downloading caused by unreliable error - detection. - * Release 0.1.3 + * Fix problems in map downloading caused by unreliable error detection. -2007-05-15 +2007-05-14 Quy Tonthat <qtonthat@gmail.com>: - * Fixed bugs that can cause segfault on exit. The problem was caused -by mapslayer's weak_ref not being unref'ed in some cases. + * Changelog entry for the last commit + * Fix bug that causes crash on viking exit. 2007-05-13 Evan Battaglia <gtoevan@gmx.net>: - * Fix problem of "bad" tiles showing up when downloading. The problem was loading of incomplete tiles. Fixed this by first downloading to a temporary file, then moving when complete. + * Remove the old tile from cache BEFORE redrawing. + * Fix "corrupted tile" problem -- was really just that incomplete tiles were being drawn & subsequently taken into memory cache. We should really add a "clear memory cache" menu item too. 2007-05-11 Evan Battaglia <gtoevan@gmx.net>: - * Fix removal of redownloaded tiles from memory cache. - * Fix a stupid segfault in main.c (opening new files) + * Fix stupid segfault bug in main.c (open file) + * Now when we refresh tiles it will remove them from the memory cache like it was supposed to. 2007-05-09 Quy Tonthat <qtonthat@gmail.com>: - * New Google version numbers. + * New google version number 2007-05-08 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * New "Refresh onscreen tiles" menu entry + * Refreshing tiles 2007-05-04 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * debian/: debianization + * Declaring Debianization + * Added watch configuration files for other Debian packager + * Removing Debian maintainer script examples + * Adding menu entry inside the Debian package + * Removing unused file for Viking's Debian package + * Correct copyright holder in Debian package + * Update Debian package documentation + * Initial dh_make debianization 2007-04-29 -Reid Priedhorsky <reid@reidster.net>: - * libusb support +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Declaring Reid's patch + * Applying Reid's patch 2007-04-28 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * OpenSourceMap slippy maps (in osm.c) -- Maplink tiles - * Add configuration option for OpenStreetMap sources + * Allows to enable/disable OpenStreetMap module + * Adding Maplint OpenStreetMap layer 2007-04-23 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * OpenSourceMap slippy maps (in osm.c) -- Osmarender and Mapnik + * New module for OpenStreetMap sources. + * Updating Changelog for libcurl adition 2007-04-21 Evan Battaglia <gtoevan@gmx.net>: - * OpenSourceMap slippy maps (in google.c) -- identical to google maps except zoom numbering + * Slippy maps + * slippy maps 2007-04-16 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * Adding libcurl support + * Add libcurl + * Moving up cache management + * Introducing download module + * Unused function 2007-04-04 Quy Tonthat <qtonthat@gmail.com>: - * New Google version number. * Fixed Google Directions + * New google version number 2007-02-20 Quy Tonthat <qtonthat@gmail.com>: - * GPS layer dialog now displayed at the center of the Viking main - window. + * GPS layer dialog is now displayed at the center of the Viking main window 2007-02-19 Quy Tonthat <qtonthat@gmail.com>: - * New Google version numbers. + * New Google version numbers 2007-02-15 Quy Tonthat <qtonthat@gmail.com>: - * Made viking.spec.in out of Michael's viking.spec - * Added viking.spec.in to autoconf files. - -2007-02-15 -Michael A. Peters <mpeters@mac.com>: - * Added viking.spec + * Added viking.spec.in (by Michael A Peters). Made autoconf be aware of the new file + * Added viking.spec.in (by Michael A Peters). Made autoconf be aware of the new file 2007-02-14 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * NEWS, configure.ac: preparing 0.1.2 + * Preparing 0.1.2 + * Cleanup 2007-02-13 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * src/vikwindow.c: remove URL and version number from window title - * src/dialog.c: add URL and use dynamic information for version - * AUTHORS, src/dialog.c: update contributors list - * AUTHORS, src/dialog.c, src/Makefile.am: About dialog filled with - AUTHORS file + * About dialog filled with AUTHORS file + * Preparing 0.1.2: update contributors lists + * Update ChangeLog for my recent modifications + * Add (current) version and URL in about dialog + * Remove URL and version from title -2007-02-07 +2007-02-06 Quy Tonthat <qtonthat@gmail.com>: - * Fix bug that causes crashes when click at the right side (outside) - of the track graph area in the Track Poperties window. + * Fix bug that causes crashes when click at the right of the track graph. 2007-02-06 Jocelyn Jaubert <jocelyn.jaubert@gmail.com>: - * Add new information to Track Properties. Postion in time will be - tracked and display when moving mouse cursor around the track graph. - -2007-02-06 -Quy Tonthat <qtonthat@gmail.com>: - * New google version numbers. - * correct main window title and viking website. + * Patch from Jocelyn Jaubert. Add time position to Track Poperties 2007-02-05 Quy Tonthat <qtonthat@gmail.com>: - * Cosmetic changes. + * Corrected main window title and viking website + * New google version numbers + * Cosmetic changes 2007-02-04 Quy Tonthat <qtonthat@gmail.com>: - * Simplify tools enable/disable codes. + * Simplify tools enable/disable codes 2007-02-01 Quy Tonthat <qtonthat@gmail.com>: - * Only tools that work with current active layer are enable, - others are disable (fade out and does nothing when clicked on). + * Disable/enable tools according to what layer is active + +2007-01-28 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Work done by Quy 2007-01-27 Quy Tonthat <qtonthat@gmail.com>: - * Display map sections while downloading (bug 1303429) + * Display map sections while downloading 2007-01-25 Quy Tonthat <qtonthat@gmail.com>: - * Fixed bugs that caused crashes on creating new map layer or - new track/waypoint layer. - -2007-01-24 -Quy Tonthat <qtonthat@gmail.com>: - * Updated google tranparent version number. - * Made it more convenient to update google version numbers. + * Fixed bugs that caused crashes on creating new map layer or new track/waypoint layer 2007-01-23 Quy Tonthat <qtonthat@gmail.com>: - * Merged branch modular to trunk. + * Updated google tranparent version number + * Merged branch modular (r146:173) to trunk + +2007-01-18 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Content moved to the Wiki + * Update 2007-01-05 Quy Tonthat <qtonthat@gmail.com>: - * Bug fix: main menu edit->delete and edit->cut did not work with - waypoints and tracks. + * Bug fix: main menu edit->delete and edit->cut did not work with waypoints and tracks. 2007-01-04 Quy Tonthat <qtonthat@gmail.com>: - * Added "Copy" and "Cut" to popup menus for track and waypoint (on the - layer panel). + * Added 'Copy' and 'Cut' to popup menus for waypoint and track 2007-01-03 Quy Tonthat <qtonthat@gmail.com>: - * bug fix: crash on inserting aggregate layer if the selected layer's - parent is not an aggregate layer. - * bug fix: crash when delete a child layer whose parent is not - an aggregiate layer (eg gpslayer) - * Menu item selection for layer instances. + * Remove assumption aggregate is the only type of layers that has child layers. Gpslayer does too. 2007-01-02 Quy Tonthat <qtonthat@gmail.com>: - * gpslayer: Unexpose interface functions. + * menu selection for layer instances. * Layers now can have their say on what pop up menu items they want. -2007-01-02 -Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * Add ability to disable Terraserver stuff - * Add ability to disable Expedia stuff - 2007-01-01 Quy Tonthat <qtonthat@gmail.com>: - * gpslayer: fix bugs that causes crashes when click "Cancel" on layer - creation dialog. + * gpslayer: code cleanup 2007-01-01 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: * Make all .h self sufficient - * Add ability to disable Google stuff - + +2007-01-01 +Quy Tonthat <qtonthat@gmail.com>: + * gpslayer: fix bug that caused crash when click \'Cancel\' on layer creating dialog + 2006-12-31 Quy Tonthat <qtonthat@gmail.com>: - * Added gps layer + * Added gpslayer -2007-01-02 +2006-12-26 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * Add ability to disable Terraserver stuff - * Add ability to disable Expedia stuff + * Improve ChangeLog for next test release + * Fix a google version number change -2007-01-01 -Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * Make all .h self sufficient - * Add ability to disable Google stuff - -2006-12-26 -Quy Tonthat <qtonthat@gmail.com>: - * Fix a google version number change (at least in Australia). +2006-12-17 +Alex Foobarian <foobarian@gmail.com>: + * 2006-12-07 -Quy Tonthat <qtonthat@gmail.com>: - * Fix an array overflow bug in Map Layer Properties - +Alex Foobarian <foobarian@gmail.com>: + * fix array overflow + +2006-12-05 +Alex Foobarian <foobarian@gmail.com>: + * + 2006-12-04 Alex Foobarian <foobarian@gmail.com>: - * Added an "About" dialog - + * about dialog + 2006-11-30 Alex Foobarian <foobarian@gmail.com>: - * Added Quy Tonthat's patch to fix a bug in Track Properties + * + +2006-11-29 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Makefile and Makefile.in are generated files and should be ignored by SVN 2006-11-29 Alex Foobarian <foobarian@gmail.com>: - * Added patch by Quy Tonthat <qtonthat@gmail.com> to fix a crash bug - + * + 2006-11-12 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * Add expat explicit dependency + * Add explicit dependency to expat library 2006-10-31 Alex Foobarian <foobarian@gmail.com>: - * Visual feedback for moving waypoints + * visual feedback when moving waypoints 2006-10-30 Alex Foobarian <foobarian@gmail.com>: - * Created standard Edit menu - * Implemented Cut for trackpoints and waypoints - * When moving trackpoints, we now draw one under the cursor for visual feedback + * + * fix toolbar icons in recent gtk + +2006-10-28 +Alex Foobarian <foobarian@gmail.com>: + * ticket 1577378: make viking compile with older gtk + * ignore png_h files + * fixing icons + * fixing icons + * modified mime types for png files + * 2006-10-26 Alex Foobarian <foobarian@gmail.com>: - * Cleared up the drawing modes and map type descriptions - * Updated google version string to make it work in Europe - * Added Cut/Copy/Paste shortcuts to right-click menus - * Compacted the track properties dialog + * *** empty log message *** + * *** empty log message *** + * google version seems to be required in europe + +2006-10-23 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Improve the ChangeLog for the 2006-10-23 release + * Improve Makefile for a "make distcheck" support 2006-10-23 Alex Foobarian <foobarian@gmail.com>: - * Introduced a toolbar tool interface, converted existing tools to use it - * As a result, ruler drawing bugs are gone - * Sped up ruler drawing by increasing the redraw priority + * toolbox tool improvements 2006-08-15 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * Add implicit DMS->DDD conversions in waypoints dialogs + * Adding implicit DMS->dec conversion in dialogs + * Adding implicit DMS->dec conversion in dialogs 2006-07-26 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * src/degrees_converters.c, src/degrees_converters.h, - test/degrees_converter.c: add dec -> DDD conversion - * src/degrees_converters.c, src/degrees_converters.h, - test/degrees_converter.c: add dec -> DMM conversion - * src/degrees_converters.c: refactor dms conversions + * add dec -> DDD conversion + * add dec -> DMM conversion + * refactor dms conversions 2006-07-24 -Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * Add patch for GoogleMaps from Reid Priedhorsky +Reid Priedhorsky <reid@reidster.net>: + * Adding the path for GoogleMaps from Reid Priedhorsky 2006-07-22 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * Makefile.am, configure.ac, src/Makefile.am, - src/degrees_converters.c, src/degrees_converters.h, - test/Makefile.am, test/check_degrees_conversions.sh, - test/degrees_converter.c: Adding degrees conversion functions - (DDD/DMM/DMS) + * Adding degrees conversion functions (DDD/DMM/DMS) 2006-07-06 Evan Battaglia <gtoevan@gmx.net>: - * ChangeLog, src/google.c: Upgrade Google Maps -- Europe - -2006-07-01 -Evan Battaglia <gtoevan@gmx.net>: - * Upgrade Google Maps version (yay Europe!) + * Upgrade Google Maps -- Europe 2006-06-11 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * NEWS, configure.ac: Preparing 0.1.1 + * Preparing 0.1.1 + +2006-05-26 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Bootstraping from CVS 2006-05-25 Alex Foobarian <foobarian@gmail.com>: - * Cleaned up the data source interface - * Added a setup dialog to the GPS data source, with protocol type and serial port location + * added a setup dialog for acquire from gps 2006-05-12 Alex Foobarian <foobarian@gmail.com>: - * Small fixes in Acquire from GPS code + * small fixes in acquire from gps code 2006-05-08 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * autogen.sh: simpler method to start from CVS + * Bootstraping from CVS + +2006-05-06 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * moving generated config.h to src to allow 'make dist' + * bug #1479244: FreeBSD port -2005-12-03 +2005-12-04 Evan Battaglia <gtoevan@gmx.net>: - * Data sources -- check for existence of necessary things + * More data source fixes + * Data sources existence checks and other fixes + +2005-11-26 +Evan Battaglia <gtoevan@gmx.net>: + * Geocaching.com (via gcget) data source + * Data sources update + * Google import adds to currently-existing layer 2005-11-25 Evan Battaglia <gtoevan@gmx.net>: - * Created "data sources" structure to easily add new data sources via GPS babel. - It's ugly now and there's a lot to be done, but I think 79-line datasources_google.c - shows the power of the approach. - * Data sources: Google & Geocaches + * Data sources core structure, google directions + +2005-11-24 +Evan Battaglia <gtoevan@gmx.net>: + * Getting ready for Google directions import + * Locale-independent output for gpsmapper.c and gpspoint.c 2005-11-23 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * src/gpx.c (gpx_dtostr): add better GPX export -Evan Battaglia <gtoevan@gmx.net>: - * dtostr -> coords.c; use in gpsmapper.c and gpspoint.c (locale-independent output) + * Better GPX export 2005-11-21 Alex Foobarian <foobarian@gmail.com>: - * Fixed v-t diagram crash bug + * *** empty log message *** + * fixed v-t diagram crash bug + * fixed a v-t diagram crash bug 2005-11-19 -Alex Foobarian <foobarian@gmail.com>: - * GPSBabel acquire code +Evan Battaglia <gtoevan@gmx.net>: + * Alex's GPSBabel acquire code 2005-11-18 Alex Foobarian <foobarian@gmail.com>: - * Copy/paste of individual track- and way-points updated to work between processes. + * *** empty log message *** + * copy/paste of individual track- and waypoints- between processes now works 2005-11-17 Alex Foobarian <foobarian@gmail.com>: - * Copy/paste between viking processes - * Layer marshalling support + * finished layer marshalling support + * fix sprintf warning + * Fix Makefile.am + +2005-11-16 +Alex Foobarian <foobarian@gmail.com>: + * Added layer marshalling support; for now trw and map layers are implemented. + * Retooled clipboard to support interprocess pasting; only full layers work between processes for now. + * fix implicit declaration warning + * Commenting out converter.[ch] until the files are in CVS; otherwise the build is broken. 2005-10-28 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * configure.ac: Adding --with-mapcache configure option - * src/config.h: Removed because no more used (generated) + * Adding --with-mapcache to configure + +2005-10-18 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Changing my email 2005-10-18 Alex Foobarian <foobarian@gmail.com>: - * Fix ruler declination in UTM mode + * fix ruler declination in UTM mode 2005-10-17 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * src/icons/Makefile.am: assumes the creation of icons.h - * src/garminsymbols.c, src/vikwindow.c: icons.h re-located - * src/Makefile.am: no more icons.h production + * Relocating icons.h in order to better handle its prodution 2005-10-16 Evan Battaglia <gtoevan@gmx.net>: - * Fix ruler: show angle, distance even when compass off-screen. - * Fix bgitemcount. Background items status bar "should" be accurate now. + * Minor SList/List confusion fix + * Some work on zoom-in overflow bugs + * Fix bgitemcount + * Fix ruler to show angle, distance when off-screen + +2005-10-14 +Alex Foobarian <foobarian@gmail.com>: + * sanity check pasted lat/lon coordinate 2005-10-13 Alex Foobarian <foobarian@gmail.com>: - * Drag and drop whole track/waypoint lists + * Drag and drop whole track/waypoint lists + * fixed dnd crash when moving to same spot, and when moving from in front of target 2005-10-12 Alex Foobarian <foobarian@gmail.com>: - * Coord layer drawing for lat/lon based projections + * coord layer drawing for lat/lon + * draw ruler only when idle + * deadlock fix 2005-10-11 Alex Foobarian <foobarian@gmail.com>: - * Draw a compass when using a ruler + * Draw a compass and bearing while using the ruler + +2005-10-09 +Alex Foobarian <foobarian@gmail.com>: + * fix pasting Google Maps links + +2005-10-08 +Evan Battaglia <gtoevan@gmx.net>: + * Fix DISCONNECT_UPDATE_SIGNAL failed assertion 2005-10-07 Alex Foobarian <foobarian@gmail.com>: - * Added ruler drawing to the ruler tool + * Added ruler drawing to the ruler tool 2005-10-06 Alex Foobarian <foobarian@gmail.com>: - * Added support for pasting coordinates in lat/lon format + * More wp icons added + * Added support for pasting lat/lon coordinates as waypoints + +2005-10-06 +Evan Battaglia <gtoevan@gmx.net>: + * Name resolution for pasting wps&tracks 2005-10-05 -Alex Foobarian <foobarian@gmail.com>: - * Change clipboard so as to use GTKClipboard. Prepare for support for pasting coordinates, etc. Evan Battaglia <gtoevan@gmx.net>: - * When pasting waypoints and tracks, do name resolution (add #2, etc) + * Alex's �bercool clipboard patch 2005-10-01 Evan Battaglia <gtoevan@gmx.net>: - * make symbols work for geocaching .loc files (and case-insensitive symbol names) - * Option as to whether or not to show unit scale (esp for exporting images) + * Remove USGS + * Remove USGS + * Option as to whether to show scale + * Update TODO + * Update AUTHORS + * Alex's optional symbols patch; Fix geocaching .loc symbols + * Remove icons.h (generated) + * make symbols work for geocaching .loc 2005-09-30 -Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * configure.ac, src/Makefile.am (SUBDIRS): added auto-tools support for src/icons Alex Foobarian <foobarian@gmail.com>: - * Added a drag_drop_request method to layer interface, updated DnD to use it + * fixed name collisions during track/wp DND + * added GPX symbols * Updated DND to insert layers at the point of the drop, instead of front of list - * Added wp symbol support to gpx - * Fixed name collisions during track/wp DND - * Layer-wide option as to whether to show waypoint symbols + * added a DnD method to layer interface, and updated treeview DnD to use it + +2005-09-30 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: + * Generated files should not appears on CVS + * Added ato-tools support for src/icons 2005-09-29 -Alex Foobarian <foobarian@gmail.com>: - * Added support for waypoint symbols (changing, loading, saving), and a small number of icons. - * Added a scale ruler - * Changed panning to show less "garbage" in exposed areas - -2005-09-28 -Evan: - * menu.xml & icons inline +Evan Battaglia <gtoevan@gmx.net>: + * Fix saving bug I introduced earlier; update TODO -2005-09-27 +2005-09-29 Alex Foobarian <foobarian@gmail.com>: - * GtkUIManager/Toolbar - * DND in the LayersPanel -Evan: - * strtod -> g_strtod (i18n glitch) + * fix warnings and remove some debug output + * Added wp symbol support; added scale ruler -2005-09-25 +2005-09-29 +Evan Battaglia <gtoevan@gmx.net>: + * trying to get g_dtostr to work + * Update TODO + * Forgot to add icons.h + * all icons inline + * menu.xml -> menu.xml.h + +2005-09-28 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * src/globals.h (VIKING_VERSION): uses the PACKAGE_VERSION macro - * Makefile.am (EXTRA_DIST): handles viking-remote - * src/Makefile.am (AM_CFLAGS): substitution of CFLAGS by AM_CFLAGS - * doc/Makefile.am, doc/dev/Makefile.am: new files - * Makefile.am (SUBDIRS): handles doc directory - * configure.ac: handles doc and doc/dev directories + * Handle doc subdirectory + * Use configure.ac version + * Substitution of CFLAGS by AM_CFLAGS + +2005-09-28 +Evan Battaglia <gtoevan@gmx.net>: + * Update TODO file + * Guilhem's autotools update + * strtod -> g_strtod + * Alex's DND & Toolbar patch + +2005-09-17 +Evan Battaglia <gtoevan@gmx.net>: + * Update TODO/Changelog + * Update TODO/ChangeLog + * Stops and elevation plotting options and fixxes + * Update TODO/ChangeLog + * GPX write, clickable v-vs-t diagram + * Tools that may or may not be helpful/fun + * Read Geocaching .loc (about time) 2005-09-16 -Alex Foobarian <foobarian@gmail.com>: fix to v-vs-t (better drawing) -Evan: * GPX fixes - * So Geocaching .LOC _isn't_ GPX?!?!? Oh well, it's XML... - * GPX write, click v-vs-t diagram - * Option to show stops in TRWLayer options, and stop_length - * Elevation plotting relative to min and max elevation in track. - * Option to do elevation plotting, and controlling relative height +Evan Battaglia <gtoevan@gmx.net>: + * Initial GPX support, experimental 3-d plotting, bugfixes, oh myg 2005-09-15 - * 4+ hours later and voila, GPX read support - * Fixes in propwin if track doesn't have certain data, say so. - -2005-09-14 -Me (Evan) again: +Evan Battaglia <gtoevan@gmx.net>: + * Fix layer editable/checkbox bug due to stupid GTK's closures + * Elevation map click and bugfixes * Fix USGS support - * Click on the elevation map to go there, so you can see where a mountain-top is etc. - * Don't crash on track properties of an empty track. 2005-09-13 -Guilhem Bonnefille <guilhem.bonnefille@gmail.com>: - * bootstrap: new file to bootstrap auto-tools - * src/config.h (VIK_CONFIG_ALPHABETIZED_TRW): no more set via this file - * Makefile.am (bin_SCRIPTS): viking-remote added - * configure.ac: --enable-alphabetized-trw option added +Evan Battaglia <gtoevan@gmx.net>: + * Guilhem's autotools support/alphabetized trw option + * Fixes to Alex's last patch + +2005-09-13 +Alex Foobarian <foobarian@gmail.com>: + * Alex Foobarian's v-vs-t and elevation map patch +2005-09-07 Evan Battaglia <gtoevan@gmx.net>: - * Experimental altitude funky plotting I'm working on - -2005-09-12 -Alex Foobarian <foobarian@gmail.com>'s changes -* disable stops, for now (I forgot about those...) -* Track elevation graph: minimum altitude difference for less jagged curves -* Track elevation graph: gray background, blue foreground -* Track elevation graph: lines to clearly show absolute elevation -* New velocity-vs-time graph & calculating function -* Notebook to hold this new graph with track elevation graph -My (Evan's) changes: -* Fix above v-vs-t patch to not crash on tracks without timestamp. -* Not show v-vs-t graph and/or elevation map if the necessary data isn't there. -Guilhem Bonnefille <guilhem.bonnefille@gmail.com>'s changes - * bootstrap: new file to bootstrap auto-tools - * src/config.h (VIK_CONFIG_ALPHABETIZED_TRW): no more set via this file - * Makefile.am (bin_SCRIPTS): viking-remote added - * configure.ac: --enable-alphabetized-trw option added + * Update INSTALL file + * Add dummy NEWS file + * Guilhem's Autotools support 2005-09-07 -Autotools support by Guilhem Bonnefille. +Alex Foobarian <foobarian@gmail.com>: + * Alex Foobarian's track profile patch + * Alex Foobarian's track duration patch -2005-09-06 -Added Alex Foobarian's track duration patch. -Added Alex Foobarian's track profile patch. -Added Alex Foobarian's elevation map fix. +2005-09-05 +Evan Battaglia <gtoevan@gmx.net>: + * Delete from cache when updating image. 2005-09-04 -Map cache fix: if only one map can fit / one map is bigger than cache size, then that's OK. -Delete from cache when updating image. - -2005-08-18 -Map cache size based on memory usage, not number of images. Some flaws to be worked out still in this. - -2005-08-16 -Accepted USGS maps support from Clark McKines. Pretty slick, I'll have to take a look at it. - -2005-08-02 -Quite easily added support for Mercator projection & Google Mercator maps (regular, transparent etc) -Chaned waypoint types a little bit (size of waypoint) - -2005-07-31 -Hopefully fixed background.c item # count -Fixed KH Maps (v=2) - -2005-06-20 -A little research & added KH Maps support. - -2005-06-19 -Fixed right-click waypoint edit -> crash bug, hopefully. -Fixed "everyone lives in zone 11" assumption for vikgeoreflayer.c; still monozone though ... -Made it so when you paste or add a new layer, it pastes it before the selected layer, not to the top. -Fixed the bug where pasting a map layer messed up the name. -Made dragging middle mouse button pan. Removed pan tool. Thanks Reid for the idea. -Made different options for drawing waypoint dots. Not very good but we can make better-looking ones later. -Side view of tracks à la Garmin MapSource, nice ... -Fixed Google street maps simply by changing "v=.1" to "v=.3" ; the newest version of gmaps is completely different, I'm unsure how long this will work for. - -2005-05-05 -Experimenting with stops - -2005-05-01 -Fixed cheap ruler bug (use ruler, change draw mode, use ruler, crash). That's really not good... but hey, it _is_ alpha software. - -2005-04-24 -Added "how many maps currently downloading" status bar hack - -2005-03-11 -What the heck? Viking-remote didn't work? Fixing --/- stuff. Also fixing hang if can't open. Did this by putting gdk_threads_enter() before file opening in main.c. -Update viking-remote to work _right_ with maps, also geo://GC1234/ works, nice... - -2005-03-08 -Uffda, I forgot Oggdeir's gpsmapper.c patch. -Also fixed Windows compiling. - -2005-02-28 -Fixed Windows compiling, hopefully. -Removed TopoZone support per topozone.com request. - -2005-02-27 -Instituted a really nice background downloading system with a separate system, works like a charm. -Fixed (hopefully) a bug where a download failed the filename wasn't deleted, leaving an empty file. -Misc cleanups/testing surrounding downloading. -Autodownload -Fix other stuff, including moving a waypoint (delete while moving -> crash) - -2005-02-26 -X and Y zoom levels for maps so factors don't have to be equal. -Fixed maps zoomed out, added an combo box for it by adding a combo box in viklayer.c, fixed maptype to use map id and not internal array index -Changed VikTrwLayer properties dialog to add an image tab, fixed GtkTable layout so as not to stretch out stuff in the y direction. -Fixed /var/cache/maps stuff -Safety for maps zoomed out -Fixed mapzoom for cases where factors aren't equal -Got the basic download in background code on, now just minor nicities -Got the genius idea that someone might want to open up more than one file at one time ;) - -2005-02-25 -No time tonight, gotta get some sleep. Did work on hooking up Google Maps with GPSBabel's module into viking with a wget & a sed command. Totally awesome. -Also, added support for the highest google zoom level which I didn't know existed. - -2005-02-23 -I'm not really supposed to be working on this ... but it get's addictive, so close to a release... -Added back alpha support. It works for all map types now. Mostly useless for other types, unless you want to see tracks under your map, since you can't show more than one non-Terraserver map at the same time. -Started work on maps for different zoom levels. You can do all different maps at all different zoom levels, even zoom in. Don't zoom in with expedia maps though, it could create a 2000px x 3000px size image or so, and cache up to 10,000 of those. Yeah. - -2005-02-22 -Made it easier to use all these maps -- switching between them, correct zoom levels, etc. -Expedia for Europe (thanks GPSDrive people again) -Kit Transue's UTM zone patch is back in for the new MapLayer. This marks the first time I have seen cross-UTM zone Topozone maps. Interestingly enough it seems that they patch the maps together. Viking messes this up a little bit but in general it works fairly well. I'm still amazed it's possible ;) -Minor cleanups etc. - -2005-02-21 -Tons of work today, too much to list really. Basicly I threw away VikMapLayer and started over. This one's nice, really easy to add new types. Google, Expedia, and Terraserver maps are now functioning, but the layer isn't completed yet, many things such as alpha, download in the background, etc. aren't quite there yet. -Topozone support, heh ;) Of course none of these maps can be used together. Especially since scaling isn't done yet. I'm also going to have to create some handy ways to switch between layers. - -2005-02-20 -Finally got the brilliant notion that a GSList isn't the smartest way to do memory map caching. In fact it's probably one of the stupidest. Increased speed (when all maps loaded) by 30x or so by using a GHashTable shared between layers. How much of the slowdown was accumulated somehow since 0.0.8 is unknown. -New map caching file naming scheme. Hierarchial directory structure for faster lookup. -Tweaked the above memory caching scheme to use a linked list in conjunction with a hashtable to allow for a maximum size limit to the cache. Currently you have to edit the file to set this upper limit. And it's in tiles -- doesn't matter the size of the tiles. -Added some code in http.c of all places to make 2 directories above if they don't exist (new caching filename scheme) - -2005-02-19 -Fixed params[3] -> params[2] l1738 to fix click image -Fixed delete a waypoint->crash bug -Fixed TOPLAYER_FROM_WIDGET() error on right click wp -> properties (no VLP to use this on; use FROM_LAYER()) - -2005-02-18 -Wow, Haven't worked on this in a while... -Sorry, just adding a hack to allow me use mapzoom at 0.25 quality. - -2005-02-02 -Changed pan, a little bit, to move the map. Not good enough though, it leaves behind stuff now. Couldn't get it to not flicker, and run at a decent speed. - -2005-01-29 -Fixed waypoint pango drawing. -Compatibility layer for GtkColorButton to use an entry for GTK 2.2 -Move Waypoints by dragging -Snap to WP (shift-) for TP & WP moving. Snap to TP (ctrl-) for WP moving and still TP moving. -Select WP on the side when editing (if the layer is selected that is) - -2005-01-28 -Changed over to Pango, finally. Just experimentally so far, though; gotta cement it and fix it over. -Changed the properties/parameters system to allow tabs (groups) in properties boxes. -Tracks & waypoints now alphabetized! Three cheers! I can't believe how relatively easy that was. Two new functions in viktreewview.c and two more lines of code in viktrwlayer.c, I thought it was going to be hard for some reason... -Added a GtkColorButton thing for layer properties. This officially boosts the minimum requirements to GTK+ 2.4. This shouldn't be too much of a problem since 2.6 is out already. -Settable waypoint background & text colors. Different ones for different layers is incredibly snazzy. -Settable track bg color. Also fix some switch/case stuff... forgot to break... -So you can do plain transparent (no WP background) by choosing white and selecting color translucency... Not exactly clear. But wow, these colors are looking really awesome. - -2005-01-23 -Expedia maps working now. Don't *exactly* match up on the top and bottom sides, but I'm not sure I can get much better. Good enough. More fixes, added autodownload (thought that was already in here? maybe only in my topozone version). -Fixes, lots of small stuff -- e.g. a bug I introduced where it wasn't getting the correct utm zone for terraserver maps when downloading. -Fixed a weird GTK bug where updating the coord mode menu radio button would change the coord mode. See only_updating_coord_mode_ui -Implemented "invisble auto-downloads". Thought up a new way of doing downloads -- a queue and only one other process -- but probably won't implement that for a while. -Wow, auto-download + street maps is really neat! - -2005-01-22 -Working on implementing Expedia maps .. Lots of stuff, had to change HTTP to hande forwarding, that took a while just to test. Had to restructure some vikmaplayer code to know about expedia maps and download differently. LOTS more to go however. It now downloads maps, but that's about it. Lots of work to go. -OK, now it cuts off the sides (ads) and stuff. Snazzy. I made a test "draw" function but it isn't working perfectly yet. It is working and piecing together maps though. They look OK pieced together but street names are messed up at borders sometimes to I'm going to make the pieces bigger. -Did I mention it draws the maps in the wrong places? - -2005-01-21 -Many little things tonight: -Much cleaner way of doing alpha/bleach. Slightly less functionality (can't do bleach and alpha) but cleaner and should be faster. -Made it so it saves coordinate mode in the .vik file. -Made it so you can change the background. Saves this to the .vik file. -White background under tracks. Inefficient but it works. - -2005-01-20 -Added support for Urban Areas color photograph maps from TerraServer. -Just a note: TopoZone isn't going to work. I had added support for it in my own prviate version, and used it happily for areas where TerraServer was messed up. But one day it didn't work. They changed their site so it's hard (if not impossible) to get to the image directly. I could always do indirect, though ... - -2005-01-17 -Made it so you can change modes -Optimized a little tiny bit, drawing still slow -GREATLY Improved UTM drawing speed by remember zone width in VikViewport. I think kit meant to do that, there was a zonie_width item in VikViewport; it went unused. -Re-instituted UTM ce1, cn2, etc. checks that went out the door when multiple zones became available. It now does these checks only if UTM is used and there is one zone. Performance is now comparable to 0.0.5 speeds. -Fixed minor UTM 2 zones bug I (apparently) introduced above where some things are on zoom. - -2005-01-16 -Added "Visit Geocache Webpage" right-click waypoint option. Not very useful until I can click on waypoints, though. - -2005-01-15 -Started massive UTM -> VikCoord abstraction project -Wow. -Biggest. Change. Ever. -Worked on it about 5 hours. It seems to be going excellent! Most UTM's have been made into VikCoord's, except for some things like VikCoordLayer which I simply disabled. I just plugged in the Lat/Lon coord to screen code and it works! Now I have to work out all the bugs, add a change coordinate / conversion system, and fix a lot of stuff. WOO HOO!!! -Update: added coord_to_screen and screen_to_coord for Lat/Lon. works FLAWLESSLY!!! AWESOME!!! - ---- viking 0.0.8 --- - -2004-12-25 -Added UTM zone glue-together by Kit Transue -Fixed various things regarding this patch (distance, lines, etc.) -Packages & uploaded changes - -2004-11-27 -Back, but not really ... -Added a fix by Peter Jones (gpspoint.c glitch) -Added CYGWIN/Makefile fixes by Alex Stohr - ---- viking 0.0.8 --- - -2004-04-13 -Back from a 3-day GPS data gathering mission. -Fixed bug wherein track GC's weren't getting updated when line_thickness was updated. -Only waypoints and trackpoints if they're in the right UTM zone. -Use g_spawn_command_line_async for showing pictures; support for Windows for this too. -Rather drastically changed background.c so as not to use pthread's detach() and cancel() functions which are strangely absent in gthread. -Changed background.c to gthread. -Auto-switch UTM if you go too far. -Draw little star on tracks if it was cut off due to UTM zones. -Show human-readable time in trackpoint window. -Fix trackpoint window so as to not show time of '0' if the TP has no timestamp. -I didn't want to take this long with 0.0.8. 0.0.7 was released in just 27 days but 0.0.8 took 50. Oh well, I'll have to work doubly hard for 0.0.9. Here is Viking 0.0.8 all. Enjoy. - -2004-04-09 -Prevent loading partially-downloaded file by first writing to a temp file and them writing that data to the image file. -g_error_free () where neccessary. -Changed "Map Download All" to clearer, more direct and generic code. -Very easily used this code to make downloading lots of maps with the "map download" tool. Just drag over the square you want to download. -Added map size parameter. Had to change viklayer.[ch], add an extra_widget_data field in the param struct and change viklayer.c to support different uint values for options - -2004-04-08 -Some experimental work with maps at a different zoom level (e.g. 4mpp maps viewed at 16mpp) - -2004-04-04 -Load thumbs in a background thread. Thumbs show up as soon as they are loaded and you redraw. -Cleanup function for maps so incomplete map downloads will be deleted, woo hoo! -Snap to TP for edit TP and new track. Hold down control. -Added Max Speed, Average Speed, Average Dist Between Trackpoints in track property window. -Added "Diff Speed" in TPWin so you can tell speed between one trackpoint to the next. - -2004-04-03 -Put maps in a background thread while updating the UI, but you can still use viking. I have to duplicate all necessary data passed to the thread (what threads to download and where) in case that layer is deleted. I still have to a couple things (actually canceling the download operation) but it works very nicely, I can download lots of maps at the same time! It feels very liberating... -Right click to redownload a map. Regretably some messed up maps have been showing up with the above method, it's a big mystery how exactly... -Did a little test: disconnected my Internet connection and tried to download a map. Viking hanged for 22 seconds. I consider that acceptable, for now at least. - -2004-04-02 -Fixed trw_layer_new_track_gcs getting called twice -- post_read link and in vik_trw_layer_create -Just got finished loading thumbnails in the background. Aye, what a bother. But it works nice. (However once I got it to crash with an Xlib async error? Sigh, that's not good...) - -2004-03-31 -Added support for clicking images to show it, using eog -- this currently cannot be changed. (!) - -2004-03-23 -Fix crash on export code (Mike Davison) -Use $VIKING_MAPS for default map directory if available (Mike Davison) - -2004-03-08 -Move image to use when alpha drawing to VikViewport. That simplifies a lot. -Little changes, here and there. Lots of options for images. - -2004-03-07 -More work on dynamic Properties boxes, it will make adding new options _so_ much easier... -A lot of work on this. Wow, Viking is getting big. And ugly. -Also fixed a bug similar to another old bug -- forgot to copy waypoint image filename when a waypoint is copied. -You can now choose the image size, via the new dynamic properties box. - -2004-03-06 -Fixed a dumb bug that prevented you from opening GPSPoint files after Viking files. -Working on dynamic Properties boxes, getting nowhere fast... - -2004-03-05 -Wrote a tiny bit of code to further shrink and cache thumbnails. - -2004-02-29 -background.c to use pthread to run stuff in the background (think -- downloading maps) and give a dialog to cancel (d'uh!) -The ability to use pthread opens up a lot of possibilities about how to handle map downloads. For instance, you could have a little dialog where you have different groups of maps downloading. Lots of possibilities, I just have to think about how I want to implement them. - -2004-02-28 -Lately I've been working on a GUI tool written in Python to link up pictures and track logs to figure out where a picture was taken. That's my excuse, anyways, for not working on Viking. -Thought a little bit about how I'm going to do pictures in Viking. Looked over ROX-Filer's thumbnailing code. -Added a bit of picture thumbnail code. You can now see photos in Viking. - ---- viking 0.0.7 --- - -2004-02-22 -Fixed edit TP, then rename track -> updates current_tp_track_name glitch. -Took quite a bit of time to change the way tools work. Instead of returning TRUE to redraw, tools return TRUE if they "accept" the tool call. If they don't, then it will look for another layer that will accept the tool call. That way you can edit trackpoints on different layers. It's nice, actually. -Fixed "edit layer name, then move it" bug the crept in somehow. It wasn't in 0.0.5-pre4, but I don't see any differences in the code, oh well, fixed it this time. -One month and almost 4000 LOC later... Viking 0.0.7 "Gonna Move Those Mountains Aside" - -2004-02-21 -Fixed track join deleting problem mentioned yesterday by keeping track of individual GtkTreeIter's for all tracks in a hash_table. Whenever a track is added/realized it's iter is added to the hash. Actually a rather pleasant (and fairly easy) solution. This simplifies deleting tracks in other places too, since we now don't need to know the iter. -Very easily made it so that when you edit a trackpoint it selects the appropriate track in the layers panel. Press Shift+10 for fast deleting. Evidently the tracks list must be expanded. -Fixed last_tpl (VikTrwLayer) / cur_tp (VikTrwLayerTpwin) confusion. -Changed split up track to change current tp to first of new track rather than last of old. -For some reason I felt I needed to add a thing in track properties which would count the number of duplicate TPs (same coords, one after the other) and make a button to remove them. -You can now change latitude, longitude, and altitude of each TP in the track window. Good for setting exact location rather then moving. -Added _real_ transparency support. I've tried before, but this time it actually wasn't hard it all. It was harder adding the UI stuff and layer attribute and all that. Anyway it might be a tad slow wise but it looks FANTASTIC! -Fixed open and save dialogs (including VikFileEntry, but excluding render to image and export as gps* dialogs) so that the dialogs are not deleted and created each time but the same one is used. This means that it will stay in the same directory. -How does a release tomorrow sound? - -2004-02-20 -Can't seem to find the time for Viking these days. Today I managed to get a little work in. -I did manage to add support for moving trackpoints. It's awesome. You just choose the edit TP tool, select a TP, and drag it. -After experimenting with arcs (arrows) for TPs (it didn't work), I changed track drawing to draw a triangle for the startpoint and a circle for the endpoint. -OK, So you can now join tracks (kind of ugly solution, but that was how it worked out), but the really ugly part is that it won't show up as deleted in the layers panel, and to make it do that, I need the track's layers panel Iter which I don't have from the tpwin. I sense major hackage ahead. - -2004-02-16 -Thursday through Sunday was another "data gathering mission". I also though up a _lot_ of great ideas for Viking. Now I just have to find the time to implement them all. -Today I added support in file.c for opening from stdin, aka "-". I also changed the magic number determining code to use ungetc() rather than rewind() so it will work correctly with stdin. -Not part of viking, but I wrote a quickie viking-remote script. - -2004-02-10 -Gotta get back to work. Sigh. Saturday and Sunday I went on a "data gathering mission", so there's my excuse. Yesterday I was away hacking on gpsbabel to support gpspoint (Viking) files. -Fixing little tiny things, like making the tpwin not close when you delete a waypoint, fixing little mistakes in trwlayer, graying buttons, etc. -Added little things to tpwin -- forward, previous, diff, makind diff work for delete button, etc. -Added a_coord_utm_diff for tpwin diff & ruler tool & track length -Added a_dialog_create_vbox_label function, converted vik_trw_layer_tpwin_new() -Added track length, tp count, segment count in properties box -Fixed if try to rename waypoint or track to one that already exists, crash bug (had to uppercase user input) -Added split up into segments. Had to change a_dialog_new_track, do above change, and a million other things. Sigh. -Fixed split up segments so it first makes a copy, then deletes the old copy. That way if the track was on the clipboard you can paste to get the original track again. Nifty eh? -Added reverse track. -That's all folks. I'm a-goin to bed. - -2004-02-06 -Just got through fixing the hardest-to-track-bug I've ever tackled. Viking would crash when I copied a -pasted a layer in a certain file, but it seemed fairly random and gdb's backtraces were no help because -it was crashing on totally unrelated things (free'ing memory twice does weird things). I finally narrowed -it down to do a certain sequence to give me the warning: viking in free() chunk already freed, etc. Then -I used step (starting from vik_trw_layer_free) to determine exactly where it was free'ing something -twice. It was the waypoint comment. I noticed comments were different from the original waypoint (on the -original layer that had been copied) so I tried stepping thru vik_waypoint_copy to see whether the -waypoint was being copied correctly. It was then when I something wrong. I had assigned one waypoint to -another, then called the function vik_waypoint_set_comment(), which, upon seeing that the comment of this -new waypoint was not null, proceeded to free it, whilst the old waypoint still carried that comment -pointer around. The ironic part is one line of code (new_wp->comment = NULL;) fixed everything. - -Well, glad to get that out of the way. Now I can proceed to work on new stuff. - -I also made sure to delete the trackpoint window if the track gets deleted. -The long-awaited SPLIT UP TRACK is finally in Viking. Goodie. - -2004-02-03 -Set up signals for VikLayer. Constructed a super-cool yet slightly-slow chain of signals using VikAggregateLayer. It's wacky. -All my hard internal work has finally payed off. I just added code for deleting trackpoints. It works, the signal is given to update and all is good. Yay. - -2004-02-02 -Back to work. I hit a snag and had to switch VikLayer to a GObject to give off signals for updating for the track editing tool. - -2004-01-30 -Very very small amount of code to report export image write errors to stderr. -Some various work on track editing: - Made another file/class viktrwlayer_tpwin.c - Added labels to show info when you click a trackpoint - Made it draw a big TP for the current TP -I don't know why it's not in this ChangeLog, but some experimental Track[point] "editing" (realling finding) support was already there: the tool, the code for finding the nearest TP, and a line of code showing a dialog with the buttons which would be useful (I obviously did some planning.) -Oh, Also, cut and paste waypoints support has been in for quite a while, before September, I'd say, somehow that escaped this log. -Anywho, the road looks clear as to how to procede with respect to track editing: make sure to reset current_tp if track is deleted, add on features, etc. - -2004-01-29 -Added a little thing to tell you how much are the map(s) will cover. -FINALLY fixed coord layer so it shows ALL necessary coord lines (<sarcasm>it actually checks your zoom level now!!!</sarcasm>) - -2004-01-28 -Slowly added "Generate directory of Images" support. -Fixed pan tool. - -2004-01-27 -You can now choose the name of the image to export to, choose the zoom level, and choose to get everything in the current viewing window. -Also took 15 minutes to add a pan tool. -Also made it remember your choices of width and height and image format for draw to image file. - -2004-01-26 -I'm celebrating Australia Day by working on the Vik for the first time in ... My fingers don't go up that high, anyway. -Adding code for exporting to image. - -2003-9-22 -Took a short two month break. Hehe. -Finally got around to checking whether server returns "200". Sometimes terraserver has erras. - ---- viking 0.0.5 -- - -2003-7-15 -Simplified vikfileentry.c by using gtk_dialog_run -Loading from World files -Saving to World files - -2003-7-14 -Map Layer -- default cache directory ~/.viking-maps (on UNIX) or C:\VIKING-MAPS (on Windows). This way people don't have to worry at all about cache directories, they can just use the default and it will automatically be created. -Create default cache directory if it doesn't exist. Automatically add file separator on cache directory name. -Don't write cache directory name to Viking file if it is default; if no directory use default (that way people can share files without having to worry about someone elses cache directory) -Readability/Naming: InitGcs -> PostRead - -2003-7-11 -More work on GeorefLayer. It's now pretty much working. -Made vikfileentry.c, changed vikgeoreflayer and vikmaplayer to use it. - -2003-7-10 -Changed zoom to two variables -- xmpp and ympp and implemented necessary changes in the layers. -Added a "Goto Any Zoom" kind of dialog/function. -Changed status bar a tad to reflect this. -Started some work (mainly UI/semantics/program interface) on GeorefLayer. Will make it actually do something later. - -2003-7-09 -Changed zoom limit from 32 mpp to 512 mpp. -Changed zoom to a double to allow any zoom level. - -2003-7-07 -Sorry ... "Real Life" (tm) has been taking up a lot of time lately. Anyway today I managed to implement track visibility in Viking GPS files. - -2003-6-27 -Don't show an empty menu for a sublayer if it doesn't add anything to the empty menu -Little bugfixes - -2003-6-26 -Put all file stuff in one file. -Removed old binary fileformat support. 3 days of work deleted in no time. -Track -> VikTrack, Waypoint -> VikWaypoint, Trackpoint -> VikTrackpoint, vikwaypoint.c, viktrack.c -Comment support, comment support for gpsmapper export -Comment for gpspoint, backslashed quotes, etc. in comment in gpspoint.c. Lot of work... I could easily backslash track/wp name, but they usually dont have quotes in -OK, I've been programming for over 4 hours. Break time. -OK, back to work. Comment support complete, I've also added altitude output support for gpspoint. -Switched various button order around in dialog.c to comply with HIG -Track undo support. Double-click to end, right click to undo. Crazy day, huh? - -2003-6-25 -Support for reading map and trackwaypoint layers. Also support for trackwaypoint data (in GPSPoint format) -Whew! Write support is complete! Man, that's a lot of work. Now I just gotta iron out any wrinkles (such as getting rid of old file format support) - -2003-6-24 -Half hour's worth of coding has made copying and pasting TrackWaypoint layers a reality. -Started working on FF2. TODO: implement individual layer getters/setters functions, write support -I've done an incredible amount of work today. -Mission: By the weekend I must have FF2 support out the door. - -2003-6-23 -Created Viking 0.0.5 branch. -Started work on copy & paste layers. With just two hours or so worth of code, you can now cut, copy and paste coord and map layers and aggregate layers made up of these. -You can even copy and paste between windows. -Next up -- trackwaypoint layers, then we're off to copying items. -Onward -- 0.0.5! - ---- viking 0.0.4 --- - -2003-6-23 -Viking 0.0.4 "Lame Duck Release" -Alright, I haven't been doing anything for the last two days. Guess I'll just release what I have... - -2003-6-20 -Added GpsMapper export support to make it easy to make Garmin maps. -Made it so you can now rename tracks. -Implemented map fade into white (alpha)! This should help distinguish tracks while still seeing maps. - -2003-6-19 -Fixed a map caching problem that occurs when you lower the size of the memory cache (it won't really be lowered). -Started experimenting with map semi-transparency. It's pretty cool. - -2003-6-18 -HIG document compliance (Open, New, Close, modified flag, etc.) I probably won't be making a "Exit" menu item, because that is the dumbest and most confusing aspect of the HIG. -Tearoff item for tools. -Made a_file_basename and replaced all places where I previously just copied and pasted the code. -Fixed _another_ "forgot to initialize" bug (layer.realized) -Simplified interface by having one Open menu item for opening any type of file and an Append menu item to do the same -In doing this, "./viking my.vik my2.vik my.gps my2.gps" etc. now works (concatenates into an unamed file.) -Removed "Properties" from Aggregate Layer popup, and added info message when running "Properties" from the Layers menu on an Aggregate -Provided a info message that tells the user the Top Layer cannot be deleted. - -2003-6-17: -Added error message for failed writes, fixed various bugs such as not free()ing any of the layers on exit (!) -Also fixed some crashes such as when you try to export a trw layer and you can't write to it. -Fixed button order in model dialogs to comply with GNOME HIG. -Added a "Delete All Layers" item from the menu. Change menu names a little bit. -Added "Save" support (current filename) -Started thinking about HIG compliance in the way of documents. Will probably get rid of delete all layers and add new, open (in new window) - -2003-6-16: -Added VikTrwLayer serialization support, added "open" and "save" dialog boxes. -Added error messages for failed reads, etc. - -2003-6-15: -More serialization work. The basics are now working, I have to add VikTrwlayer, maybe add some things in to make -it less vulnerable to crashes and really big mallocs(), and maintain compatibility between versions. - -2003-6-14: -Got some more sample data for Viking via motorcycle riding ;) - -2003-6-13: -Fixed serious glitch that crashes on creating a new track. -Fixed viking crash that happens when a new track is being created, then deleted. -Designed file format & started on serialization of layers. -Moved Layer Icon loading stuff to VikTreeview, as poor designed as it sounds, to get ready for Serialization code. - -2003-6-12: -Viking 0.0.3, first public release +Evan Battaglia <gtoevan@gmx.net>: + * Fix mapcache stuff + +2005-09-03 +Alex Foobarian <foobarian@gmail.com>: + * Alex Foobarian's track split/merge patch + +2005-09-01 +Evan Battaglia <gtoevan@gmx.net>: + * Initial revision + +2005-09-01 +(no author) <(no author)@02d69b8e-d120-0410-893f-fe71a3b6e39e>: + * New repository initialized by cvs2svn. diff --git a/Makefile.am b/Makefile.am index b17d31b..c5816a4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,7 +16,14 @@ EXTRA_DIST = \ viking.spec \ $(INTLTOOL) -dist-hook: viking.spec +.PHONY: generate-changelog +generate-changelog: + if test -d $(top_srcdir)/.git; then \ + cd $(top_srcdir) ; sh $(top_srcdir)/maintainer/git2changelog.sh > $(distdir)/c-l; \ + mv $(distdir)/c-l $(distdir)/ChangeLog; \ + fi + +dist-hook: viking.spec generate-changelog cp $(top_builddir)/viking.spec $(distdir) DISTCLEANFILES = \ diff --git a/Makefile.in b/Makefile.in index f0bcfca..847ba7b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,15 +14,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = . am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -36,12 +32,12 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/viking.spec.in \ $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ TODO config.guess config.rpath config.sub depcomp install-sh \ missing mkinstalldirs -subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/expat.m4 \ $(top_srcdir)/m4/glib-gettext.m4 $(top_srcdir)/m4/libcurl.m4 \ @@ -49,7 +45,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/expat.m4 \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno configure.status.lineno + configure.lineno config.status.lineno mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/src/config.h CONFIG_CLEAN_FILES = viking.spec @@ -60,10 +56,13 @@ SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -81,15 +80,11 @@ distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = -I m4 ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BLUEMARBLE_FALSE = @BLUEMARBLE_FALSE@ -BLUEMARBLE_TRUE = @BLUEMARBLE_TRUE@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ @@ -102,8 +97,6 @@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DB2MAN_XSL = @DB2MAN_XSL@ DEFS = @DEFS@ -DEM24K_FALSE = @DEM24K_FALSE@ -DEM24K_TRUE = @DEM24K_TRUE@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -111,55 +104,23 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXPAT_CFLAGS = @EXPAT_CFLAGS@ -EXPAT_INSTALLED_FALSE = @EXPAT_INSTALLED_FALSE@ -EXPAT_INSTALLED_TRUE = @EXPAT_INSTALLED_TRUE@ EXPAT_LIBS = @EXPAT_LIBS@ -EXPEDIA_FALSE = @EXPEDIA_FALSE@ -EXPEDIA_TRUE = @EXPEDIA_TRUE@ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@ -GEN_MANPAGES_FALSE = @GEN_MANPAGES_FALSE@ -GEN_MANPAGES_TRUE = @GEN_MANPAGES_TRUE@ -GEOCACHES_FALSE = @GEOCACHES_FALSE@ -GEOCACHES_TRUE = @GEOCACHES_TRUE@ -GEONAMES_FALSE = @GEONAMES_FALSE@ -GEONAMES_TRUE = @GEONAMES_TRUE@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GOOGLE_FALSE = @GOOGLE_FALSE@ -GOOGLE_TRUE = @GOOGLE_TRUE@ GREP = @GREP@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ LDFLAGS = @LDFLAGS@ LIBCURL = @LIBCURL@ LIBCURL_CPPFLAGS = @LIBCURL_CPPFLAGS@ @@ -167,20 +128,20 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ OBJEXT = @OBJEXT@ -OPENAERIAL_FALSE = @OPENAERIAL_FALSE@ -OPENAERIAL_TRUE = @OPENAERIAL_TRUE@ -OPENSTREETMAP_FALSE = @OPENSTREETMAP_FALSE@ -OPENSTREETMAP_TRUE = @OPENSTREETMAP_TRUE@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_CFLAGS = @PACKAGE_CFLAGS@ +PACKAGE_LIBS = @PACKAGE_LIBS@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ @@ -190,21 +151,19 @@ POW_LIB = @POW_LIB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ -REALTIME_GPS_TRACKING_FALSE = @REALTIME_GPS_TRACKING_FALSE@ -REALTIME_GPS_TRACKING_TRUE = @REALTIME_GPS_TRACKING_TRUE@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -TERRASERVER_FALSE = @TERRASERVER_FALSE@ -TERRASERVER_TRUE = @TERRASERVER_TRUE@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XP = @XP@ _libcurl_config = @_libcurl_config@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -216,6 +175,7 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -243,8 +203,12 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ SUBDIRS = src test doc po INTLTOOL = \ intltool-extract.in \ @@ -302,7 +266,7 @@ viking.spec: $(top_builddir)/config.status $(srcdir)/viking.spec.in cd $(top_builddir) && $(SHELL) ./config.status $@ install-binSCRIPTS: $(bin_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" + test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_SCRIPTS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f $$d$$p; then \ @@ -319,7 +283,6 @@ uninstall-binSCRIPTS: echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ rm -f "$(DESTDIR)$(bindir)/$$f"; \ done -uninstall-info-am: # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -352,8 +315,7 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: +$(RECURSIVE_CLEAN_TARGETS): @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -397,8 +359,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -423,8 +385,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -434,13 +396,12 @@ ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -455,24 +416,22 @@ distclean-tags: distdir: $(DISTFILES) $(am__remove_distdir) - mkdir $(distdir) - $(mkdir_p) $(distdir)/. $(distdir)/m4 $(distdir)/po - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + test -d $(distdir) || mkdir $(distdir) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -486,7 +445,7 @@ distdir: $(DISTFILES) list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ @@ -494,6 +453,8 @@ distdir: $(DISTFILES) $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ distdir) \ || exit 1; \ fi; \ @@ -504,7 +465,7 @@ distdir: $(DISTFILES) -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r $(distdir) dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz @@ -514,6 +475,10 @@ dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) +dist-lzma: distdir + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma + $(am__remove_distdir) + dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -540,6 +505,8 @@ distcheck: dist GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ + unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ @@ -579,7 +546,7 @@ distcheck: dist $(am__remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: @cd $(distuninstallcheck_dir) \ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ @@ -604,7 +571,7 @@ all-am: Makefile $(SCRIPTS) installdirs: installdirs-recursive installdirs-am: for dir in "$(DESTDIR)$(bindir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive install-exec: install-exec-recursive @@ -652,12 +619,20 @@ info-am: install-data-am: +install-dvi: install-dvi-recursive + install-exec-am: install-binSCRIPTS +install-html: install-html-recursive + install-info: install-info-recursive install-man: +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -678,31 +653,40 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-binSCRIPTS uninstall-info-am +uninstall-am: uninstall-binSCRIPTS -uninstall-info: uninstall-info-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ - check-am clean clean-generic clean-recursive ctags \ - ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-hook \ - dist-shar dist-tarZ dist-zip distcheck distclean \ - distclean-generic distclean-recursive distclean-tags \ - distcleancheck distdir distuninstallcheck dvi dvi-am html \ - html-am info info-am install install-am install-binSCRIPTS \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-binSCRIPTS uninstall-info-am +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am am--refresh check check-am clean clean-generic \ + ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ + dist-hook dist-lzma dist-shar dist-tarZ dist-zip distcheck \ + distclean distclean-generic distclean-tags distcleancheck \ + distdir distuninstallcheck dvi dvi-am html html-am info \ + info-am install install-am install-binSCRIPTS install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ + uninstall-binSCRIPTS full: ./autogen.sh make -dist-hook: viking.spec +.PHONY: generate-changelog +generate-changelog: + if test -d $(top_srcdir)/.git; then \ + cd $(top_srcdir) ; sh $(top_srcdir)/maintainer/git2changelog.sh > $(distdir)/c-l; \ + mv $(distdir)/c-l $(distdir)/ChangeLog; \ + fi + +dist-hook: viking.spec generate-changelog cp $(top_builddir)/viking.spec $(distdir) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. @@ -1,3 +1,33 @@ +Viking 0.9.9 (2009-09-09) +New features since 0.9.8 +* Filter out irrelevant key-modifiers. +* Upgrade OSM-traces support to 0.6 API +* Manage hdop,vdop,pdop,nsat +* Remove unused (and buggy) feature +* Document previous merge +* Improvement of map cache +* Add a viking parameter for mapcache memory size +* Add menu option to flush mapcache, and reduce viking memory footprint +* Use thread-pool to manage download +* Show path used for map directory in options even when using default one +* Include full libcurl version in user agent + +Fixes since 0.9.8 +* Don't crash when jobs are cancelled via the background jobs dialog. +* Fix #2163652: GPX file with byte order mark not parsed +* Fix #2766609: Don't use gpsd_units() +* Fix #2812856: Change SRTM URL +* Fix #2818818: unset langage preset while opening external Google +* Fix copyright in --version output +* Fix SRTM Server change +* Fix memory leaks found with cppcheck +* Fix warning in call to MD5Update() in function md5_hash() +* Fix previous patch +* vdop, hdop, pdop, nsats and fix_mode values were not shown +* Fix #570956: change saved_width to 1 +* Fix build problem +* Fix bug #2481237: Maps directory file chooser should look for directory + Viking 0.9.8 (2009-01-31) New features since 0.9.7 * Add GeoNames support (both for search and for POI import from Geonames+Wikipedia) @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.9.6 -*- Autoconf -*- +# generated automatically by aclocal 1.10.2 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,208 +11,20 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# Configure paths for GTK+ -# Owen Taylor 1997-2001 - -dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES, -dnl pass to pkg-config -dnl -AC_DEFUN([AM_PATH_GTK_2_0], -[dnl -dnl Get the cflags and libraries from pkg-config -dnl -AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run a test GTK+ program], - , enable_gtktest=yes) - - pkg_config_args=gtk+-2.0 - for module in . $4 - do - case "$module" in - gthread) - pkg_config_args="$pkg_config_args gthread-2.0" - ;; - esac - done - - no_gtk="" - - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - - if test x$PKG_CONFIG != xno ; then - if pkg-config --atleast-pkgconfig-version 0.7 ; then - : - else - echo "*** pkg-config too old; version 0.7 or better required." - no_gtk=yes - PKG_CONFIG=no - fi - else - no_gtk=yes - fi - - min_gtk_version=ifelse([$1], ,2.0.0,$1) - AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version) - - if test x$PKG_CONFIG != xno ; then - ## don't try to run the test against uninstalled libtool libs - if $PKG_CONFIG --uninstalled $pkg_config_args; then - echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH" - enable_gtktest=no - fi - - if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then - : - else - no_gtk=yes - fi - fi - - if test x"$no_gtk" = x ; then - GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags` - GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs` - gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_gtktest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$GTK_LIBS $LIBS" -dnl -dnl Now check if the installed GTK+ is sufficiently new. (Also sanity -dnl checks the results of pkg-config to some extent) -dnl - rm -f conf.gtktest - AC_TRY_RUN([ -#include <gtk/gtk.h> -#include <stdio.h> -#include <stdlib.h> - -int -main () -{ - int major, minor, micro; - char *tmp_version; - - system ("touch conf.gtktest"); - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = g_strdup("$min_gtk_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_gtk_version"); - exit(1); - } - - if ((gtk_major_version != $gtk_config_major_version) || - (gtk_minor_version != $gtk_config_minor_version) || - (gtk_micro_version != $gtk_config_micro_version)) - { - printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", - $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, - gtk_major_version, gtk_minor_version, gtk_micro_version); - printf ("*** was found! If pkg-config was correct, then it is best\n"); - printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); - printf("*** to point to the correct configuration files\n"); - } - else if ((gtk_major_version != GTK_MAJOR_VERSION) || - (gtk_minor_version != GTK_MINOR_VERSION) || - (gtk_micro_version != GTK_MICRO_VERSION)) - { - printf("*** GTK+ header files (version %d.%d.%d) do not match\n", - GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); - printf("*** library (version %d.%d.%d)\n", - gtk_major_version, gtk_minor_version, gtk_micro_version); - } - else - { - if ((gtk_major_version > major) || - ((gtk_major_version == major) && (gtk_minor_version > minor)) || - ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", - gtk_major_version, gtk_minor_version, gtk_micro_version); - printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n", - major, minor, micro); - printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n"); - printf("*** correct copy of pkg-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - } - return 1; -} -],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_gtk" = x ; then - AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$PKG_CONFIG" = "no" ; then - echo "*** A new enough version of pkg-config was not found." - echo "*** See http://pkgconfig.sourceforge.net" - else - if test -f conf.gtktest ; then - : - else - echo "*** Could not run GTK+ test program, checking why..." - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$LIBS $GTK_LIBS" - AC_TRY_LINK([ -#include <gtk/gtk.h> -#include <stdio.h> -], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GTK+ or finding the wrong" - echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GTK_CFLAGS="" - GTK_LIBS="" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(GTK_CFLAGS) - AC_SUBST(GTK_LIBS) - rm -f conf.gtktest -]) +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],, +[m4_warning([this file was generated for autoconf 2.64. +You have another version of autoconf. It may work, but is not guaranteed to. +If you have problems, you may need to regenerate the build system entirely. +To do so, use the procedure documented by the package, typically `autoreconf'.])]) dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) # serial 40 IT_PROG_INTLTOOL -AC_DEFUN([IT_PROG_INTLTOOL], -[AC_PREREQ([2.50])dnl +AC_DEFUN([IT_PROG_INTLTOOL], [ +AC_PREREQ([2.50])dnl +AC_REQUIRE([AM_NLS])dnl case "$am__api_version" in 1.[01234]) @@ -261,30 +73,31 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcar INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -AC_SUBST(INTLTOOL_DESKTOP_RULE) -AC_SUBST(INTLTOOL_DIRECTORY_RULE) -AC_SUBST(INTLTOOL_KEYS_RULE) -AC_SUBST(INTLTOOL_PROP_RULE) -AC_SUBST(INTLTOOL_OAF_RULE) -AC_SUBST(INTLTOOL_PONG_RULE) -AC_SUBST(INTLTOOL_SERVER_RULE) -AC_SUBST(INTLTOOL_SHEET_RULE) -AC_SUBST(INTLTOOL_SOUNDLIST_RULE) -AC_SUBST(INTLTOOL_UI_RULE) -AC_SUBST(INTLTOOL_XAM_RULE) -AC_SUBST(INTLTOOL_KBD_RULE) -AC_SUBST(INTLTOOL_XML_RULE) -AC_SUBST(INTLTOOL_XML_NOMERGE_RULE) -AC_SUBST(INTLTOOL_CAVES_RULE) -AC_SUBST(INTLTOOL_SCHEMAS_RULE) -AC_SUBST(INTLTOOL_THEME_RULE) -AC_SUBST(INTLTOOL_SERVICE_RULE) -AC_SUBST(INTLTOOL_POLICY_RULE) +_IT_SUBST(INTLTOOL_DESKTOP_RULE) +_IT_SUBST(INTLTOOL_DIRECTORY_RULE) +_IT_SUBST(INTLTOOL_KEYS_RULE) +_IT_SUBST(INTLTOOL_PROP_RULE) +_IT_SUBST(INTLTOOL_OAF_RULE) +_IT_SUBST(INTLTOOL_PONG_RULE) +_IT_SUBST(INTLTOOL_SERVER_RULE) +_IT_SUBST(INTLTOOL_SHEET_RULE) +_IT_SUBST(INTLTOOL_SOUNDLIST_RULE) +_IT_SUBST(INTLTOOL_UI_RULE) +_IT_SUBST(INTLTOOL_XAM_RULE) +_IT_SUBST(INTLTOOL_KBD_RULE) +_IT_SUBST(INTLTOOL_XML_RULE) +_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE) +_IT_SUBST(INTLTOOL_CAVES_RULE) +_IT_SUBST(INTLTOOL_SCHEMAS_RULE) +_IT_SUBST(INTLTOOL_THEME_RULE) +_IT_SUBST(INTLTOOL_SERVICE_RULE) +_IT_SUBST(INTLTOOL_POLICY_RULE) # Check the gettext tools to make sure they are GNU AC_PATH_PROG(XGETTEXT, xgettext) AC_PATH_PROG(MSGMERGE, msgmerge) AC_PATH_PROG(MSGFMT, msgfmt) +AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) fi @@ -295,12 +108,17 @@ if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) fi -AC_PATH_PROG(INTLTOOL_PERL, [perl]) +AC_PATH_PROG(INTLTOOL_PERL, perl) if test -z "$INTLTOOL_PERL"; then - AC_MSG_ERROR([perl not found; required for intltool]) + AC_MSG_ERROR([perl not found]) fi -if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then - AC_MSG_ERROR([perl 5.x required for intltool]) +AC_MSG_CHECKING([for perl >= 5.8.1]) +$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 +if test $? -ne 0; then + AC_MSG_ERROR([perl 5.8.1 is required for intltool]) +else + IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" + AC_MSG_RESULT([$IT_PERL_VERSION]) fi if test "x$2" != "xno-xml"; then AC_MSG_CHECKING([for XML::Parser]) @@ -356,6 +174,9 @@ dnl The following CONFIG_COMMANDS should be exetuted at the very end dnl of config.status. AC_CONFIG_COMMANDS_PRE([ AC_CONFIG_COMMANDS([$1/stamp-it], [ + if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then + AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.]) + fi rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" >"$1/stamp-it.tmp" [sed '/^#/d @@ -364,21 +185,27 @@ AC_CONFIG_COMMANDS_PRE([ '"s|^| $ac_top_srcdir/|" \ "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" ] - if test ! -f "$1/Makefile"; then - AC_MSG_ERROR([$1/Makefile is not ready.]) - fi - mv "$1/Makefile" "$1/Makefile.tmp" [sed '/^POTFILES =/,/[^\\]$/ { /^POTFILES =/!d r $1/POTFILES } - ' "$1/Makefile.tmp" >"$1/Makefile"] + ' "$1/Makefile.in" >"$1/Makefile"] rm -f "$1/Makefile.tmp" mv "$1/stamp-it.tmp" "$1/stamp-it" ]) ])dnl ]) +# _IT_SUBST(VARIABLE) +# ------------------- +# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST +# +AC_DEFUN([_IT_SUBST], +[ +AC_SUBST([$1]) +m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) +] +) # deprecated macros AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) @@ -386,7 +213,197 @@ AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) # AC_DEFUN([AC_PROG_INTLTOOL], ...) -# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. +# nls.m4 serial 3 (gettext-0.15) +dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. +dnl +dnl This file can can be used in projects which are not available under +dnl the GNU General Public License or the GNU Library General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Library General Public License, and the rest of the GNU +dnl gettext package package is covered by the GNU General Public License. +dnl They are *not* in the public domain. + +dnl Authors: +dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. +dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. + +AC_PREREQ(2.50) + +AC_DEFUN([AM_NLS], +[ + AC_MSG_CHECKING([whether NLS is requested]) + dnl Default is enabled NLS + AC_ARG_ENABLE(nls, + [ --disable-nls do not use Native Language Support], + USE_NLS=$enableval, USE_NLS=yes) + AC_MSG_RESULT($USE_NLS) + AC_SUBST(USE_NLS) +]) + +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# +# Copyright © 2004 Scott James Remnant <scott@netsplit.com>. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +# ---------------------------------- +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=m4_default([$1], [0.9.0]) + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi + +fi[]dnl +])# PKG_PROG_PKG_CONFIG + +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# Check to see whether a particular set of modules exists. Similar +# to PKG_CHECK_MODULES(), but does not set variables or print errors. +# +# +# Similar to PKG_CHECK_MODULES, make sure that the first instance of +# this or PKG_CHECK_MODULES is called, or make sure to call +# PKG_CHECK_EXISTS manually +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_EXISTS], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +if test -n "$PKG_CONFIG" && \ + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then + m4_ifval([$2], [$2], [:]) +m4_ifvaln([$3], [else + $3])dnl +fi]) + + +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +# --------------------------------------------- +m4_define([_PKG_CONFIG], +[if test -n "$PKG_CONFIG"; then + if test -n "$$1"; then + pkg_cv_[]$1="$$1" + else + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_failed=yes]) + fi +else + pkg_failed=untried +fi[]dnl +])# _PKG_CONFIG + +# _PKG_SHORT_ERRORS_SUPPORTED +# ----------------------------- +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi[]dnl +])# _PKG_SHORT_ERRORS_SUPPORTED + + +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) +# +# +# Note that if there is a possibility the first call to +# PKG_CHECK_MODULES might not happen, you should be sure to include an +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +# +# +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl + +pkg_failed=no +AC_MSG_CHECKING([for $1]) + +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) + +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) + +if test $pkg_failed = yes; then + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD + + ifelse([$4], , [AC_MSG_ERROR(dnl +[Package requirements ($2) were not met: + +$$1_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +_PKG_TEXT +])], + [AC_MSG_RESULT([no]) + $4]) +elif test $pkg_failed = untried; then + ifelse([$4], , [AC_MSG_FAILURE(dnl +[The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +_PKG_TEXT + +To get pkg-config, see <http://pkg-config.freedesktop.org/>.])], + [$4]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + ifelse([$3], , :, [$3]) +fi[]dnl +])# PKG_CHECK_MODULES + +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -396,14 +413,31 @@ AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. -AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) +# (This private macro should not be called outside this file.) +AC_DEFUN([AM_AUTOMAKE_VERSION], +[am__api_version='1.10' +dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to +dnl require some minimum version. Point them to the right macro. +m4_if([$1], [1.10.2], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +]) + +# _AM_AUTOCONF_VERSION(VERSION) +# ----------------------------- +# aclocal traces this macro to find the Autoconf version. +# This is a private macro too. Using m4_define simplifies +# the logic in aclocal, which can simply ignore this definition. +m4_define([_AM_AUTOCONF_VERSION], []) # AM_SET_CURRENT_AUTOMAKE_VERSION # ------------------------------- -# Call AM_AUTOMAKE_VERSION so it can be traced. -# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. +# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.9.6])]) +[AM_AUTOMAKE_VERSION([1.10.2])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- @@ -460,14 +494,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd` # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 7 +# serial 8 # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- @@ -476,8 +510,10 @@ AC_DEFUN([AM_CONDITIONAL], [AC_PREREQ(2.52)dnl ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE]) -AC_SUBST([$1_FALSE]) +AC_SUBST([$1_TRUE])dnl +AC_SUBST([$1_FALSE])dnl +_AM_SUBST_NOTMAKE([$1_TRUE])dnl +_AM_SUBST_NOTMAKE([$1_FALSE])dnl if $2; then $1_TRUE= $1_FALSE='#' @@ -491,15 +527,14 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) - -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 8 +# serial 9 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -527,6 +562,7 @@ AC_REQUIRE([AM_DEP_TRACK])dnl ifelse([$1], CC, [depcc="$CC" am_compiler_list=], [$1], CXX, [depcc="$CXX" am_compiler_list=], [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], UPC, [depcc="$UPC" am_compiler_list=], [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], [depcc="$$1" am_compiler_list=]) @@ -592,6 +628,7 @@ AC_CACHE_CHECK([dependency style of $depcc], depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then @@ -644,24 +681,34 @@ if test "x$enable_dependency_tracking" != xno; then AMDEPBACKSLASH='\' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH]) +AC_SUBST([AMDEPBACKSLASH])dnl +_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl ]) # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 3 +#serial 4 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[for mf in $CONFIG_FILES; do +[# Autoconf 2.62 quotes --file arguments for eval, but not when files +# are listed without --file. Let's play safe and only enable the eval +# if we detect the quoting. +case $CONFIG_FILES in +*\'*) eval set x "$CONFIG_FILES" ;; +*) set x $CONFIG_FILES ;; +esac +shift +for mf +do # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. @@ -669,8 +716,9 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. - # So let's grep whole file. - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then dirpart=`AS_DIRNAME("$mf")` else continue @@ -717,14 +765,14 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005, 2006, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 12 +# serial 13 # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -741,16 +789,20 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.58])dnl +[AC_PREREQ([2.60])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl AC_REQUIRE([AC_PROG_INSTALL])dnl -# test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && - test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) + fi fi # test whether we have cygpath @@ -770,6 +822,9 @@ m4_ifval([$2], AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], [_AM_SET_OPTIONS([$1])dnl +dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, + [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl @@ -805,6 +860,10 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX], [_AM_DEPENDENCIES(CXX)], [define([AC_PROG_CXX], defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJC], + [_AM_DEPENDENCIES(OBJC)], + [define([AC_PROG_OBJC], + defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl ]) ]) @@ -818,16 +877,17 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX], # our stamp files there. AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers. +_am_arg=$1 _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $1 | $1:* ) + $_am_arg | $_am_arg:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # @@ -840,7 +900,7 @@ echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -install_sh=${install_sh-"$am_aux_dir/install-sh"} +install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} AC_SUBST(install_sh)]) # Copyright (C) 2003, 2005 Free Software Foundation, Inc. @@ -918,14 +978,14 @@ rm -f confinc confmf # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 +# serial 5 # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ @@ -941,6 +1001,7 @@ AC_SUBST($1)]) # If it does, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([missing])dnl test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" # Use eval to expand $SHELL if eval "$MISSING --run true"; then @@ -951,7 +1012,7 @@ else fi ]) -# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -959,70 +1020,33 @@ fi # AM_PROG_MKDIR_P # --------------- -# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. -# -# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories -# created by `make install' are always world readable, even if the -# installer happens to have an overly restrictive umask (e.g. 077). -# This was a mistake. There are at least two reasons why we must not -# use `-m 0755': -# - it causes special bits like SGID to be ignored, -# - it may be too restrictive (some setups expect 775 directories). -# -# Do not use -m 0755 and let people choose whatever they expect by -# setting umask. -# -# We cannot accept any implementation of `mkdir' that recognizes `-p'. -# Some implementations (such as Solaris 8's) are not thread-safe: if a -# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' -# concurrently, both version can detect that a/ is missing, but only -# one can create it and the other will error out. Consequently we -# restrict ourselves to GNU make (using the --version option ensures -# this.) +# Check for `mkdir -p'. AC_DEFUN([AM_PROG_MKDIR_P], -[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - # We used to keeping the `.' as first argument, in order to - # allow $(mkdir_p) to be used without argument. As in - # $(mkdir_p) $(somedir) - # where $(somedir) is conditionally defined. However this is wrong - # for two reasons: - # 1. if the package is installed by a user who cannot write `.' - # make install will fail, - # 2. the above comment should most certainly read - # $(mkdir_p) $(DESTDIR)$(somedir) - # so it does not work when $(somedir) is undefined and - # $(DESTDIR) is not. - # To support the latter case, we have to write - # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), - # so the `.' trick is pointless. - mkdir_p='mkdir -p --' -else - # On NextStep and OpenStep, the `mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already - # exists. - for d in ./-p ./--version; - do - test -d $d && rmdir $d - done - # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. - if test -f "$ac_aux_dir/mkinstalldirs"; then - mkdir_p='$(mkinstalldirs)' - else - mkdir_p='$(install_sh) -d' - fi -fi -AC_SUBST([mkdir_p])]) +[AC_PREREQ([2.60])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, +dnl while keeping a definition of mkdir_p for backward compatibility. +dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. +dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of +dnl Makefile.ins that do not define MKDIR_P, so we do our own +dnl adjustment using top_builddir (which is defined more often than +dnl MKDIR_P). +AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl +case $mkdir_p in + [[\\/$]]* | ?:[[\\/]]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac +]) # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 +# serial 4 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -1039,7 +1063,7 @@ AC_DEFUN([_AM_SET_OPTION], # ---------------------------------- # OPTIONS is a space-separated list of Automake options. AC_DEFUN([_AM_SET_OPTIONS], -[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) # ------------------------------------------- @@ -1124,9 +1148,21 @@ dnl Don't test for $cross_compiling = yes, because it might be `maybe'. if test "$cross_compiling" != no; then AC_CHECK_TOOL([STRIP], [strip], :) fi -INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) +# Copyright (C) 2006 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# This macro is traced by Automake. +AC_DEFUN([_AM_SUBST_NOTMAKE]) + # Check how to create a tarball. -*- Autoconf -*- # Copyright (C) 2004, 2005 Free Software Foundation, Inc. @@ -1,60 +1,81 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for viking 0.9.8. +# Generated by GNU Autoconf 2.64 for viking 0.9.9. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software +# Foundation, Inc. +# # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; esac - fi - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' else - PATH_SEPARATOR=: + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' fi - rm -f conf$$.sh + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' fi -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } fi @@ -63,20 +84,18 @@ fi # there to prevent editors from complaining about space-tab. # (If _AS_PATH_WALK were called with IFS unset, it would disable word # splitting by setting IFS to empty value.) -as_nl=' -' IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -case $0 in +case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done IFS=$as_save_IFS ;; @@ -87,354 +106,321 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 fi -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : done PS1='$ ' PS2='> ' PS4='+ ' # NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi -done - -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - - -# Name of the executable. -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE # CDPATH. -$as_unset CDPATH - +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH if test "x$CONFIG_SHELL" = x; then - if (eval ":") 2>/dev/null; then - as_have_required=yes + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST else - as_have_required=no + case \`(set -o) 2>/dev/null\` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac fi - - if test $as_have_required = yes && (eval ": -(as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} +" + as_required="as_fn_return () { (exit \$1); } +as_fn_success () { as_fn_return 0; } +as_fn_failure () { as_fn_return 1; } +as_fn_ret_success () { return 0; } +as_fn_ret_failure () { return 1; } exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : +as_fn_success || { exitcode=1; echo as_fn_success failed.; } +as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } +as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } +as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } +if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : + +else + exitcode=1; echo positional parameters were not saved. +fi +test x\$exitcode = x0 || exit 1" + as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO + as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO + eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && + test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 +test \$(( 1 + 1 )) = 2 || exit 1" + if (eval "$as_required") 2>/dev/null; then : + as_have_required=yes else - exitcode=1 - echo positional parameters were not saved. + as_have_required=no fi + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : -test \$exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=\$LINENO - as_lineno_2=\$LINENO - test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && - test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } -") 2> /dev/null; then - : else - as_candidate_shells= - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - case $as_dir in + as_found=: + case $as_dir in #( /*) for as_base in sh bash ksh sh5; do - as_candidate_shells="$as_candidate_shells $as_dir/$as_base" + # Try only shells that exist, to save several forks. + as_shell=$as_dir/$as_base + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + CONFIG_SHELL=$as_shell as_have_required=yes + if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + break 2 +fi +fi done;; esac + as_found=false done +$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi; } IFS=$as_save_IFS - for as_shell in $as_candidate_shells $SHELL; do - # Try only shells that exist, to save several forks. - if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { ("$as_shell") 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - + if test "x$CONFIG_SHELL" != x; then : + # We cannot yet assume a decent shell, so we have to provide a + # neutralization value for shells without unset; and this also + # works around shells that cannot unset nonexistent variables. + BASH_ENV=/dev/null + ENV=/dev/null + (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} fi - -: -_ASEOF -}; then - CONFIG_SHELL=$as_shell - as_have_required=yes - if { "$as_shell" 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - + if test x$as_have_required = xno; then : + $as_echo "$0: This script requires a shell more modern than all" + $as_echo "$0: the shells that I found on your system." + if test x${ZSH_VERSION+set} = xset ; then + $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" + $as_echo "$0: be upgraded to zsh 4.3.4 or later." + else + $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, +$0: including any error possibly output before this +$0: message. Then install a modern shell, or manually run +$0: the script under such a shell if you do have one." + fi + exit 1 fi +fi +fi +SHELL=${CONFIG_SHELL-/bin/sh} +export SHELL +# Unset more variables known to interfere with behavior of common tools. +CLICOLOR_FORCE= GREP_OPTIONS= +unset CLICOLOR_FORCE GREP_OPTIONS - -: -(as_func_return () { - (exit $1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 +## --------------------- ## +## M4sh Shell Functions. ## +## --------------------- ## +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} } +as_unset=as_fn_unset -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ -if as_func_ret_success; then - : + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + + +} # as_fn_mkdir_p +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = "$1" ); then - : + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' else - exitcode=1 - echo positional parameters were not saved. -fi - -test $exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } - -_ASEOF -}; then - break -fi - -fi - - done - - if test "x$CONFIG_SHELL" != x; then - for as_var in BASH_ENV ENV - do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - done - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} -fi - - - if test $as_have_required = no; then - echo This script requires a shell more modern than all the - echo shells that I found on your system. Please install a - echo modern shell, or manually run the script under such a - echo shell if you do have one. - { (exit 1); exit 1; } -fi - - -fi - -fi - + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith -(eval "as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} +# as_fn_error ERROR [LINENO LOG_FD] +# --------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with status $?, using 1 if that was 0. +as_fn_error () +{ + as_status=$?; test $as_status -eq 0 && as_status=1 + if test "$3"; then + as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + fi + $as_echo "$as_me: error: $1" >&2 + as_fn_exit $as_status +} # as_fn_error -exitcode=0 -if as_func_success; then - : +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. + as_expr=false fi -if as_func_ret_success; then - : +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. + as_basename=false fi -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname else - exitcode=1 - echo positional parameters were not saved. + as_dirname=false fi -test \$exitcode = 0") || { - echo No shell found that supports shell functions. - echo Please tell autoconf@gnu.org about your system, - echo including any error possibly output before this - echo message -} - +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) + as_lineno_1=$LINENO as_lineno_1a=$LINENO + as_lineno_2=$LINENO as_lineno_2a=$LINENO + eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && + test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { + # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) sed -n ' p /[$]LINENO/= @@ -451,8 +437,7 @@ test \$exitcode = 0") || { s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the @@ -462,49 +447,40 @@ test \$exitcode = 0") || { exit } - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in +case `echo -n x` in #((((( -n*) - case `echo 'x\c'` in + case `echo 'xy\c'` in *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; esac;; *) ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file else rm -f conf$$.dir - mkdir conf$$.dir -fi -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + mkdir conf$$.dir 2>/dev/null +fi +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else as_ln_s='cp -p' -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln + fi else as_ln_s='cp -p' fi @@ -512,7 +488,7 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null if mkdir -p . 2>/dev/null; then - as_mkdir_p=: + as_mkdir_p='mkdir -p "$as_dir"' else test -d ./-p && rmdir ./-p as_mkdir_p=false @@ -529,12 +505,12 @@ else as_test_x=' eval sh -c '\'' if test -d "$1"; then - test -d "$1/."; + test -d "$1/."; else - case $1 in - -*)set "./$1";; + case $1 in #( + -*)set "./$1";; esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( ???[sx]*):;;*)false;;esac;fi '\'' sh ' @@ -548,7 +524,6 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - exec 7<&0 </dev/null 6>&1 # Name of the host. @@ -567,14 +542,14 @@ cross_compiling=no subdirs= MFLAGS= MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='viking' PACKAGE_TARNAME='viking' -PACKAGE_VERSION='0.9.8' -PACKAGE_STRING='viking 0.9.8' +PACKAGE_VERSION='0.9.9' +PACKAGE_STRING='viking 0.9.9' PACKAGE_BUGREPORT='' +PACKAGE_URL='' # Factoring default headers for most tests. ac_includes_default="\ @@ -612,175 +587,198 @@ ac_includes_default="\ # include <unistd.h> #endif" -ac_subst_vars='SHELL -PATH_SEPARATOR -PACKAGE_NAME -PACKAGE_TARNAME -PACKAGE_VERSION -PACKAGE_STRING -PACKAGE_BUGREPORT -exec_prefix -prefix -program_transform_name -bindir -sbindir -libexecdir -datarootdir -datadir -sysconfdir -sharedstatedir -localstatedir -includedir -oldincludedir -docdir -infodir -htmldir -dvidir -pdfdir -psdir -libdir -localedir -mandir -DEFS -ECHO_C -ECHO_N -ECHO_T -LIBS -build_alias -host_alias -target_alias -INSTALL_PROGRAM -INSTALL_SCRIPT -INSTALL_DATA -CYGPATH_W -PACKAGE -VERSION -ACLOCAL -AUTOCONF -AUTOMAKE -AUTOHEADER -MAKEINFO -install_sh -STRIP -INSTALL_STRIP_PROGRAM -mkdir_p -AWK -SET_MAKE -am__leading_dot -AMTAR -am__tar -am__untar -CC -CFLAGS -LDFLAGS -CPPFLAGS -ac_ct_CC -EXEEXT -OBJEXT -DEPDIR -am__include -am__quote -AMDEP_TRUE -AMDEP_FALSE -AMDEPBACKSLASH -CCDEPMODE -am__fastdepCC_TRUE -am__fastdepCC_FALSE -RANLIB -GETTEXT_PACKAGE -CPP -GREP -EGREP -build -build_cpu -build_vendor -build_os -host -host_cpu -host_vendor -host_os -USE_NLS -MSGFMT -MSGFMT_OPTS -GMSGFMT -XGETTEXT -CATALOGS -CATOBJEXT -DATADIRNAME -GMOFILES -INSTOBJEXT -INTLLIBS -PO_IN_DATADIR_TRUE -PO_IN_DATADIR_FALSE -POFILES -POSUB -MKINSTALLDIRS -INTLTOOL_UPDATE -INTLTOOL_MERGE -INTLTOOL_EXTRACT -INTLTOOL_DESKTOP_RULE -INTLTOOL_DIRECTORY_RULE -INTLTOOL_KEYS_RULE -INTLTOOL_PROP_RULE -INTLTOOL_OAF_RULE -INTLTOOL_PONG_RULE -INTLTOOL_SERVER_RULE -INTLTOOL_SHEET_RULE -INTLTOOL_SOUNDLIST_RULE -INTLTOOL_UI_RULE -INTLTOOL_XAM_RULE -INTLTOOL_KBD_RULE -INTLTOOL_XML_RULE -INTLTOOL_XML_NOMERGE_RULE -INTLTOOL_CAVES_RULE -INTLTOOL_SCHEMAS_RULE -INTLTOOL_THEME_RULE -INTLTOOL_SERVICE_RULE -INTLTOOL_POLICY_RULE -MSGMERGE -INTLTOOL_PERL -ALL_LINGUAS -CONFIG_STATUS_DEPENDENCIES -ACLOCAL_AMFLAGS -LIBOBJS -POW_LIB -EXPAT_INSTALLED_TRUE -EXPAT_INSTALLED_FALSE -EXPAT_CFLAGS -EXPAT_LIBS -_libcurl_config -LIBCURL_CPPFLAGS -LIBCURL -GDK_PIXBUF_CSOURCE -PKG_CONFIG -GTK_CFLAGS -GTK_LIBS -GOOGLE_TRUE -GOOGLE_FALSE -TERRASERVER_TRUE -TERRASERVER_FALSE -EXPEDIA_TRUE -EXPEDIA_FALSE -OPENSTREETMAP_TRUE -OPENSTREETMAP_FALSE -BLUEMARBLE_TRUE -BLUEMARBLE_FALSE -OPENAERIAL_TRUE -OPENAERIAL_FALSE -GEONAMES_TRUE -GEONAMES_FALSE -GEOCACHES_TRUE -GEOCACHES_FALSE -DEM24K_TRUE -DEM24K_FALSE -REALTIME_GPS_TRACKING_TRUE -REALTIME_GPS_TRACKING_FALSE -DB2MAN_XSL -XP -GEN_MANPAGES_TRUE +ac_subst_vars='LTLIBOBJS GEN_MANPAGES_FALSE -LTLIBOBJS' +GEN_MANPAGES_TRUE +XP +DB2MAN_XSL +REALTIME_GPS_TRACKING_FALSE +REALTIME_GPS_TRACKING_TRUE +DEM24K_FALSE +DEM24K_TRUE +GEOCACHES_FALSE +GEOCACHES_TRUE +GEONAMES_FALSE +GEONAMES_TRUE +OPENAERIAL_FALSE +OPENAERIAL_TRUE +BLUEMARBLE_FALSE +BLUEMARBLE_TRUE +OPENSTREETMAP_FALSE +OPENSTREETMAP_TRUE +EXPEDIA_FALSE +EXPEDIA_TRUE +TERRASERVER_FALSE +TERRASERVER_TRUE +GOOGLE_FALSE +GOOGLE_TRUE +PACKAGE_LIBS +PACKAGE_CFLAGS +PKG_CONFIG +GDK_PIXBUF_CSOURCE +LIBCURL +LIBCURL_CPPFLAGS +_libcurl_config +EXPAT_LIBS +EXPAT_CFLAGS +EXPAT_INSTALLED_FALSE +EXPAT_INSTALLED_TRUE +POW_LIB +LIBOBJS +ACLOCAL_AMFLAGS +CONFIG_STATUS_DEPENDENCIES +ALL_LINGUAS +INTLTOOL_PERL +MSGMERGE +INTLTOOL_POLICY_RULE +INTLTOOL_SERVICE_RULE +INTLTOOL_THEME_RULE +INTLTOOL_SCHEMAS_RULE +INTLTOOL_CAVES_RULE +INTLTOOL_XML_NOMERGE_RULE +INTLTOOL_XML_RULE +INTLTOOL_KBD_RULE +INTLTOOL_XAM_RULE +INTLTOOL_UI_RULE +INTLTOOL_SOUNDLIST_RULE +INTLTOOL_SHEET_RULE +INTLTOOL_SERVER_RULE +INTLTOOL_PONG_RULE +INTLTOOL_OAF_RULE +INTLTOOL_PROP_RULE +INTLTOOL_KEYS_RULE +INTLTOOL_DIRECTORY_RULE +INTLTOOL_DESKTOP_RULE +INTLTOOL_EXTRACT +INTLTOOL_MERGE +INTLTOOL_UPDATE +MKINSTALLDIRS +POSUB +POFILES +PO_IN_DATADIR_FALSE +PO_IN_DATADIR_TRUE +INTLLIBS +INSTOBJEXT +GMOFILES +DATADIRNAME +CATOBJEXT +CATALOGS +XGETTEXT +GMSGFMT +MSGFMT_OPTS +MSGFMT +USE_NLS +host_os +host_vendor +host_cpu +host +build_os +build_vendor +build_cpu +build +EGREP +GREP +CPP +GETTEXT_PACKAGE +RANLIB +am__fastdepCC_FALSE +am__fastdepCC_TRUE +CCDEPMODE +AMDEPBACKSLASH +AMDEP_FALSE +AMDEP_TRUE +am__quote +am__include +DEPDIR +OBJEXT +EXEEXT +ac_ct_CC +CPPFLAGS +LDFLAGS +CFLAGS +CC +am__untar +am__tar +AMTAR +am__leading_dot +SET_MAKE +AWK +mkdir_p +MKDIR_P +INSTALL_STRIP_PROGRAM +STRIP +install_sh +MAKEINFO +AUTOHEADER +AUTOMAKE +AUTOCONF +ACLOCAL +VERSION +PACKAGE +CYGPATH_W +am__isrc +INSTALL_DATA +INSTALL_SCRIPT +INSTALL_PROGRAM +target_alias +host_alias +build_alias +LIBS +ECHO_T +ECHO_N +ECHO_C +DEFS +mandir +localedir +libdir +psdir +pdfdir +dvidir +htmldir +infodir +docdir +oldincludedir +includedir +localstatedir +sharedstatedir +sysconfdir +datadir +datarootdir +libexecdir +sbindir +bindir +program_transform_name +prefix +exec_prefix +PACKAGE_URL +PACKAGE_BUGREPORT +PACKAGE_STRING +PACKAGE_VERSION +PACKAGE_TARNAME +PACKAGE_NAME +PATH_SEPARATOR +SHELL' ac_subst_files='' +ac_user_opts=' +enable_option_checking +enable_dependency_tracking +enable_nls +with_expat +with_libcurl +enable_alphabetized_trw +enable_google +enable_terraserver +enable_expedia +enable_openstreetmap +enable_bluemarble +enable_openaerial +enable_geonames +enable_geocaches +enable_dem24k +enable_realtime_gps_tracking +with_search +with_mapcache +' ac_precious_vars='build_alias host_alias target_alias @@ -789,12 +787,17 @@ CFLAGS LDFLAGS LIBS CPPFLAGS -CPP' +CPP +PKG_CONFIG +PACKAGE_CFLAGS +PACKAGE_LIBS' # Initialize some variables set by options. ac_init_help= ac_init_version=false +ac_unrecognized_opts= +ac_unrecognized_sep= # The variables have the same names as the options, with # dashes changed to underlines. cache_file=/dev/null @@ -893,13 +896,20 @@ do datarootdir=$ac_optarg ;; -disable-* | --disable-*) - ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` - eval enable_$ac_feature=no ;; + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=no ;; -docdir | --docdir | --docdi | --doc | --do) ac_prev=docdir ;; @@ -912,13 +922,20 @@ do dvidir=$ac_optarg ;; -enable-* | --enable-*) - ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` - eval enable_$ac_feature=\$ac_optarg ;; + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=\$ac_optarg ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ @@ -1109,22 +1126,36 @@ do ac_init_version=: ;; -with-* | --with-*) - ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/[-.]/_/g'` - eval with_$ac_package=\$ac_optarg ;; + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=\$ac_optarg ;; -without-* | --without-*) - ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/[-.]/_/g'` - eval with_$ac_package=no ;; + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=no ;; --x) # Obsolete; use --with-x. @@ -1144,25 +1175,25 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) { echo "$as_me: error: unrecognized option: $ac_option -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } + -*) as_fn_error "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information." ;; *=*) ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` # Reject names that are not valid shell variable names. - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } + case $ac_envvar in #( + '' | [0-9]* | *[!_$as_cr_alnum]* ) + as_fn_error "invalid variable name: \`$ac_envvar'" ;; + esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; *) # FIXME: should be removed in autoconf 3.0. - echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} ;; @@ -1171,23 +1202,36 @@ done if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } + as_fn_error "missing argument to $ac_option" +fi + +if test -n "$ac_unrecognized_opts"; then + case $enable_option_checking in + no) ;; + fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + esac fi -# Be sure to have absolute directory names. +# Check all directory arguments for consistency. for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ libdir localedir mandir do eval ac_val=\$$ac_var + # Remove trailing slashes. + case $ac_val in + */ ) + ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` + eval $ac_var=\$ac_val;; + esac + # Be sure to have absolute directory names. case $ac_val in [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; } + as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1201,7 +1245,7 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. + $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. If a cross compiler is detected then cross compile mode will be used." >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes @@ -1217,23 +1261,21 @@ test "$silent" = yes && exec 6>/dev/null ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - { echo "$as_me: error: Working directory cannot be determined" >&2 - { (exit 1); exit 1; }; } + as_fn_error "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - { echo "$as_me: error: pwd does not report name of working directory" >&2 - { (exit 1); exit 1; }; } + as_fn_error "pwd does not report name of working directory" # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes # Try the directory containing this script, then the parent directory. - ac_confdir=`$as_dirname -- "$0" || -$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$0" : 'X\(//\)[^/]' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X"$0" | + ac_confdir=`$as_dirname -- "$as_myself" || +$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_myself" : 'X\(//\)[^/]' \| \ + X"$as_myself" : 'X\(//\)$' \| \ + X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_myself" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -1260,13 +1302,11 @@ else fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } + as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 - { (exit 1); exit 1; }; } + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1292,7 +1332,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures viking 0.9.8 to adapt to many kinds of systems. +\`configure' configures viking 0.9.9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1314,9 +1354,9 @@ Configuration: Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] + [$ac_default_prefix] --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] + [PREFIX] By default, \`make install' will install all the files in \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify @@ -1326,25 +1366,25 @@ for instance \`--prefix=\$HOME'. For better control, use the options below. Fine tuning of the installation directories: - --bindir=DIR user executables [EPREFIX/bin] - --sbindir=DIR system admin executables [EPREFIX/sbin] - --libexecdir=DIR program executables [EPREFIX/libexec] - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] - --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] - --datadir=DIR read-only architecture-independent data [DATAROOTDIR] - --infodir=DIR info documentation [DATAROOTDIR/info] - --localedir=DIR locale-dependent data [DATAROOTDIR/locale] - --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/viking] - --htmldir=DIR html documentation [DOCDIR] - --dvidir=DIR dvi documentation [DOCDIR] - --pdfdir=DIR pdf documentation [DOCDIR] - --psdir=DIR ps documentation [DOCDIR] + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root [DATAROOTDIR/doc/viking] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] _ACEOF cat <<\_ACEOF @@ -1362,16 +1402,17 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of viking 0.9.8:";; + short | recursive ) echo "Configuration of viking 0.9.9:";; esac cat <<\_ACEOF Optional Features: + --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors - --disable-gtktest do not try to compile and run a test GTK+ program + --disable-nls do not use Native Language Support --enable-alphabetized-trw enable alphabetized track & waypoints (default is enable) @@ -1407,10 +1448,16 @@ Some influential environment variables: CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if you have headers in a nonstandard directory <include dir> CPP C preprocessor + PKG_CONFIG path to pkg-config utility + PACKAGE_CFLAGS + C compiler flags for PACKAGE, overriding pkg-config + PACKAGE_LIBS + linker flags for PACKAGE, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. +Report bugs to the package provider. _ACEOF ac_status=$? fi @@ -1418,15 +1465,17 @@ fi if test "$ac_init_help" = "recursive"; then # If there are subdirs, report their specific --help. for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d "$ac_dir" || continue + test -d "$ac_dir" || + { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || + continue ac_builddir=. case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -1462,7 +1511,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix echo && $SHELL "$ac_srcdir/configure" --help=recursive else - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi || ac_status=$? cd "$ac_pwd" || { ac_status=$?; break; } done @@ -1471,22 +1520,427 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -viking configure 0.9.8 -generated by GNU Autoconf 2.61 +viking configure 0.9.9 +generated by GNU Autoconf 2.64 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +Copyright (C) 2009 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF exit fi + +## ------------------------ ## +## Autoconf initialization. ## +## ------------------------ ## + +# ac_fn_c_try_compile LINENO +# -------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext + if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + return $ac_retval + +} # ac_fn_c_try_compile + +# ac_fn_c_try_cpp LINENO +# ---------------------- +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_cpp () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + return $ac_retval + +} # ac_fn_c_try_cpp + +# ac_fn_c_try_run LINENO +# ---------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes +# that executables *can* be run. +ac_fn_c_try_run () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then : + ac_retval=0 +else + $as_echo "$as_me: program exited with status $ac_status" >&5 + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=$ac_status +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + return $ac_retval + +} # ac_fn_c_try_run + +# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists, giving a warning if it cannot be compiled using +# the include files in INCLUDES and setting the cache variable VAR +# accordingly. +ac_fn_c_check_header_mongrel () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 +$as_echo_n "checking $2 usability... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_header_compiler=yes +else + ac_header_compiler=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } + +# Is the header present? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 +$as_echo_n "checking $2 presence... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <$2> +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + ac_header_preproc=yes +else + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( + yes:no: ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; + no:yes:* ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; +esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=\$ac_header_compiler" +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_c_check_header_mongrel + +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_c_check_header_compile + +# ac_fn_c_try_link LINENO +# ----------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest$ac_exeext + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + return $ac_retval + +} # ac_fn_c_try_link + +# ac_fn_c_check_func LINENO FUNC VAR +# ---------------------------------- +# Tests whether FUNC exists, setting the cache variable VAR accordingly +ac_fn_c_check_func () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Define $2 to an innocuous variant, in case <limits.h> declares $2. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define $2 innocuous_$2 + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $2 (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef $2 + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $2 (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$2 || defined __stub___$2 +choke me +#endif + +int +main () +{ +return $2 (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_c_check_func + +# ac_fn_c_check_type LINENO TYPE VAR INCLUDES +# ------------------------------------------- +# Tests whether TYPE exists after having included INCLUDES, setting cache +# variable VAR accordingly. +ac_fn_c_check_type () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=no" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +if (sizeof ($2)) + return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +if (sizeof (($2))) + return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + +else + eval "$3=yes" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_c_check_type cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by viking $as_me 0.9.8, which was -generated by GNU Autoconf 2.61. Invocation command line was +It was created by viking $as_me 0.9.9, which was +generated by GNU Autoconf 2.64. Invocation command line was $ $0 $@ @@ -1522,8 +1976,8 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - echo "PATH: $as_dir" -done + $as_echo "PATH: $as_dir" + done IFS=$as_save_IFS } >&5 @@ -1557,12 +2011,12 @@ do | -silent | --silent | --silen | --sile | --sil) continue ;; *\'*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in - 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; + 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; 2) - ac_configure_args1="$ac_configure_args1 '$ac_arg'" + as_fn_append ac_configure_args1 " '$ac_arg'" if test $ac_must_keep_next = true; then ac_must_keep_next=false # Got value, back to normal. else @@ -1578,13 +2032,13 @@ do -* ) ac_must_keep_next=true ;; esac fi - ac_configure_args="$ac_configure_args '$ac_arg'" + as_fn_append ac_configure_args " '$ac_arg'" ;; esac done done -$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } -$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } +{ ac_configure_args0=; unset ac_configure_args0;} +{ ac_configure_args1=; unset ac_configure_args1;} # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there @@ -1609,12 +2063,13 @@ _ASBOX case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( - *) $as_unset $ac_var ;; + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; esac ;; esac done @@ -1643,9 +2098,9 @@ _ASBOX do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - echo "$ac_var='\''$ac_val'\''" + $as_echo "$ac_var='\''$ac_val'\''" done | sort echo @@ -1660,9 +2115,9 @@ _ASBOX do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - echo "$ac_var='\''$ac_val'\''" + $as_echo "$ac_var='\''$ac_val'\''" done | sort echo fi @@ -1678,64 +2133,69 @@ _ASBOX echo fi test "$ac_signal" != 0 && - echo "$as_me: caught signal $ac_signal" - echo "$as_me: exit $exit_status" + $as_echo "$as_me: caught signal $ac_signal" + $as_echo "$as_me: exit $exit_status" } >&5 rm -f core *.core core.conftest.* && rm -f -r conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status ' 0 for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal + trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal done ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. rm -f -r conftest* confdefs.h +$as_echo "/* confdefs.h */" > confdefs.h + # Predefined preprocessor variables. cat >>confdefs.h <<_ACEOF #define PACKAGE_NAME "$PACKAGE_NAME" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_TARNAME "$PACKAGE_TARNAME" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_VERSION "$PACKAGE_VERSION" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_STRING "$PACKAGE_STRING" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" _ACEOF +cat >>confdefs.h <<_ACEOF +#define PACKAGE_URL "$PACKAGE_URL" +_ACEOF + # Let the site file select an alternate cache file if it wants to. -# Prefer explicitly selected file to automatically selected ones. +# Prefer an explicitly selected file to automatically selected ones. +ac_site_file1=NONE +ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - set x "$CONFIG_SITE" + ac_site_file1=$CONFIG_SITE elif test "x$prefix" != xNONE; then - set x "$prefix/share/config.site" "$prefix/etc/config.site" + ac_site_file1=$prefix/share/config.site + ac_site_file2=$prefix/etc/config.site else - set x "$ac_default_prefix/share/config.site" \ - "$ac_default_prefix/etc/config.site" + ac_site_file1=$ac_default_prefix/share/config.site + ac_site_file2=$ac_default_prefix/etc/config.site fi -shift -for ac_site_file +for ac_site_file in "$ac_site_file1" "$ac_site_file2" do + test "x$ac_site_file" = xNONE && continue if test -r "$ac_site_file"; then - { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 -echo "$as_me: loading site script $ac_site_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +$as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" fi @@ -1745,16 +2205,16 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. if test -f "$cache_file"; then - { echo "$as_me:$LINENO: loading cache $cache_file" >&5 -echo "$as_me: loading cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +$as_echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . "$cache_file";; *) . "./$cache_file";; esac fi else - { echo "$as_me:$LINENO: creating cache $cache_file" >&5 -echo "$as_me: creating cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +$as_echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -1768,68 +2228,56 @@ for ac_var in $ac_precious_vars; do eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 -echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 -echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 -echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: + # differences in whitespace do not lead to failure. + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + ac_cache_corrupted=: + else + { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in - *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; *) ac_arg=$ac_var=$ac_new_val ;; esac case " $ac_configure_args " in *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; + *) as_fn_append ac_configure_args " '$ac_arg'" ;; esac fi done if $ac_cache_corrupted; then - { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 -echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } + { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} + as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi - - - - - - - - - - - - - - - - - - - - - - - - +## -------------------- ## +## Main body of script. ## +## -------------------- ## ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -1838,27 +2286,20 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -am__api_version="1.9" +am__api_version='1.10' + ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi + for ac_t in install-sh install.sh shtool; do + if test -f "$ac_dir/$ac_t"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/$ac_t -c" + break 2 + fi + done done if test -z "$ac_aux_dir"; then - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 -echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -1883,22 +2324,23 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. -{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } +# Reject install programs that cannot install multiple files. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 +$as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +if test "${ac_cv_path_install+set}" = set; then : + $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in - ./ | .// | /cC/* | \ + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in #(( + ./ | .// | /[cC]/* | \ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ + ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ /usr/ucb/* ) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. @@ -1916,17 +2358,29 @@ case $as_dir/ in # program-specific install script used by HP pwplus--don't use. : else - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 + rm -rf conftest.one conftest.two conftest.dir + echo one > conftest.one + echo two > conftest.two + mkdir conftest.dir + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && + test -s conftest.one && test -s conftest.two && + test -s conftest.dir/conftest.one && + test -s conftest.dir/conftest.two + then + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi fi fi done done ;; esac -done + + done IFS=$as_save_IFS +rm -rf conftest.one conftest.two conftest.dir fi if test "${ac_cv_path_install+set}" = set; then @@ -1939,8 +2393,8 @@ fi INSTALL=$ac_install_sh fi fi -{ echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 +$as_echo "$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. @@ -1950,8 +2404,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5 -echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 +$as_echo_n "checking whether build environment is sane... " >&6; } # Just in case sleep 1 echo timestamp > conftest.file @@ -1974,11 +2428,8 @@ if ( # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". - { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&5 -echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "ls -t appears to fail. Make sure there is not a broken +alias in your environment" "$LINENO" 5 fi test "$2" = conftest.file @@ -1987,26 +2438,20 @@ then # Ok. : else - { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! -Check your system clock" >&5 -echo "$as_me: error: newly created file is older than distributed files! -Check your system clock" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "newly created file is older than distributed files! +Check your system clock" "$LINENO" 5 fi -{ echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. test "$program_suffix" != NONE && program_transform_name="s&\$&$program_suffix&;$program_transform_name" -# Double any \ or $. echo might interpret backslashes. +# Double any \ or $. # By default was `s,x,x', remove it if useless. -cat <<\_ACEOF >conftest.sed -s/[\\$]/&&/g;s/;s,x,x,$// -_ACEOF -program_transform_name=`echo $program_transform_name | sed -f conftest.sed` -rm -f conftest.sed +ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' +program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` # expand $ac_aux_dir to an absolute path am_aux_dir=`cd $ac_aux_dir && pwd` @@ -2017,51 +2462,66 @@ if eval "$MISSING --run true"; then am_missing_run="$MISSING --run " else am_missing_run= - { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 -echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} -fi - -if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - # We used to keeping the `.' as first argument, in order to - # allow $(mkdir_p) to be used without argument. As in - # $(mkdir_p) $(somedir) - # where $(somedir) is conditionally defined. However this is wrong - # for two reasons: - # 1. if the package is installed by a user who cannot write `.' - # make install will fail, - # 2. the above comment should most certainly read - # $(mkdir_p) $(DESTDIR)$(somedir) - # so it does not work when $(somedir) is undefined and - # $(DESTDIR) is not. - # To support the latter case, we have to write - # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), - # so the `.' trick is pointless. - mkdir_p='mkdir -p --' -else - # On NextStep and OpenStep, the `mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already - # exists. - for d in ./-p ./--version; - do - test -d $d && rmdir $d + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 +$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } +if test -z "$MKDIR_P"; then + if test "${ac_cv_path_mkdir+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in mkdir gmkdir; do + for ac_exec_ext in '' $ac_executable_extensions; do + { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( + 'mkdir (GNU coreutils) '* | \ + 'mkdir (coreutils) '* | \ + 'mkdir (fileutils) '4.1*) + ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext + break 3;; + esac + done + done done - # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. - if test -f "$ac_aux_dir/mkinstalldirs"; then - mkdir_p='$(mkinstalldirs)' +IFS=$as_save_IFS + +fi + + if test "${ac_cv_path_mkdir+set}" = set; then + MKDIR_P="$ac_cv_path_mkdir -p" else - mkdir_p='$(install_sh) -d' + # As a last resort, use the slow shell script. Don't cache a + # value for MKDIR_P within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + test -d ./--version && rmdir ./--version + MKDIR_P="$ac_install_sh -d" fi fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 +$as_echo "$MKDIR_P" >&6; } + +mkdir_p="$MKDIR_P" +case $mkdir_p in + [\\/$]* | ?:[\\/]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_AWK+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_AWK+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. @@ -2071,36 +2531,37 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AWK="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - { echo "$as_me:$LINENO: result: $AWK" >&5 -echo "${ECHO_T}$AWK" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +$as_echo "$AWK" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi test -n "$AWK" && break done -{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } -set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +set x ${MAKE-make} +ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF SHELL = /bin/sh @@ -2117,12 +2578,12 @@ esac rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } SET_MAKE= else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi @@ -2135,12 +2596,14 @@ else fi rmdir .tst 2>/dev/null -# test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && - test -f $srcdir/config.status; then - { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 -echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} - { (exit 1); exit 1; }; } +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + am__isrc=' -I$(srcdir)' + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + fi fi # test whether we have cygpath @@ -2155,7 +2618,7 @@ fi # Define the identity of the package. PACKAGE='viking' - VERSION='0.9.8' + VERSION='0.9.9' cat >>confdefs.h <<_ACEOF @@ -2183,7 +2646,7 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} -install_sh=${install_sh-"$am_aux_dir/install-sh"} +install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} # Installed binaries are usually stripped using `strip' when the user # run `make install-strip'. However `strip' might not be the right @@ -2193,10 +2656,10 @@ if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_STRIP+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. @@ -2206,25 +2669,25 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - { echo "$as_me:$LINENO: result: $STRIP" >&5 -echo "${ECHO_T}$STRIP" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2233,10 +2696,10 @@ if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. @@ -2246,25 +2709,25 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_STRIP="strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -echo "${ECHO_T}$ac_ct_STRIP" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_STRIP" = x; then @@ -2272,12 +2735,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac STRIP=$ac_ct_STRIP @@ -2287,7 +2746,7 @@ else fi fi -INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" # We need awk for the "check" target. The system "awk" is bad on # some platforms. @@ -2313,10 +2772,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2326,25 +2785,25 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2353,10 +2812,10 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -2366,25 +2825,25 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_CC" = x; then @@ -2392,12 +2851,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -2410,10 +2865,10 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2423,25 +2878,25 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2450,10 +2905,10 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2464,18 +2919,18 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS if test $ac_prog_rejected = yes; then @@ -2494,11 +2949,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2509,10 +2964,10 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2522,25 +2977,25 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2553,10 +3008,10 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -2566,25 +3021,25 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2596,12 +3051,8 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -2611,98 +3062,82 @@ fi fi -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "no acceptable C compiler found in \$PATH +See \`config.log' for more details." "$LINENO" 5; } # Provide some information about the compiler. -echo "$as_me:$LINENO: checking for C compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -V >&5") 2>&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + rm -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - +#include <stdio.h> int main () { +FILE *f = fopen ("conftest.out", "w"); + return ferror (f) || fclose (f) != 0; ; return 0; } _ACEOF ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.exe b.out" +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } -ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -# -# List of possible output files, starting from the most likely. -# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) -# only as a last resort. b.out is created by i960 compilers. -ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' -# -# The IRIX 6 linker writes into existing files which may not be -# executable, retaining their permissions. Remove them first so a -# subsequent execution test works. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +$as_echo_n "checking for C compiler default output file name... " >&6; } +ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` + +# The possible output files: +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" + ac_rmfiles= for ac_file in $ac_files do case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; * ) ac_rmfiles="$ac_rmfiles $ac_file";; esac done rm -f $ac_rmfiles -if { (ac_try="$ac_link_default" +if { { ac_try="$ac_link_default" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link_default") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, @@ -2712,14 +3147,14 @@ for ac_file in $ac_files '' do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; [ab].out ) # We found the default executable, but exeext='' is most # certainly right. break;; *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi @@ -2738,78 +3173,75 @@ test "$ac_cv_exeext" = no && ac_cv_exeext= else ac_file='' fi - -{ echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6; } -if test -z "$ac_file"; then - echo "$as_me: failed program was:" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } +if test -z "$ac_file"; then : + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { echo "$as_me:$LINENO: error: C compiler cannot create executables -See \`config.log' for more details." >&5 -echo "$as_me: error: C compiler cannot create executables -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ as_fn_set_status 77 +as_fn_error "C compiler cannot create executables +See \`config.log' for more details." "$LINENO" 5; }; } fi - ac_exeext=$ac_cv_exeext # Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +$as_echo_n "checking whether the C compiler works... " >&6; } # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then if { ac_try='./$ac_file' - { (case "(($ac_try" in + { { case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_try") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:$LINENO: error: cannot run C compiled programs. + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } +See \`config.log' for more details." "$LINENO" 5; } fi fi fi -{ echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -rm -f a.out a.exe conftest$ac_cv_exeext b.out +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out ac_clean_files=$ac_clean_files_save # Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } -{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 -echo "${ECHO_T}$cross_compiling" >&6; } - -{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } -if { (ac_try="$ac_link" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +$as_echo_n "checking for suffix of executables... " >&6; } +if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with @@ -2817,37 +3249,31 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 for ac_file in conftest.exe conftest conftest.*; do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` break;; * ) break;; esac done else - { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." "$LINENO" 5; } fi - rm -f conftest$ac_cv_exeext -{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -echo "${ECHO_T}$ac_cv_exeext" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +$as_echo "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } -if test "${ac_cv_objext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +$as_echo_n "checking for suffix of object files... " >&6; } +if test "${ac_cv_objext+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -2859,51 +3285,46 @@ main () } _ACEOF rm -f conftest.o conftest.obj -if { (ac_try="$ac_compile" +if { { ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : for ac_file in conftest.o conftest.obj conftest.*; do test -f "$ac_file" || continue; case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac done else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "cannot compute suffix of object files: cannot compile +See \`config.log' for more details." "$LINENO" 5; } fi - rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -echo "${ECHO_T}$ac_cv_objext" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +$as_echo "$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +if test "${ac_cv_c_compiler_gnu+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -2917,54 +3338,34 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_compiler_gnu=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no + ac_compiler_gnu=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } -GCC=`test $ac_compiler_gnu = yes && echo yes` +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +$as_echo "$ac_cv_c_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GCC=yes +else + GCC= +fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +$as_echo_n "checking whether $CC accepts -g... " >&6; } +if test "${ac_cv_prog_cc_g+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -2975,34 +3376,11 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3013,35 +3391,12 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_compile "$LINENO"; then : - ac_c_werror_flag=$ac_save_c_werror_flag +else + ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3052,42 +3407,18 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +$as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then @@ -3103,18 +3434,14 @@ else CFLAGS= fi fi -{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 -echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +if test "${ac_cv_prog_cc_c89+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdarg.h> #include <stdio.h> @@ -3171,31 +3498,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_c89=$ac_arg -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext test "x$ac_cv_prog_cc_c89" != "xno" && break done @@ -3206,17 +3511,19 @@ fi # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) - { echo "$as_me:$LINENO: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6; } ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; xno) - { echo "$as_me:$LINENO: result: unsupported" >&5 -echo "${ECHO_T}unsupported" >&6; } ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; *) CC="$CC $ac_cv_prog_cc_c89" - { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; esac +if test "x$ac_cv_prog_cc_c89" != xno; then : +fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -3235,8 +3542,8 @@ am__doit: .PHONY: am__doit END # If we don't find an include directive, just comment out the code. -{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 -echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 +$as_echo_n "checking for style of include used by $am_make... " >&6; } am__include="#" am__quote= _am_result=none @@ -3263,12 +3570,12 @@ if test "$am__include" = "#"; then fi -{ echo "$as_me:$LINENO: result: $_am_result" >&5 -echo "${ECHO_T}$_am_result" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 +$as_echo "$_am_result" >&6; } rm -f confinc confmf # Check whether --enable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then +if test "${enable_dependency_tracking+set}" = set; then : enableval=$enable_dependency_tracking; fi @@ -3276,9 +3583,7 @@ if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' fi - - -if test "x$enable_dependency_tracking" != xno; then + if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= AMDEP_FALSE='#' else @@ -3288,13 +3593,12 @@ fi - depcc="$CC" am_compiler_list= -{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up @@ -3356,6 +3660,7 @@ else depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then @@ -3381,13 +3686,11 @@ else fi fi -{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - - -if + if test "x$enable_dependency_tracking" != xno \ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then am__fastdepCC_TRUE= @@ -3398,11 +3701,12 @@ else fi -{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } -set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +set x ${MAKE-make} +ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF SHELL = /bin/sh @@ -3419,22 +3723,22 @@ esac rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } SET_MAKE= else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_RANLIB+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. @@ -3444,25 +3748,25 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - { echo "$as_me:$LINENO: result: $RANLIB" >&5 -echo "${ECHO_T}$RANLIB" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 +$as_echo "$RANLIB" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -3471,10 +3775,10 @@ if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_RANLIB"; then ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. @@ -3484,25 +3788,25 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_RANLIB="ranlib" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 -echo "${ECHO_T}$ac_ct_RANLIB" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 +$as_echo "$ac_ct_RANLIB" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_RANLIB" = x; then @@ -3510,12 +3814,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac RANLIB=$ac_ct_RANLIB @@ -3540,15 +3840,15 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +$as_echo_n "checking how to run the C preprocessor... " >&6; } # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + if test "${ac_cv_prog_CPP+set}" = set; then : + $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" @@ -3562,11 +3862,7 @@ do # <limits.h> exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include <limits.h> @@ -3575,76 +3871,34 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi - rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <ac_nonexistent.h> _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. ac_preproc_ok=: break fi - rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then +if $ac_preproc_ok; then : break fi @@ -3656,8 +3910,8 @@ fi else ac_cv_prog_CPP=$CPP fi -{ echo "$as_me:$LINENO: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +$as_echo "$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do @@ -3667,11 +3921,7 @@ do # <limits.h> exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include <limits.h> @@ -3680,83 +3930,40 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi - rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <ac_nonexistent.h> _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. ac_preproc_ok=: break fi - rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : +if $ac_preproc_ok; then : + else - { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&5 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." "$LINENO" 5; } fi ac_ext=c @@ -3766,45 +3973,40 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 -echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } -if test "${ac_cv_path_GREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # Extract the first word of "grep ggrep" to use in msg output -if test -z "$GREP"; then -set dummy grep ggrep; ac_prog_name=$2 -if test "${ac_cv_path_GREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +$as_echo_n "checking for grep that handles long lines and -e... " >&6; } +if test "${ac_cv_path_GREP+set}" = set; then : + $as_echo_n "(cached) " >&6 else + if test -z "$GREP"; then ac_path_GREP_found=false -# Loop through the user's path and test for each of PROGNAME-LIST -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue - # Check for GNU ac_path_GREP and select it if it is found. + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue +# Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in *GNU*) ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; *) ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + $as_echo_n 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - echo 'GREP' >> "conftest.nl" + $as_echo 'GREP' >> "conftest.nl" "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_GREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_GREP="$ac_path_GREP" @@ -3816,77 +4018,61 @@ case `"$ac_path_GREP" --version 2>&1` in rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac - - $ac_path_GREP_found && break 3 + $ac_path_GREP_found && break 3 + done + done done -done - -done IFS=$as_save_IFS - - -fi - -GREP="$ac_cv_path_GREP" -if test -z "$GREP"; then - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } -fi - + if test -z "$ac_cv_path_GREP"; then + as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi else ac_cv_path_GREP=$GREP fi - fi -{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 -echo "${ECHO_T}$ac_cv_path_GREP" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +$as_echo "$ac_cv_path_GREP" >&6; } GREP="$ac_cv_path_GREP" -{ echo "$as_me:$LINENO: checking for egrep" >&5 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +$as_echo_n "checking for egrep... " >&6; } +if test "${ac_cv_path_EGREP+set}" = set; then : + $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 then ac_cv_path_EGREP="$GREP -E" else - # Extract the first word of "egrep" to use in msg output -if test -z "$EGREP"; then -set dummy egrep; ac_prog_name=$2 -if test "${ac_cv_path_EGREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else + if test -z "$EGREP"; then ac_path_EGREP_found=false -# Loop through the user's path and test for each of PROGNAME-LIST -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue - # Check for GNU ac_path_EGREP and select it if it is found. + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue +# Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in *GNU*) ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; *) ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + $as_echo_n 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - echo 'EGREP' >> "conftest.nl" + $as_echo 'EGREP' >> "conftest.nl" "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_EGREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_EGREP="$ac_path_EGREP" @@ -3898,46 +4084,31 @@ case `"$ac_path_EGREP" --version 2>&1` in rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac - - $ac_path_EGREP_found && break 3 + $ac_path_EGREP_found && break 3 + done + done done -done - -done IFS=$as_save_IFS - - -fi - -EGREP="$ac_cv_path_EGREP" -if test -z "$EGREP"; then - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } -fi - + if test -z "$ac_cv_path_EGREP"; then + as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi else ac_cv_path_EGREP=$EGREP fi - fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 -echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +$as_echo "$ac_cv_path_EGREP" >&6; } EGREP="$ac_cv_path_EGREP" -{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } -if test "${ac_cv_header_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } +if test "${ac_cv_header_stdc+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdlib.h> #include <stdarg.h> @@ -3952,47 +4123,23 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_header_stdc=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_stdc=no + ac_cv_header_stdc=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <string.h> _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then - : + $EGREP "memchr" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -4002,18 +4149,14 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdlib.h> _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then - : + $EGREP "free" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -4023,14 +4166,10 @@ fi if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : : else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <ctype.h> #include <stdlib.h> @@ -4057,113 +4196,36 @@ main () return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_run "$LINENO"; then : -( exit $ac_status ) -ac_cv_header_stdc=no +else + ac_cv_header_stdc=no fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF +$as_echo "#define STDC_HEADERS 1" >>confdefs.h fi # On IRIX 5.3, sys/types and inttypes.h are conflicting. - - - - - - - - - for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ inttypes.h stdint.h unistd.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Header=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Header'}'` = yes; then +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +" +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF fi @@ -4173,35 +4235,27 @@ done # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 -echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 -{ echo "$as_me:$LINENO: checking build system type" >&5 -echo $ECHO_N "checking build system type... $ECHO_C" >&6; } -if test "${ac_cv_build+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +$as_echo_n "checking build system type... " >&6; } +if test "${ac_cv_build+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_build_alias=$build_alias test "x$ac_build_alias" = x && ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` test "x$ac_build_alias" = x && - { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 -echo "$as_me: error: cannot guess build type; you must specify one" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 fi -{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -echo "${ECHO_T}$ac_cv_build" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +$as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 -echo "$as_me: error: invalid value of canonical build" >&2;} - { (exit 1); exit 1; }; };; +*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -4217,28 +4271,24 @@ IFS=$ac_save_IFS case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -{ echo "$as_me:$LINENO: checking host system type" >&5 -echo $ECHO_N "checking host system type... $ECHO_C" >&6; } -if test "${ac_cv_host+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +$as_echo_n "checking host system type... " >&6; } +if test "${ac_cv_host+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test "x$host_alias" = x; then ac_cv_host=$ac_cv_build else ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -echo "${ECHO_T}$ac_cv_host" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +$as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 -echo "$as_me: error: invalid value of canonical host" >&2;} - { (exit 1); exit 1; }; };; +*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -4255,140 +4305,12 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac - -for ac_header in locale.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then + for ac_header in locale.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default" +if test "x$ac_cv_header_locale_h" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_LOCALE_H 1 _ACEOF fi @@ -4396,16 +4318,12 @@ fi done if test $ac_cv_header_locale_h = yes; then - { echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5 -echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6; } -if test "${am_cv_val_LC_MESSAGES+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5 +$as_echo_n "checking for LC_MESSAGES... " >&6; } +if test "${am_cv_val_LC_MESSAGES+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <locale.h> int @@ -4416,42 +4334,19 @@ return LC_MESSAGES return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : am_cv_val_LC_MESSAGES=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - am_cv_val_LC_MESSAGES=no + am_cv_val_LC_MESSAGES=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 -echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5 +$as_echo "$am_cv_val_LC_MESSAGES" >&6; } if test $am_cv_val_LC_MESSAGES = yes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_LC_MESSAGES 1 -_ACEOF +$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h fi fi @@ -4464,148 +4359,20 @@ _ACEOF XGETTEXT=: INTLLIBS= - if test "${ac_cv_header_libintl_h+set}" = set; then - { echo "$as_me:$LINENO: checking for libintl.h" >&5 -echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; } -if test "${ac_cv_header_libintl_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 -echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking libintl.h usability" >&5 -echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <libintl.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking libintl.h presence" >&5 -echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <libintl.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ echo "$as_me:$LINENO: checking for libintl.h" >&5 -echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; } -if test "${ac_cv_header_libintl_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_libintl_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 -echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; } - -fi -if test $ac_cv_header_libintl_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default" +if test "x$ac_cv_header_libintl_h" = x""yes; then : gt_cv_func_dgettext_libintl="no" libintl_extra_libs="" # # First check in libc # - { echo "$as_me:$LINENO: checking for ngettext in libc" >&5 -echo $ECHO_N "checking for ngettext in libc... $ECHO_C" >&6; } -if test "${gt_cv_func_ngettext_libc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5 +$as_echo_n "checking for ngettext in libc... " >&6; } +if test "${gt_cv_func_ngettext_libc+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <libintl.h> @@ -4618,50 +4385,25 @@ return !ngettext ("","", 1) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : gt_cv_func_ngettext_libc=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - gt_cv_func_ngettext_libc=no + gt_cv_func_ngettext_libc=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5 -echo "${ECHO_T}$gt_cv_func_ngettext_libc" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_ngettext_libc" >&5 +$as_echo "$gt_cv_func_ngettext_libc" >&6; } if test "$gt_cv_func_ngettext_libc" = "yes" ; then - { echo "$as_me:$LINENO: checking for dgettext in libc" >&5 -echo $ECHO_N "checking for dgettext in libc... $ECHO_C" >&6; } -if test "${gt_cv_func_dgettext_libc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5 +$as_echo_n "checking for dgettext in libc... " >&6; } +if test "${gt_cv_func_dgettext_libc+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <libintl.h> @@ -4674,130 +4416,26 @@ return !dgettext ("","") return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : gt_cv_func_dgettext_libc=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - gt_cv_func_dgettext_libc=no + gt_cv_func_dgettext_libc=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5 -echo "${ECHO_T}$gt_cv_func_dgettext_libc" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5 +$as_echo "$gt_cv_func_dgettext_libc" >&6; } fi if test "$gt_cv_func_ngettext_libc" = "yes" ; then - -for ac_func in bind_textdomain_codeset -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then + for ac_func in bind_textdomain_codeset +do : + ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" +if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_BIND_TEXTDOMAIN_CODESET 1 _ACEOF fi @@ -4812,18 +4450,14 @@ done || test "$gt_cv_func_ngettext_libc" != "yes" \ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then - { echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5 -echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6; } -if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5 +$as_echo_n "checking for bindtextdomain in -lintl... " >&6; } +if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -4841,51 +4475,26 @@ return bindtextdomain (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_intl_bindtextdomain=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_intl_bindtextdomain=no + ac_cv_lib_intl_bindtextdomain=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5 -echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6; } -if test $ac_cv_lib_intl_bindtextdomain = yes; then - { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 -echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; } -if test "${ac_cv_lib_intl_ngettext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5 +$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; } +if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 +$as_echo_n "checking for ngettext in -lintl... " >&6; } +if test "${ac_cv_lib_intl_ngettext+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -4903,51 +4512,26 @@ return ngettext (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_intl_ngettext=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_intl_ngettext=no + ac_cv_lib_intl_ngettext=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 -echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; } -if test $ac_cv_lib_intl_ngettext = yes; then - { echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5 -echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6; } -if test "${ac_cv_lib_intl_dgettext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5 +$as_echo "$ac_cv_lib_intl_ngettext" >&6; } +if test "x$ac_cv_lib_intl_ngettext" = x""yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5 +$as_echo_n "checking for dgettext in -lintl... " >&6; } +if test "${ac_cv_lib_intl_dgettext+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -4965,39 +4549,18 @@ return dgettext (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_intl_dgettext=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_intl_dgettext=no + ac_cv_lib_intl_dgettext=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5 -echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6; } -if test $ac_cv_lib_intl_dgettext = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5 +$as_echo "$ac_cv_lib_intl_dgettext" >&6; } +if test "x$ac_cv_lib_intl_dgettext" = x""yes; then : gt_cv_func_dgettext_libintl=yes fi @@ -5007,22 +4570,18 @@ fi if test "$gt_cv_func_dgettext_libintl" != "yes" ; then - { echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5 -echo $ECHO_N "checking if -liconv is needed to use gettext... $ECHO_C" >&6; } - { echo "$as_me:$LINENO: result: " >&5 -echo "${ECHO_T}" >&6; } - { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 -echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; } -if test "${ac_cv_lib_intl_ngettext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -liconv is needed to use gettext" >&5 +$as_echo_n "checking if -liconv is needed to use gettext... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 +$as_echo_n "checking for ngettext in -lintl... " >&6; } +if test "${ac_cv_lib_intl_ngettext+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl -liconv $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -5040,51 +4599,26 @@ return ngettext (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_intl_ngettext=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_intl_ngettext=no + ac_cv_lib_intl_ngettext=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 -echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; } -if test $ac_cv_lib_intl_ngettext = yes; then - { echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5 -echo $ECHO_N "checking for dcgettext in -lintl... $ECHO_C" >&6; } -if test "${ac_cv_lib_intl_dcgettext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5 +$as_echo "$ac_cv_lib_intl_ngettext" >&6; } +if test "x$ac_cv_lib_intl_ngettext" = x""yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5 +$as_echo_n "checking for dcgettext in -lintl... " >&6; } +if test "${ac_cv_lib_intl_dcgettext+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl -liconv $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -5102,39 +4636,18 @@ return dcgettext (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_intl_dcgettext=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_intl_dcgettext=no + ac_cv_lib_intl_dcgettext=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5 -echo "${ECHO_T}$ac_cv_lib_intl_dcgettext" >&6; } -if test $ac_cv_lib_intl_dcgettext = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5 +$as_echo "$ac_cv_lib_intl_dcgettext" >&6; } +if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then : gt_cv_func_dgettext_libintl=yes libintl_extra_libs=-liconv else @@ -5156,95 +4669,12 @@ fi glib_save_LIBS="$LIBS" LIBS="$LIBS -lintl $libintl_extra_libs" unset ac_cv_func_bind_textdomain_codeset - -for ac_func in bind_textdomain_codeset -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then + for ac_func in bind_textdomain_codeset +do : + ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" +if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_BIND_TEXTDOMAIN_CODESET 1 _ACEOF fi @@ -5274,16 +4704,14 @@ done if test "$gt_cv_have_gettext" = "yes"; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_GETTEXT 1 -_ACEOF +$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_MSGFMT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_MSGFMT+set}" = set; then : + $as_echo_n "(cached) " >&6 else case "$MSGFMT" in /*) @@ -5307,112 +4735,29 @@ esac fi MSGFMT="$ac_cv_path_MSGFMT" if test "$MSGFMT" != "no"; then - { echo "$as_me:$LINENO: result: $MSGFMT" >&5 -echo "${ECHO_T}$MSGFMT" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 +$as_echo "$MSGFMT" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "$MSGFMT" != "no"; then glib_save_LIBS="$LIBS" LIBS="$LIBS $INTLLIBS" - -for ac_func in dcgettext -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then + for ac_func in dcgettext +do : + ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext" +if test "x$ac_cv_func_dcgettext" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_DCGETTEXT 1 _ACEOF fi done MSGFMT_OPTS= - { echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5 -echo $ECHO_N "checking if msgfmt accepts -c... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5 +$as_echo_n "checking if msgfmt accepts -c... " >&6; } cat >conftest.foo <<_ACEOF msgid "" @@ -5426,25 +4771,25 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" _ACEOF -if { (echo "$as_me:$LINENO: msgfmt -c -o /dev/null conftest.foo") >&5 +if { { $as_echo "$as_me:${as_lineno-$LINENO}: msgfmt -c -o /dev/null conftest.foo"; } >&5 (msgfmt -c -o /dev/null conftest.foo) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - MSGFMT_OPTS=-c; { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } -else { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + MSGFMT_OPTS=-c; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } echo "$as_me: failed input was:" >&5 sed 's/^/| /' conftest.foo >&5 fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_GMSGFMT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_GMSGFMT+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $GMSGFMT in [\\/]* | ?:[\\/]*) @@ -5456,14 +4801,14 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" @@ -5472,20 +4817,20 @@ esac fi GMSGFMT=$ac_cv_path_GMSGFMT if test -n "$GMSGFMT"; then - { echo "$as_me:$LINENO: result: $GMSGFMT" >&5 -echo "${ECHO_T}$GMSGFMT" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 +$as_echo "$GMSGFMT" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_XGETTEXT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_XGETTEXT+set}" = set; then : + $as_echo_n "(cached) " >&6 else case "$XGETTEXT" in /*) @@ -5509,18 +4854,14 @@ esac fi XGETTEXT="$ac_cv_path_XGETTEXT" if test "$XGETTEXT" != ":"; then - { echo "$as_me:$LINENO: result: $XGETTEXT" >&5 -echo "${ECHO_T}$XGETTEXT" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 +$as_echo "$XGETTEXT" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -5532,114 +4873,14 @@ extern int _nl_msg_cat_cntr; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : CATOBJEXT=.gmo DATADIRNAME=share else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - case $host in + case $host in *-*-solaris*) - { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 -echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; } -if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ -#define bind_textdomain_codeset innocuous_bind_textdomain_codeset - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char bind_textdomain_codeset (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - -#undef bind_textdomain_codeset - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char bind_textdomain_codeset (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset -choke me -#endif - -int -main () -{ -return bind_textdomain_codeset (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func_bind_textdomain_codeset=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_bind_textdomain_codeset=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 -echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; } -if test $ac_cv_func_bind_textdomain_codeset = yes; then + ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" +if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : CATOBJEXT=.gmo DATADIRNAME=share else @@ -5654,9 +4895,8 @@ fi ;; esac fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS="$glib_save_LIBS" INSTOBJEXT=.mo else @@ -5670,9 +4910,7 @@ fi if test "$gt_cv_have_gettext" = "yes" ; then -cat >>confdefs.h <<\_ACEOF -#define ENABLE_NLS 1 -_ACEOF +$as_echo "#define ENABLE_NLS 1" >>confdefs.h fi @@ -5680,8 +4918,8 @@ _ACEOF if $XGETTEXT --omit-header /dev/null 2> /dev/null; then : ; else - { echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5 -echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5 +$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; } XGETTEXT=":" fi fi @@ -5713,8 +4951,8 @@ echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6; } if test "x$ALL_LINGUAS" = "x"; then LINGUAS= else - { echo "$as_me:$LINENO: checking for catalogs to be installed" >&5 -echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5 +$as_echo_n "checking for catalogs to be installed... " >&6; } NEW_LINGUAS= for presentlang in $ALL_LINGUAS; do useit=no @@ -5738,8 +4976,8 @@ echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6; } fi done LINGUAS=$NEW_LINGUAS - { echo "$as_me:$LINENO: result: $LINGUAS" >&5 -echo "${ECHO_T}$LINGUAS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5 +$as_echo "$LINGUAS" >&6; } fi if test -n "$LINGUAS"; then @@ -5792,140 +5030,12 @@ _ACEOF - -for ac_header in locale.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then + for ac_header in locale.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default" +if test "x$ac_cv_header_locale_h" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_LOCALE_H 1 _ACEOF fi @@ -5933,16 +5043,12 @@ fi done if test $ac_cv_header_locale_h = yes; then - { echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5 -echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6; } -if test "${am_cv_val_LC_MESSAGES+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5 +$as_echo_n "checking for LC_MESSAGES... " >&6; } +if test "${am_cv_val_LC_MESSAGES+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <locale.h> int @@ -5953,42 +5059,19 @@ return LC_MESSAGES return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : am_cv_val_LC_MESSAGES=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - am_cv_val_LC_MESSAGES=no + am_cv_val_LC_MESSAGES=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 -echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5 +$as_echo "$am_cv_val_LC_MESSAGES" >&6; } if test $am_cv_val_LC_MESSAGES = yes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_LC_MESSAGES 1 -_ACEOF +$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h fi fi @@ -6001,148 +5084,20 @@ _ACEOF XGETTEXT=: INTLLIBS= - if test "${ac_cv_header_libintl_h+set}" = set; then - { echo "$as_me:$LINENO: checking for libintl.h" >&5 -echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; } -if test "${ac_cv_header_libintl_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 -echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking libintl.h usability" >&5 -echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <libintl.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking libintl.h presence" >&5 -echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <libintl.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ echo "$as_me:$LINENO: checking for libintl.h" >&5 -echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; } -if test "${ac_cv_header_libintl_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_libintl_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 -echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; } - -fi -if test $ac_cv_header_libintl_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default" +if test "x$ac_cv_header_libintl_h" = x""yes; then : gt_cv_func_dgettext_libintl="no" libintl_extra_libs="" # # First check in libc # - { echo "$as_me:$LINENO: checking for ngettext in libc" >&5 -echo $ECHO_N "checking for ngettext in libc... $ECHO_C" >&6; } -if test "${gt_cv_func_ngettext_libc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5 +$as_echo_n "checking for ngettext in libc... " >&6; } +if test "${gt_cv_func_ngettext_libc+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <libintl.h> @@ -6155,50 +5110,25 @@ return !ngettext ("","", 1) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : gt_cv_func_ngettext_libc=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - gt_cv_func_ngettext_libc=no + gt_cv_func_ngettext_libc=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5 -echo "${ECHO_T}$gt_cv_func_ngettext_libc" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_ngettext_libc" >&5 +$as_echo "$gt_cv_func_ngettext_libc" >&6; } if test "$gt_cv_func_ngettext_libc" = "yes" ; then - { echo "$as_me:$LINENO: checking for dgettext in libc" >&5 -echo $ECHO_N "checking for dgettext in libc... $ECHO_C" >&6; } -if test "${gt_cv_func_dgettext_libc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5 +$as_echo_n "checking for dgettext in libc... " >&6; } +if test "${gt_cv_func_dgettext_libc+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <libintl.h> @@ -6211,130 +5141,26 @@ return !dgettext ("","") return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : gt_cv_func_dgettext_libc=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - gt_cv_func_dgettext_libc=no + gt_cv_func_dgettext_libc=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5 -echo "${ECHO_T}$gt_cv_func_dgettext_libc" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5 +$as_echo "$gt_cv_func_dgettext_libc" >&6; } fi if test "$gt_cv_func_ngettext_libc" = "yes" ; then - -for ac_func in bind_textdomain_codeset -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then + for ac_func in bind_textdomain_codeset +do : + ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" +if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_BIND_TEXTDOMAIN_CODESET 1 _ACEOF fi @@ -6349,18 +5175,14 @@ done || test "$gt_cv_func_ngettext_libc" != "yes" \ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then - { echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5 -echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6; } -if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5 +$as_echo_n "checking for bindtextdomain in -lintl... " >&6; } +if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -6378,51 +5200,26 @@ return bindtextdomain (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_intl_bindtextdomain=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_intl_bindtextdomain=no + ac_cv_lib_intl_bindtextdomain=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5 -echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6; } -if test $ac_cv_lib_intl_bindtextdomain = yes; then - { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 -echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; } -if test "${ac_cv_lib_intl_ngettext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5 +$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; } +if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 +$as_echo_n "checking for ngettext in -lintl... " >&6; } +if test "${ac_cv_lib_intl_ngettext+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -6440,51 +5237,26 @@ return ngettext (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_intl_ngettext=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_intl_ngettext=no + ac_cv_lib_intl_ngettext=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 -echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; } -if test $ac_cv_lib_intl_ngettext = yes; then - { echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5 -echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6; } -if test "${ac_cv_lib_intl_dgettext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5 +$as_echo "$ac_cv_lib_intl_ngettext" >&6; } +if test "x$ac_cv_lib_intl_ngettext" = x""yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5 +$as_echo_n "checking for dgettext in -lintl... " >&6; } +if test "${ac_cv_lib_intl_dgettext+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -6502,39 +5274,18 @@ return dgettext (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_intl_dgettext=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_intl_dgettext=no + ac_cv_lib_intl_dgettext=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5 -echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6; } -if test $ac_cv_lib_intl_dgettext = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5 +$as_echo "$ac_cv_lib_intl_dgettext" >&6; } +if test "x$ac_cv_lib_intl_dgettext" = x""yes; then : gt_cv_func_dgettext_libintl=yes fi @@ -6544,22 +5295,18 @@ fi if test "$gt_cv_func_dgettext_libintl" != "yes" ; then - { echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5 -echo $ECHO_N "checking if -liconv is needed to use gettext... $ECHO_C" >&6; } - { echo "$as_me:$LINENO: result: " >&5 -echo "${ECHO_T}" >&6; } - { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 -echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; } -if test "${ac_cv_lib_intl_ngettext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -liconv is needed to use gettext" >&5 +$as_echo_n "checking if -liconv is needed to use gettext... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 +$as_echo_n "checking for ngettext in -lintl... " >&6; } +if test "${ac_cv_lib_intl_ngettext+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl -liconv $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -6577,51 +5324,26 @@ return ngettext (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_intl_ngettext=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_intl_ngettext=no + ac_cv_lib_intl_ngettext=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 -echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; } -if test $ac_cv_lib_intl_ngettext = yes; then - { echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5 -echo $ECHO_N "checking for dcgettext in -lintl... $ECHO_C" >&6; } -if test "${ac_cv_lib_intl_dcgettext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5 +$as_echo "$ac_cv_lib_intl_ngettext" >&6; } +if test "x$ac_cv_lib_intl_ngettext" = x""yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5 +$as_echo_n "checking for dcgettext in -lintl... " >&6; } +if test "${ac_cv_lib_intl_dcgettext+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl -liconv $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -6639,39 +5361,18 @@ return dcgettext (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_intl_dcgettext=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_intl_dcgettext=no + ac_cv_lib_intl_dcgettext=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5 -echo "${ECHO_T}$ac_cv_lib_intl_dcgettext" >&6; } -if test $ac_cv_lib_intl_dcgettext = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5 +$as_echo "$ac_cv_lib_intl_dcgettext" >&6; } +if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then : gt_cv_func_dgettext_libintl=yes libintl_extra_libs=-liconv else @@ -6693,95 +5394,12 @@ fi glib_save_LIBS="$LIBS" LIBS="$LIBS -lintl $libintl_extra_libs" unset ac_cv_func_bind_textdomain_codeset - -for ac_func in bind_textdomain_codeset -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then + for ac_func in bind_textdomain_codeset +do : + ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" +if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_BIND_TEXTDOMAIN_CODESET 1 _ACEOF fi @@ -6811,16 +5429,14 @@ done if test "$gt_cv_have_gettext" = "yes"; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_GETTEXT 1 -_ACEOF +$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_MSGFMT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_MSGFMT+set}" = set; then : + $as_echo_n "(cached) " >&6 else case "$MSGFMT" in /*) @@ -6844,112 +5460,29 @@ esac fi MSGFMT="$ac_cv_path_MSGFMT" if test "$MSGFMT" != "no"; then - { echo "$as_me:$LINENO: result: $MSGFMT" >&5 -echo "${ECHO_T}$MSGFMT" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 +$as_echo "$MSGFMT" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "$MSGFMT" != "no"; then glib_save_LIBS="$LIBS" LIBS="$LIBS $INTLLIBS" - -for ac_func in dcgettext -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then + for ac_func in dcgettext +do : + ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext" +if test "x$ac_cv_func_dcgettext" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_DCGETTEXT 1 _ACEOF fi done MSGFMT_OPTS= - { echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5 -echo $ECHO_N "checking if msgfmt accepts -c... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5 +$as_echo_n "checking if msgfmt accepts -c... " >&6; } cat >conftest.foo <<_ACEOF msgid "" @@ -6963,25 +5496,25 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" _ACEOF -if { (echo "$as_me:$LINENO: msgfmt -c -o /dev/null conftest.foo") >&5 +if { { $as_echo "$as_me:${as_lineno-$LINENO}: msgfmt -c -o /dev/null conftest.foo"; } >&5 (msgfmt -c -o /dev/null conftest.foo) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - MSGFMT_OPTS=-c; { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } -else { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + MSGFMT_OPTS=-c; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } echo "$as_me: failed input was:" >&5 sed 's/^/| /' conftest.foo >&5 fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_GMSGFMT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_GMSGFMT+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $GMSGFMT in [\\/]* | ?:[\\/]*) @@ -6993,14 +5526,14 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" @@ -7009,20 +5542,20 @@ esac fi GMSGFMT=$ac_cv_path_GMSGFMT if test -n "$GMSGFMT"; then - { echo "$as_me:$LINENO: result: $GMSGFMT" >&5 -echo "${ECHO_T}$GMSGFMT" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 +$as_echo "$GMSGFMT" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_XGETTEXT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_XGETTEXT+set}" = set; then : + $as_echo_n "(cached) " >&6 else case "$XGETTEXT" in /*) @@ -7046,18 +5579,14 @@ esac fi XGETTEXT="$ac_cv_path_XGETTEXT" if test "$XGETTEXT" != ":"; then - { echo "$as_me:$LINENO: result: $XGETTEXT" >&5 -echo "${ECHO_T}$XGETTEXT" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 +$as_echo "$XGETTEXT" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -7069,114 +5598,14 @@ extern int _nl_msg_cat_cntr; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : CATOBJEXT=.gmo DATADIRNAME=share else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - case $host in + case $host in *-*-solaris*) - { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 -echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; } -if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ -#define bind_textdomain_codeset innocuous_bind_textdomain_codeset - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char bind_textdomain_codeset (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - -#undef bind_textdomain_codeset - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char bind_textdomain_codeset (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset -choke me -#endif - -int -main () -{ -return bind_textdomain_codeset (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func_bind_textdomain_codeset=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_bind_textdomain_codeset=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 -echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; } -if test $ac_cv_func_bind_textdomain_codeset = yes; then + ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" +if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : CATOBJEXT=.gmo DATADIRNAME=share else @@ -7191,9 +5620,8 @@ fi ;; esac fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS="$glib_save_LIBS" INSTOBJEXT=.mo else @@ -7207,9 +5635,7 @@ fi if test "$gt_cv_have_gettext" = "yes" ; then -cat >>confdefs.h <<\_ACEOF -#define ENABLE_NLS 1 -_ACEOF +$as_echo "#define ENABLE_NLS 1" >>confdefs.h fi @@ -7217,8 +5643,8 @@ _ACEOF if $XGETTEXT --omit-header /dev/null 2> /dev/null; then : ; else - { echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5 -echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5 +$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; } XGETTEXT=":" fi fi @@ -7250,8 +5676,8 @@ echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6; } if test "x$ALL_LINGUAS" = "x"; then LINGUAS= else - { echo "$as_me:$LINENO: checking for catalogs to be installed" >&5 -echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5 +$as_echo_n "checking for catalogs to be installed... " >&6; } NEW_LINGUAS= for presentlang in $ALL_LINGUAS; do useit=no @@ -7275,8 +5701,8 @@ echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6; } fi done LINGUAS=$NEW_LINGUAS - { echo "$as_me:$LINENO: result: $LINGUAS" >&5 -echo "${ECHO_T}$LINGUAS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5 +$as_echo "$LINGUAS" >&6; } fi if test -n "$LINGUAS"; then @@ -7308,38 +5734,49 @@ echo "${ECHO_T}$LINGUAS" >&6; } < $srcdir/po/POTFILES.in > po/POTFILES + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 +$as_echo_n "checking whether NLS is requested... " >&6; } + # Check whether --enable-nls was given. +if test "${enable_nls+set}" = set; then : + enableval=$enable_nls; USE_NLS=$enableval +else + USE_NLS=yes +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 +$as_echo "$USE_NLS" >&6; } + + + + case "$am__api_version" in 1.01234) - { { echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5 -echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5 ;; *) ;; esac if test -n "0.35.0"; then - { echo "$as_me:$LINENO: checking for intltool >= 0.35.0" >&5 -echo $ECHO_N "checking for intltool >= 0.35.0... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.35.0" >&5 +$as_echo_n "checking for intltool >= 0.35.0... " >&6; } INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - { echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5 -echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5 +$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; } test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || - { { echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.35.0 or later." >&5 -echo "$as_me: error: Your intltool is too old. You need intltool 0.35.0 or later." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "Your intltool is too old. You need intltool 0.35.0 or later." "$LINENO" 5 fi # Extract the first word of "intltool-update", so it can be a program name with args. set dummy intltool-update; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $INTLTOOL_UPDATE in [\\/]* | ?:[\\/]*) @@ -7351,14 +5788,14 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -7366,20 +5803,20 @@ esac fi INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE if test -n "$INTLTOOL_UPDATE"; then - { echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5 -echo "${ECHO_T}$INTLTOOL_UPDATE" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5 +$as_echo "$INTLTOOL_UPDATE" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Extract the first word of "intltool-merge", so it can be a program name with args. set dummy intltool-merge; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $INTLTOOL_MERGE in [\\/]* | ?:[\\/]*) @@ -7391,14 +5828,14 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -7406,20 +5843,20 @@ esac fi INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE if test -n "$INTLTOOL_MERGE"; then - { echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5 -echo "${ECHO_T}$INTLTOOL_MERGE" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5 +$as_echo "$INTLTOOL_MERGE" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Extract the first word of "intltool-extract", so it can be a program name with args. set dummy intltool-extract; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $INTLTOOL_EXTRACT in [\\/]* | ?:[\\/]*) @@ -7431,14 +5868,14 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -7446,18 +5883,16 @@ esac fi INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT if test -n "$INTLTOOL_EXTRACT"; then - { echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5 -echo "${ECHO_T}$INTLTOOL_EXTRACT" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5 +$as_echo "$INTLTOOL_EXTRACT" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then - { { echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5 -echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5 fi INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' @@ -7500,13 +5935,89 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcar + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + # Check the gettext tools to make sure they are GNU # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_XGETTEXT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_XGETTEXT+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $XGETTEXT in [\\/]* | ?:[\\/]*) @@ -7518,14 +6029,14 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -7533,20 +6044,20 @@ esac fi XGETTEXT=$ac_cv_path_XGETTEXT if test -n "$XGETTEXT"; then - { echo "$as_me:$LINENO: result: $XGETTEXT" >&5 -echo "${ECHO_T}$XGETTEXT" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 +$as_echo "$XGETTEXT" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Extract the first word of "msgmerge", so it can be a program name with args. set dummy msgmerge; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_MSGMERGE+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_MSGMERGE+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $MSGMERGE in [\\/]* | ?:[\\/]*) @@ -7558,14 +6069,14 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -7573,20 +6084,20 @@ esac fi MSGMERGE=$ac_cv_path_MSGMERGE if test -n "$MSGMERGE"; then - { echo "$as_me:$LINENO: result: $MSGMERGE" >&5 -echo "${ECHO_T}$MSGMERGE" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5 +$as_echo "$MSGMERGE" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_MSGFMT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_MSGFMT+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $MSGFMT in [\\/]* | ?:[\\/]*) @@ -7598,14 +6109,14 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -7613,34 +6124,71 @@ esac fi MSGFMT=$ac_cv_path_MSGFMT if test -n "$MSGFMT"; then - { echo "$as_me:$LINENO: result: $MSGFMT" >&5 -echo "${ECHO_T}$MSGFMT" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 +$as_echo "$MSGFMT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +# Extract the first word of "gmsgfmt", so it can be a program name with args. +set dummy gmsgfmt; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_GMSGFMT+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + case $GMSGFMT in + [\\/]* | ?:[\\/]*) + ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" + ;; +esac +fi +GMSGFMT=$ac_cv_path_GMSGFMT +if test -n "$GMSGFMT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 +$as_echo "$GMSGFMT" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then - { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5 -echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5 fi xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then - { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5 -echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5 fi # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $INTLTOOL_PERL in [\\/]* | ?:[\\/]*) @@ -7652,14 +6200,14 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -7667,34 +6215,35 @@ esac fi INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL if test -n "$INTLTOOL_PERL"; then - { echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5 -echo "${ECHO_T}$INTLTOOL_PERL" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5 +$as_echo "$INTLTOOL_PERL" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test -z "$INTLTOOL_PERL"; then - { { echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5 -echo "$as_me: error: perl not found; required for intltool" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "perl not found" "$LINENO" 5 fi -if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then - { { echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5 -echo "$as_me: error: perl 5.x required for intltool" >&2;} - { (exit 1); exit 1; }; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5 +$as_echo_n "checking for perl >= 5.8.1... " >&6; } +$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 +if test $? -ne 0; then + as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5 +else + IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5 +$as_echo "$IT_PERL_VERSION" >&6; } fi if test "x" != "xno-xml"; then - { echo "$as_me:$LINENO: checking for XML::Parser" >&5 -echo $ECHO_N "checking for XML::Parser... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5 +$as_echo_n "checking for XML::Parser... " >&6; } if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then - { echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +$as_echo "ok" >&6; } else - { { echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5 -echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5 fi fi @@ -7704,11 +6253,7 @@ fi # Set DATADIRNAME correctly if it is not set yet # (copied from glib-gettext.m4) if test -z "$DATADIRNAME"; then - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -7720,113 +6265,13 @@ extern int _nl_msg_cat_cntr; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : DATADIRNAME=share else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - case $host in + case $host in *-*-solaris*) - { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 -echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; } -if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ -#define bind_textdomain_codeset innocuous_bind_textdomain_codeset - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char bind_textdomain_codeset (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - -#undef bind_textdomain_codeset - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char bind_textdomain_codeset (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset -choke me -#endif - -int -main () -{ -return bind_textdomain_codeset (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func_bind_textdomain_codeset=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_bind_textdomain_codeset=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 -echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; } -if test $ac_cv_func_bind_textdomain_codeset = yes; then + ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" +if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : DATADIRNAME=share else DATADIRNAME=lib @@ -7838,9 +6283,8 @@ fi ;; esac fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi @@ -7855,16 +6299,12 @@ ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" # Checks for header files. -{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } -if test "${ac_cv_header_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } +if test "${ac_cv_header_stdc+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdlib.h> #include <stdarg.h> @@ -7879,47 +6319,23 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_header_stdc=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_stdc=no + ac_cv_header_stdc=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <string.h> _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then - : + $EGREP "memchr" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -7929,18 +6345,14 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdlib.h> _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then - : + $EGREP "free" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -7950,14 +6362,10 @@ fi if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : : else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <ctype.h> #include <stdlib.h> @@ -7984,195 +6392,33 @@ main () return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_run "$LINENO"; then : -( exit $ac_status ) -ac_cv_header_stdc=no +else + ac_cv_header_stdc=no fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF +$as_echo "#define STDC_HEADERS 1" >>confdefs.h fi - - - - - - - - - - - for ac_header in malloc.h netdb.h netinet/in.h stdlib.h string.h sys/param.h sys/socket.h sys/types.h sys/wait.h unistd.h math.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF fi @@ -8181,16 +6427,12 @@ done # Checks for typedefs, structures, and compiler characteristics. -{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 -echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; } -if test "${ac_cv_c_const+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 +$as_echo_n "checking for an ANSI C-conforming const... " >&6; } +if test "${ac_cv_c_const+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -8250,98 +6492,24 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_c_const=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_c_const=no + ac_cv_c_const=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 -echo "${ECHO_T}$ac_cv_c_const" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 +$as_echo "$ac_cv_c_const" >&6; } if test $ac_cv_c_const = no; then -cat >>confdefs.h <<\_ACEOF -#define const -_ACEOF +$as_echo "#define const /**/" >>confdefs.h fi -{ echo "$as_me:$LINENO: checking for mode_t" >&5 -echo $ECHO_N "checking for mode_t... $ECHO_C" >&6; } -if test "${ac_cv_type_mode_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -typedef mode_t ac__type_new_; -int -main () -{ -if ((ac__type_new_ *) 0) - return 0; -if (sizeof (ac__type_new_)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_type_mode_t=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_mode_t=no -fi +ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default" +if test "x$ac_cv_type_mode_t" = x""yes; then : -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5 -echo "${ECHO_T}$ac_cv_type_mode_t" >&6; } -if test $ac_cv_type_mode_t = yes; then - : else cat >>confdefs.h <<_ACEOF @@ -8352,22 +6520,18 @@ fi # Checks for library functions. -{ echo "$as_me:$LINENO: checking whether lstat dereferences a symlink specified with a trailing slash" >&5 -echo $ECHO_N "checking whether lstat dereferences a symlink specified with a trailing slash... $ECHO_C" >&6; } -if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat dereferences a symlink specified with a trailing slash" >&5 +$as_echo_n "checking whether lstat dereferences a symlink specified with a trailing slash... " >&6; } +if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then : + $as_echo_n "(cached) " >&6 else rm -f conftest.sym conftest.file echo >conftest.file if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : ac_cv_func_lstat_dereferences_slashed_symlink=no else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int @@ -8382,39 +6546,15 @@ struct stat sbuf; return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_run "$LINENO"; then : ac_cv_func_lstat_dereferences_slashed_symlink=yes else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_func_lstat_dereferences_slashed_symlink=no + ac_cv_func_lstat_dereferences_slashed_symlink=no fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - else # If the `ln -s' command failed, then we probably don't even # have an lstat function. @@ -8423,8 +6563,8 @@ fi rm -f conftest.sym conftest.file fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5 -echo "${ECHO_T}$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5 +$as_echo "$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; } test $ac_cv_func_lstat_dereferences_slashed_symlink = yes && @@ -8442,19 +6582,15 @@ esac fi -{ echo "$as_me:$LINENO: checking whether stat accepts an empty string" >&5 -echo $ECHO_N "checking whether stat accepts an empty string... $ECHO_C" >&6; } -if test "${ac_cv_func_stat_empty_string_bug+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat accepts an empty string" >&5 +$as_echo_n "checking whether stat accepts an empty string... " >&6; } +if test "${ac_cv_func_stat_empty_string_bug+set}" = set; then : + $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : ac_cv_func_stat_empty_string_bug=yes else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int @@ -8466,42 +6602,18 @@ struct stat sbuf; return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_run "$LINENO"; then : ac_cv_func_stat_empty_string_bug=no else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_func_stat_empty_string_bug=yes + ac_cv_func_stat_empty_string_bug=yes fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_stat_empty_string_bug" >&5 -echo "${ECHO_T}$ac_cv_func_stat_empty_string_bug" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_stat_empty_string_bug" >&5 +$as_echo "$ac_cv_func_stat_empty_string_bug" >&6; } if test $ac_cv_func_stat_empty_string_bug = yes; then case " $LIBOBJS " in *" stat.$ac_objext "* ) ;; @@ -8516,19 +6628,15 @@ _ACEOF fi -{ echo "$as_me:$LINENO: checking for working strtod" >&5 -echo $ECHO_N "checking for working strtod... $ECHO_C" >&6; } -if test "${ac_cv_func_strtod+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strtod" >&5 +$as_echo_n "checking for working strtod... " >&6; } +if test "${ac_cv_func_strtod+set}" = set; then : + $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : ac_cv_func_strtod=no else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default @@ -8561,42 +6669,18 @@ main() } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_run "$LINENO"; then : ac_cv_func_strtod=yes else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_func_strtod=no + ac_cv_func_strtod=no fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_strtod" >&5 -echo "${ECHO_T}$ac_cv_func_strtod" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strtod" >&5 +$as_echo "$ac_cv_func_strtod" >&6; } if test $ac_cv_func_strtod = no; then case " $LIBOBJS " in *" strtod.$ac_objext "* ) ;; @@ -8604,101 +6688,20 @@ if test $ac_cv_func_strtod = no; then ;; esac -{ echo "$as_me:$LINENO: checking for pow" >&5 -echo $ECHO_N "checking for pow... $ECHO_C" >&6; } -if test "${ac_cv_func_pow+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define pow to an innocuous variant, in case <limits.h> declares pow. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ -#define pow innocuous_pow - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char pow (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - -#undef pow - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char pow (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_pow || defined __stub___pow -choke me -#endif - -int -main () -{ -return pow (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func_pow=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_pow=no -fi +ac_fn_c_check_func "$LINENO" "pow" "ac_cv_func_pow" +if test "x$ac_cv_func_pow" = x""yes; then : -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_pow" >&5 -echo "${ECHO_T}$ac_cv_func_pow" >&6; } if test $ac_cv_func_pow = no; then - { echo "$as_me:$LINENO: checking for pow in -lm" >&5 -echo $ECHO_N "checking for pow in -lm... $ECHO_C" >&6; } -if test "${ac_cv_lib_m_pow+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&5 +$as_echo_n "checking for pow in -lm... " >&6; } +if test "${ac_cv_lib_m_pow+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lm $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -8716,151 +6719,36 @@ return pow (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_m_pow=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_m_pow=no + ac_cv_lib_m_pow=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_m_pow" >&5 -echo "${ECHO_T}$ac_cv_lib_m_pow" >&6; } -if test $ac_cv_lib_m_pow = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&5 +$as_echo "$ac_cv_lib_m_pow" >&6; } +if test "x$ac_cv_lib_m_pow" = x""yes; then : POW_LIB=-lm else - { echo "$as_me:$LINENO: WARNING: cannot find library containing definition of pow" >&5 -echo "$as_me: WARNING: cannot find library containing definition of pow" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find library containing definition of pow" >&5 +$as_echo "$as_me: WARNING: cannot find library containing definition of pow" >&2;} fi fi fi - - - - - - - - - - - - - - for ac_func in floor gethostbyname memset mkdtemp pow realpath socket sqrt strcasecmp strchr strdup strncasecmp strtol strtoul -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +eval as_val=\$$as_ac_var + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF fi @@ -8870,16 +6758,14 @@ done # Expat # Check whether --with-expat was given. -if test "${with_expat+set}" = set; then +if test "${with_expat+set}" = set; then : withval=$with_expat; else with_expat=yes fi - - -if test $with_expat != no; then + if test $with_expat != no; then EXPAT_INSTALLED_TRUE= EXPAT_INSTALLED_FALSE='#' else @@ -8895,18 +6781,14 @@ fi EXPAT_CFLAGS="-I$with_expat/include" EXPAT_LIBS="-L$with_expat/lib" fi - { echo "$as_me:$LINENO: checking for XML_ParserCreate in -lexpat" >&5 -echo $ECHO_N "checking for XML_ParserCreate in -lexpat... $ECHO_C" >&6; } -if test "${ac_cv_lib_expat_XML_ParserCreate+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML_ParserCreate in -lexpat" >&5 +$as_echo_n "checking for XML_ParserCreate in -lexpat... " >&6; } +if test "${ac_cv_lib_expat_XML_ParserCreate+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lexpat "$EXPAT_LIBS" $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -8924,39 +6806,18 @@ return XML_ParserCreate (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_expat_XML_ParserCreate=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_expat_XML_ParserCreate=no + ac_cv_lib_expat_XML_ParserCreate=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_expat_XML_ParserCreate" >&5 -echo "${ECHO_T}$ac_cv_lib_expat_XML_ParserCreate" >&6; } -if test $ac_cv_lib_expat_XML_ParserCreate = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_expat_XML_ParserCreate" >&5 +$as_echo "$ac_cv_lib_expat_XML_ParserCreate" >&6; } +if test "x$ac_cv_lib_expat_XML_ParserCreate" = x""yes; then : EXPAT_LIBS="$EXPAT_LIBS -lexpat" expat_found=yes else @@ -8964,146 +6825,16 @@ else fi if test $expat_found = no; then - { { echo "$as_me:$LINENO: error: Could not find the Expat library" >&5 -echo "$as_me: error: Could not find the Expat library" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "Could not find the Expat library" "$LINENO" 5 fi expat_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $EXPAT_CFLAGS" - -for ac_header in expat.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then + for ac_header in expat.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "expat.h" "ac_cv_header_expat_h" "$ac_includes_default" +if test "x$ac_cv_header_expat_h" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_EXPAT_H 1 _ACEOF else @@ -9113,9 +6844,7 @@ fi done if test $expat_found = no; then - { { echo "$as_me:$LINENO: error: Could not find expat.h" >&5 -echo "$as_me: error: Could not find expat.h" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "Could not find expat.h" "$LINENO" 5 fi CFLAGS="$expat_save_CFLAGS" fi @@ -9146,25 +6875,8 @@ echo "$as_me: error: Could not find expat.h" >&2;} - - - - - - - - - - - - - - - - - # Check whether --with-libcurl was given. -if test "${with_libcurl+set}" = set; then +if test "${with_libcurl+set}" = set; then : withval=$with_libcurl; _libcurl_with=$withval else _libcurl_with=yes @@ -9177,10 +6889,10 @@ fi do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_AWK+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_AWK+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. @@ -9190,25 +6902,25 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AWK="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - { echo "$as_me:$LINENO: result: $AWK" >&5 -echo "${ECHO_T}$AWK" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +$as_echo "$AWK" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -9225,10 +6937,10 @@ done _libcurl_ldflags="-L$withval/lib" # Extract the first word of ""$withval/bin/curl-config"", so it can be a program name with args. set dummy "$withval/bin/curl-config"; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path__libcurl_config+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path__libcurl_config+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $_libcurl_config in [\\/]* | ?:[\\/]*) @@ -9240,14 +6952,14 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path__libcurl_config="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -9255,21 +6967,21 @@ esac fi _libcurl_config=$ac_cv_path__libcurl_config if test -n "$_libcurl_config"; then - { echo "$as_me:$LINENO: result: $_libcurl_config" >&5 -echo "${ECHO_T}$_libcurl_config" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_libcurl_config" >&5 +$as_echo "$_libcurl_config" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi else # Extract the first word of "curl-config", so it can be a program name with args. set dummy curl-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path__libcurl_config+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path__libcurl_config+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $_libcurl_config in [\\/]* | ?:[\\/]*) @@ -9281,14 +6993,14 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path__libcurl_config="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -9296,35 +7008,35 @@ esac fi _libcurl_config=$ac_cv_path__libcurl_config if test -n "$_libcurl_config"; then - { echo "$as_me:$LINENO: result: $_libcurl_config" >&5 -echo "${ECHO_T}$_libcurl_config" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_libcurl_config" >&5 +$as_echo "$_libcurl_config" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi fi if test x$_libcurl_config != "x" ; then - { echo "$as_me:$LINENO: checking for the version of libcurl" >&5 -echo $ECHO_N "checking for the version of libcurl... $ECHO_C" >&6; } -if test "${libcurl_cv_lib_curl_version+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the version of libcurl" >&5 +$as_echo_n "checking for the version of libcurl... " >&6; } +if test "${libcurl_cv_lib_curl_version+set}" = set; then : + $as_echo_n "(cached) " >&6 else libcurl_cv_lib_curl_version=`$_libcurl_config --version | $AWK '{print $2}'` fi -{ echo "$as_me:$LINENO: result: $libcurl_cv_lib_curl_version" >&5 -echo "${ECHO_T}$libcurl_cv_lib_curl_version" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libcurl_cv_lib_curl_version" >&5 +$as_echo "$libcurl_cv_lib_curl_version" >&6; } _libcurl_version=`echo $libcurl_cv_lib_curl_version | $_libcurl_version_parse` _libcurl_wanted=`echo 0 | $_libcurl_version_parse` if test $_libcurl_wanted -gt 0 ; then - { echo "$as_me:$LINENO: checking for libcurl >= version " >&5 -echo $ECHO_N "checking for libcurl >= version ... $ECHO_C" >&6; } -if test "${libcurl_cv_lib_version_ok+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libcurl >= version " >&5 +$as_echo_n "checking for libcurl >= version ... " >&6; } +if test "${libcurl_cv_lib_version_ok+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test $_libcurl_version -ge $_libcurl_wanted ; then @@ -9334,8 +7046,8 @@ else fi fi -{ echo "$as_me:$LINENO: result: $libcurl_cv_lib_version_ok" >&5 -echo "${ECHO_T}$libcurl_cv_lib_version_ok" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libcurl_cv_lib_version_ok" >&5 +$as_echo "$libcurl_cv_lib_version_ok" >&6; } fi if test $_libcurl_wanted -eq 0 || test x$libcurl_cv_lib_version_ok = xyes ; then @@ -9375,10 +7087,10 @@ echo "${ECHO_T}$libcurl_cv_lib_version_ok" >&6; } # link line (or failing that, "-lcurl") is enough. LIBCURL=${LIBCURL-"$_libcurl_ldflags -lcurl"} - { echo "$as_me:$LINENO: checking whether libcurl is usable" >&5 -echo $ECHO_N "checking whether libcurl is usable... $ECHO_C" >&6; } -if test "${libcurl_cv_lib_curl_usable+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libcurl is usable" >&5 +$as_echo_n "checking whether libcurl is usable... " >&6; } +if test "${libcurl_cv_lib_curl_usable+set}" = set; then : + $as_echo_n "(cached) " >&6 else _libcurl_save_cppflags=$CPPFLAGS @@ -9386,11 +7098,7 @@ else _libcurl_save_libs=$LIBS LIBS="$LIBCURL $LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <curl/curl.h> int @@ -9412,34 +7120,13 @@ x=CURLOPT_VERBOSE; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : libcurl_cv_lib_curl_usable=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - libcurl_cv_lib_curl_usable=no + libcurl_cv_lib_curl_usable=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext CPPFLAGS=$_libcurl_save_cppflags LIBS=$_libcurl_save_libs @@ -9447,8 +7134,8 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ unset _libcurl_save_libs fi -{ echo "$as_me:$LINENO: result: $libcurl_cv_lib_curl_usable" >&5 -echo "${ECHO_T}$libcurl_cv_lib_curl_usable" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libcurl_cv_lib_curl_usable" >&5 +$as_echo "$libcurl_cv_lib_curl_usable" >&6; } if test $libcurl_cv_lib_curl_usable = yes ; then @@ -9460,94 +7147,12 @@ echo "${ECHO_T}$libcurl_cv_lib_curl_usable" >&6; } _libcurl_save_libs=$LIBS LIBS="$LIBS $LIBCURL" - { echo "$as_me:$LINENO: checking for curl_free" >&5 -echo $ECHO_N "checking for curl_free... $ECHO_C" >&6; } -if test "${ac_cv_func_curl_free+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define curl_free to an innocuous variant, in case <limits.h> declares curl_free. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ -#define curl_free innocuous_curl_free - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char curl_free (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - -#undef curl_free - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char curl_free (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_curl_free || defined __stub___curl_free -choke me -#endif - -int -main () -{ -return curl_free (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func_curl_free=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_curl_free=no -fi + ac_fn_c_check_func "$LINENO" "curl_free" "ac_cv_func_curl_free" +if test "x$ac_cv_func_curl_free" = x""yes; then : -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_curl_free" >&5 -echo "${ECHO_T}$ac_cv_func_curl_free" >&6; } -if test $ac_cv_func_curl_free = yes; then - : else -cat >>confdefs.h <<\_ACEOF -#define curl_free free -_ACEOF +$as_echo "#define curl_free free" >>confdefs.h fi @@ -9558,19 +7163,17 @@ fi unset _libcurl_save_libs -cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBCURL 1 -_ACEOF +$as_echo "#define HAVE_LIBCURL 1" >>confdefs.h for _libcurl_feature in $_libcurl_features ; do cat >>confdefs.h <<_ACEOF -#define `echo "libcurl_feature_$_libcurl_feature" | $as_tr_cpp` 1 +#define `$as_echo "libcurl_feature_$_libcurl_feature" | $as_tr_cpp` 1 _ACEOF - eval `echo "libcurl_feature_$_libcurl_feature" | $as_tr_sh`=yes + eval `$as_echo "libcurl_feature_$_libcurl_feature" | $as_tr_sh`=yes done if test "x$_libcurl_protocols" = "x" ; then @@ -9592,10 +7195,10 @@ _ACEOF for _libcurl_protocol in $_libcurl_protocols ; do cat >>confdefs.h <<_ACEOF -#define `echo "libcurl_protocol_$_libcurl_protocol" | $as_tr_cpp` 1 +#define `$as_echo "libcurl_protocol_$_libcurl_protocol" | $as_tr_cpp` 1 _ACEOF - eval `echo "libcurl_protocol_$_libcurl_protocol" | $as_tr_sh`=yes + eval `$as_echo "libcurl_protocol_$_libcurl_protocol" | $as_tr_sh`=yes done else unset LIBCURL @@ -9616,9 +7219,7 @@ _ACEOF if test x$_libcurl_with = xno || test x$libcurl_cv_lib_curl_usable != xyes ; then # This is the IF-NO path - { { echo "$as_me:$LINENO: error: libcurl is needed but not found" >&5 -echo "$as_me: error: libcurl is needed but not found" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "libcurl is needed but not found" "$LINENO" 5 else # This is the IF-YES path : @@ -9627,12 +7228,13 @@ echo "$as_me: error: libcurl is needed but not found" >&2;} unset _libcurl_with +# gdk-pixbuf-csource # Extract the first word of "gdk-pixbuf-csource", so it can be a program name with args. set dummy gdk-pixbuf-csource; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_GDK_PIXBUF_CSOURCE+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_GDK_PIXBUF_CSOURCE+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$GDK_PIXBUF_CSOURCE"; then ac_cv_prog_GDK_PIXBUF_CSOURCE="$GDK_PIXBUF_CSOURCE" # Let the user override the test. @@ -9642,62 +7244,44 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_GDK_PIXBUF_CSOURCE="yes" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi GDK_PIXBUF_CSOURCE=$ac_cv_prog_GDK_PIXBUF_CSOURCE if test -n "$GDK_PIXBUF_CSOURCE"; then - { echo "$as_me:$LINENO: result: $GDK_PIXBUF_CSOURCE" >&5 -echo "${ECHO_T}$GDK_PIXBUF_CSOURCE" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GDK_PIXBUF_CSOURCE" >&5 +$as_echo "$GDK_PIXBUF_CSOURCE" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test $GDK_PIXBUF_CSOURCE != "yes" then - { { echo "$as_me:$LINENO: error: gdk-pixbuf-csource is needed but not found" >&5 -echo "$as_me: error: gdk-pixbuf-csource is needed but not found" >&2;} - { (exit 1); exit 1; }; } -fi - -# Checks for libraries. -# Check whether --enable-gtktest was given. -if test "${enable_gtktest+set}" = set; then - enableval=$enable_gtktest; -else - enable_gtktest=yes + as_fn_error "gdk-pixbuf-csource is needed but not found" "$LINENO" 5 fi - pkg_config_args=gtk+-2.0 - for module in . gthread - do - case "$module" in - gthread) - pkg_config_args="$pkg_config_args gthread-2.0" - ;; - esac - done - no_gtk="" - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -9709,339 +7293,281 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS - test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi - if test x$PKG_CONFIG != xno ; then - if pkg-config --atleast-pkgconfig-version 0.7 ; then - : - else - echo "*** pkg-config too old; version 0.7 or better required." - no_gtk=yes - PKG_CONFIG=no - fi + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" else - no_gtk=yes + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi - min_gtk_version=2.2.0 - { echo "$as_me:$LINENO: checking for GTK+ - version >= $min_gtk_version" >&5 -echo $ECHO_N "checking for GTK+ - version >= $min_gtk_version... $ECHO_C" >&6; } +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.9.0 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + PKG_CONFIG="" + fi - if test x$PKG_CONFIG != xno ; then - ## don't try to run the test against uninstalled libtool libs - if $PKG_CONFIG --uninstalled $pkg_config_args; then - echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH" - enable_gtktest=no - fi +fi + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PACKAGE" >&5 +$as_echo_n "checking for PACKAGE... " >&6; } - if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then - : +if test -n "$PKG_CONFIG"; then + if test -n "$PACKAGE_CFLAGS"; then + pkg_cv_PACKAGE_CFLAGS="$PACKAGE_CFLAGS" else - no_gtk=yes + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" + glib-2.0 >= 2.12 + gthread-2.0 >= 2.2 + gtk+-2.0 >= 2.8 +\""; } >&5 + ($PKG_CONFIG --exists --print-errors " + glib-2.0 >= 2.12 + gthread-2.0 >= 2.2 + gtk+-2.0 >= 2.8 +") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_PACKAGE_CFLAGS=`$PKG_CONFIG --cflags " + glib-2.0 >= 2.12 + gthread-2.0 >= 2.2 + gtk+-2.0 >= 2.8 +" 2>/dev/null` +else + pkg_failed=yes +fi fi - fi - - if test x"$no_gtk" = x ; then - GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags` - GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs` - gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` - gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` - gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` - if test "x$enable_gtktest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$GTK_LIBS $LIBS" - rm -f conf.gtktest - if test "$cross_compiling" = yes; then - echo $ac_n "cross compiling; assumed OK... $ac_c" -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#include <gtk/gtk.h> -#include <stdio.h> -#include <stdlib.h> - -int -main () -{ - int major, minor, micro; - char *tmp_version; +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$PACKAGE_LIBS"; then + pkg_cv_PACKAGE_LIBS="$PACKAGE_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" + glib-2.0 >= 2.12 + gthread-2.0 >= 2.2 + gtk+-2.0 >= 2.8 +\""; } >&5 + ($PKG_CONFIG --exists --print-errors " + glib-2.0 >= 2.12 + gthread-2.0 >= 2.2 + gtk+-2.0 >= 2.8 +") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_PACKAGE_LIBS=`$PKG_CONFIG --libs " + glib-2.0 >= 2.12 + gthread-2.0 >= 2.2 + gtk+-2.0 >= 2.8 +" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi - system ("touch conf.gtktest"); - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = g_strdup("$min_gtk_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_gtk_version"); - exit(1); - } - if ((gtk_major_version != $gtk_config_major_version) || - (gtk_minor_version != $gtk_config_minor_version) || - (gtk_micro_version != $gtk_config_micro_version)) - { - printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", - $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, - gtk_major_version, gtk_minor_version, gtk_micro_version); - printf ("*** was found! If pkg-config was correct, then it is best\n"); - printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); - printf("*** to point to the correct configuration files\n"); - } - else if ((gtk_major_version != GTK_MAJOR_VERSION) || - (gtk_minor_version != GTK_MINOR_VERSION) || - (gtk_micro_version != GTK_MICRO_VERSION)) - { - printf("*** GTK+ header files (version %d.%d.%d) do not match\n", - GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); - printf("*** library (version %d.%d.%d)\n", - gtk_major_version, gtk_minor_version, gtk_micro_version); - } - else - { - if ((gtk_major_version > major) || - ((gtk_major_version == major) && (gtk_minor_version > minor)) || - ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", - gtk_major_version, gtk_minor_version, gtk_micro_version); - printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n", - major, minor, micro); - printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n"); - printf("*** correct copy of pkg-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - } - return 1; -} +if test $pkg_failed = yes; then -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -no_gtk=yes -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + _pkg_short_errors_supported=no fi + if test $_pkg_short_errors_supported = yes; then + PACKAGE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " + glib-2.0 >= 2.12 + gthread-2.0 >= 2.2 + gtk+-2.0 >= 2.8 +"` + else + PACKAGE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " + glib-2.0 >= 2.12 + gthread-2.0 >= 2.2 + gtk+-2.0 >= 2.8 +"` + fi + # Put the nasty error message in config.log where it belongs + echo "$PACKAGE_PKG_ERRORS" >&5 + as_fn_error "Package requirements ( + glib-2.0 >= 2.12 + gthread-2.0 >= 2.2 + gtk+-2.0 >= 2.8 +) were not met: - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_gtk" = x ; then - { echo "$as_me:$LINENO: result: yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&5 -echo "${ECHO_T}yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&6; } - : - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - if test "$PKG_CONFIG" = "no" ; then - echo "*** A new enough version of pkg-config was not found." - echo "*** See http://pkgconfig.sourceforge.net" - else - if test -f conf.gtktest ; then - : - else - echo "*** Could not run GTK+ test program, checking why..." - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$LIBS $GTK_LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +$PACKAGE_PKG_ERRORS -#include <gtk/gtk.h> -#include <stdio.h> +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. -int -main () -{ - return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GTK+ or finding the wrong" - echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +Alternatively, you may set the environment variables PACKAGE_CFLAGS +and PACKAGE_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" "$LINENO" 5 +elif test $pkg_failed = untried; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables PACKAGE_CFLAGS +and PACKAGE_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. - echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GTK+ is incorrectly installed." +To get pkg-config, see <http://pkg-config.freedesktop.org/>. +See \`config.log' for more details." "$LINENO" 5; } +else + PACKAGE_CFLAGS=$pkg_cv_PACKAGE_CFLAGS + PACKAGE_LIBS=$pkg_cv_PACKAGE_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + : fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GTK_CFLAGS="" - GTK_LIBS="" - { { echo "$as_me:$LINENO: error: needs GTK+ 2.2.0" >&5 -echo "$as_me: error: needs GTK+ 2.2.0" >&2;} - { (exit 1); exit 1; }; } - fi - rm -f conf.gtktest # Options # Check whether --enable-alphabetized-trw was given. -if test "${enable_alphabetized_trw+set}" = set; then +if test "${enable_alphabetized_trw+set}" = set; then : enableval=$enable_alphabetized_trw; ac_cv_enable_alpha_trw=$enableval else ac_cv_enable_alpha_trw=yes fi -{ echo "$as_me:$LINENO: checking whether to enable alphabetized track & waypoint" >&5 -echo $ECHO_N "checking whether to enable alphabetized track & waypoint... $ECHO_C" >&6; } -if test "${ac_cv_enable_alpha_trw+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable alphabetized track & waypoint" >&5 +$as_echo_n "checking whether to enable alphabetized track & waypoint... " >&6; } +if test "${ac_cv_enable_alpha_trw+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_cv_enable_alpha_trw=yes fi -{ echo "$as_me:$LINENO: result: $ac_cv_enable_alpha_trw" >&5 -echo "${ECHO_T}$ac_cv_enable_alpha_trw" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_alpha_trw" >&5 +$as_echo "$ac_cv_enable_alpha_trw" >&6; } case $ac_cv_enable_alpha_trw in yes) -cat >>confdefs.h <<\_ACEOF -#define VIK_CONFIG_ALPHABETIZED_TRW -_ACEOF +$as_echo "#define VIK_CONFIG_ALPHABETIZED_TRW /**/" >>confdefs.h ;; esac # Check whether --enable-google was given. -if test "${enable_google+set}" = set; then +if test "${enable_google+set}" = set; then : enableval=$enable_google; ac_cv_enable_google=$enableval else ac_cv_enable_google=yes fi -{ echo "$as_me:$LINENO: checking whether to enable Google stuff" >&5 -echo $ECHO_N "checking whether to enable Google stuff... $ECHO_C" >&6; } -if test "${ac_cv_enable_google+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable Google stuff" >&5 +$as_echo_n "checking whether to enable Google stuff... " >&6; } +if test "${ac_cv_enable_google+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_cv_enable_google=yes fi -{ echo "$as_me:$LINENO: result: $ac_cv_enable_google" >&5 -echo "${ECHO_T}$ac_cv_enable_google" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_google" >&5 +$as_echo "$ac_cv_enable_google" >&6; } case $ac_cv_enable_google in yes) -cat >>confdefs.h <<\_ACEOF -#define VIK_CONFIG_GOOGLE -_ACEOF +$as_echo "#define VIK_CONFIG_GOOGLE /**/" >>confdefs.h ;; esac - - -if test x$ac_cv_enable_google = xyes; then + if test x$ac_cv_enable_google = xyes; then GOOGLE_TRUE= GOOGLE_FALSE='#' else @@ -10051,33 +7577,29 @@ fi # Check whether --enable-terraserver was given. -if test "${enable_terraserver+set}" = set; then +if test "${enable_terraserver+set}" = set; then : enableval=$enable_terraserver; ac_cv_enable_terraserver=$enableval else ac_cv_enable_terraserver=yes fi -{ echo "$as_me:$LINENO: checking whether to enable Terraserver stuff" >&5 -echo $ECHO_N "checking whether to enable Terraserver stuff... $ECHO_C" >&6; } -if test "${ac_cv_enable_terraserver+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable Terraserver stuff" >&5 +$as_echo_n "checking whether to enable Terraserver stuff... " >&6; } +if test "${ac_cv_enable_terraserver+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_cv_enable_terraserver=yes fi -{ echo "$as_me:$LINENO: result: $ac_cv_enable_terraserver" >&5 -echo "${ECHO_T}$ac_cv_enable_terraserver" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_terraserver" >&5 +$as_echo "$ac_cv_enable_terraserver" >&6; } case $ac_cv_enable_terraserver in yes) -cat >>confdefs.h <<\_ACEOF -#define VIK_CONFIG_TERRASERVER -_ACEOF +$as_echo "#define VIK_CONFIG_TERRASERVER /**/" >>confdefs.h ;; esac - - -if test x$ac_cv_enable_terraserver = xyes; then + if test x$ac_cv_enable_terraserver = xyes; then TERRASERVER_TRUE= TERRASERVER_FALSE='#' else @@ -10087,33 +7609,29 @@ fi # Check whether --enable-expedia was given. -if test "${enable_expedia+set}" = set; then +if test "${enable_expedia+set}" = set; then : enableval=$enable_expedia; ac_cv_enable_expedia=$enableval else ac_cv_enable_expedia=no fi -{ echo "$as_me:$LINENO: checking whether to enable Expedia stuff" >&5 -echo $ECHO_N "checking whether to enable Expedia stuff... $ECHO_C" >&6; } -if test "${ac_cv_enable_expedia+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable Expedia stuff" >&5 +$as_echo_n "checking whether to enable Expedia stuff... " >&6; } +if test "${ac_cv_enable_expedia+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_cv_enable_expedia=yes fi -{ echo "$as_me:$LINENO: result: $ac_cv_enable_expedia" >&5 -echo "${ECHO_T}$ac_cv_enable_expedia" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_expedia" >&5 +$as_echo "$ac_cv_enable_expedia" >&6; } case $ac_cv_enable_expedia in yes) -cat >>confdefs.h <<\_ACEOF -#define VIK_CONFIG_EXPEDIA -_ACEOF +$as_echo "#define VIK_CONFIG_EXPEDIA /**/" >>confdefs.h ;; esac - - -if test x$ac_cv_enable_expedia = xyes; then + if test x$ac_cv_enable_expedia = xyes; then EXPEDIA_TRUE= EXPEDIA_FALSE='#' else @@ -10124,33 +7642,29 @@ fi # OpenStreetMap http://www.openstreetmap.org/ # Check whether --enable-openstreetmap was given. -if test "${enable_openstreetmap+set}" = set; then +if test "${enable_openstreetmap+set}" = set; then : enableval=$enable_openstreetmap; ac_cv_enable_openstreetmap=$enableval else ac_cv_enable_openstreetmap=yes fi -{ echo "$as_me:$LINENO: checking whether to enable OpenStreetMap stuff" >&5 -echo $ECHO_N "checking whether to enable OpenStreetMap stuff... $ECHO_C" >&6; } -if test "${ac_cv_enable_openstreetmap+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable OpenStreetMap stuff" >&5 +$as_echo_n "checking whether to enable OpenStreetMap stuff... " >&6; } +if test "${ac_cv_enable_openstreetmap+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_cv_enable_openstreetmap=yes fi -{ echo "$as_me:$LINENO: result: $ac_cv_enable_openstreetmap" >&5 -echo "${ECHO_T}$ac_cv_enable_openstreetmap" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_openstreetmap" >&5 +$as_echo "$ac_cv_enable_openstreetmap" >&6; } case $ac_cv_enable_openstreetmap in yes) -cat >>confdefs.h <<\_ACEOF -#define VIK_CONFIG_OPENSTREETMAP -_ACEOF +$as_echo "#define VIK_CONFIG_OPENSTREETMAP /**/" >>confdefs.h ;; esac - - -if test x$ac_cv_enable_openstreetmap = xyes; then + if test x$ac_cv_enable_openstreetmap = xyes; then OPENSTREETMAP_TRUE= OPENSTREETMAP_FALSE='#' else @@ -10161,33 +7675,29 @@ fi # BlueMarble # Check whether --enable-bluemarble was given. -if test "${enable_bluemarble+set}" = set; then +if test "${enable_bluemarble+set}" = set; then : enableval=$enable_bluemarble; ac_cv_enable_bluemarble=$enableval else ac_cv_enable_bluemarble=yes fi -{ echo "$as_me:$LINENO: checking whether to enable BlueMarble stuff" >&5 -echo $ECHO_N "checking whether to enable BlueMarble stuff... $ECHO_C" >&6; } -if test "${ac_cv_enable_bluemarble+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable BlueMarble stuff" >&5 +$as_echo_n "checking whether to enable BlueMarble stuff... " >&6; } +if test "${ac_cv_enable_bluemarble+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_cv_enable_bluemarble=yes fi -{ echo "$as_me:$LINENO: result: $ac_cv_enable_bluemarble" >&5 -echo "${ECHO_T}$ac_cv_enable_bluemarble" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_bluemarble" >&5 +$as_echo "$ac_cv_enable_bluemarble" >&6; } case $ac_cv_enable_bluemarble in yes) -cat >>confdefs.h <<\_ACEOF -#define VIK_CONFIG_BLUEMARBLE -_ACEOF +$as_echo "#define VIK_CONFIG_BLUEMARBLE /**/" >>confdefs.h ;; esac - - -if test x$ac_cv_enable_bluemarble = xyes; then + if test x$ac_cv_enable_bluemarble = xyes; then BLUEMARBLE_TRUE= BLUEMARBLE_FALSE='#' else @@ -10198,33 +7708,29 @@ fi # OpenAerial # Check whether --enable-openaerial was given. -if test "${enable_openaerial+set}" = set; then +if test "${enable_openaerial+set}" = set; then : enableval=$enable_openaerial; ac_cv_enable_openaerial=$enableval else ac_cv_enable_openaerial=yes fi -{ echo "$as_me:$LINENO: checking whether to enable OpenAerial stuff" >&5 -echo $ECHO_N "checking whether to enable OpenAerial stuff... $ECHO_C" >&6; } -if test "${ac_cv_enable_openaerial+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable OpenAerial stuff" >&5 +$as_echo_n "checking whether to enable OpenAerial stuff... " >&6; } +if test "${ac_cv_enable_openaerial+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_cv_enable_openaerial=yes fi -{ echo "$as_me:$LINENO: result: $ac_cv_enable_openaerial" >&5 -echo "${ECHO_T}$ac_cv_enable_openaerial" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_openaerial" >&5 +$as_echo "$ac_cv_enable_openaerial" >&6; } case $ac_cv_enable_openaerial in yes) -cat >>confdefs.h <<\_ACEOF -#define VIK_CONFIG_OPENAERIAL -_ACEOF +$as_echo "#define VIK_CONFIG_OPENAERIAL /**/" >>confdefs.h ;; esac - - -if test x$ac_cv_enable_openaerial = xyes; then + if test x$ac_cv_enable_openaerial = xyes; then OPENAERIAL_TRUE= OPENAERIAL_FALSE='#' else @@ -10235,33 +7741,29 @@ fi # GeoNames http://www.geonames.org/ # Check whether --enable-geonames was given. -if test "${enable_geonames+set}" = set; then +if test "${enable_geonames+set}" = set; then : enableval=$enable_geonames; ac_cv_enable_geonames=$enableval else ac_cv_enable_geonames=yes fi -{ echo "$as_me:$LINENO: checking whether to enable Geonames stuff" >&5 -echo $ECHO_N "checking whether to enable Geonames stuff... $ECHO_C" >&6; } -if test "${ac_cv_enable_geonames+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable Geonames stuff" >&5 +$as_echo_n "checking whether to enable Geonames stuff... " >&6; } +if test "${ac_cv_enable_geonames+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_cv_enable_geonames=yes fi -{ echo "$as_me:$LINENO: result: $ac_cv_enable_geonames" >&5 -echo "${ECHO_T}$ac_cv_enable_geonames" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_geonames" >&5 +$as_echo "$ac_cv_enable_geonames" >&6; } case $ac_cv_enable_geonames in yes) -cat >>confdefs.h <<\_ACEOF -#define VIK_CONFIG_GEONAMES -_ACEOF +$as_echo "#define VIK_CONFIG_GEONAMES /**/" >>confdefs.h ;; esac - - -if test x$ac_cv_enable_geonames = xyes; then + if test x$ac_cv_enable_geonames = xyes; then GEONAMES_TRUE= GEONAMES_FALSE='#' else @@ -10271,33 +7773,29 @@ fi # Check whether --enable-geocaches was given. -if test "${enable_geocaches+set}" = set; then +if test "${enable_geocaches+set}" = set; then : enableval=$enable_geocaches; ac_cv_enable_geocaches=$enableval else ac_cv_enable_geocaches=no fi -{ echo "$as_me:$LINENO: checking whether to enable Geocaches Acquire" >&5 -echo $ECHO_N "checking whether to enable Geocaches Acquire... $ECHO_C" >&6; } -if test "${ac_cv_enable_geocaches+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable Geocaches Acquire" >&5 +$as_echo_n "checking whether to enable Geocaches Acquire... " >&6; } +if test "${ac_cv_enable_geocaches+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_cv_enable_geocaches=yes fi -{ echo "$as_me:$LINENO: result: $ac_cv_enable_geocaches" >&5 -echo "${ECHO_T}$ac_cv_enable_geocaches" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_geocaches" >&5 +$as_echo "$ac_cv_enable_geocaches" >&6; } case $ac_cv_enable_geocaches in yes) -cat >>confdefs.h <<\_ACEOF -#define VIK_CONFIG_GEOCACHES -_ACEOF +$as_echo "#define VIK_CONFIG_GEOCACHES /**/" >>confdefs.h ;; esac - - -if test x$ac_cv_enable_geocaches = xyes; then + if test x$ac_cv_enable_geocaches = xyes; then GEOCACHES_TRUE= GEOCACHES_FALSE='#' else @@ -10308,33 +7806,29 @@ fi # Check whether --enable-dem24k was given. -if test "${enable_dem24k+set}" = set; then +if test "${enable_dem24k+set}" = set; then : enableval=$enable_dem24k; ac_cv_enable_dem24k=$enableval else ac_cv_enable_dem24k=no fi -{ echo "$as_me:$LINENO: checking whether to enable USGS DEM 24k download source" >&5 -echo $ECHO_N "checking whether to enable USGS DEM 24k download source... $ECHO_C" >&6; } -if test "${ac_cv_enable_dem24k+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable USGS DEM 24k download source" >&5 +$as_echo_n "checking whether to enable USGS DEM 24k download source... " >&6; } +if test "${ac_cv_enable_dem24k+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_cv_enable_dem24k=yes fi -{ echo "$as_me:$LINENO: result: $ac_cv_enable_dem24k" >&5 -echo "${ECHO_T}$ac_cv_enable_dem24k" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_dem24k" >&5 +$as_echo "$ac_cv_enable_dem24k" >&6; } case $ac_cv_enable_dem24k in yes) -cat >>confdefs.h <<\_ACEOF -#define VIK_CONFIG_DEM24K -_ACEOF +$as_echo "#define VIK_CONFIG_DEM24K /**/" >>confdefs.h ;; esac - - -if test x$ac_cv_enable_dem24k = xyes; then + if test x$ac_cv_enable_dem24k = xyes; then DEM24K_TRUE= DEM24K_FALSE='#' else @@ -10345,36 +7839,31 @@ fi # Realtime GPS tracking # Check whether --enable-realtime-gps-tracking was given. -if test "${enable_realtime_gps_tracking+set}" = set; then +if test "${enable_realtime_gps_tracking+set}" = set; then : enableval=$enable_realtime_gps_tracking; ac_cv_enable_realtimegpstracking=$enableval else ac_cv_enable_realtimegpstracking=yes fi -{ echo "$as_me:$LINENO: checking whether to enable Realtime GPS Tracking stuff" >&5 -echo $ECHO_N "checking whether to enable Realtime GPS Tracking stuff... $ECHO_C" >&6; } -if test "${ac_cv_enable_realtimegpstracking+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable Realtime GPS Tracking stuff" >&5 +$as_echo_n "checking whether to enable Realtime GPS Tracking stuff... " >&6; } +if test "${ac_cv_enable_realtimegpstracking+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_cv_enable_realtimegpstracking=yes fi -{ echo "$as_me:$LINENO: result: $ac_cv_enable_realtimegpstracking" >&5 -echo "${ECHO_T}$ac_cv_enable_realtimegpstracking" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_realtimegpstracking" >&5 +$as_echo "$ac_cv_enable_realtimegpstracking" >&6; } case $ac_cv_enable_realtimegpstracking in yes) - -{ echo "$as_me:$LINENO: checking for gps_poll in -lgps" >&5 -echo $ECHO_N "checking for gps_poll in -lgps... $ECHO_C" >&6; } -if test "${ac_cv_lib_gps_gps_poll+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gps_poll in -lgps" >&5 +$as_echo_n "checking for gps_poll in -lgps... " >&6; } +if test "${ac_cv_lib_gps_gps_poll+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lgps $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -10392,39 +7881,18 @@ return gps_poll (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_gps_gps_poll=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_gps_gps_poll=no + ac_cv_lib_gps_gps_poll=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_gps_gps_poll" >&5 -echo "${ECHO_T}$ac_cv_lib_gps_gps_poll" >&6; } -if test $ac_cv_lib_gps_gps_poll = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gps_gps_poll" >&5 +$as_echo "$ac_cv_lib_gps_gps_poll" >&6; } +if test "x$ac_cv_lib_gps_gps_poll" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBGPS 1 _ACEOF @@ -10432,21 +7900,15 @@ _ACEOF LIBS="-lgps $LIBS" else - { { echo "$as_me:$LINENO: error: libgps is needed for Realtime GPS Tracking feature, but not found. The feature can be disable with --disable-realtime-gps-tracking" >&5 -echo "$as_me: error: libgps is needed for Realtime GPS Tracking feature, but not found. The feature can be disable with --disable-realtime-gps-tracking" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "libgps is needed for Realtime GPS Tracking feature, but not found. The feature can be disable with --disable-realtime-gps-tracking" "$LINENO" 5 fi -cat >>confdefs.h <<\_ACEOF -#define VIK_CONFIG_REALTIME_GPS_TRACKING -_ACEOF +$as_echo "#define VIK_CONFIG_REALTIME_GPS_TRACKING /**/" >>confdefs.h ;; esac - - -if test x$ac_cv_enable_realtimegpstracking = xyes; then + if test x$ac_cv_enable_realtimegpstracking = xyes; then REALTIME_GPS_TRACKING_TRUE= REALTIME_GPS_TRACKING_FALSE='#' else @@ -10457,7 +7919,7 @@ fi # Check whether --with-search was given. -if test "${with_search+set}" = set; then +if test "${with_search+set}" = set; then : withval=$with_search; case "x$withval" in "xgoogle") VIK_CONFIG_SEARCH=VIK_CONFIG_SEARCH_GOOGLE @@ -10466,9 +7928,7 @@ if test "${with_search+set}" = set; then VIK_CONFIG_SEARCH=VIK_CONFIG_SEARCH_GEONAMES ;; *) - { { echo "$as_me:$LINENO: error: Please, set a value for search method" >&5 -echo "$as_me: error: Please, set a value for search method" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "Please, set a value for search method" "$LINENO" 5 esac else VIK_CONFIG_SEARCH=VIK_CONFIG_SEARCH_GOOGLE @@ -10493,13 +7953,11 @@ _ACEOF # Check whether --with-mapcache was given. -if test "${with_mapcache+set}" = set; then +if test "${with_mapcache+set}" = set; then : withval=$with_mapcache; if test "x$withval" = "xno"; then VIK_CONFIG_MAPCACHE_SIZE=0; elif test "x$withval" = "xyes"; then - { { echo "$as_me:$LINENO: error: Please, set a value for size of the map cache" >&5 -echo "$as_me: error: Please, set a value for size of the map cache" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "Please, set a value for size of the map cache" "$LINENO" 5 else VIK_CONFIG_MAPCACHE_SIZE=${withval} fi @@ -10517,10 +7975,10 @@ DB2MAN_XSL=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl # Extract the first word of "xsltproc", so it can be a program name with args. set dummy xsltproc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_XP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_XP+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $XP in [\\/]* | ?:[\\/]*) @@ -10532,14 +7990,14 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_XP="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -10547,17 +8005,15 @@ esac fi XP=$ac_cv_path_XP if test -n "$XP"; then - { echo "$as_me:$LINENO: result: $XP" >&5 -echo "${ECHO_T}$XP" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XP" >&5 +$as_echo "$XP" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - - -if test "x$XP" != "x" && test -r "$DB2MAN_XSL"; then + if test "x$XP" != "x" && test -r "$DB2MAN_XSL"; then GEN_MANPAGES_TRUE= GEN_MANPAGES_FALSE='#' else @@ -10601,12 +8057,13 @@ _ACEOF case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( - *) $as_unset $ac_var ;; + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; esac ;; esac done @@ -10614,8 +8071,8 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; (set) 2>&1 | case $as_nl`(ac_space=' '; set) 2>&1` in #( *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \). + # `set' does not quote correctly, so add quotes: double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \. sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" @@ -10638,12 +8095,12 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then test "x$cache_file" != "x/dev/null" && - { echo "$as_me:$LINENO: updating cache $cache_file" >&5 -echo "$as_me: updating cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +$as_echo "$as_me: updating cache $cache_file" >&6;} cat confcache >$cache_file else - { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 -echo "$as_me: not updating unwritable cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache @@ -10659,11 +8116,11 @@ ac_ltlibobjs= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`echo "$ac_i" | sed "$ac_script"` + ac_i=`$as_echo "$ac_i" | sed "$ac_script"` # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. - ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' + as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" + as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' done LIBOBJS=$ac_libobjs @@ -10671,114 +8128,74 @@ LTLIBOBJS=$ac_ltlibobjs if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"AMDEP\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi ac_config_commands="$ac_config_commands po/stamp-it" if test -z "${EXPAT_INSTALLED_TRUE}" && test -z "${EXPAT_INSTALLED_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"EXPAT_INSTALLED\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"EXPAT_INSTALLED\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"EXPAT_INSTALLED\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${GOOGLE_TRUE}" && test -z "${GOOGLE_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"GOOGLE\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"GOOGLE\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"GOOGLE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${TERRASERVER_TRUE}" && test -z "${TERRASERVER_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"TERRASERVER\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"TERRASERVER\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"TERRASERVER\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${EXPEDIA_TRUE}" && test -z "${EXPEDIA_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"EXPEDIA\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"EXPEDIA\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"EXPEDIA\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${OPENSTREETMAP_TRUE}" && test -z "${OPENSTREETMAP_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"OPENSTREETMAP\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"OPENSTREETMAP\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"OPENSTREETMAP\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${BLUEMARBLE_TRUE}" && test -z "${BLUEMARBLE_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"BLUEMARBLE\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"BLUEMARBLE\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"BLUEMARBLE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${OPENAERIAL_TRUE}" && test -z "${OPENAERIAL_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"OPENAERIAL\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"OPENAERIAL\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"OPENAERIAL\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${GEONAMES_TRUE}" && test -z "${GEONAMES_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"GEONAMES\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"GEONAMES\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"GEONAMES\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${GEOCACHES_TRUE}" && test -z "${GEOCACHES_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"GEOCACHES\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"GEOCACHES\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"GEOCACHES\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${DEM24K_TRUE}" && test -z "${DEM24K_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"DEM24K\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"DEM24K\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"DEM24K\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${REALTIME_GPS_TRACKING_TRUE}" && test -z "${REALTIME_GPS_TRACKING_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"REALTIME_GPS_TRACKING\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"REALTIME_GPS_TRACKING\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"REALTIME_GPS_TRACKING\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${GEN_MANPAGES_TRUE}" && test -z "${GEN_MANPAGES_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"GEN_MANPAGES\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"GEN_MANPAGES\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"GEN_MANPAGES\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi : ${CONFIG_STATUS=./config.status} +ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 -echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +as_write_fail=0 +cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 #! $SHELL # Generated by $as_me. # Run this file to recreate the current configuration. @@ -10788,59 +8205,79 @@ cat >$CONFIG_STATUS <<_ACEOF debug=false ac_cs_recheck=false ac_cs_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; esac - fi - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' else - PATH_SEPARATOR=: + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' fi - rm -f conf$$.sh + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' fi -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } fi @@ -10849,20 +8286,18 @@ fi # there to prevent editors from complaining about space-tab. # (If _AS_PATH_WALK were called with IFS unset, it would disable word # splitting by setting IFS to empty value.) -as_nl=' -' IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -case $0 in +case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done IFS=$as_save_IFS ;; @@ -10873,32 +8308,111 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 fi -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : done PS1='$ ' PS2='> ' PS4='+ ' # NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + +# as_fn_error ERROR [LINENO LOG_FD] +# --------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with status $?, using 1 if that was 0. +as_fn_error () +{ + as_status=$?; test $as_status -eq 0 && as_status=1 + if test "$3"; then + as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 fi -done + $as_echo "$as_me: error: $1" >&2 + as_fn_exit $as_status +} # as_fn_error + + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + -# Required to use basename. if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr @@ -10912,13 +8426,17 @@ else as_basename=false fi +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi -# Name of the executable. as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X/"$0" | +$as_echo X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -10933,104 +8451,103 @@ echo X/"$0" | } s/.*/./; q'` -# CDPATH. -$as_unset CDPATH - - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | - sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno - N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" - # Exit status is that of the last command. - exit -} - - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in +case `echo -n x` in #((((( -n*) - case `echo 'x\c'` in + case `echo 'xy\c'` in *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; esac;; *) ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file else rm -f conf$$.dir - mkdir conf$$.dir -fi -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + mkdir conf$$.dir 2>/dev/null +fi +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else as_ln_s='cp -p' -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln + fi else as_ln_s='cp -p' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + + +} # as_fn_mkdir_p if mkdir -p . 2>/dev/null; then - as_mkdir_p=: + as_mkdir_p='mkdir -p "$as_dir"' else test -d ./-p && rmdir ./-p as_mkdir_p=false @@ -11047,12 +8564,12 @@ else as_test_x=' eval sh -c '\'' if test -d "$1"; then - test -d "$1/."; + test -d "$1/."; else - case $1 in - -*)set "./$1";; + case $1 in #( + -*)set "./$1";; esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( ???[sx]*):;;*)false;;esac;fi '\'' sh ' @@ -11067,13 +8584,19 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" exec 6>&1 +## ----------------------------------- ## +## Main body of $CONFIG_STATUS script. ## +## ----------------------------------- ## +_ASEOF +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 -# Save the log message, to keep $[0] and so on meaningful, and to +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# Save the log message, to keep $0 and so on meaningful, and to # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by viking $as_me 0.9.8, which was -generated by GNU Autoconf 2.61. Invocation command line was +This file was extended by viking $as_me 0.9.9, which was +generated by GNU Autoconf 2.64. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -11086,7 +8609,16 @@ on `(hostname || uname -n) 2>/dev/null | sed 1q` _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +case $ac_config_files in *" +"*) set x $ac_config_files; shift; ac_config_files=$*;; +esac + +case $ac_config_headers in *" +"*) set x $ac_config_headers; shift; ac_config_headers=$*;; +esac + + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. config_files="$ac_config_files" config_headers="$ac_config_headers" @@ -11094,22 +8626,24 @@ config_commands="$ac_config_commands" _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ -\`$as_me' instantiates files from templates according to the -current configuration. +\`$as_me' instantiates files and other configuration actions +from templates according to the current configuration. Unless the files +and actions are specified as TAGs, all are instantiated by default. -Usage: $0 [OPTIONS] [FILE]... +Usage: $0 [OPTION]... [TAG]... -h, --help print this help, then exit -V, --version print version number and configuration settings, then exit - -q, --quiet do not print progress messages + -q, --quiet, --silent + do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] - instantiate the configuration file FILE - --header=FILE[:TEMPLATE] - instantiate the configuration header FILE + --file=FILE[:TEMPLATE] + instantiate the configuration file FILE + --header=FILE[:TEMPLATE] + instantiate the configuration header FILE Configuration files: $config_files @@ -11120,27 +8654,29 @@ $config_headers Configuration commands: $config_commands -Report bugs to <bug-autoconf@gnu.org>." +Report bugs to the package provider." _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -viking config.status 0.9.8 -configured by $0, generated by GNU Autoconf 2.61, - with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" +viking config.status 0.9.9 +configured by $0, generated by GNU Autoconf 2.64, + with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" -Copyright (C) 2006 Free Software Foundation, Inc. +Copyright (C) 2009 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." ac_pwd='$ac_pwd' srcdir='$srcdir' INSTALL='$INSTALL' +MKDIR_P='$MKDIR_P' +AWK='$AWK' +test -n "\$AWK" || AWK=awk _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -# If no file are specified by the user, then we need to provide default -# value. By we need to know if files were specified by the user. +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# The default lists apply if the user does not specify any file. ac_need_defaults=: while test $# != 0 do @@ -11162,34 +8698,38 @@ do -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - echo "$ac_cs_version"; exit ;; + $as_echo "$ac_cs_version"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift - CONFIG_FILES="$CONFIG_FILES $ac_optarg" + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; --header | --heade | --head | --hea ) $ac_shift - CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append CONFIG_HEADERS " '$ac_optarg'" ac_need_defaults=false;; --he | --h) # Conflict between --help and --header - { echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; };; + as_fn_error "ambiguous option: \`$1' +Try \`$0 --help' for more information.";; --help | --hel | -h ) - echo "$ac_cs_usage"; exit ;; + $as_echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;; # This is an error. - -*) { echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } ;; + -*) as_fn_error "unrecognized option: \`$1' +Try \`$0 --help' for more information." ;; - *) ac_config_targets="$ac_config_targets $1" + *) as_fn_append ac_config_targets " $1" ac_need_defaults=false ;; esac @@ -11204,27 +8744,29 @@ if $ac_cs_silent; then fi _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 - CONFIG_SHELL=$SHELL + set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + shift + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + CONFIG_SHELL='$SHELL' export CONFIG_SHELL - exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + exec "\$@" fi _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 exec 5>>config.log { echo sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ## Running $as_me. ## _ASBOX - echo "$ac_log" + $as_echo "$ac_log" } >&5 _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # # INIT-COMMANDS # @@ -11234,7 +8776,7 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # Handling of arguments. for ac_config_target in $ac_config_targets @@ -11254,9 +8796,7 @@ do "viking.spec") CONFIG_FILES="$CONFIG_FILES viking.spec" ;; "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; + *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -11283,7 +8823,7 @@ $debug || trap 'exit_status=$? { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status ' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 + trap 'as_fn_exit 1' 1 2 13 15 } # Create a (secure) tmp directory for tmp files. @@ -11294,276 +8834,140 @@ $debug || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || -{ - echo "$me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } -} - -# -# Set up the sed scripts for CONFIG_FILES section. -# +} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 -# No need to generate the scripts if there are no CONFIG_FILES. -# This happens for instance when ./config.status config.h +# Set up the scripts for CONFIG_FILES section. +# No need to generate them if there are no CONFIG_FILES. +# This happens for instance with `./config.status config.h'. if test -n "$CONFIG_FILES"; then -_ACEOF - - - -ac_delim='%!_!# ' -for ac_last_try in false false false false false :; do - cat >conf$$subs.sed <<_ACEOF -SHELL!$SHELL$ac_delim -PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim -PACKAGE_NAME!$PACKAGE_NAME$ac_delim -PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim -PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim -PACKAGE_STRING!$PACKAGE_STRING$ac_delim -PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim -exec_prefix!$exec_prefix$ac_delim -prefix!$prefix$ac_delim -program_transform_name!$program_transform_name$ac_delim -bindir!$bindir$ac_delim -sbindir!$sbindir$ac_delim -libexecdir!$libexecdir$ac_delim -datarootdir!$datarootdir$ac_delim -datadir!$datadir$ac_delim -sysconfdir!$sysconfdir$ac_delim -sharedstatedir!$sharedstatedir$ac_delim -localstatedir!$localstatedir$ac_delim -includedir!$includedir$ac_delim -oldincludedir!$oldincludedir$ac_delim -docdir!$docdir$ac_delim -infodir!$infodir$ac_delim -htmldir!$htmldir$ac_delim -dvidir!$dvidir$ac_delim -pdfdir!$pdfdir$ac_delim -psdir!$psdir$ac_delim -libdir!$libdir$ac_delim -localedir!$localedir$ac_delim -mandir!$mandir$ac_delim -DEFS!$DEFS$ac_delim -ECHO_C!$ECHO_C$ac_delim -ECHO_N!$ECHO_N$ac_delim -ECHO_T!$ECHO_T$ac_delim -LIBS!$LIBS$ac_delim -build_alias!$build_alias$ac_delim -host_alias!$host_alias$ac_delim -target_alias!$target_alias$ac_delim -INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim -INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim -INSTALL_DATA!$INSTALL_DATA$ac_delim -CYGPATH_W!$CYGPATH_W$ac_delim -PACKAGE!$PACKAGE$ac_delim -VERSION!$VERSION$ac_delim -ACLOCAL!$ACLOCAL$ac_delim -AUTOCONF!$AUTOCONF$ac_delim -AUTOMAKE!$AUTOMAKE$ac_delim -AUTOHEADER!$AUTOHEADER$ac_delim -MAKEINFO!$MAKEINFO$ac_delim -install_sh!$install_sh$ac_delim -STRIP!$STRIP$ac_delim -INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim -mkdir_p!$mkdir_p$ac_delim -AWK!$AWK$ac_delim -SET_MAKE!$SET_MAKE$ac_delim -am__leading_dot!$am__leading_dot$ac_delim -AMTAR!$AMTAR$ac_delim -am__tar!$am__tar$ac_delim -am__untar!$am__untar$ac_delim -CC!$CC$ac_delim -CFLAGS!$CFLAGS$ac_delim -LDFLAGS!$LDFLAGS$ac_delim -CPPFLAGS!$CPPFLAGS$ac_delim -ac_ct_CC!$ac_ct_CC$ac_delim -EXEEXT!$EXEEXT$ac_delim -OBJEXT!$OBJEXT$ac_delim -DEPDIR!$DEPDIR$ac_delim -am__include!$am__include$ac_delim -am__quote!$am__quote$ac_delim -AMDEP_TRUE!$AMDEP_TRUE$ac_delim -AMDEP_FALSE!$AMDEP_FALSE$ac_delim -AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim -CCDEPMODE!$CCDEPMODE$ac_delim -am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim -am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim -RANLIB!$RANLIB$ac_delim -GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim -CPP!$CPP$ac_delim -GREP!$GREP$ac_delim -EGREP!$EGREP$ac_delim -build!$build$ac_delim -build_cpu!$build_cpu$ac_delim -build_vendor!$build_vendor$ac_delim -build_os!$build_os$ac_delim -host!$host$ac_delim -host_cpu!$host_cpu$ac_delim -host_vendor!$host_vendor$ac_delim -host_os!$host_os$ac_delim -USE_NLS!$USE_NLS$ac_delim -MSGFMT!$MSGFMT$ac_delim -MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim -GMSGFMT!$GMSGFMT$ac_delim -XGETTEXT!$XGETTEXT$ac_delim -CATALOGS!$CATALOGS$ac_delim -CATOBJEXT!$CATOBJEXT$ac_delim -DATADIRNAME!$DATADIRNAME$ac_delim -GMOFILES!$GMOFILES$ac_delim -INSTOBJEXT!$INSTOBJEXT$ac_delim -_ACEOF - - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then - break - elif $ac_last_try; then - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -done -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` -if test -n "$ac_eof"; then - ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` - ac_eof=`expr $ac_eof + 1` +ac_cr=`echo X | tr X '\015'` +# On cygwin, bash can eat \r inside `` if the user requested igncr. +# But we know of no other shell where ac_cr would be empty at this +# point, so we can use a bashism as a fallback. +if test "x$ac_cr" = x; then + eval ac_cr=\$\'\\r\' +fi +ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` +if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then + ac_cs_awk_cr='\r' +else + ac_cs_awk_cr=$ac_cr fi -cat >>$CONFIG_STATUS <<_ACEOF -cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -_ACEOF -sed ' -s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g -s/^/s,@/; s/!/@,|#_!!_#|/ -:n -t n -s/'"$ac_delim"'$/,g/; t -s/$/\\/; p -N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n -' >>$CONFIG_STATUS <conf$$subs.sed -rm -f conf$$subs.sed -cat >>$CONFIG_STATUS <<_ACEOF -CEOF$ac_eof +echo 'BEGIN {' >"$tmp/subs1.awk" && _ACEOF +{ + echo "cat >conf$$subs.awk <<_ACEOF" && + echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && + echo "_ACEOF" +} >conf$$subs.sh || + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do - cat >conf$$subs.sed <<_ACEOF -INTLLIBS!$INTLLIBS$ac_delim -PO_IN_DATADIR_TRUE!$PO_IN_DATADIR_TRUE$ac_delim -PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim -POFILES!$POFILES$ac_delim -POSUB!$POSUB$ac_delim -MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim -INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim -INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim -INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim -INTLTOOL_DESKTOP_RULE!$INTLTOOL_DESKTOP_RULE$ac_delim -INTLTOOL_DIRECTORY_RULE!$INTLTOOL_DIRECTORY_RULE$ac_delim -INTLTOOL_KEYS_RULE!$INTLTOOL_KEYS_RULE$ac_delim -INTLTOOL_PROP_RULE!$INTLTOOL_PROP_RULE$ac_delim -INTLTOOL_OAF_RULE!$INTLTOOL_OAF_RULE$ac_delim -INTLTOOL_PONG_RULE!$INTLTOOL_PONG_RULE$ac_delim -INTLTOOL_SERVER_RULE!$INTLTOOL_SERVER_RULE$ac_delim -INTLTOOL_SHEET_RULE!$INTLTOOL_SHEET_RULE$ac_delim -INTLTOOL_SOUNDLIST_RULE!$INTLTOOL_SOUNDLIST_RULE$ac_delim -INTLTOOL_UI_RULE!$INTLTOOL_UI_RULE$ac_delim -INTLTOOL_XAM_RULE!$INTLTOOL_XAM_RULE$ac_delim -INTLTOOL_KBD_RULE!$INTLTOOL_KBD_RULE$ac_delim -INTLTOOL_XML_RULE!$INTLTOOL_XML_RULE$ac_delim -INTLTOOL_XML_NOMERGE_RULE!$INTLTOOL_XML_NOMERGE_RULE$ac_delim -INTLTOOL_CAVES_RULE!$INTLTOOL_CAVES_RULE$ac_delim -INTLTOOL_SCHEMAS_RULE!$INTLTOOL_SCHEMAS_RULE$ac_delim -INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim -INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim -INTLTOOL_POLICY_RULE!$INTLTOOL_POLICY_RULE$ac_delim -MSGMERGE!$MSGMERGE$ac_delim -INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim -ALL_LINGUAS!$ALL_LINGUAS$ac_delim -CONFIG_STATUS_DEPENDENCIES!$CONFIG_STATUS_DEPENDENCIES$ac_delim -ACLOCAL_AMFLAGS!$ACLOCAL_AMFLAGS$ac_delim -LIBOBJS!$LIBOBJS$ac_delim -POW_LIB!$POW_LIB$ac_delim -EXPAT_INSTALLED_TRUE!$EXPAT_INSTALLED_TRUE$ac_delim -EXPAT_INSTALLED_FALSE!$EXPAT_INSTALLED_FALSE$ac_delim -EXPAT_CFLAGS!$EXPAT_CFLAGS$ac_delim -EXPAT_LIBS!$EXPAT_LIBS$ac_delim -_libcurl_config!$_libcurl_config$ac_delim -LIBCURL_CPPFLAGS!$LIBCURL_CPPFLAGS$ac_delim -LIBCURL!$LIBCURL$ac_delim -GDK_PIXBUF_CSOURCE!$GDK_PIXBUF_CSOURCE$ac_delim -PKG_CONFIG!$PKG_CONFIG$ac_delim -GTK_CFLAGS!$GTK_CFLAGS$ac_delim -GTK_LIBS!$GTK_LIBS$ac_delim -GOOGLE_TRUE!$GOOGLE_TRUE$ac_delim -GOOGLE_FALSE!$GOOGLE_FALSE$ac_delim -TERRASERVER_TRUE!$TERRASERVER_TRUE$ac_delim -TERRASERVER_FALSE!$TERRASERVER_FALSE$ac_delim -EXPEDIA_TRUE!$EXPEDIA_TRUE$ac_delim -EXPEDIA_FALSE!$EXPEDIA_FALSE$ac_delim -OPENSTREETMAP_TRUE!$OPENSTREETMAP_TRUE$ac_delim -OPENSTREETMAP_FALSE!$OPENSTREETMAP_FALSE$ac_delim -BLUEMARBLE_TRUE!$BLUEMARBLE_TRUE$ac_delim -BLUEMARBLE_FALSE!$BLUEMARBLE_FALSE$ac_delim -OPENAERIAL_TRUE!$OPENAERIAL_TRUE$ac_delim -OPENAERIAL_FALSE!$OPENAERIAL_FALSE$ac_delim -GEONAMES_TRUE!$GEONAMES_TRUE$ac_delim -GEONAMES_FALSE!$GEONAMES_FALSE$ac_delim -GEOCACHES_TRUE!$GEOCACHES_TRUE$ac_delim -GEOCACHES_FALSE!$GEOCACHES_FALSE$ac_delim -DEM24K_TRUE!$DEM24K_TRUE$ac_delim -DEM24K_FALSE!$DEM24K_FALSE$ac_delim -REALTIME_GPS_TRACKING_TRUE!$REALTIME_GPS_TRACKING_TRUE$ac_delim -REALTIME_GPS_TRACKING_FALSE!$REALTIME_GPS_TRACKING_FALSE$ac_delim -DB2MAN_XSL!$DB2MAN_XSL$ac_delim -XP!$XP$ac_delim -GEN_MANPAGES_TRUE!$GEN_MANPAGES_TRUE$ac_delim -GEN_MANPAGES_FALSE!$GEN_MANPAGES_FALSE$ac_delim -LTLIBOBJS!$LTLIBOBJS$ac_delim -_ACEOF + . ./conf$$subs.sh || + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 71; then + ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` + if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi done +rm -f conf$$subs.sh + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +cat >>"\$tmp/subs1.awk" <<\\_ACAWK && +_ACEOF +sed -n ' +h +s/^/S["/; s/!.*/"]=/ +p +g +s/^[^!]*!// +:repl +t repl +s/'"$ac_delim"'$// +t delim +:nl +h +s/\(.\{148\}\).*/\1/ +t more1 +s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ +p +n +b repl +:more1 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t nl +:delim +h +s/\(.\{148\}\).*/\1/ +t more2 +s/["\\]/\\&/g; s/^/"/; s/$/"/ +p +b +:more2 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t delim +' <conf$$subs.awk | sed ' +/^[^""]/{ + N + s/\n// +} +' >>$CONFIG_STATUS || ac_write_fail=1 +rm -f conf$$subs.awk +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +_ACAWK +cat >>"\$tmp/subs1.awk" <<_ACAWK && + for (key in S) S_is_set[key] = 1 + FS = "" -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` -if test -n "$ac_eof"; then - ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` - ac_eof=`expr $ac_eof + 1` -fi +} +{ + line = $ 0 + nfields = split(line, field, "@") + substed = 0 + len = length(field[1]) + for (i = 2; i < nfields; i++) { + key = field[i] + keylen = length(key) + if (S_is_set[key]) { + value = S[key] + line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) + len += length(value) + length(field[++i]) + substed = 1 + } else + len += 1 + keylen + } -cat >>$CONFIG_STATUS <<_ACEOF -cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end + print line +} + +_ACAWK _ACEOF -sed ' -s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g -s/^/s,@/; s/!/@,|#_!!_#|/ -:n -t n -s/'"$ac_delim"'$/,g/; t -s/$/\\/; p -N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n -' >>$CONFIG_STATUS <conf$$subs.sed -rm -f conf$$subs.sed -cat >>$CONFIG_STATUS <<_ACEOF -:end -s/|#_!!_#|//g -CEOF$ac_eof +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then + sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" +else + cat +fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ + || as_fn_error "could not setup config files machinery" "$LINENO" 5 _ACEOF - # VPATH may cause trouble with some makes, so we remove $(srcdir), # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and # trailing colons and then remove the whole line if VPATH becomes empty @@ -11579,20 +8983,128 @@ s/^[^=]*=[ ]*$// }' fi -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 fi # test -n "$CONFIG_FILES" +# Set up the scripts for CONFIG_HEADERS section. +# No need to generate them if there are no CONFIG_HEADERS. +# This happens for instance with `./config.status Makefile'. +if test -n "$CONFIG_HEADERS"; then +cat >"$tmp/defines.awk" <<\_ACAWK || +BEGIN { +_ACEOF + +# Transform confdefs.h into an awk script `defines.awk', embedded as +# here-document in config.status, that substitutes the proper values into +# config.h.in to produce config.h. + +# Create a delimiter string that does not exist in confdefs.h, to ease +# handling of long lines. +ac_delim='%!_!# ' +for ac_last_try in false false :; do + ac_t=`sed -n "/$ac_delim/p" confdefs.h` + if test -z "$ac_t"; then + break + elif $ac_last_try; then + as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +# For the awk script, D is an array of macro values keyed by name, +# likewise P contains macro parameters if any. Preserve backslash +# newline sequences. + +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* +sed -n ' +s/.\{148\}/&'"$ac_delim"'/g +t rset +:rset +s/^[ ]*#[ ]*define[ ][ ]*/ / +t def +d +:def +s/\\$// +t bsnl +s/["\\]/\\&/g +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +D["\1"]=" \3"/p +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p +d +:bsnl +s/["\\]/\\&/g +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +D["\1"]=" \3\\\\\\n"\\/p +t cont +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p +t cont +d +:cont +n +s/.\{148\}/&'"$ac_delim"'/g +t clear +:clear +s/\\$// +t bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/"/p +d +:bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p +b cont +' <confdefs.h | sed ' +s/'"$ac_delim"'/"\\\ +"/g' >>$CONFIG_STATUS || ac_write_fail=1 + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + for (key in D) D_is_set[key] = 1 + FS = "" +} +/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { + line = \$ 0 + split(line, arg, " ") + if (arg[1] == "#") { + defundef = arg[2] + mac1 = arg[3] + } else { + defundef = substr(arg[1], 2) + mac1 = arg[2] + } + split(mac1, mac2, "(") #) + macro = mac2[1] + prefix = substr(line, 1, index(line, defundef) - 1) + if (D_is_set[macro]) { + # Preserve the white space surrounding the "#". + print prefix "define", macro P[macro] D[macro] + next + } else { + # Replace #undef with comments. This is necessary, for example, + # in the case of _POSIX_SOURCE, which is predefined and required + # on some systems where configure will not decide to define it. + if (defundef == "undef") { + print "/*", prefix defundef, macro, "*/" + next + } + } +} +{ print } +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + as_fn_error "could not setup config headers machinery" "$LINENO" 5 +fi # test -n "$CONFIG_HEADERS" + -for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS +eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" +shift +for ac_tag do case $ac_tag in :[FHLC]) ac_mode=$ac_tag; continue;; esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 -echo "$as_me: error: Invalid tag $ac_tag." >&2;} - { (exit 1); exit 1; }; };; + :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -11620,26 +9132,34 @@ echo "$as_me: error: Invalid tag $ac_tag." >&2;} [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -echo "$as_me: error: cannot find input file: $ac_f" >&2;} - { (exit 1); exit 1; }; };; + as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac - ac_file_inputs="$ac_file_inputs $ac_f" + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + as_fn_append ac_file_inputs " '$ac_f'" done # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ - configure_input="Generated from "`IFS=: - echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." + configure_input='Generated from '` + $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +$as_echo "$as_me: creating $ac_file" >&6;} fi + # Neutralize special characters interpreted by sed in replacement strings. + case $configure_input in #( + *\&* | *\|* | *\\* ) + ac_sed_conf_input=`$as_echo "$configure_input" | + sed 's/[\\\\&|]/\\\\&/g'`;; #( + *) ac_sed_conf_input=$configure_input;; + esac case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin";; + *:-:* | *:-) cat >"$tmp/stdin" \ + || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -11649,42 +9169,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - { as_dir="$ac_dir" - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -echo X"$as_dir" | +$as_echo X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -11702,20 +9187,15 @@ echo X"$as_dir" | q } s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } + as_dir="$ac_dir"; as_fn_mkdir_p ac_builddir=. case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -11753,14 +9233,19 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; esac + ac_MKDIR_P=$MKDIR_P + case $MKDIR_P in + [\\/$]* | ?:[\\/]* ) ;; + */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; + esac _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # If the template does not know about datarootdir, expand it. # FIXME: This hack should be removed a few years after 2.60. ac_datarootdir_hack=; ac_datarootdir_seen= - -case `sed -n '/datarootdir/ { +ac_sed_dataroot=' +/datarootdir/ { p q } @@ -11768,36 +9253,37 @@ case `sed -n '/datarootdir/ { /@docdir@/p /@infodir@/p /@localedir@/p -/@mandir@/p -' $ac_file_inputs` in +/@mandir@/p' +case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_datarootdir_hack=' s&@datadir@&$datadir&g s&@docdir@&$docdir&g s&@infodir@&$infodir&g s&@localedir@&$localedir&g s&@mandir@&$mandir&g - s&\\\${datarootdir}&$datarootdir&g' ;; + s&\\\${datarootdir}&$datarootdir&g' ;; esac _ACEOF # Neutralize VPATH when `$srcdir' = `.'. # Shell code in configure.ac might set extrasub. # FIXME: do we really want to maintain this feature? -cat >>$CONFIG_STATUS <<_ACEOF - sed "$ac_vpsub +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_sed_extra="$ac_vpsub $extrasub _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s&@configure_input@&$configure_input&;t t +s|@configure_input@|$ac_sed_conf_input|;t t s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@top_build_prefix@&$ac_top_build_prefix&;t t s&@srcdir@&$ac_srcdir&;t t s&@abs_srcdir@&$ac_abs_srcdir&;t t s&@top_srcdir@&$ac_top_srcdir&;t t @@ -11806,136 +9292,67 @@ s&@builddir@&$ac_builddir&;t t s&@abs_builddir@&$ac_abs_builddir&;t t s&@abs_top_builddir@&$ac_abs_top_builddir&;t t s&@INSTALL@&$ac_INSTALL&;t t +s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack -" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out +" +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ + || as_fn_error "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && - { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined." >&5 -echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined." >&2;} rm -f "$tmp/stdin" case $ac_file in - -) cat "$tmp/out"; rm -f "$tmp/out";; - *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; - esac + -) cat "$tmp/out" && rm -f "$tmp/out";; + *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + esac \ + || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; :H) # # CONFIG_HEADER # -_ACEOF - -# Transform confdefs.h into a sed script `conftest.defines', that -# substitutes the proper values into config.h.in to produce config.h. -rm -f conftest.defines conftest.tail -# First, append a space to every undef/define line, to ease matching. -echo 's/$/ /' >conftest.defines -# Then, protect against being on the right side of a sed subst, or in -# an unquoted here document, in config.status. If some macros were -# called several times there might be several #defines for the same -# symbol, which is useless. But do not sort them, since the last -# AC_DEFINE must be honored. -ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* -# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where -# NAME is the cpp macro being defined, VALUE is the value it is being given. -# PARAMS is the parameter list in the macro definition--in most cases, it's -# just an empty string. -ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*' -ac_dB='\\)[ (].*,\\1define\\2' -ac_dC=' ' -ac_dD=' ,' - -uniq confdefs.h | - sed -n ' - t rset - :rset - s/^[ ]*#[ ]*define[ ][ ]*// - t ok - d - :ok - s/[\\&,]/\\&/g - s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p - s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p - ' >>conftest.defines - -# Remove the space that was appended to ease matching. -# Then replace #undef with comments. This is necessary, for -# example, in the case of _POSIX_SOURCE, which is predefined and required -# on some systems where configure will not decide to define it. -# (The regexp can be short, since the line contains either #define or #undef.) -echo 's/ $// -s,^[ #]*u.*,/* & */,' >>conftest.defines - -# Break up conftest.defines: -ac_max_sed_lines=50 - -# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" -# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" -# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" -# et cetera. -ac_in='$ac_file_inputs' -ac_out='"$tmp/out1"' -ac_nxt='"$tmp/out2"' - -while : -do - # Write a here document: - cat >>$CONFIG_STATUS <<_ACEOF - # First, check the format of the line: - cat >"\$tmp/defines.sed" <<\\CEOF -/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def -/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def -b -:def -_ACEOF - sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS - echo 'CEOF - sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS - ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in - sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail - grep . conftest.tail >/dev/null || break - rm -f conftest.defines - mv conftest.tail conftest.defines -done -rm -f conftest.defines conftest.tail - -echo "ac_result=$ac_in" >>$CONFIG_STATUS -cat >>$CONFIG_STATUS <<\_ACEOF if test x"$ac_file" != x-; then - echo "/* $configure_input */" >"$tmp/config.h" - cat "$ac_result" >>"$tmp/config.h" - if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then - { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 -echo "$as_me: $ac_file is unchanged" >&6;} + { + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" + } >"$tmp/config.h" \ + || as_fn_error "could not create $ac_file" "$LINENO" 5 + if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 +$as_echo "$as_me: $ac_file is unchanged" >&6;} else - rm -f $ac_file - mv "$tmp/config.h" $ac_file + rm -f "$ac_file" + mv "$tmp/config.h" "$ac_file" \ + || as_fn_error "could not create $ac_file" "$LINENO" 5 fi else - echo "/* $configure_input */" - cat "$ac_result" + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ + || as_fn_error "could not create -" "$LINENO" 5 fi - rm -f "$tmp/out12" -# Compute $ac_file's index in $config_headers. +# Compute "$ac_file"'s index in $config_headers. +_am_arg="$ac_file" _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $ac_file | $ac_file:* ) + $_am_arg | $_am_arg:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || -$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X$ac_file : 'X\(//\)[^/]' \| \ - X$ac_file : 'X\(//\)$' \| \ - X$ac_file : 'X\(/\)' \| . 2>/dev/null || -echo X$ac_file | +echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || +$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$_am_arg" : 'X\(//\)[^/]' \| \ + X"$_am_arg" : 'X\(//\)$' \| \ + X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$_am_arg" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -11955,14 +9372,23 @@ echo X$ac_file | s/.*/./; q'`/stamp-h$_am_stamp_count ;; - :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5 -echo "$as_me: executing $ac_file commands" >&6;} + :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 +$as_echo "$as_me: executing $ac_file commands" >&6;} ;; esac case $ac_file$ac_mode in - "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do + "depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files +# are listed without --file. Let's play safe and only enable the eval +# if we detect the quoting. +case $CONFIG_FILES in +*\'*) eval set x "$CONFIG_FILES" ;; +*) set x $CONFIG_FILES ;; +esac +shift +for mf +do # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. @@ -11970,14 +9396,15 @@ echo "$as_me: executing $ac_file commands" >&6;} # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. - # So let's grep whole file. - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then dirpart=`$as_dirname -- "$mf" || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ X"$mf" : 'X\(//\)$' \| \ X"$mf" : 'X\(/\)' \| . 2>/dev/null || -echo X"$mf" | +$as_echo X"$mf" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -12021,42 +9448,7 @@ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$file" : 'X\(//\)[^/]' \| \ X"$file" : 'X\(//\)$' \| \ X"$file" : 'X\(/\)' \| . 2>/dev/null || -echo X"$file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - { as_dir=$dirpart/$fdir - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -echo X"$as_dir" | +$as_echo X"$file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -12074,12 +9466,7 @@ echo X"$as_dir" | q } s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } + as_dir=$dirpart/$fdir; as_fn_mkdir_p # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" done @@ -12092,6 +9479,9 @@ done sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile esac ;; "po/stamp-it":C) + if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then + as_fn_error "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5 + fi rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp" >"po/stamp-it.tmp" sed '/^#/d @@ -12100,17 +9490,11 @@ done '"s|^| $ac_top_srcdir/|" \ "$srcdir/po/POTFILES.in" | sed '$!s/$/ \\/' >"po/POTFILES" - if test ! -f "po/Makefile"; then - { { echo "$as_me:$LINENO: error: po/Makefile is not ready." >&5 -echo "$as_me: error: po/Makefile is not ready." >&2;} - { (exit 1); exit 1; }; } - fi - mv "po/Makefile" "po/Makefile.tmp" sed '/^POTFILES =/,/[^\\]$/ { /^POTFILES =/!d r po/POTFILES } - ' "po/Makefile.tmp" >"po/Makefile" + ' "po/Makefile.in" >"po/Makefile" rm -f "po/Makefile.tmp" mv "po/stamp-it.tmp" "po/stamp-it" ;; @@ -12119,11 +9503,13 @@ echo "$as_me: error: po/Makefile is not ready." >&2;} done # for ac_tag -{ (exit 0); exit 0; } +as_fn_exit 0 _ACEOF -chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save +test $ac_write_fail = 0 || + as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 + # configure is writing to config.log, and then calls config.status. # config.status does its own redirection, appending to config.log. @@ -12143,7 +9529,11 @@ if test "$no_create" != yes; then exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || { (exit 1); exit 1; } + $ac_cs_success || as_fn_exit $? +fi +if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi diff --git a/configure.ac b/configure.ac index 0af7788..fbbc39b 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT(viking, 0.9.8) +AC_INIT(viking, 0.9.9) AM_INIT_AUTOMAKE() dnl AC_CONFIG_SRCDIR([src/main.c]) AC_CONFIG_HEADERS([src/config.h]) @@ -48,14 +48,26 @@ AM_WITH_EXPAT # Curl LIBCURL_CHECK_CONFIG([yes],[],[],[AC_MSG_ERROR([libcurl is needed but not found])]) +# gdk-pixbuf-csource AC_CHECK_PROG([GDK_PIXBUF_CSOURCE],gdk-pixbuf-csource,[yes]) if test $GDK_PIXBUF_CSOURCE != "yes" then AC_MSG_ERROR([gdk-pixbuf-csource is needed but not found]) fi -# Checks for libraries. -AM_PATH_GTK_2_0(2.2.0,,AC_MSG_ERROR(needs GTK+ 2.2.0),gthread) +dnl ------------------ +dnl | Pkgconfig checks |--------------------------------------- +dnl ------------------ + +PKG_CHECK_MODULES(PACKAGE, [ + glib-2.0 >= 2.12 + gthread-2.0 >= 2.2 + gtk+-2.0 >= 2.8 +]) + +AC_SUBST(PACKAGE_CFLAGS) +AC_SUBST(PACKAGE_LIBS) + # Options AC_ARG_ENABLE(alphabetized-trw, AC_HELP_STRING([--enable-alphabetized-trw], diff --git a/doc/Makefile.in b/doc/Makefile.in index 30ce85c..a728618 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,15 +13,11 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -51,14 +47,17 @@ SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive man1dir = $(mandir)/man1 am__installdirs = "$(DESTDIR)$(man1dir)" NROFF = nroff MANS = $(man_MANS) +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -66,15 +65,11 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BLUEMARBLE_FALSE = @BLUEMARBLE_FALSE@ -BLUEMARBLE_TRUE = @BLUEMARBLE_TRUE@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ @@ -87,8 +82,6 @@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DB2MAN_XSL = @DB2MAN_XSL@ DEFS = @DEFS@ -DEM24K_FALSE = @DEM24K_FALSE@ -DEM24K_TRUE = @DEM24K_TRUE@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -96,55 +89,23 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXPAT_CFLAGS = @EXPAT_CFLAGS@ -EXPAT_INSTALLED_FALSE = @EXPAT_INSTALLED_FALSE@ -EXPAT_INSTALLED_TRUE = @EXPAT_INSTALLED_TRUE@ EXPAT_LIBS = @EXPAT_LIBS@ -EXPEDIA_FALSE = @EXPEDIA_FALSE@ -EXPEDIA_TRUE = @EXPEDIA_TRUE@ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@ -GEN_MANPAGES_FALSE = @GEN_MANPAGES_FALSE@ -GEN_MANPAGES_TRUE = @GEN_MANPAGES_TRUE@ -GEOCACHES_FALSE = @GEOCACHES_FALSE@ -GEOCACHES_TRUE = @GEOCACHES_TRUE@ -GEONAMES_FALSE = @GEONAMES_FALSE@ -GEONAMES_TRUE = @GEONAMES_TRUE@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GOOGLE_FALSE = @GOOGLE_FALSE@ -GOOGLE_TRUE = @GOOGLE_TRUE@ GREP = @GREP@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ LDFLAGS = @LDFLAGS@ LIBCURL = @LIBCURL@ LIBCURL_CPPFLAGS = @LIBCURL_CPPFLAGS@ @@ -152,20 +113,20 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ OBJEXT = @OBJEXT@ -OPENAERIAL_FALSE = @OPENAERIAL_FALSE@ -OPENAERIAL_TRUE = @OPENAERIAL_TRUE@ -OPENSTREETMAP_FALSE = @OPENSTREETMAP_FALSE@ -OPENSTREETMAP_TRUE = @OPENSTREETMAP_TRUE@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_CFLAGS = @PACKAGE_CFLAGS@ +PACKAGE_LIBS = @PACKAGE_LIBS@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ @@ -175,21 +136,19 @@ POW_LIB = @POW_LIB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ -REALTIME_GPS_TRACKING_FALSE = @REALTIME_GPS_TRACKING_FALSE@ -REALTIME_GPS_TRACKING_TRUE = @REALTIME_GPS_TRACKING_TRUE@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -TERRASERVER_FALSE = @TERRASERVER_FALSE@ -TERRASERVER_TRUE = @TERRASERVER_TRUE@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XP = @XP@ -''-nonet _libcurl_config = @_libcurl_config@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -201,6 +160,7 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -228,8 +188,12 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ SUBDIRS = dev EXTRA_DIST = GEOCODED-PHOTOS GETTING-STARTED GPSMAPPER \ viking.xml viking-remote.xml @@ -249,8 +213,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -274,10 +238,9 @@ $(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: install-man1: $(man1_MANS) $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" + test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ @@ -286,8 +249,8 @@ install-man1: $(man1_MANS) $(man_MANS) esac; \ done; \ for i in $$list; do \ - if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ - else file=$$i; fi; \ + if test -f $$i; then file=$$i; \ + else file=$(srcdir)/$$i; fi; \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ case "$$ext" in \ 1*) ;; \ @@ -352,8 +315,7 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: +$(RECURSIVE_CLEAN_TARGETS): @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -397,8 +359,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -423,8 +385,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -434,13 +396,12 @@ ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -454,22 +415,21 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -483,7 +443,7 @@ distdir: $(DISTFILES) list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ @@ -491,6 +451,8 @@ distdir: $(DISTFILES) $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ distdir) \ || exit 1; \ fi; \ @@ -501,7 +463,7 @@ all-am: Makefile $(MANS) installdirs: installdirs-recursive installdirs-am: for dir in "$(DESTDIR)$(man1dir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive install-exec: install-exec-recursive @@ -548,12 +510,20 @@ info-am: install-data-am: install-man +install-dvi: install-dvi-recursive + install-exec-am: +install-html: install-html-recursive + install-info: install-info-recursive install-man: install-man1 +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -572,24 +542,26 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-info-am uninstall-man - -uninstall-info: uninstall-info-recursive +uninstall-am: uninstall-man uninstall-man: uninstall-man1 -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-generic clean-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-recursive distclean-tags \ +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip + +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic ctags \ + ctags-recursive distclean distclean-generic distclean-tags \ distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-man1 install-strip installcheck installcheck-am \ + install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-man1 install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic maintainer-clean-recursive \ - mostlyclean mostlyclean-generic mostlyclean-recursive pdf \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-info-am uninstall-man uninstall-man1 + uninstall-man uninstall-man1 %.1: %.xml diff --git a/doc/dev/Makefile.in b/doc/dev/Makefile.in index 5fbcb3b..4d51164 100644 --- a/doc/dev/Makefile.in +++ b/doc/dev/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,15 +13,11 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -52,15 +48,11 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BLUEMARBLE_FALSE = @BLUEMARBLE_FALSE@ -BLUEMARBLE_TRUE = @BLUEMARBLE_TRUE@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ @@ -73,8 +65,6 @@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DB2MAN_XSL = @DB2MAN_XSL@ DEFS = @DEFS@ -DEM24K_FALSE = @DEM24K_FALSE@ -DEM24K_TRUE = @DEM24K_TRUE@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -82,55 +72,23 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXPAT_CFLAGS = @EXPAT_CFLAGS@ -EXPAT_INSTALLED_FALSE = @EXPAT_INSTALLED_FALSE@ -EXPAT_INSTALLED_TRUE = @EXPAT_INSTALLED_TRUE@ EXPAT_LIBS = @EXPAT_LIBS@ -EXPEDIA_FALSE = @EXPEDIA_FALSE@ -EXPEDIA_TRUE = @EXPEDIA_TRUE@ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@ -GEN_MANPAGES_FALSE = @GEN_MANPAGES_FALSE@ -GEN_MANPAGES_TRUE = @GEN_MANPAGES_TRUE@ -GEOCACHES_FALSE = @GEOCACHES_FALSE@ -GEOCACHES_TRUE = @GEOCACHES_TRUE@ -GEONAMES_FALSE = @GEONAMES_FALSE@ -GEONAMES_TRUE = @GEONAMES_TRUE@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GOOGLE_FALSE = @GOOGLE_FALSE@ -GOOGLE_TRUE = @GOOGLE_TRUE@ GREP = @GREP@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ LDFLAGS = @LDFLAGS@ LIBCURL = @LIBCURL@ LIBCURL_CPPFLAGS = @LIBCURL_CPPFLAGS@ @@ -138,20 +96,20 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ OBJEXT = @OBJEXT@ -OPENAERIAL_FALSE = @OPENAERIAL_FALSE@ -OPENAERIAL_TRUE = @OPENAERIAL_TRUE@ -OPENSTREETMAP_FALSE = @OPENSTREETMAP_FALSE@ -OPENSTREETMAP_TRUE = @OPENSTREETMAP_TRUE@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_CFLAGS = @PACKAGE_CFLAGS@ +PACKAGE_LIBS = @PACKAGE_LIBS@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ @@ -161,21 +119,19 @@ POW_LIB = @POW_LIB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ -REALTIME_GPS_TRACKING_FALSE = @REALTIME_GPS_TRACKING_FALSE@ -REALTIME_GPS_TRACKING_TRUE = @REALTIME_GPS_TRACKING_TRUE@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -TERRASERVER_FALSE = @TERRASERVER_FALSE@ -TERRASERVER_TRUE = @TERRASERVER_TRUE@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XP = @XP@ _libcurl_config = @_libcurl_config@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -187,6 +143,7 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -214,8 +171,12 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ EXTRA_DIST = \ CLEANUPS \ Clipboard \ @@ -235,8 +196,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -260,7 +221,6 @@ $(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: tags: TAGS TAGS: @@ -269,22 +229,21 @@ CTAGS: distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -343,12 +302,20 @@ info-am: install-data-am: +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -367,16 +334,19 @@ ps: ps-am ps-am: -uninstall-am: uninstall-info-am +uninstall-am: + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/mkinstalldirs b/mkinstalldirs index 259dbfc..d2d5f21 100755 --- a/mkinstalldirs +++ b/mkinstalldirs @@ -1,33 +1,21 @@ #! /bin/sh # mkinstalldirs --- make directory hierarchy - -scriptversion=2005-06-29.22 - -# Original author: Noah Friedman <friedman@prep.ai.mit.edu> +# Author: Noah Friedman <friedman@prep.ai.mit.edu> # Created: 1993-05-16 -# Public domain. -# -# This file is maintained in Automake, please report -# bugs to <bug-automake@gnu.org> or send patches to -# <automake-patches@gnu.org>. +# Public domain errstatus=0 -dirmode= +dirmode="" usage="\ -Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... - -Create each directory DIR (with mode MODE, if specified), including all -leading file name components. - -Report bugs to <bug-automake@gnu.org>." +Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..." # process command line arguments while test $# -gt 0 ; do case $1 in -h | --help | --h*) # -h for help - echo "$usage" - exit $? + echo "$usage" 1>&2 + exit 0 ;; -m) # -m PERM arg shift @@ -35,10 +23,6 @@ while test $# -gt 0 ; do dirmode=$1 shift ;; - --version) - echo "$0 $scriptversion" - exit $? - ;; --) # stop option processing shift break @@ -66,58 +50,30 @@ case $# in 0) exit 0 ;; esac -# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and -# mkdir -p a/c at the same time, both will detect that a is missing, -# one will create a, then the other will try to create a and die with -# a "File exists" error. This is a problem when calling mkinstalldirs -# from a parallel make. We use --version in the probe to restrict -# ourselves to GNU mkdir, which is thread-safe. case $dirmode in '') - if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then + if mkdir -p -- . 2>/dev/null; then echo "mkdir -p -- $*" exec mkdir -p -- "$@" - else - # On NextStep and OpenStep, the `mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already - # exists. - test -d ./-p && rmdir ./-p - test -d ./--version && rmdir ./--version fi ;; *) - if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 && - test ! -d ./--version; then + if mkdir -m "$dirmode" -p -- . 2>/dev/null; then echo "mkdir -m $dirmode -p -- $*" exec mkdir -m "$dirmode" -p -- "$@" - else - # Clean up after NextStep and OpenStep mkdir. - for d in ./-m ./-p ./--version "./$dirmode"; - do - test -d $d && rmdir $d - done fi ;; esac for file do - case $file in - /*) pathcomp=/ ;; - *) pathcomp= ;; - esac - oIFS=$IFS - IFS=/ - set fnord $file + set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` shift - IFS=$oIFS + pathcomp= for d do - test "x$d" = x && continue - - pathcomp=$pathcomp$d + pathcomp="$pathcomp$d" case $pathcomp in -*) pathcomp=./$pathcomp ;; esac @@ -128,21 +84,21 @@ do mkdir "$pathcomp" || lasterr=$? if test ! -d "$pathcomp"; then - errstatus=$lasterr + errstatus=$lasterr else - if test ! -z "$dirmode"; then + if test ! -z "$dirmode"; then echo "chmod $dirmode $pathcomp" - lasterr= - chmod "$dirmode" "$pathcomp" || lasterr=$? + lasterr="" + chmod "$dirmode" "$pathcomp" || lasterr=$? - if test ! -z "$lasterr"; then - errstatus=$lasterr - fi - fi + if test ! -z "$lasterr"; then + errstatus=$lasterr + fi + fi fi fi - pathcomp=$pathcomp/ + pathcomp="$pathcomp/" done done @@ -151,8 +107,5 @@ exit $errstatus # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" # End: +# mkinstalldirs ends here diff --git a/po/ChangeLog b/po/ChangeLog index 24ad762..ff447b7 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,45 @@ +2009-09-09 Guilhem Bonnefille <guilhem.bonnefille@gmail.com> + * import launchpad files + +2009-09-07 rainofchaos <rainofchaos@gmail.com> + * zh_CN.po: updated + +2009-09-06 Federico Vera <Unknown> + * es.po: updated + +2009-09-02 Guilhem Bonnefille <guilhem.bonnefille@gmail.com> + * fr.po: updated + +2009-08-31 EliotBlennerhassett <eliot@blennerhassett.gen.nz> + * en_GB.po: created + +2009-08-20 Dainius Sakalinskas <dinuxlt@gmail.com> + * lt.po: updated + +2009-08-20 Alessi Andrea <knukun@gmail.com> + * it.po: updated + +2009-08-20 Radek Stastny <Unknown> + * cs.po: updated + +2009-08-18 Guilhem Bonnefille <guilhem.bonnefille@gmail.com> + * import launchpad files + +2009-07-30 MarcusLS <MLS@gmx.de> + * de.po: updated + +2009-07-20 skrzat <Unknown> + * pl.po: updated + +2009-05-23 MeltingShell <Unknown> + * it.po: updated + +2009-05-01 Mikael Olofsson <michlos@1vb.us> + * sv.po: updated + +2009-04-04 Tadas Masiulionis <Unknown> + * lt.po: updated + 2009-02-08 Guilhem Bonnefille <guilhem.bonnefille@gmail.com> * fr.po: updated diff --git a/po/Makefile.in.in b/po/Makefile.in.in index 6891e8f..402a25f 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -21,7 +21,7 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ PACKAGE = @PACKAGE@ VERSION = @VERSION@ -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -54,16 +54,16 @@ GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDA ALL_LINGUAS = @ALL_LINGUAS@ -PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi) +PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi) -USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS`" -o -n "`echo $$ALINGUAS|grep ' ?$$lang ?'`"; then printf "$$lang "; fi; done; fi) +USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi) -USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done) +USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done) -POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done) +POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done) -DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES) -EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS +DISTFILES = Makefile.in.in POTFILES.in $(POFILES) +EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS POTFILES = \ # This comment gets stripped out @@ -101,7 +101,6 @@ install: install-data install-data: install-data-@USE_NLS@ install-data-no: all install-data-yes: all - $(mkdir_p) $(DESTDIR)$(itlocaledir) linguas="$(USE_LINGUAS)"; \ for lang in $$linguas; do \ dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \ diff --git a/po/POTFILES.in b/po/POTFILES.in index 1650174..dacfb31 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -14,6 +14,7 @@ src/datasource_gps.c src/dem.c src/download.c src/file.c +src/mapcache.c src/print.c src/util.c src/vikcoordlayer.c @@ -7,15 +7,15 @@ msgid "" msgstr "" "Project-Id-Version: viking\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-04 22:47+0100\n" -"PO-Revision-Date: 2009-02-05 21:55+0000\n" +"POT-Creation-Date: 2009-08-20 09:50+0200\n" +"PO-Revision-Date: 2009-08-20 23:20+0000\n" "Last-Translator: Radek Stastny <Unknown>\n" "Language-Team: Czech <cs@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2009-02-08 13:36+0000\n" +"X-Launchpad-Export-Date: 2009-09-09 20:12+0000\n" "X-Generator: Launchpad (build Unknown)\n" #: ../src/acquire.c:118 @@ -26,28 +26,28 @@ msgstr "Pracuji..." msgid "Error: acquisition failed." msgstr "Chyba: staženà selhalo" -#: ../src/acquire.c:149 ../src/vikgpslayer.c:957 +#: ../src/acquire.c:149 ../src/vikgpslayer.c:953 msgid "Done." msgstr "Hotovo." -#: ../src/acquire.c:326 ../src/vikgpslayer.c:996 +#: ../src/acquire.c:326 ../src/vikgpslayer.c:992 msgid "Status: detecting gpsbabel" msgstr "Status: hledám gpsbabel" -#: ../src/background.c:54 +#: ../src/background.c:57 #, c-format msgid "%d items" msgstr "%d položek" -#: ../src/background.c:212 +#: ../src/background.c:224 msgid "Job" msgstr "Úloha" -#: ../src/background.c:216 +#: ../src/background.c:228 msgid "Progress" msgstr "PrůbÄ›h" -#: ../src/background.c:227 +#: ../src/background.c:239 msgid "Viking Background Jobs" msgstr "Úlohy na pozadÃ" @@ -74,7 +74,7 @@ msgid "" "into." msgstr "K vloženà mÃsta je nutné vybrat cÃlovou vrstvu." -#: ../src/curl_download.c:85 +#: ../src/curl_download.c:94 #, c-format msgid "%s() Curl perform failed: %s" msgstr "%s() Curl selhal: %s" @@ -367,7 +367,7 @@ msgstr "Staženo z GPS" msgid "using cmdline '%s' and file '%s'\n" msgstr "použÃvám pÅ™Ãkaz '%s' a soubor '%s'\n" -#: ../src/datasource_gps.c:150 ../src/vikgpslayer.c:711 +#: ../src/datasource_gps.c:150 ../src/vikgpslayer.c:707 #, c-format msgid "Downloading %d waypoint..." msgid_plural "Downloading %d waypoints..." @@ -375,7 +375,7 @@ msgstr[0] "Stahuji %d mÃsto..." msgstr[1] "Stahuji %d mÃsta..." msgstr[2] "Stahuji %d mÃst..." -#: ../src/datasource_gps.c:152 ../src/vikgpslayer.c:713 +#: ../src/datasource_gps.c:152 ../src/vikgpslayer.c:709 #, c-format msgid "Downloading %d trackpoint..." msgid_plural "Downloading %d trackpoints..." @@ -393,7 +393,7 @@ msgstr "Staženo %d z %d %s..." msgid "Downloaded %d %s." msgstr "Staženo %d %s." -#: ../src/datasource_gps.c:185 ../src/vikgpslayer.c:783 +#: ../src/datasource_gps.c:185 ../src/vikgpslayer.c:779 #, c-format msgid "GPS Device: %s" msgstr "GPS zaÅ™ÃzenÃ: %s" @@ -406,7 +406,7 @@ msgstr "GPS protokol:" msgid "Serial Port:" msgstr "Sériový port:" -#: ../src/datasource_gps.c:299 ../src/vikgpslayer.c:1001 +#: ../src/datasource_gps.c:299 ../src/vikgpslayer.c:997 msgid "GPS device: N/A" msgstr "GPS zaÅ™ÃzenÃ: N/A" @@ -437,6 +437,10 @@ msgstr "Chyba stahovánÃ: %s" msgid "Draw mode '%s' no more supported" msgstr "Zobrazovacà režim '%s' již nenà podporován" +#: ../src/mapcache.c:63 +msgid "Mapcache memory size (MB):" +msgstr "Velikost cache (MB):" + #: ../src/print.c:53 msgid "None" msgstr "Žádný" @@ -479,11 +483,11 @@ msgstr "Ignorovat okraje _stránky" msgid "Image S_ize:" msgstr "Velikost obrázku" -#: ../src/util.c:75 +#: ../src/util.c:76 msgid "Could not launch web browser." msgstr "nelze spustit webový prohlÞeÄ" -#: ../src/util.c:86 +#: ../src/util.c:87 msgid "Could not create new email." msgstr "Nelze vytvožit nový email." @@ -699,11 +703,11 @@ msgstr "Nebyl vybrán žádný zdroj, je tÅ™eba zmÄ›nit vlastnosti vrstvy." msgid "Downloading DEM %s" msgstr "Stahuji DEM %s" -#: ../src/vikfileentry.c:67 +#: ../src/vikfileentry.c:68 msgid "Browse..." msgstr "Procházet..." -#: ../src/vikfileentry.c:94 +#: ../src/vikfileentry.c:96 msgid "Choose file" msgstr "VýbÄ›r souboru" @@ -816,11 +820,11 @@ msgstr "Gpsd port:" msgid "Gpsd Retry Interval (seconds):" msgstr "Opakovat pÅ™ipojenà k gpsd po (s):" -#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:989 +#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:985 msgid "GPS Download" msgstr "Staženà z GPS" -#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:989 +#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:985 msgid "GPS Upload" msgstr "Nahránà do GPS" @@ -828,40 +832,40 @@ msgstr "Nahránà do GPS" msgid "GPS Realtime Tracking" msgstr "GPS sledovánà pozice" -#: ../src/vikgpslayer.c:373 +#: ../src/vikgpslayer.c:371 msgid "Unknown GPS Protocol" msgstr "Neznámý GPS protokol" -#: ../src/vikgpslayer.c:379 +#: ../src/vikgpslayer.c:377 msgid "Unknown serial port device" msgstr "Neznámé zaÅ™Ãzenà pro sériový port" -#: ../src/vikgpslayer.c:444 +#: ../src/vikgpslayer.c:442 #, c-format msgid "%s: unknown parameter" msgstr "%s: neznámý parametr" -#: ../src/vikgpslayer.c:545 +#: ../src/vikgpslayer.c:541 msgid "Upload to GPS" msgstr "Nahránà do GPS" -#: ../src/vikgpslayer.c:550 +#: ../src/vikgpslayer.c:546 msgid "Download from GPS" msgstr "Staženà z GPS" -#: ../src/vikgpslayer.c:568 +#: ../src/vikgpslayer.c:564 msgid "Empty Upload" msgstr "Nic k nahránÃ" -#: ../src/vikgpslayer.c:573 +#: ../src/vikgpslayer.c:569 msgid "Empty Download" msgstr "Nic ke staženÃ" -#: ../src/vikgpslayer.c:578 +#: ../src/vikgpslayer.c:574 msgid "Empty All" msgstr "Sm_azat vÅ¡e" -#: ../src/vikgpslayer.c:718 +#: ../src/vikgpslayer.c:714 #, c-format msgid "Uploading %d waypoint..." msgid_plural "Uploading %d waypoints..." @@ -869,7 +873,7 @@ msgstr[0] "Nahrávám %d mÃsto..." msgstr[1] "Nahrávám %d mÃsta..." msgstr[2] "Nahrávám %d mÃst..." -#: ../src/vikgpslayer.c:720 +#: ../src/vikgpslayer.c:716 #, c-format msgid "Uploading %d trackpoint..." msgid_plural "Uploading %d trackpoints..." @@ -877,7 +881,7 @@ msgstr[0] "Nahrávám %d bod" msgstr[1] "Nahrávám %d body" msgstr[2] "Nahrávám %d bodů" -#: ../src/vikgpslayer.c:744 +#: ../src/vikgpslayer.c:740 #, c-format msgid "Downloaded %d out of %d waypoint..." msgid_plural "Downloaded %d out of %d waypoints..." @@ -885,7 +889,7 @@ msgstr[0] "Staženo %d z %d mÃsta..." msgstr[1] "Staženo %d z %d mÃst..." msgstr[2] "Staženo %d z %d mÃst..." -#: ../src/vikgpslayer.c:746 +#: ../src/vikgpslayer.c:742 #, c-format msgid "Downloaded %d out of %d trackpoint..." msgid_plural "Downloaded %d out of %d trackpoints..." @@ -893,7 +897,7 @@ msgstr[0] "Stažen %d z %d bodu..." msgstr[1] "Staženo %d z %d bodů..." msgstr[2] "Staženo %d z %d bodů..." -#: ../src/vikgpslayer.c:750 +#: ../src/vikgpslayer.c:746 #, c-format msgid "Uploaded %d out of %d waypoint..." msgid_plural "Uploaded %d out of %d waypoints..." @@ -901,7 +905,7 @@ msgstr[0] "Nahráno %d z %d mÃsta" msgstr[1] "Nahráno %d z %d mÃst" msgstr[2] "Nahráno %d z %d mÃst" -#: ../src/vikgpslayer.c:752 +#: ../src/vikgpslayer.c:748 #, c-format msgid "Uploaded %d out of %d trackpoint..." msgid_plural "Uploaded %d out of %d trackpoints..." @@ -909,7 +913,7 @@ msgstr[0] "Nahrán %d z %d bodu..." msgstr[1] "Nahráno %d z %d bodů..." msgstr[2] "Nahráno %d z %d bodů..." -#: ../src/vikgpslayer.c:759 +#: ../src/vikgpslayer.c:755 #, c-format msgid "Downloaded %d waypoint" msgid_plural "Downloaded %d waypoints" @@ -917,7 +921,7 @@ msgstr[0] "Staženo %d mÃsto" msgstr[1] "Stažena %d mÃsta" msgstr[2] "Staženo %d mÃst" -#: ../src/vikgpslayer.c:761 +#: ../src/vikgpslayer.c:757 #, c-format msgid "Downloaded %d trackpoint" msgid_plural "Downloaded %d trackpoints" @@ -925,7 +929,7 @@ msgstr[0] "Stažen %d bod" msgstr[1] "Staženy %d body" msgstr[2] "Staženo %d bodů" -#: ../src/vikgpslayer.c:765 +#: ../src/vikgpslayer.c:761 #, c-format msgid "Uploaded %d waypoint" msgid_plural "Uploaded %d waypoints" @@ -933,7 +937,7 @@ msgstr[0] "Nahráno %d mÃsto" msgstr[1] "Nahrána %d mÃsta" msgstr[2] "Nahráno %d mÃst" -#: ../src/vikgpslayer.c:767 +#: ../src/vikgpslayer.c:763 #, c-format msgid "Uploaded %d trackpoint" msgid_plural "Uploaded %d trackpoints" @@ -941,7 +945,7 @@ msgstr[0] "Nahrán %d bod" msgstr[1] "Nahrány %d body" msgstr[2] "Nahráno %d bodů" -#: ../src/vikgpslayer.c:952 +#: ../src/vikgpslayer.c:948 msgid "Error: couldn't find gpsbabel." msgstr "Chyba: gpsbabel nenalezen" @@ -995,8 +999,8 @@ msgid "Map Type:" msgstr "Typ mapy:" #: ../src/vikmapslayer.c:120 -msgid "Maps Directory (Optional):" -msgstr "Adresář map (volitelnÄ›)" +msgid "Maps Directory:" +msgstr "Adresář pro mapy:" #: ../src/vikmapslayer.c:121 msgid "Alpha:" @@ -1042,7 +1046,7 @@ msgid "" "factor" msgstr "ZbabÄ›le odmÃtá vykreslit mapové podklady nad stupeň pÅ™iblÞenà %d" -#: ../src/vikmapslayer.c:924 +#: ../src/vikmapslayer.c:927 #, c-format msgid "Redownloading up to %d %s map..." msgid_plural "Redownloading up to %d %s maps..." @@ -1050,7 +1054,7 @@ msgstr[0] "Opakované staženà %d %s mapy..." msgstr[1] "Opakované staženà %d %s map..." msgstr[2] "Opakované staženà %d %s map..." -#: ../src/vikmapslayer.c:926 +#: ../src/vikmapslayer.c:929 #, c-format msgid "Redownloading %d %s map..." msgid_plural "Redownloading %d %s maps..." @@ -1058,7 +1062,7 @@ msgstr[0] "Opakované stahovánà %d %s mapy..." msgstr[1] "Opakované stahovánà %d %s map..." msgstr[2] "Opakované stahovánà %d %s map..." -#: ../src/vikmapslayer.c:930 ../src/vikmapslayer.c:1001 +#: ../src/vikmapslayer.c:933 ../src/vikmapslayer.c:1004 #, c-format msgid "Downloading %d %s map..." msgid_plural "Downloading %d %s maps..." @@ -1066,15 +1070,15 @@ msgstr[0] "Stahuji %d %s mapu..." msgstr[1] "Stahuji %d %s mapu..." msgstr[2] "Stahuji %d %s mapu..." -#: ../src/vikmapslayer.c:1058 +#: ../src/vikmapslayer.c:1061 msgid "Redownload bad map(s)" msgstr "Znovu stáhnout Å¡patné mapy" -#: ../src/vikmapslayer.c:1062 +#: ../src/vikmapslayer.c:1065 msgid "Redownload all map(s)" msgstr "Znovy stáhnout vÅ¡echny mapy" -#: ../src/vikmapslayer.c:1142 +#: ../src/vikmapslayer.c:1145 #, c-format msgid "" "Wrong drawmode for this map.\n" @@ -1083,16 +1087,16 @@ msgstr "" "Å¡patný zobrazovacà režim pro tento druh mapy.\n" "Vyberte \"%s\" z menu Zobrazenà a zkuste znovu." -#: ../src/vikmapslayer.c:1147 +#: ../src/vikmapslayer.c:1150 msgid "Wrong zoom level for this map." msgstr "Å patný stupeň pÅ™iblÞenà pro tuto mapu." -#: ../src/vikmapslayer.c:1172 +#: ../src/vikmapslayer.c:1175 msgid "Download Onscreen Maps" msgstr "Stáhnout viditelné mapy" #. TODO Add GTK_STOCK_REFRESH icon -#: ../src/vikmapslayer.c:1178 +#: ../src/vikmapslayer.c:1181 msgid "Refresh Onscreen Tiles" msgstr "Obnovit viditelné mapy" @@ -1280,12 +1284,12 @@ msgstr "Ve vrstvÄ› nejsou body ani mÃsta." msgid "Export Layer" msgstr "Export vrstvy jako..." -#: ../src/viktrwlayer.c:1565 ../src/vikwindow.c:1446 ../src/vikwindow.c:1820 +#: ../src/viktrwlayer.c:1565 ../src/vikwindow.c:1438 ../src/vikwindow.c:1817 #, c-format msgid "The file \"%s\" exists, do you wish to overwrite it?" msgstr "Soubor \"%s\" existuje, pÅ™epsat?" -#: ../src/viktrwlayer.c:1575 ../src/vikwindow.c:1464 +#: ../src/viktrwlayer.c:1575 ../src/vikwindow.c:1456 msgid "The filename you requested could not be opened for writing." msgstr "Soubor nemůže být otevÅ™en k zápisu." @@ -1301,71 +1305,71 @@ msgstr "Jméno mÃsta:" msgid "Waypoint not found in this layer." msgstr "MÃsto nenà v této vrstvÄ›" -#: ../src/viktrwlayer.c:1724 +#: ../src/viktrwlayer.c:1723 msgid "Goto Center of Layer" msgstr "JÃt na stÅ™ed vrstvy" -#: ../src/viktrwlayer.c:1729 +#: ../src/viktrwlayer.c:1728 msgid "Goto Waypoint" msgstr "JÃt na mÃsto" -#: ../src/viktrwlayer.c:1735 +#: ../src/viktrwlayer.c:1734 msgid "Export layer" msgstr "Export vrstvy" -#: ../src/viktrwlayer.c:1740 +#: ../src/viktrwlayer.c:1739 msgid "Export as GPSPoint" msgstr "Export jako GPSPoint" -#: ../src/viktrwlayer.c:1745 +#: ../src/viktrwlayer.c:1744 msgid "Export as GPSMapper" msgstr "Export jako GPSMapper" -#: ../src/viktrwlayer.c:1750 +#: ../src/viktrwlayer.c:1749 msgid "Export as GPX" msgstr "Export jako GPX" -#: ../src/viktrwlayer.c:1755 ../src/viktrwlayer.c:2794 +#: ../src/viktrwlayer.c:1754 ../src/viktrwlayer.c:2794 msgid "New Waypoint" msgstr "Nové mÃsto" -#: ../src/viktrwlayer.c:1762 +#: ../src/viktrwlayer.c:1761 msgid "Add Wikipedia Waypoints" msgstr "NajÃt mÃsta na Wikipedii" -#: ../src/viktrwlayer.c:1767 +#: ../src/viktrwlayer.c:1766 msgid "Within layer bounds" msgstr "UvnitÅ™ hranic vrstvy" -#: ../src/viktrwlayer.c:1772 +#: ../src/viktrwlayer.c:1771 msgid "Within current view" msgstr "UvnitÅ™ aktuálnÃho pohledu" -#: ../src/viktrwlayer.c:1779 ../src/viktrwlayer.c:2760 +#: ../src/viktrwlayer.c:1778 ../src/viktrwlayer.c:2760 msgid "Upload to OSM" msgstr "Nahraj na OSM" -#: ../src/viktrwlayer.c:2290 +#: ../src/viktrwlayer.c:2289 msgid "Failed. This track does not have timestamp" msgstr "Selhalo. Trasa neobsahuje Äasové údaje" -#: ../src/viktrwlayer.c:2304 +#: ../src/viktrwlayer.c:2303 msgid "Failed. No other track in this layer has timestamp" msgstr "Selhalo. Žádná trasa v této vstvÄ› neobsahuje Äasové údaje" -#: ../src/viktrwlayer.c:2310 +#: ../src/viktrwlayer.c:2309 msgid "Merge with..." msgstr "PÅ™ipojit s ..," -#: ../src/viktrwlayer.c:2310 +#: ../src/viktrwlayer.c:2309 msgid "Select track to merge with" msgstr "Vybrat trasu k pÅ™ipojenÃ" -#: ../src/viktrwlayer.c:2347 +#: ../src/viktrwlayer.c:2346 msgid "Merge Threshold..." msgstr "Práh pro spojovánÃ..." -#: ../src/viktrwlayer.c:2348 +#: ../src/viktrwlayer.c:2347 msgid "Merge when time between tracks less than:" msgstr "PÅ™ipojit trasy pokud je dÄ›là ménÄ› než:" @@ -1441,131 +1445,131 @@ msgstr "Vyhledat trasu Google" msgid "Use with filter" msgstr "PoužÃt jako filtr" -#: ../src/viktrwlayer.c:3736 +#: ../src/viktrwlayer.c:3735 msgid "Could not launch eog to open file." msgstr "Nelze spustit \"eog\"" -#: ../src/viktrwlayer.c:3790 +#: ../src/viktrwlayer.c:3789 #, c-format msgid "Creating %d Image Thumbnails..." msgstr "VytvářÃm %d náhledy obrázků..." -#: ../src/viktrwlayer.c:4010 +#: ../src/viktrwlayer.c:4009 msgid "No map layer in use. Create one first" msgstr "Je tÅ™eba vytvoÅ™it mapovou vrstvu." -#: ../src/viktrwlayer_propwin.c:658 +#: ../src/viktrwlayer_propwin.c:661 msgid "Failed spliting track. Track unchanged" msgstr "Chyba pÅ™i rozdÄ›lenà trasy. Trasa nezmÄ›nÄ›na." -#: ../src/viktrwlayer_propwin.c:675 +#: ../src/viktrwlayer_propwin.c:678 msgid "Operation Aborted. Track unchanged" msgstr "Operace zruÅ¡ena. Trasa nezmÄ›nÄ›na." -#: ../src/viktrwlayer_propwin.c:729 +#: ../src/viktrwlayer_propwin.c:732 #, c-format msgid "%s - Track Properties" msgstr "%s - vlastnosti trasy" -#: ../src/viktrwlayer_propwin.c:734 +#: ../src/viktrwlayer_propwin.c:737 msgid "Split at Marker" msgstr "RozdÄ›lit na oznaÄeném bodu" -#: ../src/viktrwlayer_propwin.c:735 +#: ../src/viktrwlayer_propwin.c:738 msgid "Split Segments" msgstr "RozdÄ›lit segmenty" -#: ../src/viktrwlayer_propwin.c:736 +#: ../src/viktrwlayer_propwin.c:739 msgid "Reverse" msgstr "Pozpátku" -#: ../src/viktrwlayer_propwin.c:737 +#: ../src/viktrwlayer_propwin.c:740 msgid "Delete Dupl." msgstr "Smazat zdvoj." -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Comment:</b>" msgstr "<b>Komentář:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Track Length:</b>" msgstr "<b>Délka trasy:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Trackpoints:</b>" msgstr "<b>Body:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Segments:</b>" msgstr "<b>Segmenty:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Duplicate Points:</b>" msgstr "<b>Zdvojené body:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Max Speed:</b>" msgstr "<b>NejvyÅ¡Å¡Ã rychlost:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Avg. Speed:</b>" msgstr "<b>PrůmÄ›rná rychlost:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Avg. Dist. Between TPs:</b>" msgstr "<b>PrůmÄ›rná vzdálenost mezi body:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Elevation Range:</b>" msgstr "<b>Rozsah nadmoÅ™ské výšky:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Total Elevation Gain/Loss:</b>" msgstr "<b>Celkové stoupánÃ/klesánÃ:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Start:</b>" msgstr "<b>ZaÄátek:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>End:</b>" msgstr "<b>Konec:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Duration:</b>" msgstr "<b>TrvánÃ:</b>" -#: ../src/viktrwlayer_propwin.c:788 ../src/viktrwlayer_propwin.c:795 -#: ../src/viktrwlayer_propwin.c:804 ../src/viktrwlayer_propwin.c:811 -#: ../src/viktrwlayer_propwin.c:850 ../src/viktrwlayer_propwin.c:851 -#: ../src/viktrwlayer_propwin.c:852 ../src/viktrwlayer_propwin.c:874 -#: ../src/viktrwlayer_propwin.c:881 +#: ../src/viktrwlayer_propwin.c:791 ../src/viktrwlayer_propwin.c:798 +#: ../src/viktrwlayer_propwin.c:807 ../src/viktrwlayer_propwin.c:814 +#: ../src/viktrwlayer_propwin.c:853 ../src/viktrwlayer_propwin.c:854 +#: ../src/viktrwlayer_propwin.c:855 ../src/viktrwlayer_propwin.c:877 +#: ../src/viktrwlayer_propwin.c:884 #, c-format msgid "No Data" msgstr "Žádná data" -#: ../src/viktrwlayer_propwin.c:847 +#: ../src/viktrwlayer_propwin.c:850 #, c-format msgid "%d minutes" msgstr "%d minut" -#: ../src/viktrwlayer_propwin.c:870 +#: ../src/viktrwlayer_propwin.c:873 msgid "Statistics" msgstr "Statistika" -#: ../src/viktrwlayer_propwin.c:875 +#: ../src/viktrwlayer_propwin.c:878 msgid "<b>Track Distance:</b>" msgstr "<b>Vzdálenost na trase:</b>" -#: ../src/viktrwlayer_propwin.c:876 +#: ../src/viktrwlayer_propwin.c:879 msgid "Elevation-distance" msgstr "Výška - vzdálenost" -#: ../src/viktrwlayer_propwin.c:882 +#: ../src/viktrwlayer_propwin.c:885 msgid "<b>Track Time:</b>" msgstr "<b>ÄŒas na trase:</b>" -#: ../src/viktrwlayer_propwin.c:883 +#: ../src/viktrwlayer_propwin.c:886 msgid "Speed-time" msgstr "Rychlost-Äas" @@ -1605,31 +1609,47 @@ msgstr "<b>RozdÃl Äasu:</b>" msgid "<b>\"Speed\" Between:</b>" msgstr "<b>Rychlost mezi body:</b>" -#: ../src/viktrwlayer_tpwin.c:117 +#: ../src/viktrwlayer_tpwin.c:110 +msgid "<b>VDOP:</b>" +msgstr "<b>VDOP:</b>" + +#: ../src/viktrwlayer_tpwin.c:111 +msgid "<b>HDOP:</b>" +msgstr "<b>HDOP:</b>" + +#: ../src/viktrwlayer_tpwin.c:112 +msgid "<b>PDOP:</b>" +msgstr "<b>PDOP:</b>" + +#: ../src/viktrwlayer_tpwin.c:113 +msgid "<b>SAT/FIX:</b>" +msgstr "<b>SAT/FIX:</b>" + +#: ../src/viktrwlayer_tpwin.c:122 msgid "Trackpoint" msgstr "Bod" -#: ../src/viktrwlayer_tpwin.c:122 +#: ../src/viktrwlayer_tpwin.c:127 msgid "Split Here" msgstr "Zde rozdÄ›lit" -#: ../src/viktrwlayer_tpwin.c:123 +#: ../src/viktrwlayer_tpwin.c:128 msgid "Join With Last" msgstr "Spojit s poslednÃm" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Pan" msgstr "Posun" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Zoom" msgstr "Lupa" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Ruler" msgstr "PravÃtko" -#: ../src/vikwindow.c:363 +#: ../src/vikwindow.c:364 #, c-format msgid "" "Do you want to save the changes you made to the document \"%s\"?\n" @@ -1639,441 +1659,445 @@ msgstr "" "Uložit zmÄ›ny v souboru \"%s\"?\n" "ZmÄ›ny se ztratà pokud nebudou uloženy." -#: ../src/vikwindow.c:366 ../src/vikwindow.c:1314 +#: ../src/vikwindow.c:367 ../src/vikwindow.c:1306 msgid "Untitled" msgstr "Bez názvu" -#: ../src/vikwindow.c:367 +#: ../src/vikwindow.c:368 msgid "Don't Save" msgstr "Neukládat" -#: ../src/vikwindow.c:400 +#: ../src/vikwindow.c:401 msgid "mpp" msgstr "mpp" -#: ../src/vikwindow.c:400 +#: ../src/vikwindow.c:401 msgid "pixelfact" msgstr "pixelfact" -#: ../src/vikwindow.c:527 +#: ../src/vikwindow.c:528 #, c-format msgid "%s %s %dm" msgstr "%s %s %dm" -#: ../src/vikwindow.c:529 +#: ../src/vikwindow.c:530 #, c-format msgid "%s %s" msgstr "%s %s" -#: ../src/vikwindow.c:1113 +#: ../src/vikwindow.c:1105 msgid "You must select a layer to show its properties." msgstr "K zobrazenà vlastnostà je tÅ™eba oznaÄit vrstvu." -#: ../src/vikwindow.c:1129 +#: ../src/vikwindow.c:1121 msgid "You must select a layer to delete." msgstr "Ke smazánà Je tÅ™eba oznaÄit vrstvu." -#: ../src/vikwindow.c:1347 +#: ../src/vikwindow.c:1339 msgid "The file you requested could not be opened." msgstr "Nelze otevÅ™Ãt vybraný soubor." -#: ../src/vikwindow.c:1390 +#: ../src/vikwindow.c:1382 msgid "Please select a GPS data file to open. " msgstr "Vyberte prosÃm datový GPS soubor. " -#: ../src/vikwindow.c:1433 +#: ../src/vikwindow.c:1425 msgid "Save as Viking File." msgstr "Uložit jako soubor typu Viking." -#: ../src/vikwindow.c:1667 +#: ../src/vikwindow.c:1664 msgid "" "Viewable region outside allowable pixel size bounds for image. Clipping " "width/height values." msgstr "Zobrazovaná oblast pÅ™esáhla okraje mapy. Upravuji zobrazenÃ." -#: ../src/vikwindow.c:1686 +#: ../src/vikwindow.c:1683 #, c-format msgid "Total area: %ldm x %ldm (%.3f sq. km)" msgstr "Celková plocha: %ldm x %ldm (%.3f km Ätv. )" #. todo: default for answers inside VikWindow or static (thruout instance) -#: ../src/vikwindow.c:1694 +#: ../src/vikwindow.c:1691 msgid "Save to Image File" msgstr "Uložit obrázek do souboru" -#: ../src/vikwindow.c:1712 +#: ../src/vikwindow.c:1709 msgid "Width (pixels):" msgstr "Å ÃÅ™ka (pixelů):" -#: ../src/vikwindow.c:1714 +#: ../src/vikwindow.c:1711 msgid "Height (pixels):" msgstr "Výška (pixelů):" -#: ../src/vikwindow.c:1717 +#: ../src/vikwindow.c:1714 msgid "Zoom (meters per pixel):" msgstr "MÄ›rÃtko (metrů/pixel)" -#: ../src/vikwindow.c:1723 +#: ../src/vikwindow.c:1720 msgid "Area in current viewable window" msgstr "AktuálnÄ› zobrazená oblast" -#: ../src/vikwindow.c:1733 +#: ../src/vikwindow.c:1730 msgid "Save as PNG" msgstr "Uložit jako PNG" -#: ../src/vikwindow.c:1734 +#: ../src/vikwindow.c:1731 msgid "Save as JPEG" msgstr "Uložit jako JPEG" -#: ../src/vikwindow.c:1754 +#: ../src/vikwindow.c:1751 msgid "East-west image tiles:" msgstr "Východ-západ obrázky:" -#: ../src/vikwindow.c:1756 +#: ../src/vikwindow.c:1753 msgid "North-south image tiles:" msgstr "PoÄet obrázků svisle:" -#: ../src/vikwindow.c:1796 +#: ../src/vikwindow.c:1793 msgid "You must be in UTM mode to use this feature" msgstr "Tato funkce je dostupná pouze v UTM módu" -#: ../src/vikwindow.c:1807 +#: ../src/vikwindow.c:1804 msgid "Save Image" msgstr "Uložit obrázek" -#: ../src/vikwindow.c:1834 +#: ../src/vikwindow.c:1831 msgid "Choose a directory to hold images" msgstr "Vybrat adresář na obrázky" -#: ../src/vikwindow.c:1920 +#: ../src/vikwindow.c:1917 msgid "Choose a background color" msgstr "Vyberte barvu pozadÃ" -#: ../src/vikwindow.c:1941 +#: ../src/vikwindow.c:1938 msgid "_File" msgstr "_Soubor" -#: ../src/vikwindow.c:1942 +#: ../src/vikwindow.c:1939 msgid "_Edit" msgstr "_Upravit" -#: ../src/vikwindow.c:1943 +#: ../src/vikwindow.c:1940 msgid "_View" msgstr "_ZobrazenÃ" -#: ../src/vikwindow.c:1944 ../src/vikwindow.c:2015 +#: ../src/vikwindow.c:1941 ../src/vikwindow.c:2013 msgid "_Zoom" msgstr "_PÅ™iblÞenÃ" -#: ../src/vikwindow.c:1945 ../src/vikwindow.c:2014 +#: ../src/vikwindow.c:1942 ../src/vikwindow.c:2012 msgid "_Pan" msgstr "_Posun" -#: ../src/vikwindow.c:1946 +#: ../src/vikwindow.c:1943 msgid "_Layers" msgstr "_Vrstvy" -#: ../src/vikwindow.c:1947 +#: ../src/vikwindow.c:1944 msgid "_Tools" msgstr "Nás_troje" -#: ../src/vikwindow.c:1948 +#: ../src/vikwindow.c:1945 msgid "_Webtools" msgstr "_Externà odkazy" -#: ../src/vikwindow.c:1949 +#: ../src/vikwindow.c:1946 msgid "_Help" msgstr "_NápovÄ›da" -#: ../src/vikwindow.c:1951 +#: ../src/vikwindow.c:1948 msgid "_New" msgstr "_Nový" -#: ../src/vikwindow.c:1951 +#: ../src/vikwindow.c:1948 msgid "New file" msgstr "Nový soubor" -#: ../src/vikwindow.c:1952 +#: ../src/vikwindow.c:1949 msgid "_Open" msgstr "_OtevÅ™Ãt" -#: ../src/vikwindow.c:1952 +#: ../src/vikwindow.c:1949 msgid "Open a file" msgstr "OtevÅ™Ãt soubor" -#: ../src/vikwindow.c:1953 +#: ../src/vikwindow.c:1950 msgid "A_ppend File" msgstr "PÅ™ipojit soubor" -#: ../src/vikwindow.c:1953 +#: ../src/vikwindow.c:1950 msgid "Append data from a different file" msgstr "PÅ™ipojà data z jiného souboru" -#: ../src/vikwindow.c:1954 +#: ../src/vikwindow.c:1951 msgid "A_cquire" msgstr "_ZÃskat" -#: ../src/vikwindow.c:1955 +#: ../src/vikwindow.c:1952 msgid "From _GPS" msgstr "z GPS" -#: ../src/vikwindow.c:1955 +#: ../src/vikwindow.c:1952 msgid "Transfer data from a GPS device" msgstr "ZÃskat data z GPS" -#: ../src/vikwindow.c:1956 +#: ../src/vikwindow.c:1953 msgid "Google _Directions" msgstr "Google _trasy" -#: ../src/vikwindow.c:1956 +#: ../src/vikwindow.c:1953 msgid "Get driving directions from Google" msgstr "ZÃská trasu z Google" -#: ../src/vikwindow.c:1958 +#: ../src/vikwindow.c:1955 msgid "Geo_caches" msgstr "Geo_cache" -#: ../src/vikwindow.c:1958 +#: ../src/vikwindow.c:1955 msgid "Get Geocaches from geocaching.com" msgstr "ZÃskat Geocache z geocaching.com" -#: ../src/vikwindow.c:1960 +#: ../src/vikwindow.c:1957 msgid "_Save" msgstr "_Uložit" -#: ../src/vikwindow.c:1960 +#: ../src/vikwindow.c:1957 msgid "Save the file" msgstr "Uložit _soubor" -#: ../src/vikwindow.c:1961 +#: ../src/vikwindow.c:1958 msgid "Save _As" msgstr "Uložit _jako" -#: ../src/vikwindow.c:1961 +#: ../src/vikwindow.c:1958 msgid "Save the file under different name" msgstr "Uložit soubor s jiným jménem" -#: ../src/vikwindow.c:1962 +#: ../src/vikwindow.c:1959 msgid "_Generate Image File" msgstr "_VytvoÅ™it obrázek" -#: ../src/vikwindow.c:1962 +#: ../src/vikwindow.c:1959 msgid "Save a snapshot of the workspace into a file" msgstr "Uložà zobrazenà mapy jako obrázek" -#: ../src/vikwindow.c:1963 +#: ../src/vikwindow.c:1960 msgid "Generate _Directory of Images" msgstr "VytvoÅ™it _adresář s obrázky" -#: ../src/vikwindow.c:1963 +#: ../src/vikwindow.c:1960 msgid "FIXME:IMGDIR" msgstr "FIXME:IMGDIR" -#: ../src/vikwindow.c:1966 +#: ../src/vikwindow.c:1963 msgid "_Print..." msgstr "_Tisk..." -#: ../src/vikwindow.c:1966 +#: ../src/vikwindow.c:1963 msgid "Print maps" msgstr "Tisk map" -#: ../src/vikwindow.c:1969 +#: ../src/vikwindow.c:1966 msgid "E_xit" msgstr "U_konÄit" -#: ../src/vikwindow.c:1969 +#: ../src/vikwindow.c:1966 msgid "Exit the program" msgstr "UkonÄit aplikaci" -#: ../src/vikwindow.c:1970 +#: ../src/vikwindow.c:1967 msgid "Save and Exit" msgstr "U_ložit a ukonÄit" -#: ../src/vikwindow.c:1970 +#: ../src/vikwindow.c:1967 msgid "Save and Exit the program" msgstr "Uložit a ukonÄit aplikaci" -#: ../src/vikwindow.c:1972 +#: ../src/vikwindow.c:1969 msgid "Go To location" msgstr "JÃt na mÃsto..." -#: ../src/vikwindow.c:1972 +#: ../src/vikwindow.c:1969 msgid "Go to address/place using text search" msgstr "JÃt na adresu pomocà vyhledávánÃ" -#: ../src/vikwindow.c:1973 +#: ../src/vikwindow.c:1970 msgid "_Go to Lat\\/Lon..." msgstr "_JÃt na souÅ™adnice..." -#: ../src/vikwindow.c:1973 +#: ../src/vikwindow.c:1970 msgid "Go to arbitrary lat\\/lon coordinate" msgstr "JÃt na libovolné zemÄ›pisné souÅ™adnice" -#: ../src/vikwindow.c:1974 +#: ../src/vikwindow.c:1971 msgid "Go to UTM..." msgstr "JÃt na souÅ™adnice _UTM..." -#: ../src/vikwindow.c:1974 +#: ../src/vikwindow.c:1971 msgid "Go to arbitrary UTM coordinate" msgstr "JÃt na libovolné UTM souÅ™adnice" -#: ../src/vikwindow.c:1975 +#: ../src/vikwindow.c:1972 msgid "Set Background Color..." msgstr "Nastavit _barvu pozadÃ" -#: ../src/vikwindow.c:1976 +#: ../src/vikwindow.c:1973 msgid "Zoom _In" msgstr "PÅ™_iblÞit" -#: ../src/vikwindow.c:1977 +#: ../src/vikwindow.c:1974 msgid "Zoom _Out" msgstr "_Oddálit" -#: ../src/vikwindow.c:1978 +#: ../src/vikwindow.c:1975 msgid "Zoom _To" msgstr "_ZmÄ›nit velikost na..." -#: ../src/vikwindow.c:1979 +#: ../src/vikwindow.c:1976 msgid "0.25" msgstr "0.25" -#: ../src/vikwindow.c:1980 +#: ../src/vikwindow.c:1977 msgid "0.5" msgstr "0.5" -#: ../src/vikwindow.c:1981 +#: ../src/vikwindow.c:1978 msgid "1" msgstr "1" -#: ../src/vikwindow.c:1982 +#: ../src/vikwindow.c:1979 msgid "2" msgstr "2" -#: ../src/vikwindow.c:1983 +#: ../src/vikwindow.c:1980 msgid "4" msgstr "4" -#: ../src/vikwindow.c:1984 +#: ../src/vikwindow.c:1981 msgid "8" msgstr "8" -#: ../src/vikwindow.c:1985 +#: ../src/vikwindow.c:1982 msgid "16" msgstr "16" -#: ../src/vikwindow.c:1986 +#: ../src/vikwindow.c:1983 msgid "32" msgstr "32" -#: ../src/vikwindow.c:1987 +#: ../src/vikwindow.c:1984 msgid "64" msgstr "64" -#: ../src/vikwindow.c:1988 +#: ../src/vikwindow.c:1985 msgid "128" msgstr "128" -#: ../src/vikwindow.c:1989 +#: ../src/vikwindow.c:1986 msgid "Pan North" msgstr "posun na sever" -#: ../src/vikwindow.c:1990 +#: ../src/vikwindow.c:1987 msgid "Pan East" msgstr "posun na východ" -#: ../src/vikwindow.c:1991 +#: ../src/vikwindow.c:1988 msgid "Pan South" msgstr "posun na jih" -#: ../src/vikwindow.c:1992 +#: ../src/vikwindow.c:1989 msgid "Pan West" msgstr "posun na západ" -#: ../src/vikwindow.c:1993 +#: ../src/vikwindow.c:1990 msgid "Background _Jobs" msgstr "Úlohy na _pozadÃ" -#: ../src/vikwindow.c:1995 +#: ../src/vikwindow.c:1992 msgid "Cu_t" msgstr "Vyjmou_t" -#: ../src/vikwindow.c:1996 +#: ../src/vikwindow.c:1993 msgid "_Copy" msgstr "_KopÃrovat" -#: ../src/vikwindow.c:1997 +#: ../src/vikwindow.c:1994 msgid "_Paste" msgstr "_Vložit" -#: ../src/vikwindow.c:1998 +#: ../src/vikwindow.c:1995 msgid "_Delete" msgstr "_Smazat" -#: ../src/vikwindow.c:1999 +#: ../src/vikwindow.c:1996 msgid "Delete All" msgstr "S_mazat vÅ¡e" -#: ../src/vikwindow.c:2000 +#: ../src/vikwindow.c:1997 +msgid "Flush Map cache" +msgstr "Smazánà cache:" + +#: ../src/vikwindow.c:1998 msgid "_Preferences..." msgstr "_PÅ™edvolby..." -#: ../src/vikwindow.c:2001 +#: ../src/vikwindow.c:1999 msgid "_Properties" msgstr "V_lastnosti" -#: ../src/vikwindow.c:2003 +#: ../src/vikwindow.c:2001 msgid "_About" msgstr "O _aplikaci" -#: ../src/vikwindow.c:2008 +#: ../src/vikwindow.c:2006 msgid "_UTM Mode" msgstr "_UTM mód" -#: ../src/vikwindow.c:2009 +#: ../src/vikwindow.c:2007 msgid "_Expedia Mode" msgstr "_Expedia mód" -#: ../src/vikwindow.c:2010 +#: ../src/vikwindow.c:2008 msgid "_Mercator Mode" msgstr "_Mercator mód" -#: ../src/vikwindow.c:2014 +#: ../src/vikwindow.c:2012 msgid "Pan Tool" msgstr "Posun" -#: ../src/vikwindow.c:2015 +#: ../src/vikwindow.c:2013 msgid "Zoom Tool" msgstr "Lupa" -#: ../src/vikwindow.c:2016 +#: ../src/vikwindow.c:2014 msgid "_Ruler" msgstr "_PravÃtko" -#: ../src/vikwindow.c:2016 +#: ../src/vikwindow.c:2014 msgid "Ruler Tool" msgstr "PravÃtko" -#: ../src/vikwindow.c:2020 +#: ../src/vikwindow.c:2018 msgid "Show Scale" msgstr "Zobrazit _měřÃtko" -#: ../src/vikwindow.c:2021 +#: ../src/vikwindow.c:2019 msgid "Show Center Mark" msgstr "Zobrazit _stÅ™ed" -#: ../src/vikwindow.c:2022 +#: ../src/vikwindow.c:2020 msgid "Full Screen" msgstr "Celá obrazovka" -#: ../src/vikwindow.c:2022 +#: ../src/vikwindow.c:2020 msgid "Activate full screen mode" msgstr "PÅ™es celou obrazovku" -#: ../src/vikwindow.c:2023 +#: ../src/vikwindow.c:2021 msgid "Show Side Panel" msgstr "BoÄnà panel vstev" -#: ../src/vikwindow.c:2085 +#: ../src/vikwindow.c:2083 #, c-format msgid "New %s Layer" msgstr "Nová %s vrstva" @@ -2090,40 +2114,5 @@ msgstr "Správce GPS a mapových dat" msgid "Viking" msgstr "Viking" -#~ msgid "Transparent Google Maps" -#~ msgstr "průhledné Google mapy" - -#~ msgid "Google Satellite Images" -#~ msgstr "Google satelitnà mapy" - -#~ msgid "Google Terrain Maps" -#~ msgstr "Google terénnà mapy" - -#~ msgid "Failed getting google version numbers" -#~ msgstr "Chyba pÅ™i zÃskávanà verze google ÄÃsel" - -#~ msgid "Old Google Maps" -#~ msgstr "staré Google mapy" - -#~ msgid "Keep current position at center" -#~ msgstr "Aktuálnà pozice uprostÅ™ed" - -#~ msgid "_Old Google Mode" -#~ msgstr "starý G_oogle mód" - -#~ msgid "Old _KH Mode" -#~ msgstr "starý _KH mód" - -#~ msgid "_Google Mode" -#~ msgstr "_Google mód" - -#, c-format -#~ msgid "couldn't open temp file %s" -#~ msgstr "nelze vytvoÅ™it doÄasný soubor: %s" - -#, c-format -#~ msgid "Failed downloading %s" -#~ msgstr "Staženà selhalo %s" - -#~ msgid "Failed fetching Google numbers (\"GLoadApi\" not found)" -#~ msgstr "Chyba pÅ™i stahovánà Google \"ÄÃsel\" (\"GLoadApi\" nenalezeno)" +#~ msgid "Maps Directory (Optional):" +#~ msgstr "Adresář map (volitelnÄ›)" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: viking\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-04 22:47+0100\n" +"POT-Creation-Date: 2009-08-20 09:50+0200\n" "PO-Revision-Date: 2009-02-04 22:19+0000\n" "Last-Translator: Guilhem Bonnefille <guilhem.bonnefille@gmail.com>\n" "Language-Team: Danish <da@li.org>\n" @@ -15,7 +15,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-02-08 13:36+0000\n" +"X-Launchpad-Export-Date: 2009-09-09 20:12+0000\n" "X-Generator: Launchpad (build Unknown)\n" #: ../src/acquire.c:118 @@ -26,28 +26,28 @@ msgstr "Arbejder..." msgid "Error: acquisition failed." msgstr "" -#: ../src/acquire.c:149 ../src/vikgpslayer.c:957 +#: ../src/acquire.c:149 ../src/vikgpslayer.c:953 msgid "Done." msgstr "Færdig." -#: ../src/acquire.c:326 ../src/vikgpslayer.c:996 +#: ../src/acquire.c:326 ../src/vikgpslayer.c:992 msgid "Status: detecting gpsbabel" msgstr "" -#: ../src/background.c:54 +#: ../src/background.c:57 #, c-format msgid "%d items" msgstr "%d emner" -#: ../src/background.c:212 +#: ../src/background.c:224 msgid "Job" msgstr "Opgave" -#: ../src/background.c:216 +#: ../src/background.c:228 msgid "Progress" msgstr "Fremdrift" -#: ../src/background.c:227 +#: ../src/background.c:239 msgid "Viking Background Jobs" msgstr "Viking baggrundsjob" @@ -72,7 +72,7 @@ msgid "" "into." msgstr "" -#: ../src/curl_download.c:85 +#: ../src/curl_download.c:94 #, c-format msgid "%s() Curl perform failed: %s" msgstr "" @@ -344,14 +344,14 @@ msgstr "Hentet fra GPS" msgid "using cmdline '%s' and file '%s'\n" msgstr "" -#: ../src/datasource_gps.c:150 ../src/vikgpslayer.c:711 +#: ../src/datasource_gps.c:150 ../src/vikgpslayer.c:707 #, c-format msgid "Downloading %d waypoint..." msgid_plural "Downloading %d waypoints..." msgstr[0] "" msgstr[1] "" -#: ../src/datasource_gps.c:152 ../src/vikgpslayer.c:713 +#: ../src/datasource_gps.c:152 ../src/vikgpslayer.c:709 #, c-format msgid "Downloading %d trackpoint..." msgid_plural "Downloading %d trackpoints..." @@ -368,7 +368,7 @@ msgstr "Downloadet %d ud af %d %s..." msgid "Downloaded %d %s." msgstr "Downloaded %d %s." -#: ../src/datasource_gps.c:185 ../src/vikgpslayer.c:783 +#: ../src/datasource_gps.c:185 ../src/vikgpslayer.c:779 #, c-format msgid "GPS Device: %s" msgstr "GPS udstyr: %s" @@ -381,7 +381,7 @@ msgstr "GPS protekol:" msgid "Serial Port:" msgstr "" -#: ../src/datasource_gps.c:299 ../src/vikgpslayer.c:1001 +#: ../src/datasource_gps.c:299 ../src/vikgpslayer.c:997 msgid "GPS device: N/A" msgstr "GPS udstyr: N/A" @@ -412,6 +412,10 @@ msgstr "" msgid "Draw mode '%s' no more supported" msgstr "" +#: ../src/mapcache.c:63 +msgid "Mapcache memory size (MB):" +msgstr "" + #: ../src/print.c:53 msgid "None" msgstr "Ingen" @@ -454,11 +458,11 @@ msgstr "" msgid "Image S_ize:" msgstr "B_illed størrelse:" -#: ../src/util.c:75 +#: ../src/util.c:76 msgid "Could not launch web browser." msgstr "Kunne ikke starte web browser." -#: ../src/util.c:86 +#: ../src/util.c:87 msgid "Could not create new email." msgstr "" @@ -673,11 +677,11 @@ msgstr "" msgid "Downloading DEM %s" msgstr "" -#: ../src/vikfileentry.c:67 +#: ../src/vikfileentry.c:68 msgid "Browse..." msgstr "Gennemse..." -#: ../src/vikfileentry.c:94 +#: ../src/vikfileentry.c:96 msgid "Choose file" msgstr "Vælg fil" @@ -790,11 +794,11 @@ msgstr "Gpsd port:" msgid "Gpsd Retry Interval (seconds):" msgstr "" -#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:989 +#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:985 msgid "GPS Download" msgstr "GPS download" -#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:989 +#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:985 msgid "GPS Upload" msgstr "GPS upload" @@ -802,110 +806,110 @@ msgstr "GPS upload" msgid "GPS Realtime Tracking" msgstr "" -#: ../src/vikgpslayer.c:373 +#: ../src/vikgpslayer.c:371 msgid "Unknown GPS Protocol" msgstr "Ukendt GPS protekol" -#: ../src/vikgpslayer.c:379 +#: ../src/vikgpslayer.c:377 msgid "Unknown serial port device" msgstr "" -#: ../src/vikgpslayer.c:444 +#: ../src/vikgpslayer.c:442 #, c-format msgid "%s: unknown parameter" msgstr "%s: ukendt parameter" -#: ../src/vikgpslayer.c:545 +#: ../src/vikgpslayer.c:541 msgid "Upload to GPS" msgstr "Upload til GPS" -#: ../src/vikgpslayer.c:550 +#: ../src/vikgpslayer.c:546 msgid "Download from GPS" msgstr "Download fra GPS" -#: ../src/vikgpslayer.c:568 +#: ../src/vikgpslayer.c:564 msgid "Empty Upload" msgstr "Tom upload" -#: ../src/vikgpslayer.c:573 +#: ../src/vikgpslayer.c:569 msgid "Empty Download" msgstr "Tom download" -#: ../src/vikgpslayer.c:578 +#: ../src/vikgpslayer.c:574 msgid "Empty All" msgstr "Tøm alt" -#: ../src/vikgpslayer.c:718 +#: ../src/vikgpslayer.c:714 #, c-format msgid "Uploading %d waypoint..." msgid_plural "Uploading %d waypoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:720 +#: ../src/vikgpslayer.c:716 #, c-format msgid "Uploading %d trackpoint..." msgid_plural "Uploading %d trackpoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:744 +#: ../src/vikgpslayer.c:740 #, c-format msgid "Downloaded %d out of %d waypoint..." msgid_plural "Downloaded %d out of %d waypoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:746 +#: ../src/vikgpslayer.c:742 #, c-format msgid "Downloaded %d out of %d trackpoint..." msgid_plural "Downloaded %d out of %d trackpoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:750 +#: ../src/vikgpslayer.c:746 #, c-format msgid "Uploaded %d out of %d waypoint..." msgid_plural "Uploaded %d out of %d waypoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:752 +#: ../src/vikgpslayer.c:748 #, c-format msgid "Uploaded %d out of %d trackpoint..." msgid_plural "Uploaded %d out of %d trackpoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:759 +#: ../src/vikgpslayer.c:755 #, c-format msgid "Downloaded %d waypoint" msgid_plural "Downloaded %d waypoints" msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:761 +#: ../src/vikgpslayer.c:757 #, c-format msgid "Downloaded %d trackpoint" msgid_plural "Downloaded %d trackpoints" msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:765 +#: ../src/vikgpslayer.c:761 #, c-format msgid "Uploaded %d waypoint" msgid_plural "Uploaded %d waypoints" msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:767 +#: ../src/vikgpslayer.c:763 #, c-format msgid "Uploaded %d trackpoint" msgid_plural "Uploaded %d trackpoints" msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:952 +#: ../src/vikgpslayer.c:948 msgid "Error: couldn't find gpsbabel." msgstr "" @@ -959,7 +963,7 @@ msgid "Map Type:" msgstr "Kort type:" #: ../src/vikmapslayer.c:120 -msgid "Maps Directory (Optional):" +msgid "Maps Directory:" msgstr "" #: ../src/vikmapslayer.c:121 @@ -1004,51 +1008,51 @@ msgid "" "factor" msgstr "" -#: ../src/vikmapslayer.c:924 +#: ../src/vikmapslayer.c:927 #, c-format msgid "Redownloading up to %d %s map..." msgid_plural "Redownloading up to %d %s maps..." msgstr[0] "" msgstr[1] "" -#: ../src/vikmapslayer.c:926 +#: ../src/vikmapslayer.c:929 #, c-format msgid "Redownloading %d %s map..." msgid_plural "Redownloading %d %s maps..." msgstr[0] "" msgstr[1] "" -#: ../src/vikmapslayer.c:930 ../src/vikmapslayer.c:1001 +#: ../src/vikmapslayer.c:933 ../src/vikmapslayer.c:1004 #, c-format msgid "Downloading %d %s map..." msgid_plural "Downloading %d %s maps..." msgstr[0] "Downloader %d %s kort..." -#: ../src/vikmapslayer.c:1058 +#: ../src/vikmapslayer.c:1061 msgid "Redownload bad map(s)" msgstr "" -#: ../src/vikmapslayer.c:1062 +#: ../src/vikmapslayer.c:1065 msgid "Redownload all map(s)" msgstr "Gendownload alle kort" -#: ../src/vikmapslayer.c:1142 +#: ../src/vikmapslayer.c:1145 #, c-format msgid "" "Wrong drawmode for this map.\n" "Select \"%s\" from View menu and try again." msgstr "" -#: ../src/vikmapslayer.c:1147 +#: ../src/vikmapslayer.c:1150 msgid "Wrong zoom level for this map." msgstr "Forkert zoom niveau for dette kort." -#: ../src/vikmapslayer.c:1172 +#: ../src/vikmapslayer.c:1175 msgid "Download Onscreen Maps" msgstr "" #. TODO Add GTK_STOCK_REFRESH icon -#: ../src/vikmapslayer.c:1178 +#: ../src/vikmapslayer.c:1181 msgid "Refresh Onscreen Tiles" msgstr "" @@ -1236,12 +1240,12 @@ msgstr "" msgid "Export Layer" msgstr "Eksportér lag" -#: ../src/viktrwlayer.c:1565 ../src/vikwindow.c:1446 ../src/vikwindow.c:1820 +#: ../src/viktrwlayer.c:1565 ../src/vikwindow.c:1438 ../src/vikwindow.c:1817 #, c-format msgid "The file \"%s\" exists, do you wish to overwrite it?" msgstr "Filen \"%s\" eksisterer, ønsker du at overskrive den?" -#: ../src/viktrwlayer.c:1575 ../src/vikwindow.c:1464 +#: ../src/viktrwlayer.c:1575 ../src/vikwindow.c:1456 msgid "The filename you requested could not be opened for writing." msgstr "Filnavnet du anmodede om kunne ikke Ã¥bnes til skrivning." @@ -1257,71 +1261,71 @@ msgstr "" msgid "Waypoint not found in this layer." msgstr "" -#: ../src/viktrwlayer.c:1724 +#: ../src/viktrwlayer.c:1723 msgid "Goto Center of Layer" msgstr "" -#: ../src/viktrwlayer.c:1729 +#: ../src/viktrwlayer.c:1728 msgid "Goto Waypoint" msgstr "" -#: ../src/viktrwlayer.c:1735 +#: ../src/viktrwlayer.c:1734 msgid "Export layer" msgstr "" -#: ../src/viktrwlayer.c:1740 +#: ../src/viktrwlayer.c:1739 msgid "Export as GPSPoint" msgstr "" -#: ../src/viktrwlayer.c:1745 +#: ../src/viktrwlayer.c:1744 msgid "Export as GPSMapper" msgstr "" -#: ../src/viktrwlayer.c:1750 +#: ../src/viktrwlayer.c:1749 msgid "Export as GPX" msgstr "Ekspotér som GPX" -#: ../src/viktrwlayer.c:1755 ../src/viktrwlayer.c:2794 +#: ../src/viktrwlayer.c:1754 ../src/viktrwlayer.c:2794 msgid "New Waypoint" msgstr "" -#: ../src/viktrwlayer.c:1762 +#: ../src/viktrwlayer.c:1761 msgid "Add Wikipedia Waypoints" msgstr "" -#: ../src/viktrwlayer.c:1767 +#: ../src/viktrwlayer.c:1766 msgid "Within layer bounds" msgstr "" -#: ../src/viktrwlayer.c:1772 +#: ../src/viktrwlayer.c:1771 msgid "Within current view" msgstr "" -#: ../src/viktrwlayer.c:1779 ../src/viktrwlayer.c:2760 +#: ../src/viktrwlayer.c:1778 ../src/viktrwlayer.c:2760 msgid "Upload to OSM" msgstr "" -#: ../src/viktrwlayer.c:2290 +#: ../src/viktrwlayer.c:2289 msgid "Failed. This track does not have timestamp" msgstr "" -#: ../src/viktrwlayer.c:2304 +#: ../src/viktrwlayer.c:2303 msgid "Failed. No other track in this layer has timestamp" msgstr "" -#: ../src/viktrwlayer.c:2310 +#: ../src/viktrwlayer.c:2309 msgid "Merge with..." msgstr "" -#: ../src/viktrwlayer.c:2310 +#: ../src/viktrwlayer.c:2309 msgid "Select track to merge with" msgstr "" -#: ../src/viktrwlayer.c:2347 +#: ../src/viktrwlayer.c:2346 msgid "Merge Threshold..." msgstr "" -#: ../src/viktrwlayer.c:2348 +#: ../src/viktrwlayer.c:2347 msgid "Merge when time between tracks less than:" msgstr "" @@ -1397,131 +1401,131 @@ msgstr "" msgid "Use with filter" msgstr "" -#: ../src/viktrwlayer.c:3736 +#: ../src/viktrwlayer.c:3735 msgid "Could not launch eog to open file." msgstr "" -#: ../src/viktrwlayer.c:3790 +#: ../src/viktrwlayer.c:3789 #, c-format msgid "Creating %d Image Thumbnails..." msgstr "" -#: ../src/viktrwlayer.c:4010 +#: ../src/viktrwlayer.c:4009 msgid "No map layer in use. Create one first" msgstr "Ingen kortlag i brug. Skab en først" -#: ../src/viktrwlayer_propwin.c:658 +#: ../src/viktrwlayer_propwin.c:661 msgid "Failed spliting track. Track unchanged" msgstr "" -#: ../src/viktrwlayer_propwin.c:675 +#: ../src/viktrwlayer_propwin.c:678 msgid "Operation Aborted. Track unchanged" msgstr "" -#: ../src/viktrwlayer_propwin.c:729 +#: ../src/viktrwlayer_propwin.c:732 #, c-format msgid "%s - Track Properties" msgstr "" -#: ../src/viktrwlayer_propwin.c:734 +#: ../src/viktrwlayer_propwin.c:737 msgid "Split at Marker" msgstr "" -#: ../src/viktrwlayer_propwin.c:735 +#: ../src/viktrwlayer_propwin.c:738 msgid "Split Segments" msgstr "" -#: ../src/viktrwlayer_propwin.c:736 +#: ../src/viktrwlayer_propwin.c:739 msgid "Reverse" msgstr "Omvendt" -#: ../src/viktrwlayer_propwin.c:737 +#: ../src/viktrwlayer_propwin.c:740 msgid "Delete Dupl." msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Comment:</b>" msgstr "<b>Kommentar:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Track Length:</b>" msgstr "<b>Spor længde:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Trackpoints:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Segments:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Duplicate Points:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Max Speed:</b>" msgstr "<b>Max hastighed:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Avg. Speed:</b>" msgstr "<b>Gennemsnitlig hastighed:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Avg. Dist. Between TPs:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Elevation Range:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Total Elevation Gain/Loss:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Start:</b>" msgstr "<b>Start:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>End:</b>" msgstr "<b>Slut:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Duration:</b>" msgstr "<b>Varighed:</b>" -#: ../src/viktrwlayer_propwin.c:788 ../src/viktrwlayer_propwin.c:795 -#: ../src/viktrwlayer_propwin.c:804 ../src/viktrwlayer_propwin.c:811 -#: ../src/viktrwlayer_propwin.c:850 ../src/viktrwlayer_propwin.c:851 -#: ../src/viktrwlayer_propwin.c:852 ../src/viktrwlayer_propwin.c:874 -#: ../src/viktrwlayer_propwin.c:881 +#: ../src/viktrwlayer_propwin.c:791 ../src/viktrwlayer_propwin.c:798 +#: ../src/viktrwlayer_propwin.c:807 ../src/viktrwlayer_propwin.c:814 +#: ../src/viktrwlayer_propwin.c:853 ../src/viktrwlayer_propwin.c:854 +#: ../src/viktrwlayer_propwin.c:855 ../src/viktrwlayer_propwin.c:877 +#: ../src/viktrwlayer_propwin.c:884 #, c-format msgid "No Data" msgstr "Ingen data" -#: ../src/viktrwlayer_propwin.c:847 +#: ../src/viktrwlayer_propwin.c:850 #, c-format msgid "%d minutes" msgstr "%d minutter" -#: ../src/viktrwlayer_propwin.c:870 +#: ../src/viktrwlayer_propwin.c:873 msgid "Statistics" msgstr "" -#: ../src/viktrwlayer_propwin.c:875 +#: ../src/viktrwlayer_propwin.c:878 msgid "<b>Track Distance:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:876 +#: ../src/viktrwlayer_propwin.c:879 msgid "Elevation-distance" msgstr "" -#: ../src/viktrwlayer_propwin.c:882 +#: ../src/viktrwlayer_propwin.c:885 msgid "<b>Track Time:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:883 +#: ../src/viktrwlayer_propwin.c:886 msgid "Speed-time" msgstr "Hastighed-tid" @@ -1561,31 +1565,47 @@ msgstr "<b>Tidsforskel:</b>" msgid "<b>\"Speed\" Between:</b>" msgstr "<b>\"Hastighed\" mellem:</b>" -#: ../src/viktrwlayer_tpwin.c:117 -msgid "Trackpoint" +#: ../src/viktrwlayer_tpwin.c:110 +msgid "<b>VDOP:</b>" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:111 +msgid "<b>HDOP:</b>" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:112 +msgid "<b>PDOP:</b>" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:113 +msgid "<b>SAT/FIX:</b>" msgstr "" #: ../src/viktrwlayer_tpwin.c:122 +msgid "Trackpoint" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:127 msgid "Split Here" msgstr "Opdel her" -#: ../src/viktrwlayer_tpwin.c:123 +#: ../src/viktrwlayer_tpwin.c:128 msgid "Join With Last" msgstr "" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Pan" msgstr "" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Zoom" msgstr "Zoom" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Ruler" msgstr "Lineal" -#: ../src/vikwindow.c:363 +#: ../src/vikwindow.c:364 #, c-format msgid "" "Do you want to save the changes you made to the document \"%s\"?\n" @@ -1593,441 +1613,445 @@ msgid "" "Your changes will be lost if you don't save them." msgstr "" -#: ../src/vikwindow.c:366 ../src/vikwindow.c:1314 +#: ../src/vikwindow.c:367 ../src/vikwindow.c:1306 msgid "Untitled" msgstr "Uden navn" -#: ../src/vikwindow.c:367 +#: ../src/vikwindow.c:368 msgid "Don't Save" msgstr "Gem ikke" -#: ../src/vikwindow.c:400 +#: ../src/vikwindow.c:401 msgid "mpp" msgstr "" -#: ../src/vikwindow.c:400 +#: ../src/vikwindow.c:401 msgid "pixelfact" msgstr "" -#: ../src/vikwindow.c:527 +#: ../src/vikwindow.c:528 #, c-format msgid "%s %s %dm" msgstr "" -#: ../src/vikwindow.c:529 +#: ../src/vikwindow.c:530 #, c-format msgid "%s %s" msgstr "" -#: ../src/vikwindow.c:1113 +#: ../src/vikwindow.c:1105 msgid "You must select a layer to show its properties." msgstr "" -#: ../src/vikwindow.c:1129 +#: ../src/vikwindow.c:1121 msgid "You must select a layer to delete." msgstr "" -#: ../src/vikwindow.c:1347 +#: ../src/vikwindow.c:1339 msgid "The file you requested could not be opened." msgstr "Den fil du anmodede om kunne ikke Ã¥bnes." -#: ../src/vikwindow.c:1390 +#: ../src/vikwindow.c:1382 msgid "Please select a GPS data file to open. " msgstr "Vælg venligst en GPS data fil. " -#: ../src/vikwindow.c:1433 +#: ../src/vikwindow.c:1425 msgid "Save as Viking File." msgstr "Gem som Viking fil." -#: ../src/vikwindow.c:1667 +#: ../src/vikwindow.c:1664 msgid "" "Viewable region outside allowable pixel size bounds for image. Clipping " "width/height values." msgstr "" -#: ../src/vikwindow.c:1686 +#: ../src/vikwindow.c:1683 #, c-format msgid "Total area: %ldm x %ldm (%.3f sq. km)" msgstr "" #. todo: default for answers inside VikWindow or static (thruout instance) -#: ../src/vikwindow.c:1694 +#: ../src/vikwindow.c:1691 msgid "Save to Image File" msgstr "Gem til billedfil" -#: ../src/vikwindow.c:1712 +#: ../src/vikwindow.c:1709 msgid "Width (pixels):" msgstr "Bredde (pixels):" -#: ../src/vikwindow.c:1714 +#: ../src/vikwindow.c:1711 msgid "Height (pixels):" msgstr "Højde (pixels):" -#: ../src/vikwindow.c:1717 +#: ../src/vikwindow.c:1714 msgid "Zoom (meters per pixel):" msgstr "Zoom (meter pr pixel):" -#: ../src/vikwindow.c:1723 +#: ../src/vikwindow.c:1720 msgid "Area in current viewable window" msgstr "" -#: ../src/vikwindow.c:1733 +#: ../src/vikwindow.c:1730 msgid "Save as PNG" msgstr "Gem som PNG" -#: ../src/vikwindow.c:1734 +#: ../src/vikwindow.c:1731 msgid "Save as JPEG" msgstr "Gem som JPEG" -#: ../src/vikwindow.c:1754 +#: ../src/vikwindow.c:1751 msgid "East-west image tiles:" msgstr "" -#: ../src/vikwindow.c:1756 +#: ../src/vikwindow.c:1753 msgid "North-south image tiles:" msgstr "" -#: ../src/vikwindow.c:1796 +#: ../src/vikwindow.c:1793 msgid "You must be in UTM mode to use this feature" msgstr "Du skal være i UTM mode for at bruge denne facilitet" -#: ../src/vikwindow.c:1807 +#: ../src/vikwindow.c:1804 msgid "Save Image" msgstr "Gem billede" -#: ../src/vikwindow.c:1834 +#: ../src/vikwindow.c:1831 msgid "Choose a directory to hold images" msgstr "" -#: ../src/vikwindow.c:1920 +#: ../src/vikwindow.c:1917 msgid "Choose a background color" msgstr "Vælg en baggrundsfarve" -#: ../src/vikwindow.c:1941 +#: ../src/vikwindow.c:1938 msgid "_File" msgstr "_Fil" -#: ../src/vikwindow.c:1942 +#: ../src/vikwindow.c:1939 msgid "_Edit" msgstr "_Redigér" -#: ../src/vikwindow.c:1943 +#: ../src/vikwindow.c:1940 msgid "_View" msgstr "_Vis" -#: ../src/vikwindow.c:1944 ../src/vikwindow.c:2015 +#: ../src/vikwindow.c:1941 ../src/vikwindow.c:2013 msgid "_Zoom" msgstr "_Zoom" -#: ../src/vikwindow.c:1945 ../src/vikwindow.c:2014 +#: ../src/vikwindow.c:1942 ../src/vikwindow.c:2012 msgid "_Pan" msgstr "" -#: ../src/vikwindow.c:1946 +#: ../src/vikwindow.c:1943 msgid "_Layers" msgstr "_Lag" -#: ../src/vikwindow.c:1947 +#: ../src/vikwindow.c:1944 msgid "_Tools" msgstr "Værk_tøjer" -#: ../src/vikwindow.c:1948 +#: ../src/vikwindow.c:1945 msgid "_Webtools" msgstr "" -#: ../src/vikwindow.c:1949 +#: ../src/vikwindow.c:1946 msgid "_Help" msgstr "_Hjælp" -#: ../src/vikwindow.c:1951 +#: ../src/vikwindow.c:1948 msgid "_New" msgstr "_Ny" -#: ../src/vikwindow.c:1951 +#: ../src/vikwindow.c:1948 msgid "New file" msgstr "Ny fil" -#: ../src/vikwindow.c:1952 +#: ../src/vikwindow.c:1949 msgid "_Open" msgstr "_Ã…bn" -#: ../src/vikwindow.c:1952 +#: ../src/vikwindow.c:1949 msgid "Open a file" msgstr "Ã…bn en fil" -#: ../src/vikwindow.c:1953 +#: ../src/vikwindow.c:1950 msgid "A_ppend File" msgstr "" -#: ../src/vikwindow.c:1953 +#: ../src/vikwindow.c:1950 msgid "Append data from a different file" msgstr "" -#: ../src/vikwindow.c:1954 +#: ../src/vikwindow.c:1951 msgid "A_cquire" msgstr "" -#: ../src/vikwindow.c:1955 +#: ../src/vikwindow.c:1952 msgid "From _GPS" msgstr "Fra _GPS" -#: ../src/vikwindow.c:1955 +#: ../src/vikwindow.c:1952 msgid "Transfer data from a GPS device" msgstr "Overfør data fra GPS udstyr" -#: ../src/vikwindow.c:1956 +#: ../src/vikwindow.c:1953 msgid "Google _Directions" msgstr "" -#: ../src/vikwindow.c:1956 +#: ../src/vikwindow.c:1953 msgid "Get driving directions from Google" msgstr "FÃ¥ kørselsanvisninger fra Google" -#: ../src/vikwindow.c:1958 +#: ../src/vikwindow.c:1955 msgid "Geo_caches" msgstr "Geo_caches" -#: ../src/vikwindow.c:1958 +#: ../src/vikwindow.c:1955 msgid "Get Geocaches from geocaching.com" msgstr "FÃ¥ Geocaches fra geocaching.com" -#: ../src/vikwindow.c:1960 +#: ../src/vikwindow.c:1957 msgid "_Save" msgstr "_Gem" -#: ../src/vikwindow.c:1960 +#: ../src/vikwindow.c:1957 msgid "Save the file" msgstr "Gem filen" -#: ../src/vikwindow.c:1961 +#: ../src/vikwindow.c:1958 msgid "Save _As" msgstr "Gem _som" -#: ../src/vikwindow.c:1961 +#: ../src/vikwindow.c:1958 msgid "Save the file under different name" msgstr "Gem filen under et andet navn" -#: ../src/vikwindow.c:1962 +#: ../src/vikwindow.c:1959 msgid "_Generate Image File" msgstr "" -#: ../src/vikwindow.c:1962 +#: ../src/vikwindow.c:1959 msgid "Save a snapshot of the workspace into a file" msgstr "" -#: ../src/vikwindow.c:1963 +#: ../src/vikwindow.c:1960 msgid "Generate _Directory of Images" msgstr "" -#: ../src/vikwindow.c:1963 +#: ../src/vikwindow.c:1960 msgid "FIXME:IMGDIR" msgstr "" -#: ../src/vikwindow.c:1966 +#: ../src/vikwindow.c:1963 msgid "_Print..." msgstr "_Udskriv..." -#: ../src/vikwindow.c:1966 +#: ../src/vikwindow.c:1963 msgid "Print maps" msgstr "Udskriv kort" -#: ../src/vikwindow.c:1969 +#: ../src/vikwindow.c:1966 msgid "E_xit" msgstr "A_fslut" -#: ../src/vikwindow.c:1969 +#: ../src/vikwindow.c:1966 msgid "Exit the program" msgstr "Afslut programmet" -#: ../src/vikwindow.c:1970 +#: ../src/vikwindow.c:1967 msgid "Save and Exit" msgstr "Gem og afslut" -#: ../src/vikwindow.c:1970 +#: ../src/vikwindow.c:1967 msgid "Save and Exit the program" msgstr "Gem og afslut programmet" -#: ../src/vikwindow.c:1972 +#: ../src/vikwindow.c:1969 msgid "Go To location" msgstr "" -#: ../src/vikwindow.c:1972 +#: ../src/vikwindow.c:1969 msgid "Go to address/place using text search" msgstr "" -#: ../src/vikwindow.c:1973 +#: ../src/vikwindow.c:1970 msgid "_Go to Lat\\/Lon..." msgstr "" -#: ../src/vikwindow.c:1973 +#: ../src/vikwindow.c:1970 msgid "Go to arbitrary lat\\/lon coordinate" msgstr "" -#: ../src/vikwindow.c:1974 +#: ../src/vikwindow.c:1971 msgid "Go to UTM..." msgstr "GÃ¥ til UTM..." -#: ../src/vikwindow.c:1974 +#: ../src/vikwindow.c:1971 msgid "Go to arbitrary UTM coordinate" msgstr "" -#: ../src/vikwindow.c:1975 +#: ../src/vikwindow.c:1972 msgid "Set Background Color..." msgstr "Sæt baggrundsfarve..." -#: ../src/vikwindow.c:1976 +#: ../src/vikwindow.c:1973 msgid "Zoom _In" msgstr "Zoom _ind" -#: ../src/vikwindow.c:1977 +#: ../src/vikwindow.c:1974 msgid "Zoom _Out" msgstr "Zoom _ud" -#: ../src/vikwindow.c:1978 +#: ../src/vikwindow.c:1975 msgid "Zoom _To" msgstr "Zoom _til" -#: ../src/vikwindow.c:1979 +#: ../src/vikwindow.c:1976 msgid "0.25" msgstr "0,25" -#: ../src/vikwindow.c:1980 +#: ../src/vikwindow.c:1977 msgid "0.5" msgstr "0,5" -#: ../src/vikwindow.c:1981 +#: ../src/vikwindow.c:1978 msgid "1" msgstr "1" -#: ../src/vikwindow.c:1982 +#: ../src/vikwindow.c:1979 msgid "2" msgstr "2" -#: ../src/vikwindow.c:1983 +#: ../src/vikwindow.c:1980 msgid "4" msgstr "4" -#: ../src/vikwindow.c:1984 +#: ../src/vikwindow.c:1981 msgid "8" msgstr "8" -#: ../src/vikwindow.c:1985 +#: ../src/vikwindow.c:1982 msgid "16" msgstr "16" -#: ../src/vikwindow.c:1986 +#: ../src/vikwindow.c:1983 msgid "32" msgstr "32" -#: ../src/vikwindow.c:1987 +#: ../src/vikwindow.c:1984 msgid "64" msgstr "64" -#: ../src/vikwindow.c:1988 +#: ../src/vikwindow.c:1985 msgid "128" msgstr "128" -#: ../src/vikwindow.c:1989 +#: ../src/vikwindow.c:1986 msgid "Pan North" msgstr "" -#: ../src/vikwindow.c:1990 +#: ../src/vikwindow.c:1987 msgid "Pan East" msgstr "" -#: ../src/vikwindow.c:1991 +#: ../src/vikwindow.c:1988 msgid "Pan South" msgstr "" -#: ../src/vikwindow.c:1992 +#: ../src/vikwindow.c:1989 msgid "Pan West" msgstr "" -#: ../src/vikwindow.c:1993 +#: ../src/vikwindow.c:1990 msgid "Background _Jobs" msgstr "Baggrunds_job" -#: ../src/vikwindow.c:1995 +#: ../src/vikwindow.c:1992 msgid "Cu_t" msgstr "K_lip" -#: ../src/vikwindow.c:1996 +#: ../src/vikwindow.c:1993 msgid "_Copy" msgstr "_Kopiér" -#: ../src/vikwindow.c:1997 +#: ../src/vikwindow.c:1994 msgid "_Paste" msgstr "_Sæt ind" -#: ../src/vikwindow.c:1998 +#: ../src/vikwindow.c:1995 msgid "_Delete" msgstr "_Slet" -#: ../src/vikwindow.c:1999 +#: ../src/vikwindow.c:1996 msgid "Delete All" msgstr "Slet alle" -#: ../src/vikwindow.c:2000 +#: ../src/vikwindow.c:1997 +msgid "Flush Map cache" +msgstr "" + +#: ../src/vikwindow.c:1998 msgid "_Preferences..." msgstr "" -#: ../src/vikwindow.c:2001 +#: ../src/vikwindow.c:1999 msgid "_Properties" msgstr "_Egenskaber" -#: ../src/vikwindow.c:2003 +#: ../src/vikwindow.c:2001 msgid "_About" msgstr "_Om" -#: ../src/vikwindow.c:2008 +#: ../src/vikwindow.c:2006 msgid "_UTM Mode" msgstr "" -#: ../src/vikwindow.c:2009 +#: ../src/vikwindow.c:2007 msgid "_Expedia Mode" msgstr "" -#: ../src/vikwindow.c:2010 +#: ../src/vikwindow.c:2008 msgid "_Mercator Mode" msgstr "" -#: ../src/vikwindow.c:2014 +#: ../src/vikwindow.c:2012 msgid "Pan Tool" msgstr "" -#: ../src/vikwindow.c:2015 +#: ../src/vikwindow.c:2013 msgid "Zoom Tool" msgstr "Zoomværktøj" -#: ../src/vikwindow.c:2016 +#: ../src/vikwindow.c:2014 msgid "_Ruler" msgstr "" -#: ../src/vikwindow.c:2016 +#: ../src/vikwindow.c:2014 msgid "Ruler Tool" msgstr "" -#: ../src/vikwindow.c:2020 +#: ../src/vikwindow.c:2018 msgid "Show Scale" msgstr "Vis skala" -#: ../src/vikwindow.c:2021 +#: ../src/vikwindow.c:2019 msgid "Show Center Mark" msgstr "" -#: ../src/vikwindow.c:2022 +#: ../src/vikwindow.c:2020 msgid "Full Screen" msgstr "" -#: ../src/vikwindow.c:2022 +#: ../src/vikwindow.c:2020 msgid "Activate full screen mode" msgstr "" -#: ../src/vikwindow.c:2023 +#: ../src/vikwindow.c:2021 msgid "Show Side Panel" msgstr "" -#: ../src/vikwindow.c:2085 +#: ../src/vikwindow.c:2083 #, c-format msgid "New %s Layer" msgstr "Ny %s lag" @@ -2043,29 +2067,3 @@ msgstr "" #: ../src/viking.desktop.in.h:3 msgid "Viking" msgstr "" - -#~ msgid "Transparent Google Maps" -#~ msgstr "Gennemsigtigt Google Kort" - -#~ msgid "Google Satellite Images" -#~ msgstr "Google satelit billeder" - -#~ msgid "Google Terrain Maps" -#~ msgstr "Google Terræn Kort" - -#~ msgid "Old Google Maps" -#~ msgstr "Gamle Google kort" - -#~ msgid "_Old Google Mode" -#~ msgstr "Gammel G_oogle tilstand" - -#~ msgid "_Google Mode" -#~ msgstr "_Google tilstand" - -#, c-format -#~ msgid "couldn't open temp file %s" -#~ msgstr "kunne ikke Ã¥bne den midlertidige fil %s" - -#, c-format -#~ msgid "Failed downloading %s" -#~ msgstr "Fejl ved download af %s" @@ -7,15 +7,15 @@ msgid "" msgstr "" "Project-Id-Version: viking\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-04 22:47+0100\n" -"PO-Revision-Date: 2009-02-04 22:19+0000\n" -"Last-Translator: Guilhem Bonnefille <guilhem.bonnefille@gmail.com>\n" +"POT-Creation-Date: 2009-08-20 09:50+0200\n" +"PO-Revision-Date: 2009-07-30 18:14+0000\n" +"Last-Translator: MarcusLS <MLS@gmx.de>\n" "Language-Team: German <de@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-02-08 13:36+0000\n" +"X-Launchpad-Export-Date: 2009-09-09 20:12+0000\n" "X-Generator: Launchpad (build Unknown)\n" #: ../src/acquire.c:118 @@ -24,32 +24,32 @@ msgstr "Arbeite..." #: ../src/acquire.c:141 msgid "Error: acquisition failed." -msgstr "" +msgstr "Fehler: Datenübertragung fehlgeschlagen" -#: ../src/acquire.c:149 ../src/vikgpslayer.c:957 +#: ../src/acquire.c:149 ../src/vikgpslayer.c:953 msgid "Done." msgstr "Fertig." -#: ../src/acquire.c:326 ../src/vikgpslayer.c:996 +#: ../src/acquire.c:326 ../src/vikgpslayer.c:992 msgid "Status: detecting gpsbabel" msgstr "suche gpsbabel" -#: ../src/background.c:54 +#: ../src/background.c:57 #, c-format msgid "%d items" msgstr "%d Teile" -#: ../src/background.c:212 +#: ../src/background.c:224 msgid "Job" msgstr "Job" -#: ../src/background.c:216 +#: ../src/background.c:228 msgid "Progress" msgstr "Fortschritt" -#: ../src/background.c:227 +#: ../src/background.c:239 msgid "Viking Background Jobs" -msgstr "" +msgstr "Viking Hintergrund-Programme" #: ../src/clipboard.c:84 msgid "paste failed" @@ -75,7 +75,7 @@ msgid "" "into." msgstr "Bitte eine zum Einfügen eines Wegpunktes geeignete Ebene auswählen." -#: ../src/curl_download.c:85 +#: ../src/curl_download.c:94 #, c-format msgid "%s() Curl perform failed: %s" msgstr "%s() Curl fehlgeschlagen: %s" @@ -94,23 +94,23 @@ msgstr "Längengrad:" #: ../src/dialog.c:115 msgid "Northing:" -msgstr "" +msgstr "Nördliche Deklinaton:" #: ../src/dialog.c:121 msgid "Easting:" -msgstr "" +msgstr "Östliche Deklination:" #: ../src/dialog.c:128 msgid "Zone:" -msgstr "" +msgstr "Zone:" #: ../src/dialog.c:131 msgid "Letter:" -msgstr "" +msgstr "Buchstabe:" #: ../src/dialog.c:192 msgid "Waypoint Properties" -msgstr "" +msgstr "Wegpunkt Eigenschaften" #: ../src/dialog.c:218 msgid "Name:" @@ -134,7 +134,7 @@ msgstr "SYmbol:" #: ../src/dialog.c:273 msgid "(none)" -msgstr "" +msgstr "(nichts)" #. TODO: other checks (isalpha or whatever ) #: ../src/dialog.c:328 @@ -148,44 +148,44 @@ msgstr "Der Wegpunkt \"%s\" existiert - soll er überschrieben werden?" #: ../src/dialog.c:462 ../src/geonamessearch.c:301 msgid "Nothing was selected" -msgstr "" +msgstr "Nichts ausgewählt" #: ../src/dialog.c:470 msgid "Add Track" -msgstr "" +msgstr "Track hinzufügen" #: ../src/dialog.c:478 msgid "Track Name:" -msgstr "" +msgstr "Track Name:" #: ../src/dialog.c:493 msgid "Please enter a name for the track." -msgstr "" +msgstr "Bitte einen Namen für den Track eingeben." #: ../src/dialog.c:497 #, c-format msgid "The track \"%s\" exists, do you want to overwrite it?" -msgstr "" +msgstr "Der Track \"%s\" existiert, überschreiben ?" #: ../src/dialog.c:559 msgid "Zoom Factors..." -msgstr "" +msgstr "Zoom Faktor" #: ../src/dialog.c:573 msgid "Zoom factor (in meters per pixel:" -msgstr "" +msgstr "Zoom Faktor (Meter pro Pixel)" #: ../src/dialog.c:574 msgid "X (easting): " -msgstr "" +msgstr "X (östlich): " #: ../src/dialog.c:575 msgid "Y (northing): " -msgstr "" +msgstr "Y (nördlich): " #: ../src/dialog.c:580 msgid "X and Y zoom factors must be equal" -msgstr "" +msgstr "Die Zoom-Fakoren X und Y müssen gleich sein." #: ../src/dialog.c:633 msgid "1 min" @@ -201,11 +201,11 @@ msgstr "1 Tag" #: ../src/dialog.c:636 msgid "Custom (in minutes):" -msgstr "" +msgstr "Einstellung (in Minuten)" #: ../src/dialog.c:691 msgid "GPS Data and Topo Analyzer, Explorer, and Manager." -msgstr "" +msgstr "GPS Daten und TOPO-Analyzer, Explorer und Manager," #: ../src/dialog.c:692 msgid "" @@ -226,7 +226,7 @@ msgstr "" #: ../src/dialog.c:726 msgid "Download along track" -msgstr "" +msgstr "Daten entlang des Tracks runterladen" #: ../src/dialog.c:728 msgid "Map type:" @@ -242,7 +242,7 @@ msgstr "Expedia Straßenkarten" #: ../src/expedia.c:79 msgid "Invalid expedia altitude" -msgstr "" +msgstr "Unzulässige Expedia Höhe" #: ../src/expedia.c:110 #, c-format @@ -250,6 +250,8 @@ msgid "" "Couldn't open EXPEDIA image file (right after successful download! Please " "report and delete image file!): %s" msgstr "" +"Kann EXPEDIA-Image Datei nicht öffnen (nach erfolgreichem Download! Bitte " +"berichten und löschen sie die Image-Datei !): %s" #: ../src/expedia.c:123 #, c-format @@ -257,6 +259,8 @@ msgid "" "Couldn't save EXPEDIA image file (right after successful download! Please " "report and delete image file!): %s" msgstr "" +"Kann EXPEDIA-Image Datei nicht speichern (nach erfolgreichem Download! Bitte " +"berichten und löschen sie die Image-Datei !): %s" #: ../src/geonamessearch.c:117 ../src/geonamessearch.c:133 #: ../src/geonamessearch.c:151 ../src/googlesearch.c:68 @@ -266,11 +270,11 @@ msgstr "Suche" #: ../src/geonamessearch.c:119 msgid "No entries found!" -msgstr "" +msgstr "Keine Einträge gefunden!" #: ../src/geonamessearch.c:135 ../src/googlesearch.c:70 msgid "I don't know that place. Do you want another search?" -msgstr "" +msgstr "Ort unbekannt. Wünschen sie eine andere Suche?" #: ../src/geonamessearch.c:153 ../src/googlesearch.c:88 msgid "Enter address or place name:" @@ -278,15 +282,15 @@ msgstr "Adresse oder Namen des Ortes eingeben:" #: ../src/geonamessearch.c:327 ../src/googlesearch.c:127 msgid "couldn't map temp file" -msgstr "" +msgstr "Aufzeichen der Zwischendatei fehlgeschlagen" #: ../src/geonamessearch.c:509 ../src/googlesearch.c:200 msgid "couldn't open temp file" -msgstr "" +msgstr "Kann Zwischendatei nicht öffnen" #: ../src/globals.c:41 msgid "Degree format:" -msgstr "" +msgstr "Angage in Grad:" #. Webtools #: ../src/google.c:34 @@ -295,36 +299,37 @@ msgstr "Google" #: ../src/datasource_gc.c:62 msgid "Download Geocaches" -msgstr "" +msgstr "Lade Geocaches" #: ../src/datasource_gc.c:63 msgid "Geocaching.com Caches" -msgstr "" +msgstr "Caches vog Geocaching.com" #: ../src/datasource_gc.c:78 msgid "geocaching.com username:" -msgstr "" +msgstr "geocaching.com user:" #: ../src/datasource_gc.c:79 msgid "geocaching.com password:" -msgstr "" +msgstr "geocaching.com PAsswort:" #: ../src/datasource_gc.c:107 msgid "" "Can't find gcget in path! Check that you have installed gcget correctly." msgstr "" +"Kann gcget nicht finden! Bitte prüfen ob gcget korrekt installiert ist." #: ../src/datasource_gc.c:169 msgid "Number geocaches:" -msgstr "" +msgstr "Anzahle Geocaches:" #: ../src/datasource_gc.c:171 msgid "Centered around:" -msgstr "" +msgstr "Mittelpunkt:" #: ../src/datasource_google.c:49 ../src/datasource_google.c:50 msgid "Google Directions" -msgstr "" +msgstr "Google Richtung" #: ../src/datasource_google.c:74 msgid "From:" @@ -336,45 +341,45 @@ msgstr "Zu:" #: ../src/datasource_gps.c:48 msgid "Acquire from GPS" -msgstr "" +msgstr "Hole vom GPS" #: ../src/datasource_gps.c:49 msgid "Acquired from GPS" -msgstr "" +msgstr "Vom GPS geladen" #: ../src/datasource_gps.c:133 #, c-format msgid "using cmdline '%s' and file '%s'\n" -msgstr "" +msgstr "Nutze Kommandozeile '%s' und Datei '%s'\n" -#: ../src/datasource_gps.c:150 ../src/vikgpslayer.c:711 +#: ../src/datasource_gps.c:150 ../src/vikgpslayer.c:707 #, c-format msgid "Downloading %d waypoint..." msgid_plural "Downloading %d waypoints..." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Lade %d Wegpunkt" +msgstr[1] "Lade %d Wegpunkte" -#: ../src/datasource_gps.c:152 ../src/vikgpslayer.c:713 +#: ../src/datasource_gps.c:152 ../src/vikgpslayer.c:709 #, c-format msgid "Downloading %d trackpoint..." msgid_plural "Downloading %d trackpoints..." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Lade %d Trackpunkt" +msgstr[1] "Lade %d Trackpunkte" #: ../src/datasource_gps.c:170 #, c-format msgid "Downloaded %d out of %d %s..." -msgstr "" +msgstr "%d runtergeladen von %d %s" #: ../src/datasource_gps.c:172 #, c-format msgid "Downloaded %d %s." -msgstr "" +msgstr "%d %s geladen" -#: ../src/datasource_gps.c:185 ../src/vikgpslayer.c:783 +#: ../src/datasource_gps.c:185 ../src/vikgpslayer.c:779 #, c-format msgid "GPS Device: %s" -msgstr "" +msgstr "GPS Gerät: %s" #: ../src/datasource_gps.c:262 ../src/vikgpslayer.c:133 msgid "GPS Protocol:" @@ -384,9 +389,9 @@ msgstr "GPS Protokoll:" msgid "Serial Port:" msgstr "Serieller Port:" -#: ../src/datasource_gps.c:299 ../src/vikgpslayer.c:1001 +#: ../src/datasource_gps.c:299 ../src/vikgpslayer.c:997 msgid "GPS device: N/A" -msgstr "" +msgstr "GPS Gerät: Nicht gefunden" #: ../src/dem.c:59 ../src/dem.c:73 msgid "Invalid DEM" @@ -403,16 +408,20 @@ msgstr "Ungültiger DEM Klasse B Eintrag: 1 erwartet" #: ../src/dem.c:354 #, c-format msgid "Couldn't map file %s: %s" -msgstr "" +msgstr "Kann Datei %s: %s nicht zeichnen" #: ../src/download.c:121 #, c-format msgid "Download error: %s" -msgstr "" +msgstr "Fehler beim runterladen: %s" #: ../src/file.c:426 ../src/file.c:430 #, c-format msgid "Draw mode '%s' no more supported" +msgstr "Zeichen-Modus '%s' nicht mehr unterstützt" + +#: ../src/mapcache.c:63 +msgid "Mapcache memory size (MB):" msgstr "" #: ../src/print.c:53 @@ -442,36 +451,36 @@ msgstr "fertig" #. Page Size #: ../src/print.c:579 msgid "_Adjust Page Size and Orientation" -msgstr "" +msgstr "_Adjustiere Seitengröße und Orientierung an" #: ../src/print.c:595 msgid "C_enter:" -msgstr "" +msgstr "C_enter (zentriere):" #. ignore page margins #: ../src/print.c:613 msgid "Ignore Page _Margins" -msgstr "" +msgstr "Ignoriere Seiten _Margins (Seitengrenze)" #: ../src/print.c:632 msgid "Image S_ize:" -msgstr "" +msgstr "Bilde S_ize (Bildgröße):" -#: ../src/util.c:75 +#: ../src/util.c:76 msgid "Could not launch web browser." -msgstr "" +msgstr "Kann Browser nicht starten" -#: ../src/util.c:86 +#: ../src/util.c:87 msgid "Could not create new email." -msgstr "" +msgstr "Kann E-Mai nicht erstellen" #: ../src/vikcoordlayer.c:46 ../src/vikdemlayer.c:110 msgid "Color:" -msgstr "" +msgstr "Farbe:" #: ../src/vikcoordlayer.c:47 msgid "Minutes Width:" -msgstr "" +msgstr "Minuten Dicke:" #: ../src/vikcoordlayer.c:48 ../src/vikdemlayer.c:113 msgid "Line Thickness:" @@ -483,11 +492,11 @@ msgstr "Maximale Anzahl von Punkten:" #: ../src/datasource_bfilter.c:54 msgid "Simplify All Tracks" -msgstr "" +msgstr "Vereinfache alle Tracks" #: ../src/datasource_bfilter.c:55 msgid "Simplified Tracks" -msgstr "" +msgstr "vereinfachte Tracks" #: ../src/datasource_bfilter.c:87 ../src/datasource_bfilter.c:88 msgid "Remove Duplicate Waypoints" @@ -495,56 +504,56 @@ msgstr "Doppelte Wegpunkte entfernen" #: ../src/datasource_bfilter.c:117 msgid "Waypoints Inside This" -msgstr "" +msgstr "Innere Wegpunkte in" #: ../src/datasource_bfilter.c:118 ../src/datasource_bfilter.c:151 msgid "Polygonzied Layer" -msgstr "" +msgstr "Ebene in Polygon" #: ../src/datasource_bfilter.c:150 msgid "Waypoints Outside This" -msgstr "" +msgstr "Der Wegpunkt liegt ausserhalb von" #: ../src/main.c:116 msgid "Use smaller symbols for waypoints" -msgstr "" +msgstr "Nutze kleiner Symbole für Wegpunkte" #: ../src/main.c:117 msgid "Enable debug output" -msgstr "" +msgstr "Mit Debug Ausgabe" #: ../src/main.c:118 msgid "Enable verbose output" -msgstr "" +msgstr "Mit Verlaufsprotokoll" #: ../src/main.c:119 msgid "Show version" -msgstr "" +msgstr "Zeige Version" #: ../src/osm.c:85 msgid "OSM (view)" -msgstr "" +msgstr "OSM (View)" #: ../src/osm.c:89 msgid "OSM (edit)" -msgstr "" +msgstr "OSM (Edit)" #: ../src/osm.c:93 msgid "OSM (render)" -msgstr "" +msgstr "OSM (Render)" #: ../src/osm-traces.c:77 msgid "OSM username:" -msgstr "" +msgstr "OSM Username:" #: ../src/osm-traces.c:78 msgid "OSM password:" -msgstr "" +msgstr "OSM Passwort:" #: ../src/osm-traces.c:218 #, c-format msgid "failed to upload data: HTTP response is %ld" -msgstr "" +msgstr "Fehler beim Hochladen (HTTP Fehler: %ld)" #: ../src/osm-traces.c:221 #, c-format @@ -559,16 +568,16 @@ msgstr "" #: ../src/osm-traces.c:253 #, c-format msgid "failed to open temporary file: %s" -msgstr "" +msgstr "Fehler beim öffen der Zwischendatei: %s" #: ../src/osm-traces.c:287 #, c-format msgid "failed to unlink temporary file: %s" -msgstr "" +msgstr "Fehler beim freigeben der Zwischendatei: %s" #: ../src/osm-traces.c:299 msgid "OSM upload" -msgstr "" +msgstr "OSM Upload" #: ../src/osm-traces.c:322 msgid "Email:" @@ -576,11 +585,11 @@ msgstr "E-Mail:" #: ../src/osm-traces.c:335 msgid "The email used as login" -msgstr "" +msgstr "E-Mail als login" #: ../src/osm-traces.c:336 msgid "Enter the email you use to login into www.openstreetmap.org." -msgstr "" +msgstr "Ihre E-Mailadresse für den login bei www.openstreetmap.org." #: ../src/osm-traces.c:338 msgid "Password:" @@ -588,11 +597,12 @@ msgstr "Passwort:" #: ../src/osm-traces.c:351 msgid "The password used to login" -msgstr "" +msgstr "Das Passwort für den Login" #: ../src/osm-traces.c:352 msgid "Enter the password you use to login into www.openstreetmap.org." msgstr "" +"Bitte geben sie das Passwort für den login bei www.openstreetmap.org ein" #: ../src/osm-traces.c:354 msgid "File's name:" @@ -607,22 +617,24 @@ msgid "" "This is the name of the file created on the server. This is not the name of " "the local file." msgstr "" +"Dies ist der Name der auf dem Server erstellten Datei. Das ist nicht der " +"Name der lokalen Datei." #: ../src/osm-traces.c:370 msgid "Description:" -msgstr "" +msgstr "Beschreibung:" #: ../src/osm-traces.c:377 msgid "The description of the trace" -msgstr "" +msgstr "Beschreibung des Aufzeichnung" #: ../src/osm-traces.c:380 msgid "Tags:" -msgstr "" +msgstr "Tags:" #: ../src/osm-traces.c:387 msgid "The tags associated to the trace" -msgstr "" +msgstr "Die zur Aufzeichnung gehörigen Tags:" #: ../src/osm-traces.c:390 msgid "Public" @@ -631,15 +643,16 @@ msgstr "Öffentlich" #: ../src/osm-traces.c:396 msgid "Indicates if the trace is public or not" msgstr "" +"Zeigt an, ob die Aufzeichnung öffentlich sichtbar sein soll oder nicht" #: ../src/osm-traces.c:417 #, c-format msgid "Uploading %s to OSM" -msgstr "" +msgstr "Hochladen von %s nach OSM" #: ../src/uibuilder.c:134 msgid "Take care that this password will be stored clearly in a plain file." -msgstr "" +msgstr "Achtung: Das Passwort wird in Klarschrift in einer Datei abgelegt." #: ../src/vikdemlayer.c:108 msgid "DEM Files:" @@ -675,11 +688,11 @@ msgstr "" msgid "Downloading DEM %s" msgstr "" -#: ../src/vikfileentry.c:67 +#: ../src/vikfileentry.c:68 msgid "Browse..." msgstr "Durchsuchen …" -#: ../src/vikfileentry.c:94 +#: ../src/vikfileentry.c:96 msgid "Choose file" msgstr "Datei auswählen" @@ -710,15 +723,15 @@ msgstr "Konnte Bild nicht öffnen: %s" #: ../src/vikgeoreflayer.c:293 msgid "Unexpected end of file reading World file." -msgstr "" +msgstr "Unerwartetes Ende beim einlesen der World-Datei." #: ../src/vikgeoreflayer.c:309 ../src/vikgeoreflayer.c:354 msgid "Choose World file" -msgstr "" +msgstr "Wähle World-Datei" #: ../src/vikgeoreflayer.c:322 msgid "The World file you requested could not be opened for reading." -msgstr "" +msgstr "Ihre gewünschte World-Datei kann zum einlesen nicht geöffnet werden." #: ../src/vikgeoreflayer.c:367 msgid "The file you requested could not be opened for writing." @@ -726,7 +739,7 @@ msgstr "" #: ../src/vikgeoreflayer.c:384 msgid "Layer Properties" -msgstr "" +msgstr "Ebenen-Eigenschaften" #: ../src/vikgeoreflayer.c:400 msgid "World File Parameters:" @@ -792,11 +805,11 @@ msgstr "" msgid "Gpsd Retry Interval (seconds):" msgstr "" -#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:989 +#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:985 msgid "GPS Download" msgstr "" -#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:989 +#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:985 msgid "GPS Upload" msgstr "" @@ -804,110 +817,110 @@ msgstr "" msgid "GPS Realtime Tracking" msgstr "" -#: ../src/vikgpslayer.c:373 +#: ../src/vikgpslayer.c:371 msgid "Unknown GPS Protocol" msgstr "Unbekanntes GPS Protokoll" -#: ../src/vikgpslayer.c:379 +#: ../src/vikgpslayer.c:377 msgid "Unknown serial port device" msgstr "" -#: ../src/vikgpslayer.c:444 +#: ../src/vikgpslayer.c:442 #, c-format msgid "%s: unknown parameter" msgstr "" -#: ../src/vikgpslayer.c:545 +#: ../src/vikgpslayer.c:541 msgid "Upload to GPS" msgstr "" -#: ../src/vikgpslayer.c:550 +#: ../src/vikgpslayer.c:546 msgid "Download from GPS" msgstr "" -#: ../src/vikgpslayer.c:568 +#: ../src/vikgpslayer.c:564 msgid "Empty Upload" msgstr "" -#: ../src/vikgpslayer.c:573 +#: ../src/vikgpslayer.c:569 msgid "Empty Download" msgstr "" -#: ../src/vikgpslayer.c:578 +#: ../src/vikgpslayer.c:574 msgid "Empty All" msgstr "" -#: ../src/vikgpslayer.c:718 +#: ../src/vikgpslayer.c:714 #, c-format msgid "Uploading %d waypoint..." msgid_plural "Uploading %d waypoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:720 +#: ../src/vikgpslayer.c:716 #, c-format msgid "Uploading %d trackpoint..." msgid_plural "Uploading %d trackpoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:744 +#: ../src/vikgpslayer.c:740 #, c-format msgid "Downloaded %d out of %d waypoint..." msgid_plural "Downloaded %d out of %d waypoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:746 +#: ../src/vikgpslayer.c:742 #, c-format msgid "Downloaded %d out of %d trackpoint..." msgid_plural "Downloaded %d out of %d trackpoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:750 +#: ../src/vikgpslayer.c:746 #, c-format msgid "Uploaded %d out of %d waypoint..." msgid_plural "Uploaded %d out of %d waypoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:752 +#: ../src/vikgpslayer.c:748 #, c-format msgid "Uploaded %d out of %d trackpoint..." msgid_plural "Uploaded %d out of %d trackpoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:759 +#: ../src/vikgpslayer.c:755 #, c-format msgid "Downloaded %d waypoint" msgid_plural "Downloaded %d waypoints" msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:761 +#: ../src/vikgpslayer.c:757 #, c-format msgid "Downloaded %d trackpoint" msgid_plural "Downloaded %d trackpoints" msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:765 +#: ../src/vikgpslayer.c:761 #, c-format msgid "Uploaded %d waypoint" msgid_plural "Uploaded %d waypoints" msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:767 +#: ../src/vikgpslayer.c:763 #, c-format msgid "Uploaded %d trackpoint" msgid_plural "Uploaded %d trackpoints" msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:952 +#: ../src/vikgpslayer.c:948 msgid "Error: couldn't find gpsbabel." msgstr "Fehler: gpsbabel nicht gefunden." @@ -961,7 +974,7 @@ msgid "Map Type:" msgstr "" #: ../src/vikmapslayer.c:120 -msgid "Maps Directory (Optional):" +msgid "Maps Directory:" msgstr "" #: ../src/vikmapslayer.c:121 @@ -1006,52 +1019,52 @@ msgid "" "factor" msgstr "" -#: ../src/vikmapslayer.c:924 +#: ../src/vikmapslayer.c:927 #, c-format msgid "Redownloading up to %d %s map..." msgid_plural "Redownloading up to %d %s maps..." msgstr[0] "" msgstr[1] "" -#: ../src/vikmapslayer.c:926 +#: ../src/vikmapslayer.c:929 #, c-format msgid "Redownloading %d %s map..." msgid_plural "Redownloading %d %s maps..." msgstr[0] "" msgstr[1] "" -#: ../src/vikmapslayer.c:930 ../src/vikmapslayer.c:1001 +#: ../src/vikmapslayer.c:933 ../src/vikmapslayer.c:1004 #, c-format msgid "Downloading %d %s map..." msgid_plural "Downloading %d %s maps..." msgstr[0] "" msgstr[1] "" -#: ../src/vikmapslayer.c:1058 +#: ../src/vikmapslayer.c:1061 msgid "Redownload bad map(s)" msgstr "" -#: ../src/vikmapslayer.c:1062 +#: ../src/vikmapslayer.c:1065 msgid "Redownload all map(s)" msgstr "" -#: ../src/vikmapslayer.c:1142 +#: ../src/vikmapslayer.c:1145 #, c-format msgid "" "Wrong drawmode for this map.\n" "Select \"%s\" from View menu and try again." msgstr "" -#: ../src/vikmapslayer.c:1147 +#: ../src/vikmapslayer.c:1150 msgid "Wrong zoom level for this map." msgstr "" -#: ../src/vikmapslayer.c:1172 +#: ../src/vikmapslayer.c:1175 msgid "Download Onscreen Maps" msgstr "" #. TODO Add GTK_STOCK_REFRESH icon -#: ../src/vikmapslayer.c:1178 +#: ../src/vikmapslayer.c:1181 msgid "Refresh Onscreen Tiles" msgstr "" @@ -1239,12 +1252,12 @@ msgstr "" msgid "Export Layer" msgstr "Ebene exportieren" -#: ../src/viktrwlayer.c:1565 ../src/vikwindow.c:1446 ../src/vikwindow.c:1820 +#: ../src/viktrwlayer.c:1565 ../src/vikwindow.c:1438 ../src/vikwindow.c:1817 #, c-format msgid "The file \"%s\" exists, do you wish to overwrite it?" msgstr "Soll die bereits existierende Datei \"%s\" überschrieben werden?" -#: ../src/viktrwlayer.c:1575 ../src/vikwindow.c:1464 +#: ../src/viktrwlayer.c:1575 ../src/vikwindow.c:1456 msgid "The filename you requested could not be opened for writing." msgstr "" @@ -1260,71 +1273,71 @@ msgstr "" msgid "Waypoint not found in this layer." msgstr "Wegpunkt nicht in dieser Ebene gefunden" -#: ../src/viktrwlayer.c:1724 +#: ../src/viktrwlayer.c:1723 msgid "Goto Center of Layer" msgstr "" -#: ../src/viktrwlayer.c:1729 +#: ../src/viktrwlayer.c:1728 msgid "Goto Waypoint" msgstr "" -#: ../src/viktrwlayer.c:1735 +#: ../src/viktrwlayer.c:1734 msgid "Export layer" msgstr "Ebene exportieren" -#: ../src/viktrwlayer.c:1740 +#: ../src/viktrwlayer.c:1739 msgid "Export as GPSPoint" msgstr "" -#: ../src/viktrwlayer.c:1745 +#: ../src/viktrwlayer.c:1744 msgid "Export as GPSMapper" msgstr "" -#: ../src/viktrwlayer.c:1750 +#: ../src/viktrwlayer.c:1749 msgid "Export as GPX" msgstr "" -#: ../src/viktrwlayer.c:1755 ../src/viktrwlayer.c:2794 +#: ../src/viktrwlayer.c:1754 ../src/viktrwlayer.c:2794 msgid "New Waypoint" msgstr "" -#: ../src/viktrwlayer.c:1762 +#: ../src/viktrwlayer.c:1761 msgid "Add Wikipedia Waypoints" msgstr "" -#: ../src/viktrwlayer.c:1767 +#: ../src/viktrwlayer.c:1766 msgid "Within layer bounds" msgstr "" -#: ../src/viktrwlayer.c:1772 +#: ../src/viktrwlayer.c:1771 msgid "Within current view" msgstr "" -#: ../src/viktrwlayer.c:1779 ../src/viktrwlayer.c:2760 +#: ../src/viktrwlayer.c:1778 ../src/viktrwlayer.c:2760 msgid "Upload to OSM" msgstr "" -#: ../src/viktrwlayer.c:2290 +#: ../src/viktrwlayer.c:2289 msgid "Failed. This track does not have timestamp" msgstr "" -#: ../src/viktrwlayer.c:2304 +#: ../src/viktrwlayer.c:2303 msgid "Failed. No other track in this layer has timestamp" msgstr "" -#: ../src/viktrwlayer.c:2310 +#: ../src/viktrwlayer.c:2309 msgid "Merge with..." msgstr "" -#: ../src/viktrwlayer.c:2310 +#: ../src/viktrwlayer.c:2309 msgid "Select track to merge with" msgstr "" -#: ../src/viktrwlayer.c:2347 +#: ../src/viktrwlayer.c:2346 msgid "Merge Threshold..." msgstr "" -#: ../src/viktrwlayer.c:2348 +#: ../src/viktrwlayer.c:2347 msgid "Merge when time between tracks less than:" msgstr "" @@ -1400,131 +1413,131 @@ msgstr "" msgid "Use with filter" msgstr "" -#: ../src/viktrwlayer.c:3736 +#: ../src/viktrwlayer.c:3735 msgid "Could not launch eog to open file." msgstr "" -#: ../src/viktrwlayer.c:3790 +#: ../src/viktrwlayer.c:3789 #, c-format msgid "Creating %d Image Thumbnails..." msgstr "" -#: ../src/viktrwlayer.c:4010 +#: ../src/viktrwlayer.c:4009 msgid "No map layer in use. Create one first" msgstr "" -#: ../src/viktrwlayer_propwin.c:658 +#: ../src/viktrwlayer_propwin.c:661 msgid "Failed spliting track. Track unchanged" msgstr "" -#: ../src/viktrwlayer_propwin.c:675 +#: ../src/viktrwlayer_propwin.c:678 msgid "Operation Aborted. Track unchanged" msgstr "" -#: ../src/viktrwlayer_propwin.c:729 +#: ../src/viktrwlayer_propwin.c:732 #, c-format msgid "%s - Track Properties" msgstr "" -#: ../src/viktrwlayer_propwin.c:734 +#: ../src/viktrwlayer_propwin.c:737 msgid "Split at Marker" msgstr "" -#: ../src/viktrwlayer_propwin.c:735 +#: ../src/viktrwlayer_propwin.c:738 msgid "Split Segments" msgstr "" -#: ../src/viktrwlayer_propwin.c:736 +#: ../src/viktrwlayer_propwin.c:739 msgid "Reverse" msgstr "Rückwärts" -#: ../src/viktrwlayer_propwin.c:737 +#: ../src/viktrwlayer_propwin.c:740 msgid "Delete Dupl." msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Comment:</b>" msgstr "<b>Kommentar:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Track Length:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Trackpoints:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Segments:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Duplicate Points:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Max Speed:</b>" msgstr "<b>Höchstgeschwindigkeit:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Avg. Speed:</b>" msgstr "<b>Durchschnittsgeschwindigkeit:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Avg. Dist. Between TPs:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Elevation Range:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Total Elevation Gain/Loss:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Start:</b>" msgstr "<b>Start:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>End:</b>" msgstr "<b>Ende:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Duration:</b>" msgstr "<b>Dauer:</b>" -#: ../src/viktrwlayer_propwin.c:788 ../src/viktrwlayer_propwin.c:795 -#: ../src/viktrwlayer_propwin.c:804 ../src/viktrwlayer_propwin.c:811 -#: ../src/viktrwlayer_propwin.c:850 ../src/viktrwlayer_propwin.c:851 -#: ../src/viktrwlayer_propwin.c:852 ../src/viktrwlayer_propwin.c:874 -#: ../src/viktrwlayer_propwin.c:881 +#: ../src/viktrwlayer_propwin.c:791 ../src/viktrwlayer_propwin.c:798 +#: ../src/viktrwlayer_propwin.c:807 ../src/viktrwlayer_propwin.c:814 +#: ../src/viktrwlayer_propwin.c:853 ../src/viktrwlayer_propwin.c:854 +#: ../src/viktrwlayer_propwin.c:855 ../src/viktrwlayer_propwin.c:877 +#: ../src/viktrwlayer_propwin.c:884 #, c-format msgid "No Data" msgstr "Keine Daten" -#: ../src/viktrwlayer_propwin.c:847 +#: ../src/viktrwlayer_propwin.c:850 #, c-format msgid "%d minutes" msgstr "" -#: ../src/viktrwlayer_propwin.c:870 +#: ../src/viktrwlayer_propwin.c:873 msgid "Statistics" msgstr "" -#: ../src/viktrwlayer_propwin.c:875 +#: ../src/viktrwlayer_propwin.c:878 msgid "<b>Track Distance:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:876 +#: ../src/viktrwlayer_propwin.c:879 msgid "Elevation-distance" msgstr "" -#: ../src/viktrwlayer_propwin.c:882 +#: ../src/viktrwlayer_propwin.c:885 msgid "<b>Track Time:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:883 +#: ../src/viktrwlayer_propwin.c:886 msgid "Speed-time" msgstr "" @@ -1564,31 +1577,47 @@ msgstr "<b>Zeitunterschied:</b>" msgid "<b>\"Speed\" Between:</b>" msgstr "" -#: ../src/viktrwlayer_tpwin.c:117 -msgid "Trackpoint" +#: ../src/viktrwlayer_tpwin.c:110 +msgid "<b>VDOP:</b>" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:111 +msgid "<b>HDOP:</b>" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:112 +msgid "<b>PDOP:</b>" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:113 +msgid "<b>SAT/FIX:</b>" msgstr "" #: ../src/viktrwlayer_tpwin.c:122 +msgid "Trackpoint" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:127 msgid "Split Here" msgstr "" -#: ../src/viktrwlayer_tpwin.c:123 +#: ../src/viktrwlayer_tpwin.c:128 msgid "Join With Last" msgstr "" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Pan" msgstr "" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Zoom" msgstr "Vergrößerung" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Ruler" msgstr "Lineal" -#: ../src/vikwindow.c:363 +#: ../src/vikwindow.c:364 #, c-format msgid "" "Do you want to save the changes you made to the document \"%s\"?\n" @@ -1596,469 +1625,457 @@ msgid "" "Your changes will be lost if you don't save them." msgstr "" -#: ../src/vikwindow.c:366 ../src/vikwindow.c:1314 +#: ../src/vikwindow.c:367 ../src/vikwindow.c:1306 msgid "Untitled" msgstr "Unbenannt" -#: ../src/vikwindow.c:367 +#: ../src/vikwindow.c:368 msgid "Don't Save" msgstr "Nicht speichern" -#: ../src/vikwindow.c:400 +#: ../src/vikwindow.c:401 msgid "mpp" msgstr "" -#: ../src/vikwindow.c:400 +#: ../src/vikwindow.c:401 msgid "pixelfact" msgstr "" -#: ../src/vikwindow.c:527 +#: ../src/vikwindow.c:528 #, c-format msgid "%s %s %dm" msgstr "" -#: ../src/vikwindow.c:529 +#: ../src/vikwindow.c:530 #, c-format msgid "%s %s" msgstr "" -#: ../src/vikwindow.c:1113 +#: ../src/vikwindow.c:1105 msgid "You must select a layer to show its properties." msgstr "" -#: ../src/vikwindow.c:1129 +#: ../src/vikwindow.c:1121 msgid "You must select a layer to delete." msgstr "" -#: ../src/vikwindow.c:1347 +#: ../src/vikwindow.c:1339 msgid "The file you requested could not be opened." msgstr "" -#: ../src/vikwindow.c:1390 +#: ../src/vikwindow.c:1382 msgid "Please select a GPS data file to open. " msgstr "" -#: ../src/vikwindow.c:1433 +#: ../src/vikwindow.c:1425 msgid "Save as Viking File." msgstr "" -#: ../src/vikwindow.c:1667 +#: ../src/vikwindow.c:1664 msgid "" "Viewable region outside allowable pixel size bounds for image. Clipping " "width/height values." msgstr "" -#: ../src/vikwindow.c:1686 +#: ../src/vikwindow.c:1683 #, c-format msgid "Total area: %ldm x %ldm (%.3f sq. km)" msgstr "" #. todo: default for answers inside VikWindow or static (thruout instance) -#: ../src/vikwindow.c:1694 +#: ../src/vikwindow.c:1691 msgid "Save to Image File" msgstr "" -#: ../src/vikwindow.c:1712 +#: ../src/vikwindow.c:1709 msgid "Width (pixels):" msgstr "Breite (Pixel):" -#: ../src/vikwindow.c:1714 +#: ../src/vikwindow.c:1711 msgid "Height (pixels):" msgstr "Höhe (Pixel):" -#: ../src/vikwindow.c:1717 +#: ../src/vikwindow.c:1714 msgid "Zoom (meters per pixel):" msgstr "" -#: ../src/vikwindow.c:1723 +#: ../src/vikwindow.c:1720 msgid "Area in current viewable window" msgstr "" -#: ../src/vikwindow.c:1733 +#: ../src/vikwindow.c:1730 msgid "Save as PNG" msgstr "Als PNG speichern" -#: ../src/vikwindow.c:1734 +#: ../src/vikwindow.c:1731 msgid "Save as JPEG" msgstr "Als JPEG speichern" -#: ../src/vikwindow.c:1754 +#: ../src/vikwindow.c:1751 msgid "East-west image tiles:" msgstr "" -#: ../src/vikwindow.c:1756 +#: ../src/vikwindow.c:1753 msgid "North-south image tiles:" msgstr "" -#: ../src/vikwindow.c:1796 +#: ../src/vikwindow.c:1793 msgid "You must be in UTM mode to use this feature" msgstr "" -#: ../src/vikwindow.c:1807 +#: ../src/vikwindow.c:1804 msgid "Save Image" msgstr "Bild speichern" -#: ../src/vikwindow.c:1834 +#: ../src/vikwindow.c:1831 msgid "Choose a directory to hold images" msgstr "" -#: ../src/vikwindow.c:1920 +#: ../src/vikwindow.c:1917 msgid "Choose a background color" msgstr "" -#: ../src/vikwindow.c:1941 +#: ../src/vikwindow.c:1938 msgid "_File" msgstr "" -#: ../src/vikwindow.c:1942 +#: ../src/vikwindow.c:1939 msgid "_Edit" msgstr "" -#: ../src/vikwindow.c:1943 +#: ../src/vikwindow.c:1940 msgid "_View" msgstr "" -#: ../src/vikwindow.c:1944 ../src/vikwindow.c:2015 +#: ../src/vikwindow.c:1941 ../src/vikwindow.c:2013 msgid "_Zoom" msgstr "" -#: ../src/vikwindow.c:1945 ../src/vikwindow.c:2014 +#: ../src/vikwindow.c:1942 ../src/vikwindow.c:2012 msgid "_Pan" msgstr "" -#: ../src/vikwindow.c:1946 +#: ../src/vikwindow.c:1943 msgid "_Layers" msgstr "" -#: ../src/vikwindow.c:1947 +#: ../src/vikwindow.c:1944 msgid "_Tools" msgstr "" -#: ../src/vikwindow.c:1948 +#: ../src/vikwindow.c:1945 msgid "_Webtools" msgstr "" -#: ../src/vikwindow.c:1949 +#: ../src/vikwindow.c:1946 msgid "_Help" msgstr "" -#: ../src/vikwindow.c:1951 +#: ../src/vikwindow.c:1948 msgid "_New" msgstr "" -#: ../src/vikwindow.c:1951 +#: ../src/vikwindow.c:1948 msgid "New file" msgstr "Neue Datei" -#: ../src/vikwindow.c:1952 +#: ../src/vikwindow.c:1949 msgid "_Open" msgstr "_Öffnen" -#: ../src/vikwindow.c:1952 +#: ../src/vikwindow.c:1949 msgid "Open a file" msgstr "Eine Datei öffnen" -#: ../src/vikwindow.c:1953 +#: ../src/vikwindow.c:1950 msgid "A_ppend File" msgstr "" -#: ../src/vikwindow.c:1953 +#: ../src/vikwindow.c:1950 msgid "Append data from a different file" msgstr "" -#: ../src/vikwindow.c:1954 +#: ../src/vikwindow.c:1951 msgid "A_cquire" msgstr "" -#: ../src/vikwindow.c:1955 +#: ../src/vikwindow.c:1952 msgid "From _GPS" msgstr "" -#: ../src/vikwindow.c:1955 +#: ../src/vikwindow.c:1952 msgid "Transfer data from a GPS device" msgstr "" -#: ../src/vikwindow.c:1956 +#: ../src/vikwindow.c:1953 msgid "Google _Directions" msgstr "" -#: ../src/vikwindow.c:1956 +#: ../src/vikwindow.c:1953 msgid "Get driving directions from Google" msgstr "" -#: ../src/vikwindow.c:1958 +#: ../src/vikwindow.c:1955 msgid "Geo_caches" msgstr "" -#: ../src/vikwindow.c:1958 +#: ../src/vikwindow.c:1955 msgid "Get Geocaches from geocaching.com" msgstr "" -#: ../src/vikwindow.c:1960 +#: ../src/vikwindow.c:1957 msgid "_Save" msgstr "" -#: ../src/vikwindow.c:1960 +#: ../src/vikwindow.c:1957 msgid "Save the file" msgstr "Datei speichern" -#: ../src/vikwindow.c:1961 +#: ../src/vikwindow.c:1958 msgid "Save _As" msgstr "" -#: ../src/vikwindow.c:1961 +#: ../src/vikwindow.c:1958 msgid "Save the file under different name" msgstr "Datei unter anderem Namen Speichern" -#: ../src/vikwindow.c:1962 +#: ../src/vikwindow.c:1959 msgid "_Generate Image File" msgstr "" -#: ../src/vikwindow.c:1962 +#: ../src/vikwindow.c:1959 msgid "Save a snapshot of the workspace into a file" msgstr "" -#: ../src/vikwindow.c:1963 +#: ../src/vikwindow.c:1960 msgid "Generate _Directory of Images" msgstr "" -#: ../src/vikwindow.c:1963 +#: ../src/vikwindow.c:1960 msgid "FIXME:IMGDIR" msgstr "" -#: ../src/vikwindow.c:1966 +#: ../src/vikwindow.c:1963 msgid "_Print..." msgstr "_Drucken…" -#: ../src/vikwindow.c:1966 +#: ../src/vikwindow.c:1963 msgid "Print maps" msgstr "Karten drucken" -#: ../src/vikwindow.c:1969 +#: ../src/vikwindow.c:1966 msgid "E_xit" msgstr "" -#: ../src/vikwindow.c:1969 +#: ../src/vikwindow.c:1966 msgid "Exit the program" msgstr "Das Programm beenden" -#: ../src/vikwindow.c:1970 +#: ../src/vikwindow.c:1967 msgid "Save and Exit" msgstr "Speichern und beenden" -#: ../src/vikwindow.c:1970 +#: ../src/vikwindow.c:1967 msgid "Save and Exit the program" msgstr "Speichern und das Programm beenden" -#: ../src/vikwindow.c:1972 +#: ../src/vikwindow.c:1969 msgid "Go To location" msgstr "" -#: ../src/vikwindow.c:1972 +#: ../src/vikwindow.c:1969 msgid "Go to address/place using text search" msgstr "" -#: ../src/vikwindow.c:1973 +#: ../src/vikwindow.c:1970 msgid "_Go to Lat\\/Lon..." msgstr "" -#: ../src/vikwindow.c:1973 +#: ../src/vikwindow.c:1970 msgid "Go to arbitrary lat\\/lon coordinate" msgstr "" -#: ../src/vikwindow.c:1974 +#: ../src/vikwindow.c:1971 msgid "Go to UTM..." msgstr "" -#: ../src/vikwindow.c:1974 +#: ../src/vikwindow.c:1971 msgid "Go to arbitrary UTM coordinate" msgstr "" -#: ../src/vikwindow.c:1975 +#: ../src/vikwindow.c:1972 msgid "Set Background Color..." msgstr "" -#: ../src/vikwindow.c:1976 +#: ../src/vikwindow.c:1973 msgid "Zoom _In" msgstr "" -#: ../src/vikwindow.c:1977 +#: ../src/vikwindow.c:1974 msgid "Zoom _Out" msgstr "" -#: ../src/vikwindow.c:1978 +#: ../src/vikwindow.c:1975 msgid "Zoom _To" msgstr "" -#: ../src/vikwindow.c:1979 +#: ../src/vikwindow.c:1976 msgid "0.25" msgstr "0,25" -#: ../src/vikwindow.c:1980 +#: ../src/vikwindow.c:1977 msgid "0.5" msgstr "0,5" -#: ../src/vikwindow.c:1981 +#: ../src/vikwindow.c:1978 msgid "1" msgstr "1" -#: ../src/vikwindow.c:1982 +#: ../src/vikwindow.c:1979 msgid "2" msgstr "2" -#: ../src/vikwindow.c:1983 +#: ../src/vikwindow.c:1980 msgid "4" msgstr "4" -#: ../src/vikwindow.c:1984 +#: ../src/vikwindow.c:1981 msgid "8" msgstr "8" -#: ../src/vikwindow.c:1985 +#: ../src/vikwindow.c:1982 msgid "16" msgstr "16" -#: ../src/vikwindow.c:1986 +#: ../src/vikwindow.c:1983 msgid "32" msgstr "" -#: ../src/vikwindow.c:1987 +#: ../src/vikwindow.c:1984 msgid "64" msgstr "" -#: ../src/vikwindow.c:1988 +#: ../src/vikwindow.c:1985 msgid "128" msgstr "" -#: ../src/vikwindow.c:1989 +#: ../src/vikwindow.c:1986 msgid "Pan North" msgstr "" -#: ../src/vikwindow.c:1990 +#: ../src/vikwindow.c:1987 msgid "Pan East" msgstr "" -#: ../src/vikwindow.c:1991 +#: ../src/vikwindow.c:1988 msgid "Pan South" msgstr "" -#: ../src/vikwindow.c:1992 +#: ../src/vikwindow.c:1989 msgid "Pan West" msgstr "" -#: ../src/vikwindow.c:1993 +#: ../src/vikwindow.c:1990 msgid "Background _Jobs" msgstr "" -#: ../src/vikwindow.c:1995 +#: ../src/vikwindow.c:1992 msgid "Cu_t" msgstr "" -#: ../src/vikwindow.c:1996 +#: ../src/vikwindow.c:1993 msgid "_Copy" msgstr "" -#: ../src/vikwindow.c:1997 +#: ../src/vikwindow.c:1994 msgid "_Paste" msgstr "" -#: ../src/vikwindow.c:1998 +#: ../src/vikwindow.c:1995 msgid "_Delete" msgstr "" -#: ../src/vikwindow.c:1999 +#: ../src/vikwindow.c:1996 msgid "Delete All" msgstr "" -#: ../src/vikwindow.c:2000 +#: ../src/vikwindow.c:1997 +msgid "Flush Map cache" +msgstr "" + +#: ../src/vikwindow.c:1998 msgid "_Preferences..." msgstr "" -#: ../src/vikwindow.c:2001 +#: ../src/vikwindow.c:1999 msgid "_Properties" msgstr "" -#: ../src/vikwindow.c:2003 +#: ../src/vikwindow.c:2001 msgid "_About" msgstr "" -#: ../src/vikwindow.c:2008 +#: ../src/vikwindow.c:2006 msgid "_UTM Mode" msgstr "_UTM Modus" -#: ../src/vikwindow.c:2009 +#: ../src/vikwindow.c:2007 msgid "_Expedia Mode" msgstr "_Expedia Modus" -#: ../src/vikwindow.c:2010 +#: ../src/vikwindow.c:2008 msgid "_Mercator Mode" msgstr "_Mercator Modus" -#: ../src/vikwindow.c:2014 +#: ../src/vikwindow.c:2012 msgid "Pan Tool" msgstr "" -#: ../src/vikwindow.c:2015 +#: ../src/vikwindow.c:2013 msgid "Zoom Tool" msgstr "Vergrößerungswerkzeug" -#: ../src/vikwindow.c:2016 +#: ../src/vikwindow.c:2014 msgid "_Ruler" msgstr "_Messwerkzeug" -#: ../src/vikwindow.c:2016 +#: ../src/vikwindow.c:2014 msgid "Ruler Tool" msgstr "Messwerkzeug" -#: ../src/vikwindow.c:2020 +#: ../src/vikwindow.c:2018 msgid "Show Scale" msgstr "Maßstab anzeigen" -#: ../src/vikwindow.c:2021 +#: ../src/vikwindow.c:2019 msgid "Show Center Mark" msgstr "" -#: ../src/vikwindow.c:2022 +#: ../src/vikwindow.c:2020 msgid "Full Screen" msgstr "" -#: ../src/vikwindow.c:2022 +#: ../src/vikwindow.c:2020 msgid "Activate full screen mode" msgstr "" -#: ../src/vikwindow.c:2023 +#: ../src/vikwindow.c:2021 msgid "Show Side Panel" msgstr "" -#: ../src/vikwindow.c:2085 +#: ../src/vikwindow.c:2083 #, c-format msgid "New %s Layer" msgstr "Neue %s Ebene" #: ../src/viking.desktop.in.h:1 msgid "GPS Data Manager" -msgstr "" +msgstr "GPS Daten-Manager" #: ../src/viking.desktop.in.h:2 msgid "Map Based GPS Data Manager (live data capable)." -msgstr "" +msgstr "Kartenbasierter GPS Daten-Manager (Live-Daten fähig)" #: ../src/viking.desktop.in.h:3 msgid "Viking" -msgstr "" - -#~ msgid "Transparent Google Maps" -#~ msgstr "Google Maps (durchsichtig)" - -#~ msgid "_Old Google Mode" -#~ msgstr "_Alter Google Modus" - -#~ msgid "Old _KH Mode" -#~ msgstr "Alter _KH Modus" - -#~ msgid "_Google Mode" -#~ msgstr "_Google Modus" - -#, c-format -#~ msgid "Failed downloading %s" -#~ msgstr "Download fehlgeschlagen %s" +msgstr "Viking" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: viking\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-04 22:27+0100\n" +"POT-Creation-Date: 2009-08-20 09:50+0200\n" "PO-Revision-Date: 2008-09-17 04:02+0000\n" "Last-Translator: Guilhem Bonnefille <guilhem.bonnefille@gmail.com>\n" "Language-Team: Greek <el@li.org>\n" @@ -15,7 +15,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-02-04 21:00+0000\n" +"X-Launchpad-Export-Date: 2009-09-09 20:12+0000\n" "X-Generator: Launchpad (build Unknown)\n" #: ../src/acquire.c:118 @@ -26,28 +26,28 @@ msgstr "ΕÏγασία..." msgid "Error: acquisition failed." msgstr "" -#: ../src/acquire.c:149 ../src/vikgpslayer.c:957 +#: ../src/acquire.c:149 ../src/vikgpslayer.c:953 msgid "Done." msgstr "ΟλοκληÏώθηκε." -#: ../src/acquire.c:326 ../src/vikgpslayer.c:996 +#: ../src/acquire.c:326 ../src/vikgpslayer.c:992 msgid "Status: detecting gpsbabel" msgstr "" -#: ../src/background.c:54 +#: ../src/background.c:57 #, c-format msgid "%d items" msgstr "" -#: ../src/background.c:212 +#: ../src/background.c:224 msgid "Job" msgstr "ΕÏγασία" -#: ../src/background.c:216 +#: ../src/background.c:228 msgid "Progress" msgstr "Î Ïόοδος" -#: ../src/background.c:227 +#: ../src/background.c:239 msgid "Viking Background Jobs" msgstr "" @@ -72,7 +72,7 @@ msgid "" "into." msgstr "" -#: ../src/curl_download.c:85 +#: ../src/curl_download.c:94 #, c-format msgid "%s() Curl perform failed: %s" msgstr "" @@ -344,14 +344,14 @@ msgstr "" msgid "using cmdline '%s' and file '%s'\n" msgstr "" -#: ../src/datasource_gps.c:150 ../src/vikgpslayer.c:711 +#: ../src/datasource_gps.c:150 ../src/vikgpslayer.c:707 #, c-format msgid "Downloading %d waypoint..." msgid_plural "Downloading %d waypoints..." msgstr[0] "" msgstr[1] "" -#: ../src/datasource_gps.c:152 ../src/vikgpslayer.c:713 +#: ../src/datasource_gps.c:152 ../src/vikgpslayer.c:709 #, c-format msgid "Downloading %d trackpoint..." msgid_plural "Downloading %d trackpoints..." @@ -368,7 +368,7 @@ msgstr "" msgid "Downloaded %d %s." msgstr "" -#: ../src/datasource_gps.c:185 ../src/vikgpslayer.c:783 +#: ../src/datasource_gps.c:185 ../src/vikgpslayer.c:779 #, c-format msgid "GPS Device: %s" msgstr "" @@ -381,7 +381,7 @@ msgstr "" msgid "Serial Port:" msgstr "" -#: ../src/datasource_gps.c:299 ../src/vikgpslayer.c:1001 +#: ../src/datasource_gps.c:299 ../src/vikgpslayer.c:997 msgid "GPS device: N/A" msgstr "" @@ -412,6 +412,10 @@ msgstr "" msgid "Draw mode '%s' no more supported" msgstr "" +#: ../src/mapcache.c:63 +msgid "Mapcache memory size (MB):" +msgstr "" + #: ../src/print.c:53 msgid "None" msgstr "" @@ -454,11 +458,11 @@ msgstr "" msgid "Image S_ize:" msgstr "" -#: ../src/util.c:75 +#: ../src/util.c:76 msgid "Could not launch web browser." msgstr "" -#: ../src/util.c:86 +#: ../src/util.c:87 msgid "Could not create new email." msgstr "" @@ -672,11 +676,11 @@ msgstr "" msgid "Downloading DEM %s" msgstr "" -#: ../src/vikfileentry.c:67 +#: ../src/vikfileentry.c:68 msgid "Browse..." msgstr "" -#: ../src/vikfileentry.c:94 +#: ../src/vikfileentry.c:96 msgid "Choose file" msgstr "" @@ -789,11 +793,11 @@ msgstr "" msgid "Gpsd Retry Interval (seconds):" msgstr "" -#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:989 +#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:985 msgid "GPS Download" msgstr "" -#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:989 +#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:985 msgid "GPS Upload" msgstr "" @@ -801,110 +805,110 @@ msgstr "" msgid "GPS Realtime Tracking" msgstr "" -#: ../src/vikgpslayer.c:373 +#: ../src/vikgpslayer.c:371 msgid "Unknown GPS Protocol" msgstr "" -#: ../src/vikgpslayer.c:379 +#: ../src/vikgpslayer.c:377 msgid "Unknown serial port device" msgstr "" -#: ../src/vikgpslayer.c:444 +#: ../src/vikgpslayer.c:442 #, c-format msgid "%s: unknown parameter" msgstr "" -#: ../src/vikgpslayer.c:545 +#: ../src/vikgpslayer.c:541 msgid "Upload to GPS" msgstr "" -#: ../src/vikgpslayer.c:550 +#: ../src/vikgpslayer.c:546 msgid "Download from GPS" msgstr "" -#: ../src/vikgpslayer.c:568 +#: ../src/vikgpslayer.c:564 msgid "Empty Upload" msgstr "" -#: ../src/vikgpslayer.c:573 +#: ../src/vikgpslayer.c:569 msgid "Empty Download" msgstr "" -#: ../src/vikgpslayer.c:578 +#: ../src/vikgpslayer.c:574 msgid "Empty All" msgstr "" -#: ../src/vikgpslayer.c:718 +#: ../src/vikgpslayer.c:714 #, c-format msgid "Uploading %d waypoint..." msgid_plural "Uploading %d waypoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:720 +#: ../src/vikgpslayer.c:716 #, c-format msgid "Uploading %d trackpoint..." msgid_plural "Uploading %d trackpoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:744 +#: ../src/vikgpslayer.c:740 #, c-format msgid "Downloaded %d out of %d waypoint..." msgid_plural "Downloaded %d out of %d waypoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:746 +#: ../src/vikgpslayer.c:742 #, c-format msgid "Downloaded %d out of %d trackpoint..." msgid_plural "Downloaded %d out of %d trackpoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:750 +#: ../src/vikgpslayer.c:746 #, c-format msgid "Uploaded %d out of %d waypoint..." msgid_plural "Uploaded %d out of %d waypoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:752 +#: ../src/vikgpslayer.c:748 #, c-format msgid "Uploaded %d out of %d trackpoint..." msgid_plural "Uploaded %d out of %d trackpoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:759 +#: ../src/vikgpslayer.c:755 #, c-format msgid "Downloaded %d waypoint" msgid_plural "Downloaded %d waypoints" msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:761 +#: ../src/vikgpslayer.c:757 #, c-format msgid "Downloaded %d trackpoint" msgid_plural "Downloaded %d trackpoints" msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:765 +#: ../src/vikgpslayer.c:761 #, c-format msgid "Uploaded %d waypoint" msgid_plural "Uploaded %d waypoints" msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:767 +#: ../src/vikgpslayer.c:763 #, c-format msgid "Uploaded %d trackpoint" msgid_plural "Uploaded %d trackpoints" msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:952 +#: ../src/vikgpslayer.c:948 msgid "Error: couldn't find gpsbabel." msgstr "" @@ -958,7 +962,7 @@ msgid "Map Type:" msgstr "" #: ../src/vikmapslayer.c:120 -msgid "Maps Directory (Optional):" +msgid "Maps Directory:" msgstr "" #: ../src/vikmapslayer.c:121 @@ -1003,52 +1007,52 @@ msgid "" "factor" msgstr "" -#: ../src/vikmapslayer.c:924 +#: ../src/vikmapslayer.c:927 #, c-format msgid "Redownloading up to %d %s map..." msgid_plural "Redownloading up to %d %s maps..." msgstr[0] "" msgstr[1] "" -#: ../src/vikmapslayer.c:926 +#: ../src/vikmapslayer.c:929 #, c-format msgid "Redownloading %d %s map..." msgid_plural "Redownloading %d %s maps..." msgstr[0] "" msgstr[1] "" -#: ../src/vikmapslayer.c:930 ../src/vikmapslayer.c:1001 +#: ../src/vikmapslayer.c:933 ../src/vikmapslayer.c:1004 #, c-format msgid "Downloading %d %s map..." msgid_plural "Downloading %d %s maps..." msgstr[0] "" msgstr[1] "" -#: ../src/vikmapslayer.c:1058 +#: ../src/vikmapslayer.c:1061 msgid "Redownload bad map(s)" msgstr "" -#: ../src/vikmapslayer.c:1062 +#: ../src/vikmapslayer.c:1065 msgid "Redownload all map(s)" msgstr "" -#: ../src/vikmapslayer.c:1142 +#: ../src/vikmapslayer.c:1145 #, c-format msgid "" "Wrong drawmode for this map.\n" "Select \"%s\" from View menu and try again." msgstr "" -#: ../src/vikmapslayer.c:1147 +#: ../src/vikmapslayer.c:1150 msgid "Wrong zoom level for this map." msgstr "" -#: ../src/vikmapslayer.c:1172 +#: ../src/vikmapslayer.c:1175 msgid "Download Onscreen Maps" msgstr "" #. TODO Add GTK_STOCK_REFRESH icon -#: ../src/vikmapslayer.c:1178 +#: ../src/vikmapslayer.c:1181 msgid "Refresh Onscreen Tiles" msgstr "" @@ -1236,12 +1240,12 @@ msgstr "" msgid "Export Layer" msgstr "" -#: ../src/viktrwlayer.c:1565 ../src/vikwindow.c:1446 ../src/vikwindow.c:1820 +#: ../src/viktrwlayer.c:1565 ../src/vikwindow.c:1438 ../src/vikwindow.c:1817 #, c-format msgid "The file \"%s\" exists, do you wish to overwrite it?" msgstr "" -#: ../src/viktrwlayer.c:1575 ../src/vikwindow.c:1464 +#: ../src/viktrwlayer.c:1575 ../src/vikwindow.c:1456 msgid "The filename you requested could not be opened for writing." msgstr "" @@ -1257,71 +1261,71 @@ msgstr "" msgid "Waypoint not found in this layer." msgstr "" -#: ../src/viktrwlayer.c:1724 +#: ../src/viktrwlayer.c:1723 msgid "Goto Center of Layer" msgstr "" -#: ../src/viktrwlayer.c:1729 +#: ../src/viktrwlayer.c:1728 msgid "Goto Waypoint" msgstr "" -#: ../src/viktrwlayer.c:1735 +#: ../src/viktrwlayer.c:1734 msgid "Export layer" msgstr "" -#: ../src/viktrwlayer.c:1740 +#: ../src/viktrwlayer.c:1739 msgid "Export as GPSPoint" msgstr "" -#: ../src/viktrwlayer.c:1745 +#: ../src/viktrwlayer.c:1744 msgid "Export as GPSMapper" msgstr "" -#: ../src/viktrwlayer.c:1750 +#: ../src/viktrwlayer.c:1749 msgid "Export as GPX" msgstr "" -#: ../src/viktrwlayer.c:1755 ../src/viktrwlayer.c:2794 +#: ../src/viktrwlayer.c:1754 ../src/viktrwlayer.c:2794 msgid "New Waypoint" msgstr "" -#: ../src/viktrwlayer.c:1762 +#: ../src/viktrwlayer.c:1761 msgid "Add Wikipedia Waypoints" msgstr "" -#: ../src/viktrwlayer.c:1767 +#: ../src/viktrwlayer.c:1766 msgid "Within layer bounds" msgstr "" -#: ../src/viktrwlayer.c:1772 +#: ../src/viktrwlayer.c:1771 msgid "Within current view" msgstr "" -#: ../src/viktrwlayer.c:1779 ../src/viktrwlayer.c:2760 +#: ../src/viktrwlayer.c:1778 ../src/viktrwlayer.c:2760 msgid "Upload to OSM" msgstr "" -#: ../src/viktrwlayer.c:2290 +#: ../src/viktrwlayer.c:2289 msgid "Failed. This track does not have timestamp" msgstr "" -#: ../src/viktrwlayer.c:2304 +#: ../src/viktrwlayer.c:2303 msgid "Failed. No other track in this layer has timestamp" msgstr "" -#: ../src/viktrwlayer.c:2310 +#: ../src/viktrwlayer.c:2309 msgid "Merge with..." msgstr "" -#: ../src/viktrwlayer.c:2310 +#: ../src/viktrwlayer.c:2309 msgid "Select track to merge with" msgstr "" -#: ../src/viktrwlayer.c:2347 +#: ../src/viktrwlayer.c:2346 msgid "Merge Threshold..." msgstr "" -#: ../src/viktrwlayer.c:2348 +#: ../src/viktrwlayer.c:2347 msgid "Merge when time between tracks less than:" msgstr "" @@ -1397,131 +1401,131 @@ msgstr "" msgid "Use with filter" msgstr "" -#: ../src/viktrwlayer.c:3736 +#: ../src/viktrwlayer.c:3735 msgid "Could not launch eog to open file." msgstr "" -#: ../src/viktrwlayer.c:3790 +#: ../src/viktrwlayer.c:3789 #, c-format msgid "Creating %d Image Thumbnails..." msgstr "" -#: ../src/viktrwlayer.c:4010 +#: ../src/viktrwlayer.c:4009 msgid "No map layer in use. Create one first" msgstr "" -#: ../src/viktrwlayer_propwin.c:658 +#: ../src/viktrwlayer_propwin.c:661 msgid "Failed spliting track. Track unchanged" msgstr "" -#: ../src/viktrwlayer_propwin.c:675 +#: ../src/viktrwlayer_propwin.c:678 msgid "Operation Aborted. Track unchanged" msgstr "" -#: ../src/viktrwlayer_propwin.c:729 +#: ../src/viktrwlayer_propwin.c:732 #, c-format msgid "%s - Track Properties" msgstr "" -#: ../src/viktrwlayer_propwin.c:734 +#: ../src/viktrwlayer_propwin.c:737 msgid "Split at Marker" msgstr "" -#: ../src/viktrwlayer_propwin.c:735 +#: ../src/viktrwlayer_propwin.c:738 msgid "Split Segments" msgstr "" -#: ../src/viktrwlayer_propwin.c:736 +#: ../src/viktrwlayer_propwin.c:739 msgid "Reverse" msgstr "" -#: ../src/viktrwlayer_propwin.c:737 +#: ../src/viktrwlayer_propwin.c:740 msgid "Delete Dupl." msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Comment:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Track Length:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Trackpoints:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Segments:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Duplicate Points:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Max Speed:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Avg. Speed:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Avg. Dist. Between TPs:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Elevation Range:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Total Elevation Gain/Loss:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Start:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>End:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Duration:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:788 ../src/viktrwlayer_propwin.c:795 -#: ../src/viktrwlayer_propwin.c:804 ../src/viktrwlayer_propwin.c:811 -#: ../src/viktrwlayer_propwin.c:850 ../src/viktrwlayer_propwin.c:851 -#: ../src/viktrwlayer_propwin.c:852 ../src/viktrwlayer_propwin.c:874 -#: ../src/viktrwlayer_propwin.c:881 +#: ../src/viktrwlayer_propwin.c:791 ../src/viktrwlayer_propwin.c:798 +#: ../src/viktrwlayer_propwin.c:807 ../src/viktrwlayer_propwin.c:814 +#: ../src/viktrwlayer_propwin.c:853 ../src/viktrwlayer_propwin.c:854 +#: ../src/viktrwlayer_propwin.c:855 ../src/viktrwlayer_propwin.c:877 +#: ../src/viktrwlayer_propwin.c:884 #, c-format msgid "No Data" msgstr "" -#: ../src/viktrwlayer_propwin.c:847 +#: ../src/viktrwlayer_propwin.c:850 #, c-format msgid "%d minutes" msgstr "" -#: ../src/viktrwlayer_propwin.c:870 +#: ../src/viktrwlayer_propwin.c:873 msgid "Statistics" msgstr "" -#: ../src/viktrwlayer_propwin.c:875 +#: ../src/viktrwlayer_propwin.c:878 msgid "<b>Track Distance:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:876 +#: ../src/viktrwlayer_propwin.c:879 msgid "Elevation-distance" msgstr "" -#: ../src/viktrwlayer_propwin.c:882 +#: ../src/viktrwlayer_propwin.c:885 msgid "<b>Track Time:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:883 +#: ../src/viktrwlayer_propwin.c:886 msgid "Speed-time" msgstr "" @@ -1561,31 +1565,47 @@ msgstr "" msgid "<b>\"Speed\" Between:</b>" msgstr "" -#: ../src/viktrwlayer_tpwin.c:117 -msgid "Trackpoint" +#: ../src/viktrwlayer_tpwin.c:110 +msgid "<b>VDOP:</b>" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:111 +msgid "<b>HDOP:</b>" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:112 +msgid "<b>PDOP:</b>" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:113 +msgid "<b>SAT/FIX:</b>" msgstr "" #: ../src/viktrwlayer_tpwin.c:122 +msgid "Trackpoint" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:127 msgid "Split Here" msgstr "" -#: ../src/viktrwlayer_tpwin.c:123 +#: ../src/viktrwlayer_tpwin.c:128 msgid "Join With Last" msgstr "" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Pan" msgstr "" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Zoom" msgstr "" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Ruler" msgstr "" -#: ../src/vikwindow.c:363 +#: ../src/vikwindow.c:364 #, c-format msgid "" "Do you want to save the changes you made to the document \"%s\"?\n" @@ -1593,441 +1613,445 @@ msgid "" "Your changes will be lost if you don't save them." msgstr "" -#: ../src/vikwindow.c:366 ../src/vikwindow.c:1314 +#: ../src/vikwindow.c:367 ../src/vikwindow.c:1306 msgid "Untitled" msgstr "" -#: ../src/vikwindow.c:367 +#: ../src/vikwindow.c:368 msgid "Don't Save" msgstr "" -#: ../src/vikwindow.c:400 +#: ../src/vikwindow.c:401 msgid "mpp" msgstr "" -#: ../src/vikwindow.c:400 +#: ../src/vikwindow.c:401 msgid "pixelfact" msgstr "" -#: ../src/vikwindow.c:527 +#: ../src/vikwindow.c:528 #, c-format msgid "%s %s %dm" msgstr "" -#: ../src/vikwindow.c:529 +#: ../src/vikwindow.c:530 #, c-format msgid "%s %s" msgstr "" -#: ../src/vikwindow.c:1113 +#: ../src/vikwindow.c:1105 msgid "You must select a layer to show its properties." msgstr "" -#: ../src/vikwindow.c:1129 +#: ../src/vikwindow.c:1121 msgid "You must select a layer to delete." msgstr "" -#: ../src/vikwindow.c:1347 +#: ../src/vikwindow.c:1339 msgid "The file you requested could not be opened." msgstr "" -#: ../src/vikwindow.c:1390 +#: ../src/vikwindow.c:1382 msgid "Please select a GPS data file to open. " msgstr "" -#: ../src/vikwindow.c:1433 +#: ../src/vikwindow.c:1425 msgid "Save as Viking File." msgstr "" -#: ../src/vikwindow.c:1667 +#: ../src/vikwindow.c:1664 msgid "" "Viewable region outside allowable pixel size bounds for image. Clipping " "width/height values." msgstr "" -#: ../src/vikwindow.c:1686 +#: ../src/vikwindow.c:1683 #, c-format msgid "Total area: %ldm x %ldm (%.3f sq. km)" msgstr "" #. todo: default for answers inside VikWindow or static (thruout instance) -#: ../src/vikwindow.c:1694 +#: ../src/vikwindow.c:1691 msgid "Save to Image File" msgstr "" -#: ../src/vikwindow.c:1712 +#: ../src/vikwindow.c:1709 msgid "Width (pixels):" msgstr "" -#: ../src/vikwindow.c:1714 +#: ../src/vikwindow.c:1711 msgid "Height (pixels):" msgstr "" -#: ../src/vikwindow.c:1717 +#: ../src/vikwindow.c:1714 msgid "Zoom (meters per pixel):" msgstr "" -#: ../src/vikwindow.c:1723 +#: ../src/vikwindow.c:1720 msgid "Area in current viewable window" msgstr "" -#: ../src/vikwindow.c:1733 +#: ../src/vikwindow.c:1730 msgid "Save as PNG" msgstr "" -#: ../src/vikwindow.c:1734 +#: ../src/vikwindow.c:1731 msgid "Save as JPEG" msgstr "" -#: ../src/vikwindow.c:1754 +#: ../src/vikwindow.c:1751 msgid "East-west image tiles:" msgstr "" -#: ../src/vikwindow.c:1756 +#: ../src/vikwindow.c:1753 msgid "North-south image tiles:" msgstr "" -#: ../src/vikwindow.c:1796 +#: ../src/vikwindow.c:1793 msgid "You must be in UTM mode to use this feature" msgstr "" -#: ../src/vikwindow.c:1807 +#: ../src/vikwindow.c:1804 msgid "Save Image" msgstr "" -#: ../src/vikwindow.c:1834 +#: ../src/vikwindow.c:1831 msgid "Choose a directory to hold images" msgstr "" -#: ../src/vikwindow.c:1920 +#: ../src/vikwindow.c:1917 msgid "Choose a background color" msgstr "" -#: ../src/vikwindow.c:1941 +#: ../src/vikwindow.c:1938 msgid "_File" msgstr "" -#: ../src/vikwindow.c:1942 +#: ../src/vikwindow.c:1939 msgid "_Edit" msgstr "" -#: ../src/vikwindow.c:1943 +#: ../src/vikwindow.c:1940 msgid "_View" msgstr "" -#: ../src/vikwindow.c:1944 ../src/vikwindow.c:2015 +#: ../src/vikwindow.c:1941 ../src/vikwindow.c:2013 msgid "_Zoom" msgstr "" -#: ../src/vikwindow.c:1945 ../src/vikwindow.c:2014 +#: ../src/vikwindow.c:1942 ../src/vikwindow.c:2012 msgid "_Pan" msgstr "" -#: ../src/vikwindow.c:1946 +#: ../src/vikwindow.c:1943 msgid "_Layers" msgstr "" -#: ../src/vikwindow.c:1947 +#: ../src/vikwindow.c:1944 msgid "_Tools" msgstr "" -#: ../src/vikwindow.c:1948 +#: ../src/vikwindow.c:1945 msgid "_Webtools" msgstr "" -#: ../src/vikwindow.c:1949 +#: ../src/vikwindow.c:1946 msgid "_Help" msgstr "" -#: ../src/vikwindow.c:1951 +#: ../src/vikwindow.c:1948 msgid "_New" msgstr "" -#: ../src/vikwindow.c:1951 +#: ../src/vikwindow.c:1948 msgid "New file" msgstr "" -#: ../src/vikwindow.c:1952 +#: ../src/vikwindow.c:1949 msgid "_Open" msgstr "" -#: ../src/vikwindow.c:1952 +#: ../src/vikwindow.c:1949 msgid "Open a file" msgstr "" -#: ../src/vikwindow.c:1953 +#: ../src/vikwindow.c:1950 msgid "A_ppend File" msgstr "" -#: ../src/vikwindow.c:1953 +#: ../src/vikwindow.c:1950 msgid "Append data from a different file" msgstr "" -#: ../src/vikwindow.c:1954 +#: ../src/vikwindow.c:1951 msgid "A_cquire" msgstr "" -#: ../src/vikwindow.c:1955 +#: ../src/vikwindow.c:1952 msgid "From _GPS" msgstr "" -#: ../src/vikwindow.c:1955 +#: ../src/vikwindow.c:1952 msgid "Transfer data from a GPS device" msgstr "" -#: ../src/vikwindow.c:1956 +#: ../src/vikwindow.c:1953 msgid "Google _Directions" msgstr "" -#: ../src/vikwindow.c:1956 +#: ../src/vikwindow.c:1953 msgid "Get driving directions from Google" msgstr "" -#: ../src/vikwindow.c:1958 +#: ../src/vikwindow.c:1955 msgid "Geo_caches" msgstr "" -#: ../src/vikwindow.c:1958 +#: ../src/vikwindow.c:1955 msgid "Get Geocaches from geocaching.com" msgstr "" -#: ../src/vikwindow.c:1960 +#: ../src/vikwindow.c:1957 msgid "_Save" msgstr "" -#: ../src/vikwindow.c:1960 +#: ../src/vikwindow.c:1957 msgid "Save the file" msgstr "" -#: ../src/vikwindow.c:1961 +#: ../src/vikwindow.c:1958 msgid "Save _As" msgstr "" -#: ../src/vikwindow.c:1961 +#: ../src/vikwindow.c:1958 msgid "Save the file under different name" msgstr "" -#: ../src/vikwindow.c:1962 +#: ../src/vikwindow.c:1959 msgid "_Generate Image File" msgstr "" -#: ../src/vikwindow.c:1962 +#: ../src/vikwindow.c:1959 msgid "Save a snapshot of the workspace into a file" msgstr "" -#: ../src/vikwindow.c:1963 +#: ../src/vikwindow.c:1960 msgid "Generate _Directory of Images" msgstr "" -#: ../src/vikwindow.c:1963 +#: ../src/vikwindow.c:1960 msgid "FIXME:IMGDIR" msgstr "" -#: ../src/vikwindow.c:1966 +#: ../src/vikwindow.c:1963 msgid "_Print..." msgstr "" -#: ../src/vikwindow.c:1966 +#: ../src/vikwindow.c:1963 msgid "Print maps" msgstr "" -#: ../src/vikwindow.c:1969 +#: ../src/vikwindow.c:1966 msgid "E_xit" msgstr "" -#: ../src/vikwindow.c:1969 +#: ../src/vikwindow.c:1966 msgid "Exit the program" msgstr "" -#: ../src/vikwindow.c:1970 +#: ../src/vikwindow.c:1967 msgid "Save and Exit" msgstr "" -#: ../src/vikwindow.c:1970 +#: ../src/vikwindow.c:1967 msgid "Save and Exit the program" msgstr "" -#: ../src/vikwindow.c:1972 +#: ../src/vikwindow.c:1969 msgid "Go To location" msgstr "" -#: ../src/vikwindow.c:1972 +#: ../src/vikwindow.c:1969 msgid "Go to address/place using text search" msgstr "" -#: ../src/vikwindow.c:1973 +#: ../src/vikwindow.c:1970 msgid "_Go to Lat\\/Lon..." msgstr "" -#: ../src/vikwindow.c:1973 +#: ../src/vikwindow.c:1970 msgid "Go to arbitrary lat\\/lon coordinate" msgstr "" -#: ../src/vikwindow.c:1974 +#: ../src/vikwindow.c:1971 msgid "Go to UTM..." msgstr "" -#: ../src/vikwindow.c:1974 +#: ../src/vikwindow.c:1971 msgid "Go to arbitrary UTM coordinate" msgstr "" -#: ../src/vikwindow.c:1975 +#: ../src/vikwindow.c:1972 msgid "Set Background Color..." msgstr "" -#: ../src/vikwindow.c:1976 +#: ../src/vikwindow.c:1973 msgid "Zoom _In" msgstr "" -#: ../src/vikwindow.c:1977 +#: ../src/vikwindow.c:1974 msgid "Zoom _Out" msgstr "" -#: ../src/vikwindow.c:1978 +#: ../src/vikwindow.c:1975 msgid "Zoom _To" msgstr "" -#: ../src/vikwindow.c:1979 +#: ../src/vikwindow.c:1976 msgid "0.25" msgstr "" -#: ../src/vikwindow.c:1980 +#: ../src/vikwindow.c:1977 msgid "0.5" msgstr "" -#: ../src/vikwindow.c:1981 +#: ../src/vikwindow.c:1978 msgid "1" msgstr "" -#: ../src/vikwindow.c:1982 +#: ../src/vikwindow.c:1979 msgid "2" msgstr "" -#: ../src/vikwindow.c:1983 +#: ../src/vikwindow.c:1980 msgid "4" msgstr "" -#: ../src/vikwindow.c:1984 +#: ../src/vikwindow.c:1981 msgid "8" msgstr "" -#: ../src/vikwindow.c:1985 +#: ../src/vikwindow.c:1982 msgid "16" msgstr "" -#: ../src/vikwindow.c:1986 +#: ../src/vikwindow.c:1983 msgid "32" msgstr "" -#: ../src/vikwindow.c:1987 +#: ../src/vikwindow.c:1984 msgid "64" msgstr "" -#: ../src/vikwindow.c:1988 +#: ../src/vikwindow.c:1985 msgid "128" msgstr "" -#: ../src/vikwindow.c:1989 +#: ../src/vikwindow.c:1986 msgid "Pan North" msgstr "" -#: ../src/vikwindow.c:1990 +#: ../src/vikwindow.c:1987 msgid "Pan East" msgstr "" -#: ../src/vikwindow.c:1991 +#: ../src/vikwindow.c:1988 msgid "Pan South" msgstr "" -#: ../src/vikwindow.c:1992 +#: ../src/vikwindow.c:1989 msgid "Pan West" msgstr "" -#: ../src/vikwindow.c:1993 +#: ../src/vikwindow.c:1990 msgid "Background _Jobs" msgstr "" -#: ../src/vikwindow.c:1995 +#: ../src/vikwindow.c:1992 msgid "Cu_t" msgstr "" -#: ../src/vikwindow.c:1996 +#: ../src/vikwindow.c:1993 msgid "_Copy" msgstr "" -#: ../src/vikwindow.c:1997 +#: ../src/vikwindow.c:1994 msgid "_Paste" msgstr "" -#: ../src/vikwindow.c:1998 +#: ../src/vikwindow.c:1995 msgid "_Delete" msgstr "" -#: ../src/vikwindow.c:1999 +#: ../src/vikwindow.c:1996 msgid "Delete All" msgstr "" -#: ../src/vikwindow.c:2000 +#: ../src/vikwindow.c:1997 +msgid "Flush Map cache" +msgstr "" + +#: ../src/vikwindow.c:1998 msgid "_Preferences..." msgstr "" -#: ../src/vikwindow.c:2001 +#: ../src/vikwindow.c:1999 msgid "_Properties" msgstr "" -#: ../src/vikwindow.c:2003 +#: ../src/vikwindow.c:2001 msgid "_About" msgstr "" -#: ../src/vikwindow.c:2008 +#: ../src/vikwindow.c:2006 msgid "_UTM Mode" msgstr "" -#: ../src/vikwindow.c:2009 +#: ../src/vikwindow.c:2007 msgid "_Expedia Mode" msgstr "" -#: ../src/vikwindow.c:2010 +#: ../src/vikwindow.c:2008 msgid "_Mercator Mode" msgstr "" -#: ../src/vikwindow.c:2014 +#: ../src/vikwindow.c:2012 msgid "Pan Tool" msgstr "" -#: ../src/vikwindow.c:2015 +#: ../src/vikwindow.c:2013 msgid "Zoom Tool" msgstr "" -#: ../src/vikwindow.c:2016 +#: ../src/vikwindow.c:2014 msgid "_Ruler" msgstr "" -#: ../src/vikwindow.c:2016 +#: ../src/vikwindow.c:2014 msgid "Ruler Tool" msgstr "" -#: ../src/vikwindow.c:2020 +#: ../src/vikwindow.c:2018 msgid "Show Scale" msgstr "" -#: ../src/vikwindow.c:2021 +#: ../src/vikwindow.c:2019 msgid "Show Center Mark" msgstr "" -#: ../src/vikwindow.c:2022 +#: ../src/vikwindow.c:2020 msgid "Full Screen" msgstr "" -#: ../src/vikwindow.c:2022 +#: ../src/vikwindow.c:2020 msgid "Activate full screen mode" msgstr "" -#: ../src/vikwindow.c:2023 +#: ../src/vikwindow.c:2021 msgid "Show Side Panel" msgstr "" -#: ../src/vikwindow.c:2085 +#: ../src/vikwindow.c:2083 #, c-format msgid "New %s Layer" msgstr "" @@ -7,53 +7,53 @@ msgid "" msgstr "" "Project-Id-Version: viking\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-04 22:47+0100\n" -"PO-Revision-Date: 2009-02-04 22:19+0000\n" -"Last-Translator: Tognu <jaalvarez@ipn.mx>\n" +"POT-Creation-Date: 2009-08-20 09:50+0200\n" +"PO-Revision-Date: 2009-09-06 19:13+0000\n" +"Last-Translator: Federico Vera <Unknown>\n" "Language-Team: Spanish <es@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-02-08 13:36+0000\n" +"X-Launchpad-Export-Date: 2009-09-09 20:12+0000\n" "X-Generator: Launchpad (build Unknown)\n" #: ../src/acquire.c:118 msgid "Working..." -msgstr "" +msgstr "Trabajando..." #: ../src/acquire.c:141 msgid "Error: acquisition failed." -msgstr "" +msgstr "Error: Fallo en la adquisión" -#: ../src/acquire.c:149 ../src/vikgpslayer.c:957 +#: ../src/acquire.c:149 ../src/vikgpslayer.c:953 msgid "Done." msgstr "Hecho." -#: ../src/acquire.c:326 ../src/vikgpslayer.c:996 +#: ../src/acquire.c:326 ../src/vikgpslayer.c:992 msgid "Status: detecting gpsbabel" msgstr "Conectando a gpsbabel" -#: ../src/background.c:54 +#: ../src/background.c:57 #, c-format msgid "%d items" msgstr "%d elementos" -#: ../src/background.c:212 +#: ../src/background.c:224 msgid "Job" msgstr "Tarea" -#: ../src/background.c:216 +#: ../src/background.c:228 msgid "Progress" msgstr "En proceso" -#: ../src/background.c:227 +#: ../src/background.c:239 msgid "Viking Background Jobs" -msgstr "" +msgstr "Tareas en segundo plano de Viking" #: ../src/clipboard.c:84 msgid "paste failed" -msgstr "" +msgstr "fallo el pegado" #: ../src/clipboard.c:94 msgid "wrong clipboard data size" @@ -74,7 +74,7 @@ msgid "" "into." msgstr "Por favor, seleccione una capa apropiada para pegar el waypoint." -#: ../src/curl_download.c:85 +#: ../src/curl_download.c:94 #, c-format msgid "%s() Curl perform failed: %s" msgstr "Ha fallado la llamada a la función curl %s(): %s" @@ -109,7 +109,7 @@ msgstr "Carta:" #: ../src/dialog.c:192 msgid "Waypoint Properties" -msgstr "" +msgstr "Propiedades de recorrido" #: ../src/dialog.c:218 msgid "Name:" @@ -147,7 +147,7 @@ msgstr "El waypoint \"%s\" ya existe. ¿Desea sobreescribirlo?" #: ../src/dialog.c:462 ../src/geonamessearch.c:301 msgid "Nothing was selected" -msgstr "" +msgstr "Nada fue seleccionado" #: ../src/dialog.c:470 msgid "Add Track" @@ -168,7 +168,7 @@ msgstr "La ruta \"%s\" existe. ¿Desea sobreescribirla?" #: ../src/dialog.c:559 msgid "Zoom Factors..." -msgstr "" +msgstr "Factor de acercamiento" #: ../src/dialog.c:573 msgid "Zoom factor (in meters per pixel:" @@ -222,6 +222,20 @@ msgid "" "this program; if not, write to the Free Software Foundation, Inc., 59 Temple " "Place, Suite 330, Boston, MA 02111-1307, USA" msgstr "" +"Este programa es software libre; puedes redistribuirlo , y / o modificarlo " +"bajo los terminos de la licencia Publica (GNU) publicada por la Free " +"Software Foundation; la versión 2 de la licencia , o alguna version " +"posterior.\n" +"\n" +"Este programa es distribuido con la esperanza de que pueda ser usado, PERO " +"SIN NINGUNA GARANTIA;sin que se encuentre implicada garantias de MERCADEO " +"para un proposito particular. Revisa la licencia publica GNU para mas " +"detalles.\n" +"\n" +"Tu deberas de recibir una copia de la licencia publica general GNU General " +"Public License en este programa; en caso contrario, escribe a la Free " +"Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-" +"1307, USA" #: ../src/dialog.c:726 msgid "Download along track" @@ -237,7 +251,7 @@ msgstr "Nivel de zoom:" #: ../src/expedia.c:51 msgid "Expedia Street Maps" -msgstr "" +msgstr "Mapas de calles Expedia" #: ../src/expedia.c:79 msgid "Invalid expedia altitude" @@ -269,7 +283,7 @@ msgstr "Buscar" #: ../src/geonamessearch.c:119 msgid "No entries found!" -msgstr "" +msgstr "No se registro ninguna entrada" #: ../src/geonamessearch.c:135 ../src/googlesearch.c:70 msgid "I don't know that place. Do you want another search?" @@ -289,7 +303,7 @@ msgstr "No se ha podido abrir el archivo temporal" #: ../src/globals.c:41 msgid "Degree format:" -msgstr "" +msgstr "Formato de aceptación" #. Webtools #: ../src/google.c:34 @@ -352,14 +366,14 @@ msgstr "Adquirido desde GPS" msgid "using cmdline '%s' and file '%s'\n" msgstr "usando lÃnea de comandos '%s' y fichero '%s'\n" -#: ../src/datasource_gps.c:150 ../src/vikgpslayer.c:711 +#: ../src/datasource_gps.c:150 ../src/vikgpslayer.c:707 #, c-format msgid "Downloading %d waypoint..." msgid_plural "Downloading %d waypoints..." msgstr[0] "Descargando %d waypoint..." msgstr[1] "Descargando %d waypoints..." -#: ../src/datasource_gps.c:152 ../src/vikgpslayer.c:713 +#: ../src/datasource_gps.c:152 ../src/vikgpslayer.c:709 #, c-format msgid "Downloading %d trackpoint..." msgid_plural "Downloading %d trackpoints..." @@ -376,7 +390,7 @@ msgstr "Descargados %d de %d %s..." msgid "Downloaded %d %s." msgstr "Descargados %d %s." -#: ../src/datasource_gps.c:185 ../src/vikgpslayer.c:783 +#: ../src/datasource_gps.c:185 ../src/vikgpslayer.c:779 #, c-format msgid "GPS Device: %s" msgstr "Dispositivo GPS: %s" @@ -389,7 +403,7 @@ msgstr "Protocolo GPS:" msgid "Serial Port:" msgstr "Puerto serie:" -#: ../src/datasource_gps.c:299 ../src/vikgpslayer.c:1001 +#: ../src/datasource_gps.c:299 ../src/vikgpslayer.c:997 msgid "GPS device: N/A" msgstr "Dispositivo GPS: (no disponible)" @@ -408,7 +422,7 @@ msgstr "Registro DEM de clase B incorrecto: se esperaba 1" #: ../src/dem.c:354 #, c-format msgid "Couldn't map file %s: %s" -msgstr "" +msgstr "No se encuentra el archivo de mapa %s:%s" #: ../src/download.c:121 #, c-format @@ -418,7 +432,11 @@ msgstr "Error en descarga: %s" #: ../src/file.c:426 ../src/file.c:430 #, c-format msgid "Draw mode '%s' no more supported" -msgstr "" +msgstr "El modo de dibujo '%s' no es soportado ya" + +#: ../src/mapcache.c:63 +msgid "Mapcache memory size (MB):" +msgstr "Tamaño en memoria del cache de Mapas (MB)" #: ../src/print.c:53 msgid "None" @@ -462,13 +480,13 @@ msgstr "Ignorar los _márgenes de la página" msgid "Image S_ize:" msgstr "_Tamaño de imagen" -#: ../src/util.c:75 +#: ../src/util.c:76 msgid "Could not launch web browser." msgstr "No se ha podido lanzar el navegador" -#: ../src/util.c:86 +#: ../src/util.c:87 msgid "Could not create new email." -msgstr "" +msgstr "No puedo crear un nuevo email" #: ../src/vikcoordlayer.c:46 ../src/vikdemlayer.c:110 msgid "Color:" @@ -512,15 +530,15 @@ msgstr "Waypoints en el exterior" #: ../src/main.c:116 msgid "Use smaller symbols for waypoints" -msgstr "" +msgstr "Usa simbolos pequellos para los indicadores" #: ../src/main.c:117 msgid "Enable debug output" -msgstr "" +msgstr "no puedo activar la salida" #: ../src/main.c:118 msgid "Enable verbose output" -msgstr "" +msgstr "salida verbosa activada" #: ../src/main.c:119 msgid "Show version" @@ -528,23 +546,23 @@ msgstr "Mostrar versión" #: ../src/osm.c:85 msgid "OSM (view)" -msgstr "" +msgstr "Vista OSM" #: ../src/osm.c:89 msgid "OSM (edit)" -msgstr "" +msgstr "Edicion OSM" #: ../src/osm.c:93 msgid "OSM (render)" -msgstr "" +msgstr "Renderizado OSM" #: ../src/osm-traces.c:77 msgid "OSM username:" -msgstr "" +msgstr "usuario OSM:" #: ../src/osm-traces.c:78 msgid "OSM password:" -msgstr "" +msgstr "Passeord OSM:" #: ../src/osm-traces.c:218 #, c-format @@ -647,7 +665,7 @@ msgstr "Enviando %s a OSM" #: ../src/uibuilder.c:134 msgid "Take care that this password will be stored clearly in a plain file." -msgstr "" +msgstr "verifica que este password se borre en el archivo plano" #: ../src/vikdemlayer.c:108 msgid "DEM Files:" @@ -685,11 +703,11 @@ msgstr "" msgid "Downloading DEM %s" msgstr "Descargando DEM %s" -#: ../src/vikfileentry.c:67 +#: ../src/vikfileentry.c:68 msgid "Browse..." msgstr "Examinar..." -#: ../src/vikfileentry.c:94 +#: ../src/vikfileentry.c:96 msgid "Choose file" msgstr "Elegir fichero" @@ -788,7 +806,7 @@ msgstr "Saltar a la posición actual al comienzo" #: ../src/vikgpslayer.c:139 msgid "Moving Map Method:" -msgstr "" +msgstr "Metodo de movimiento de mapas" #: ../src/vikgpslayer.c:140 msgid "Gpsd Host:" @@ -800,13 +818,13 @@ msgstr "Puerto gpsd:" #: ../src/vikgpslayer.c:142 msgid "Gpsd Retry Interval (seconds):" -msgstr "" +msgstr "Intervalo de reconexión de Gpsd (segundos)" -#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:989 +#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:985 msgid "GPS Download" msgstr "Descargar desde GPS" -#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:989 +#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:985 msgid "GPS Upload" msgstr "Enviar al GPS" @@ -814,110 +832,110 @@ msgstr "Enviar al GPS" msgid "GPS Realtime Tracking" msgstr "Seguimiento GPS en tiempo real" -#: ../src/vikgpslayer.c:373 +#: ../src/vikgpslayer.c:371 msgid "Unknown GPS Protocol" msgstr "Protocolo GPS desconocido" -#: ../src/vikgpslayer.c:379 +#: ../src/vikgpslayer.c:377 msgid "Unknown serial port device" msgstr "Puerto serie desconocido" -#: ../src/vikgpslayer.c:444 +#: ../src/vikgpslayer.c:442 #, c-format msgid "%s: unknown parameter" msgstr "Parámetro desconocido: %s" -#: ../src/vikgpslayer.c:545 +#: ../src/vikgpslayer.c:541 msgid "Upload to GPS" msgstr "EnvÃo al GPS" -#: ../src/vikgpslayer.c:550 +#: ../src/vikgpslayer.c:546 msgid "Download from GPS" msgstr "Descarga del GPS" -#: ../src/vikgpslayer.c:568 +#: ../src/vikgpslayer.c:564 msgid "Empty Upload" msgstr "Vaciar zona de envÃo" -#: ../src/vikgpslayer.c:573 +#: ../src/vikgpslayer.c:569 msgid "Empty Download" msgstr "Vaciar zona de descarga" -#: ../src/vikgpslayer.c:578 +#: ../src/vikgpslayer.c:574 msgid "Empty All" msgstr "Vaciar todo" -#: ../src/vikgpslayer.c:718 +#: ../src/vikgpslayer.c:714 #, c-format msgid "Uploading %d waypoint..." msgid_plural "Uploading %d waypoints..." msgstr[0] "Subiendo %d waypoint..." msgstr[1] "Subiendo %d waypoints..." -#: ../src/vikgpslayer.c:720 +#: ../src/vikgpslayer.c:716 #, c-format msgid "Uploading %d trackpoint..." msgid_plural "Uploading %d trackpoints..." msgstr[0] "Subiendo %d traza..." msgstr[1] "Subiendo %d trazas..." -#: ../src/vikgpslayer.c:744 +#: ../src/vikgpslayer.c:740 #, c-format msgid "Downloaded %d out of %d waypoint..." msgid_plural "Downloaded %d out of %d waypoints..." msgstr[0] "Descargado %d de %d waypoint..." msgstr[1] "Descargados %d de %d waypoints..." -#: ../src/vikgpslayer.c:746 +#: ../src/vikgpslayer.c:742 #, c-format msgid "Downloaded %d out of %d trackpoint..." msgid_plural "Downloaded %d out of %d trackpoints..." msgstr[0] "Descargada %d de %d traza..." msgstr[1] "Descargadas %d de %d trazas..." -#: ../src/vikgpslayer.c:750 +#: ../src/vikgpslayer.c:746 #, c-format msgid "Uploaded %d out of %d waypoint..." msgid_plural "Uploaded %d out of %d waypoints..." msgstr[0] "Subida %d de %d waypoint..." msgstr[1] "Subidas %d de %d waypoints..." -#: ../src/vikgpslayer.c:752 +#: ../src/vikgpslayer.c:748 #, c-format msgid "Uploaded %d out of %d trackpoint..." msgid_plural "Uploaded %d out of %d trackpoints..." msgstr[0] "Subida %d de %d trza..." msgstr[1] "Subidas %d de %d trazas..." -#: ../src/vikgpslayer.c:759 +#: ../src/vikgpslayer.c:755 #, c-format msgid "Downloaded %d waypoint" msgid_plural "Downloaded %d waypoints" msgstr[0] "Descargado %d waypoint" msgstr[1] "Descargados %d waypoints" -#: ../src/vikgpslayer.c:761 +#: ../src/vikgpslayer.c:757 #, c-format msgid "Downloaded %d trackpoint" msgid_plural "Downloaded %d trackpoints" msgstr[0] "Descargada %d traza" msgstr[1] "Descargadas %d trazas" -#: ../src/vikgpslayer.c:765 +#: ../src/vikgpslayer.c:761 #, c-format msgid "Uploaded %d waypoint" msgid_plural "Uploaded %d waypoints" msgstr[0] "Subido %d waypoint" msgstr[1] "Subidos %d waypoints" -#: ../src/vikgpslayer.c:767 +#: ../src/vikgpslayer.c:763 #, c-format msgid "Uploaded %d trackpoint" msgid_plural "Uploaded %d trackpoints" msgstr[0] "Subida %d traza" msgstr[1] "Subidas %d trazas" -#: ../src/vikgpslayer.c:952 +#: ../src/vikgpslayer.c:948 msgid "Error: couldn't find gpsbabel." msgstr "Error: gpsbabel no encontrado" @@ -971,8 +989,8 @@ msgid "Map Type:" msgstr "Tipo de mapa:" #: ../src/vikmapslayer.c:120 -msgid "Maps Directory (Optional):" -msgstr "Directorio de mapas (opcional):" +msgid "Maps Directory:" +msgstr "Directorio de Mapas:" #: ../src/vikmapslayer.c:121 msgid "Alpha:" @@ -1020,36 +1038,36 @@ msgstr "" "Evitando pusilánimemente el dibujado de teselas o existencia de teselas mas " "alla del factor de zoom %d" -#: ../src/vikmapslayer.c:924 +#: ../src/vikmapslayer.c:927 #, c-format msgid "Redownloading up to %d %s map..." msgid_plural "Redownloading up to %d %s maps..." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Descargando arriba de %d%s mapas" +msgstr[1] "Descargando arriba de %d%s mapas" -#: ../src/vikmapslayer.c:926 +#: ../src/vikmapslayer.c:929 #, c-format msgid "Redownloading %d %s map..." msgid_plural "Redownloading %d %s maps..." msgstr[0] "Redescargando %d %s mapa..." msgstr[1] "Redescargando %d %s mapas..." -#: ../src/vikmapslayer.c:930 ../src/vikmapslayer.c:1001 +#: ../src/vikmapslayer.c:933 ../src/vikmapslayer.c:1004 #, c-format msgid "Downloading %d %s map..." msgid_plural "Downloading %d %s maps..." msgstr[0] "Descargando mapa %d (%s)..." msgstr[1] "Descargando mapas %d (%s)..." -#: ../src/vikmapslayer.c:1058 +#: ../src/vikmapslayer.c:1061 msgid "Redownload bad map(s)" msgstr "Redescargar mapa(s) corrupto(s)" -#: ../src/vikmapslayer.c:1062 +#: ../src/vikmapslayer.c:1065 msgid "Redownload all map(s)" msgstr "Redescargar todos los mapas" -#: ../src/vikmapslayer.c:1142 +#: ../src/vikmapslayer.c:1145 #, c-format msgid "" "Wrong drawmode for this map.\n" @@ -1058,16 +1076,16 @@ msgstr "" "El modo de dibujado es incorrecto para este mapa.\n" "Seleccione \"%s\" en el menú Ver e inténtelo de nuevo." -#: ../src/vikmapslayer.c:1147 +#: ../src/vikmapslayer.c:1150 msgid "Wrong zoom level for this map." msgstr "Nivel de zoom incorrecto para este mapa." -#: ../src/vikmapslayer.c:1172 +#: ../src/vikmapslayer.c:1175 msgid "Download Onscreen Maps" msgstr "Descargar mapas en pantalla" #. TODO Add GTK_STOCK_REFRESH icon -#: ../src/vikmapslayer.c:1178 +#: ../src/vikmapslayer.c:1181 msgid "Refresh Onscreen Tiles" msgstr "Refrescar teselas en pantalla" @@ -1255,12 +1273,12 @@ msgstr "Esta capa no tiene waypoints ni puntos de ruta." msgid "Export Layer" msgstr "Exportar capa" -#: ../src/viktrwlayer.c:1565 ../src/vikwindow.c:1446 ../src/vikwindow.c:1820 +#: ../src/viktrwlayer.c:1565 ../src/vikwindow.c:1438 ../src/vikwindow.c:1817 #, c-format msgid "The file \"%s\" exists, do you wish to overwrite it?" msgstr "El fichero \"%s\" existe. ¿Desea sobreescribirlo?" -#: ../src/viktrwlayer.c:1575 ../src/vikwindow.c:1464 +#: ../src/viktrwlayer.c:1575 ../src/vikwindow.c:1456 msgid "The filename you requested could not be opened for writing." msgstr "El fichero seleccionado no se puede abrir para escritura." @@ -1276,71 +1294,71 @@ msgstr "Nombre del waypoint:" msgid "Waypoint not found in this layer." msgstr "Waypoint no encontrado en esta capa." -#: ../src/viktrwlayer.c:1724 +#: ../src/viktrwlayer.c:1723 msgid "Goto Center of Layer" msgstr "Ir al centro de la capa" -#: ../src/viktrwlayer.c:1729 +#: ../src/viktrwlayer.c:1728 msgid "Goto Waypoint" msgstr "Ir a waypoint" -#: ../src/viktrwlayer.c:1735 +#: ../src/viktrwlayer.c:1734 msgid "Export layer" msgstr "Exportar capa" -#: ../src/viktrwlayer.c:1740 +#: ../src/viktrwlayer.c:1739 msgid "Export as GPSPoint" msgstr "Exportar como GPSPoint" -#: ../src/viktrwlayer.c:1745 +#: ../src/viktrwlayer.c:1744 msgid "Export as GPSMapper" msgstr "Exportar como GPSMapper" -#: ../src/viktrwlayer.c:1750 +#: ../src/viktrwlayer.c:1749 msgid "Export as GPX" msgstr "Exportar como GPX" -#: ../src/viktrwlayer.c:1755 ../src/viktrwlayer.c:2794 +#: ../src/viktrwlayer.c:1754 ../src/viktrwlayer.c:2794 msgid "New Waypoint" msgstr "Nuevo waypoint" -#: ../src/viktrwlayer.c:1762 +#: ../src/viktrwlayer.c:1761 msgid "Add Wikipedia Waypoints" -msgstr "" +msgstr "Agregando señalizadores Wikipedia" -#: ../src/viktrwlayer.c:1767 +#: ../src/viktrwlayer.c:1766 msgid "Within layer bounds" -msgstr "" +msgstr "Limite de capas de marcaje" -#: ../src/viktrwlayer.c:1772 +#: ../src/viktrwlayer.c:1771 msgid "Within current view" -msgstr "" +msgstr "Vista Actual" -#: ../src/viktrwlayer.c:1779 ../src/viktrwlayer.c:2760 +#: ../src/viktrwlayer.c:1778 ../src/viktrwlayer.c:2760 msgid "Upload to OSM" msgstr "Enviar a OSM" -#: ../src/viktrwlayer.c:2290 +#: ../src/viktrwlayer.c:2289 msgid "Failed. This track does not have timestamp" -msgstr "" +msgstr "Fallo: Este track no tiene tiempo de registro" -#: ../src/viktrwlayer.c:2304 +#: ../src/viktrwlayer.c:2303 msgid "Failed. No other track in this layer has timestamp" -msgstr "" +msgstr "Fallo: no existe otro track con tiempo de registro" -#: ../src/viktrwlayer.c:2310 +#: ../src/viktrwlayer.c:2309 msgid "Merge with..." -msgstr "" +msgstr "Unido con..." -#: ../src/viktrwlayer.c:2310 +#: ../src/viktrwlayer.c:2309 msgid "Select track to merge with" -msgstr "" +msgstr "Track seleccionado unido con..." -#: ../src/viktrwlayer.c:2347 +#: ../src/viktrwlayer.c:2346 msgid "Merge Threshold..." msgstr "Umbral de fusionado..." -#: ../src/viktrwlayer.c:2348 +#: ../src/viktrwlayer.c:2347 msgid "Merge when time between tracks less than:" msgstr "Fusionar cuando el tiempo entre trazas de menos de:" @@ -1386,7 +1404,7 @@ msgstr "Fusionar por tiempo" #: ../src/viktrwlayer.c:2729 msgid "Merge With Other Tracks..." -msgstr "" +msgstr "Unido con otros tracks..." #: ../src/viktrwlayer.c:2734 msgid "Split By Time" @@ -1402,145 +1420,145 @@ msgstr "Aplicar datos DEM" #: ../src/viktrwlayer.c:2749 msgid "Extend track end" -msgstr "" +msgstr "fin del track Extend" #: ../src/viktrwlayer.c:2754 msgid "Extend using magic scissors" -msgstr "" +msgstr "Extend esta usando las tijeras magicas" #: ../src/viktrwlayer.c:2768 msgid "View Google Directions" -msgstr "" +msgstr "Vista de direcciones Google" #: ../src/viktrwlayer.c:2774 msgid "Use with filter" -msgstr "" +msgstr "Usado con el filtro" -#: ../src/viktrwlayer.c:3736 +#: ../src/viktrwlayer.c:3735 msgid "Could not launch eog to open file." msgstr "No se puede lanzar eog para abrir el fichero." -#: ../src/viktrwlayer.c:3790 +#: ../src/viktrwlayer.c:3789 #, c-format msgid "Creating %d Image Thumbnails..." msgstr "Creando %d miniaturas..." -#: ../src/viktrwlayer.c:4010 +#: ../src/viktrwlayer.c:4009 msgid "No map layer in use. Create one first" msgstr "No hay una capa de mapa en uso. Cree una primero" -#: ../src/viktrwlayer_propwin.c:658 +#: ../src/viktrwlayer_propwin.c:661 msgid "Failed spliting track. Track unchanged" -msgstr "" +msgstr "falla en la operacion del spliting . Track no modificado" -#: ../src/viktrwlayer_propwin.c:675 +#: ../src/viktrwlayer_propwin.c:678 msgid "Operation Aborted. Track unchanged" -msgstr "" +msgstr "Operacion abortada. Track no modificado" -#: ../src/viktrwlayer_propwin.c:729 +#: ../src/viktrwlayer_propwin.c:732 #, c-format msgid "%s - Track Properties" msgstr "%s - Propiedades de ruta" -#: ../src/viktrwlayer_propwin.c:734 +#: ../src/viktrwlayer_propwin.c:737 msgid "Split at Marker" -msgstr "" +msgstr "Colocando un marcador" -#: ../src/viktrwlayer_propwin.c:735 +#: ../src/viktrwlayer_propwin.c:738 msgid "Split Segments" msgstr "Dividir segmentos" -#: ../src/viktrwlayer_propwin.c:736 +#: ../src/viktrwlayer_propwin.c:739 msgid "Reverse" msgstr "Inverso" -#: ../src/viktrwlayer_propwin.c:737 +#: ../src/viktrwlayer_propwin.c:740 msgid "Delete Dupl." msgstr "Borrar dupl." -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Comment:</b>" msgstr "<b>Comentario:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Track Length:</b>" msgstr "<b>Longitud de ruta:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Trackpoints:</b>" msgstr "<b>Puntos de ruta:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Segments:</b>" msgstr "<b>Segmentos:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Duplicate Points:</b>" msgstr "<b>Puntos duplicados:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Max Speed:</b>" msgstr "<b>Velocidad max.:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Avg. Speed:</b>" msgstr "<b>Velocidad media:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Avg. Dist. Between TPs:</b>" msgstr "<b>Dist. media entre puntos:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Elevation Range:</b>" msgstr "<b>Horquilla de elevación:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Total Elevation Gain/Loss:</b>" msgstr "<b>Diferencia total de elevación:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Start:</b>" msgstr "<b>Comienzo:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>End:</b>" msgstr "<b>Fin:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Duration:</b>" msgstr "<b>Duración:</b>" -#: ../src/viktrwlayer_propwin.c:788 ../src/viktrwlayer_propwin.c:795 -#: ../src/viktrwlayer_propwin.c:804 ../src/viktrwlayer_propwin.c:811 -#: ../src/viktrwlayer_propwin.c:850 ../src/viktrwlayer_propwin.c:851 -#: ../src/viktrwlayer_propwin.c:852 ../src/viktrwlayer_propwin.c:874 -#: ../src/viktrwlayer_propwin.c:881 +#: ../src/viktrwlayer_propwin.c:791 ../src/viktrwlayer_propwin.c:798 +#: ../src/viktrwlayer_propwin.c:807 ../src/viktrwlayer_propwin.c:814 +#: ../src/viktrwlayer_propwin.c:853 ../src/viktrwlayer_propwin.c:854 +#: ../src/viktrwlayer_propwin.c:855 ../src/viktrwlayer_propwin.c:877 +#: ../src/viktrwlayer_propwin.c:884 #, c-format msgid "No Data" msgstr "Sin datos" -#: ../src/viktrwlayer_propwin.c:847 +#: ../src/viktrwlayer_propwin.c:850 #, c-format msgid "%d minutes" msgstr "%d minutos" -#: ../src/viktrwlayer_propwin.c:870 +#: ../src/viktrwlayer_propwin.c:873 msgid "Statistics" -msgstr "" +msgstr "Estadisticas" -#: ../src/viktrwlayer_propwin.c:875 +#: ../src/viktrwlayer_propwin.c:878 msgid "<b>Track Distance:</b>" -msgstr "" +msgstr "<b>Distancia del Track:</b>" -#: ../src/viktrwlayer_propwin.c:876 +#: ../src/viktrwlayer_propwin.c:879 msgid "Elevation-distance" msgstr "Elevación-distancia" -#: ../src/viktrwlayer_propwin.c:882 +#: ../src/viktrwlayer_propwin.c:885 msgid "<b>Track Time:</b>" -msgstr "" +msgstr "<b>Tiempo del Track:</b>" -#: ../src/viktrwlayer_propwin.c:883 +#: ../src/viktrwlayer_propwin.c:886 msgid "Speed-time" msgstr "Velocidad-tiempo" @@ -1580,31 +1598,47 @@ msgstr "<b>Diferencia en tiempo:</b>" msgid "<b>\"Speed\" Between:</b>" msgstr "<b>\"Velocidad\" entre:</b>" -#: ../src/viktrwlayer_tpwin.c:117 +#: ../src/viktrwlayer_tpwin.c:110 +msgid "<b>VDOP:</b>" +msgstr "<b>VDOP:</b>" + +#: ../src/viktrwlayer_tpwin.c:111 +msgid "<b>HDOP:</b>" +msgstr "<b>HDOP:</b>" + +#: ../src/viktrwlayer_tpwin.c:112 +msgid "<b>PDOP:</b>" +msgstr "<b>PDOP:</b>" + +#: ../src/viktrwlayer_tpwin.c:113 +msgid "<b>SAT/FIX:</b>" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:122 msgid "Trackpoint" msgstr "Punto de ruta" -#: ../src/viktrwlayer_tpwin.c:122 +#: ../src/viktrwlayer_tpwin.c:127 msgid "Split Here" msgstr "Dividir aquÃ" -#: ../src/viktrwlayer_tpwin.c:123 +#: ../src/viktrwlayer_tpwin.c:128 msgid "Join With Last" msgstr "Fusionar con la última" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Pan" msgstr "Desplazar" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Zoom" msgstr "Zoom" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Ruler" msgstr "Regla" -#: ../src/vikwindow.c:363 +#: ../src/vikwindow.c:364 #, c-format msgid "" "Do you want to save the changes you made to the document \"%s\"?\n" @@ -1615,53 +1649,53 @@ msgstr "" "\n" "Sus cambios se perderán si no los graba." -#: ../src/vikwindow.c:366 ../src/vikwindow.c:1314 +#: ../src/vikwindow.c:367 ../src/vikwindow.c:1306 msgid "Untitled" msgstr "Sin nombre" -#: ../src/vikwindow.c:367 +#: ../src/vikwindow.c:368 msgid "Don't Save" msgstr "No guardar" -#: ../src/vikwindow.c:400 +#: ../src/vikwindow.c:401 msgid "mpp" msgstr "metros/pixel" -#: ../src/vikwindow.c:400 +#: ../src/vikwindow.c:401 msgid "pixelfact" msgstr "factor de pixel" -#: ../src/vikwindow.c:527 +#: ../src/vikwindow.c:528 #, c-format msgid "%s %s %dm" -msgstr "" +msgstr "%s%s%dm" -#: ../src/vikwindow.c:529 +#: ../src/vikwindow.c:530 #, c-format msgid "%s %s" -msgstr "" +msgstr "%s%s" -#: ../src/vikwindow.c:1113 +#: ../src/vikwindow.c:1105 msgid "You must select a layer to show its properties." msgstr "Debe seleccionar una capa para mostrar sus propiedades." -#: ../src/vikwindow.c:1129 +#: ../src/vikwindow.c:1121 msgid "You must select a layer to delete." msgstr "Debe seleccionar una capa que borrar." -#: ../src/vikwindow.c:1347 +#: ../src/vikwindow.c:1339 msgid "The file you requested could not be opened." msgstr "El fichero seleccionado no se puede abrir" -#: ../src/vikwindow.c:1390 +#: ../src/vikwindow.c:1382 msgid "Please select a GPS data file to open. " msgstr "Por favor seleccione un fichero GPS que abrir. " -#: ../src/vikwindow.c:1433 +#: ../src/vikwindow.c:1425 msgid "Save as Viking File." msgstr "Guardar como archivo Viking." -#: ../src/vikwindow.c:1667 +#: ../src/vikwindow.c:1664 msgid "" "Viewable region outside allowable pixel size bounds for image. Clipping " "width/height values." @@ -1669,440 +1703,410 @@ msgstr "" "La región visible fuera esta fuera de los valores permitidos para los " "lÃmites de la imagen. Se limitarán el ancho y el alto." -#: ../src/vikwindow.c:1686 +#: ../src/vikwindow.c:1683 #, c-format msgid "Total area: %ldm x %ldm (%.3f sq. km)" msgstr "Area total: %ldm x %ldm (%.3f km cuadrados)" #. todo: default for answers inside VikWindow or static (thruout instance) -#: ../src/vikwindow.c:1694 +#: ../src/vikwindow.c:1691 msgid "Save to Image File" msgstr "Guardar como imagen" -#: ../src/vikwindow.c:1712 +#: ../src/vikwindow.c:1709 msgid "Width (pixels):" msgstr "Ancho (pixels):" -#: ../src/vikwindow.c:1714 +#: ../src/vikwindow.c:1711 msgid "Height (pixels):" msgstr "Alto (pixels):" -#: ../src/vikwindow.c:1717 +#: ../src/vikwindow.c:1714 msgid "Zoom (meters per pixel):" msgstr "Zoom (metros/pixel):" -#: ../src/vikwindow.c:1723 +#: ../src/vikwindow.c:1720 msgid "Area in current viewable window" msgstr "Area en ventana visible" -#: ../src/vikwindow.c:1733 +#: ../src/vikwindow.c:1730 msgid "Save as PNG" msgstr "Guardar como PNG" -#: ../src/vikwindow.c:1734 +#: ../src/vikwindow.c:1731 msgid "Save as JPEG" msgstr "Guardar como JPEG" -#: ../src/vikwindow.c:1754 +#: ../src/vikwindow.c:1751 msgid "East-west image tiles:" msgstr "Teselas de imagen E-W:" -#: ../src/vikwindow.c:1756 +#: ../src/vikwindow.c:1753 msgid "North-south image tiles:" msgstr "Teselas de imagen N-S:" -#: ../src/vikwindow.c:1796 +#: ../src/vikwindow.c:1793 msgid "You must be in UTM mode to use this feature" msgstr "Debe estar en modo UTM para usar esta función" -#: ../src/vikwindow.c:1807 +#: ../src/vikwindow.c:1804 msgid "Save Image" msgstr "Guardar imagen" -#: ../src/vikwindow.c:1834 +#: ../src/vikwindow.c:1831 msgid "Choose a directory to hold images" -msgstr "" +msgstr "Elije un directorio para colocar las imagenes" -#: ../src/vikwindow.c:1920 +#: ../src/vikwindow.c:1917 msgid "Choose a background color" msgstr "Escoja un color de fondo" -#: ../src/vikwindow.c:1941 +#: ../src/vikwindow.c:1938 msgid "_File" msgstr "_Archivo" -#: ../src/vikwindow.c:1942 +#: ../src/vikwindow.c:1939 msgid "_Edit" msgstr "_Editar" -#: ../src/vikwindow.c:1943 +#: ../src/vikwindow.c:1940 msgid "_View" msgstr "_Ver" -#: ../src/vikwindow.c:1944 ../src/vikwindow.c:2015 +#: ../src/vikwindow.c:1941 ../src/vikwindow.c:2013 msgid "_Zoom" msgstr "_Zoom" -#: ../src/vikwindow.c:1945 ../src/vikwindow.c:2014 +#: ../src/vikwindow.c:1942 ../src/vikwindow.c:2012 msgid "_Pan" msgstr "_Desplazar" -#: ../src/vikwindow.c:1946 +#: ../src/vikwindow.c:1943 msgid "_Layers" msgstr "_Capas" -#: ../src/vikwindow.c:1947 +#: ../src/vikwindow.c:1944 msgid "_Tools" msgstr "_Herramientas" -#: ../src/vikwindow.c:1948 +#: ../src/vikwindow.c:1945 msgid "_Webtools" -msgstr "" +msgstr "_Herramientas WEB" -#: ../src/vikwindow.c:1949 +#: ../src/vikwindow.c:1946 msgid "_Help" msgstr "A_yuda" -#: ../src/vikwindow.c:1951 +#: ../src/vikwindow.c:1948 msgid "_New" msgstr "_Nuevo" -#: ../src/vikwindow.c:1951 +#: ../src/vikwindow.c:1948 msgid "New file" msgstr "Nuevo archivo" -#: ../src/vikwindow.c:1952 +#: ../src/vikwindow.c:1949 msgid "_Open" msgstr "_Abrir" -#: ../src/vikwindow.c:1952 +#: ../src/vikwindow.c:1949 msgid "Open a file" msgstr "Abrir un archivo" -#: ../src/vikwindow.c:1953 +#: ../src/vikwindow.c:1950 msgid "A_ppend File" msgstr "A_ñadir a archivo" -#: ../src/vikwindow.c:1953 +#: ../src/vikwindow.c:1950 msgid "Append data from a different file" msgstr "Añadir datos de otro fichero" -#: ../src/vikwindow.c:1954 +#: ../src/vikwindow.c:1951 msgid "A_cquire" msgstr "A_dquirir" -#: ../src/vikwindow.c:1955 +#: ../src/vikwindow.c:1952 msgid "From _GPS" msgstr "Desde _GPS" -#: ../src/vikwindow.c:1955 +#: ../src/vikwindow.c:1952 msgid "Transfer data from a GPS device" msgstr "Transferir datos desde un dispositivo GPS" -#: ../src/vikwindow.c:1956 +#: ../src/vikwindow.c:1953 msgid "Google _Directions" msgstr "_Direcciones Google" -#: ../src/vikwindow.c:1956 +#: ../src/vikwindow.c:1953 msgid "Get driving directions from Google" msgstr "Obtener trayectos desde Google" -#: ../src/vikwindow.c:1958 +#: ../src/vikwindow.c:1955 msgid "Geo_caches" msgstr "Geo_caches" -#: ../src/vikwindow.c:1958 +#: ../src/vikwindow.c:1955 msgid "Get Geocaches from geocaching.com" msgstr "Obtener geocachés de geocaching.com" -#: ../src/vikwindow.c:1960 +#: ../src/vikwindow.c:1957 msgid "_Save" msgstr "_Guardar" -#: ../src/vikwindow.c:1960 +#: ../src/vikwindow.c:1957 msgid "Save the file" msgstr "Guardar el fichero" -#: ../src/vikwindow.c:1961 +#: ../src/vikwindow.c:1958 msgid "Save _As" msgstr "Guardar _como" -#: ../src/vikwindow.c:1961 +#: ../src/vikwindow.c:1958 msgid "Save the file under different name" msgstr "Guardar el fichero con otro nombre" -#: ../src/vikwindow.c:1962 +#: ../src/vikwindow.c:1959 msgid "_Generate Image File" msgstr "Generar i_magen" -#: ../src/vikwindow.c:1962 +#: ../src/vikwindow.c:1959 msgid "Save a snapshot of the workspace into a file" msgstr "Guardar una imagen del area de trabajo en un fichero" -#: ../src/vikwindow.c:1963 +#: ../src/vikwindow.c:1960 msgid "Generate _Directory of Images" msgstr "Generar _directorio de imágenes" -#: ../src/vikwindow.c:1963 +#: ../src/vikwindow.c:1960 msgid "FIXME:IMGDIR" msgstr "FIXME:IMGDIR" -#: ../src/vikwindow.c:1966 +#: ../src/vikwindow.c:1963 msgid "_Print..." msgstr "_Imprimir…" -#: ../src/vikwindow.c:1966 +#: ../src/vikwindow.c:1963 msgid "Print maps" msgstr "Imprimir mapas" -#: ../src/vikwindow.c:1969 +#: ../src/vikwindow.c:1966 msgid "E_xit" msgstr "_Salir" -#: ../src/vikwindow.c:1969 +#: ../src/vikwindow.c:1966 msgid "Exit the program" msgstr "Salir del programa" -#: ../src/vikwindow.c:1970 +#: ../src/vikwindow.c:1967 msgid "Save and Exit" msgstr "Guardar y salir" -#: ../src/vikwindow.c:1970 +#: ../src/vikwindow.c:1967 msgid "Save and Exit the program" msgstr "Guardar el fichero y salir de Viking" -#: ../src/vikwindow.c:1972 +#: ../src/vikwindow.c:1969 msgid "Go To location" -msgstr "" +msgstr "Ir a la localidad" -#: ../src/vikwindow.c:1972 +#: ../src/vikwindow.c:1969 msgid "Go to address/place using text search" -msgstr "" +msgstr "Ir a la direccion/posición usada por la busqueda de texto" -#: ../src/vikwindow.c:1973 +#: ../src/vikwindow.c:1970 msgid "_Go to Lat\\/Lon..." msgstr "_Ir a Lat/Lon..." -#: ../src/vikwindow.c:1973 +#: ../src/vikwindow.c:1970 msgid "Go to arbitrary lat\\/lon coordinate" msgstr "Ir a una lat\\/lon arbitraria" -#: ../src/vikwindow.c:1974 +#: ../src/vikwindow.c:1971 msgid "Go to UTM..." msgstr "Ir a UTM..." -#: ../src/vikwindow.c:1974 +#: ../src/vikwindow.c:1971 msgid "Go to arbitrary UTM coordinate" msgstr "Ir a una coordenada UTM arbitraria" -#: ../src/vikwindow.c:1975 +#: ../src/vikwindow.c:1972 msgid "Set Background Color..." msgstr "Fijar color de fondo..." -#: ../src/vikwindow.c:1976 +#: ../src/vikwindow.c:1973 msgid "Zoom _In" msgstr "_Ampliar" -#: ../src/vikwindow.c:1977 +#: ../src/vikwindow.c:1974 msgid "Zoom _Out" msgstr "_Reducir" -#: ../src/vikwindow.c:1978 +#: ../src/vikwindow.c:1975 msgid "Zoom _To" msgstr "Zoom _personalizado" -#: ../src/vikwindow.c:1979 +#: ../src/vikwindow.c:1976 msgid "0.25" msgstr "0,25" -#: ../src/vikwindow.c:1980 +#: ../src/vikwindow.c:1977 msgid "0.5" msgstr "0,5" -#: ../src/vikwindow.c:1981 +#: ../src/vikwindow.c:1978 msgid "1" msgstr "1" -#: ../src/vikwindow.c:1982 +#: ../src/vikwindow.c:1979 msgid "2" msgstr "2" -#: ../src/vikwindow.c:1983 +#: ../src/vikwindow.c:1980 msgid "4" msgstr "4" -#: ../src/vikwindow.c:1984 +#: ../src/vikwindow.c:1981 msgid "8" msgstr "8" -#: ../src/vikwindow.c:1985 +#: ../src/vikwindow.c:1982 msgid "16" msgstr "16" -#: ../src/vikwindow.c:1986 +#: ../src/vikwindow.c:1983 msgid "32" msgstr "32" -#: ../src/vikwindow.c:1987 +#: ../src/vikwindow.c:1984 msgid "64" msgstr "64" -#: ../src/vikwindow.c:1988 +#: ../src/vikwindow.c:1985 msgid "128" msgstr "128" -#: ../src/vikwindow.c:1989 +#: ../src/vikwindow.c:1986 msgid "Pan North" msgstr "Desplazar al N" -#: ../src/vikwindow.c:1990 +#: ../src/vikwindow.c:1987 msgid "Pan East" msgstr "Desplazar al E" -#: ../src/vikwindow.c:1991 +#: ../src/vikwindow.c:1988 msgid "Pan South" msgstr "Desplazar al S" -#: ../src/vikwindow.c:1992 +#: ../src/vikwindow.c:1989 msgid "Pan West" msgstr "Desplazar al W" -#: ../src/vikwindow.c:1993 +#: ../src/vikwindow.c:1990 msgid "Background _Jobs" msgstr "_Tareas en segundo plano" -#: ../src/vikwindow.c:1995 +#: ../src/vikwindow.c:1992 msgid "Cu_t" msgstr "Cor_tar" -#: ../src/vikwindow.c:1996 +#: ../src/vikwindow.c:1993 msgid "_Copy" msgstr "_Copiar" -#: ../src/vikwindow.c:1997 +#: ../src/vikwindow.c:1994 msgid "_Paste" msgstr "_Pegar" -#: ../src/vikwindow.c:1998 +#: ../src/vikwindow.c:1995 msgid "_Delete" msgstr "_Borrar" -#: ../src/vikwindow.c:1999 +#: ../src/vikwindow.c:1996 msgid "Delete All" msgstr "Borrar todo" -#: ../src/vikwindow.c:2000 +#: ../src/vikwindow.c:1997 +msgid "Flush Map cache" +msgstr "Limpiar cache de Mapas" + +#: ../src/vikwindow.c:1998 msgid "_Preferences..." msgstr "_Preferencias..." -#: ../src/vikwindow.c:2001 +#: ../src/vikwindow.c:1999 msgid "_Properties" msgstr "P_ropiedades" -#: ../src/vikwindow.c:2003 +#: ../src/vikwindow.c:2001 msgid "_About" msgstr "_Acerca de..." -#: ../src/vikwindow.c:2008 +#: ../src/vikwindow.c:2006 msgid "_UTM Mode" msgstr "Modo _UTM" -#: ../src/vikwindow.c:2009 +#: ../src/vikwindow.c:2007 msgid "_Expedia Mode" msgstr "Modo _Expedia" -#: ../src/vikwindow.c:2010 +#: ../src/vikwindow.c:2008 msgid "_Mercator Mode" msgstr "Modo _Mercator" -#: ../src/vikwindow.c:2014 +#: ../src/vikwindow.c:2012 msgid "Pan Tool" -msgstr "" +msgstr "Herramienta de paneo" -#: ../src/vikwindow.c:2015 +#: ../src/vikwindow.c:2013 msgid "Zoom Tool" msgstr "Herramienta zoom" -#: ../src/vikwindow.c:2016 +#: ../src/vikwindow.c:2014 msgid "_Ruler" msgstr "_Regla" -#: ../src/vikwindow.c:2016 +#: ../src/vikwindow.c:2014 msgid "Ruler Tool" msgstr "Herramienta regla" -#: ../src/vikwindow.c:2020 +#: ../src/vikwindow.c:2018 msgid "Show Scale" msgstr "Mostrar escala" -#: ../src/vikwindow.c:2021 +#: ../src/vikwindow.c:2019 msgid "Show Center Mark" msgstr "Mostrar marca central" -#: ../src/vikwindow.c:2022 +#: ../src/vikwindow.c:2020 msgid "Full Screen" msgstr "Pantalla completa" -#: ../src/vikwindow.c:2022 +#: ../src/vikwindow.c:2020 msgid "Activate full screen mode" -msgstr "" +msgstr "Activando el modo de pantalla completa" -#: ../src/vikwindow.c:2023 +#: ../src/vikwindow.c:2021 msgid "Show Side Panel" -msgstr "" +msgstr "Muestra el panel lateral" -#: ../src/vikwindow.c:2085 +#: ../src/vikwindow.c:2083 #, c-format msgid "New %s Layer" msgstr "Nueva capa %s" #: ../src/viking.desktop.in.h:1 msgid "GPS Data Manager" -msgstr "" +msgstr "Administrador de datos GPS" #: ../src/viking.desktop.in.h:2 msgid "Map Based GPS Data Manager (live data capable)." msgstr "" +"Mapa basado en el administrador de datos GPS (Capacidad de datos en tiempo " +"real)" #: ../src/viking.desktop.in.h:3 msgid "Viking" -msgstr "" - -#~ msgid "Transparent Google Maps" -#~ msgstr "Mapas Google transparentes" - -#~ msgid "Google Satellite Images" -#~ msgstr "Imágenes de satélite Google" - -#~ msgid "Google Terrain Maps" -#~ msgstr "Mapas de terreno Google" - -#~ msgid "Failed getting google version numbers" -#~ msgstr "Error al obtener el número de versión de Google" - -#~ msgid "Old Google Maps" -#~ msgstr "Mapas Google (versión antigua)" - -#~ msgid "Keep current position at center" -#~ msgstr "Mantener la posición actual en el centro" - -#~ msgid "_Old Google Mode" -#~ msgstr "Modo Google (_antigua versión)" - -#~ msgid "Old _KH Mode" -#~ msgstr "Modo _KH (antigua versión)" - -#~ msgid "_Google Mode" -#~ msgstr "Modo _Google" - -#, c-format -#~ msgid "couldn't open temp file %s" -#~ msgstr "No se ha podido abrir el archivo temporal %s" - -#, c-format -#~ msgid "Failed downloading %s" -#~ msgstr "Error en la descarga %s" +msgstr "Vikingo" -#~ msgid "Failed fetching Google numbers (\"GLoadApi\" not found)" -#~ msgstr "" -#~ "Error en la obtención de los números de Google (\"GLoadApi\" no encontrado)" +#~ msgid "Maps Directory (Optional):" +#~ msgstr "Directorio de mapas (opcional):" @@ -4,15 +4,15 @@ msgid "" msgstr "" "Project-Id-Version: Viking\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-04 22:47+0100\n" -"PO-Revision-Date: 2009-02-08 11:00+0000\n" +"POT-Creation-Date: 2009-08-20 09:50+0200\n" +"PO-Revision-Date: 2009-09-02 11:20+0000\n" "Last-Translator: Guilhem Bonnefille <guilhem.bonnefille@gmail.com>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Launchpad-Export-Date: 2009-02-08 13:36+0000\n" +"X-Launchpad-Export-Date: 2009-09-09 20:12+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Language: French\n" @@ -24,28 +24,28 @@ msgstr "Traitement..." msgid "Error: acquisition failed." msgstr "Erreur : échec d'acquisition" -#: ../src/acquire.c:149 ../src/vikgpslayer.c:957 +#: ../src/acquire.c:149 ../src/vikgpslayer.c:953 msgid "Done." msgstr "Fait." -#: ../src/acquire.c:326 ../src/vikgpslayer.c:996 +#: ../src/acquire.c:326 ../src/vikgpslayer.c:992 msgid "Status: detecting gpsbabel" msgstr "Etat : détection gpsbabel en cours" -#: ../src/background.c:54 +#: ../src/background.c:57 #, c-format msgid "%d items" msgstr "%d éléments" -#: ../src/background.c:212 +#: ../src/background.c:224 msgid "Job" msgstr "Tâche" -#: ../src/background.c:216 +#: ../src/background.c:228 msgid "Progress" msgstr "Progression" -#: ../src/background.c:227 +#: ../src/background.c:239 msgid "Viking Background Jobs" msgstr "Tâches de fond" @@ -72,7 +72,7 @@ msgid "" "into." msgstr "Pour copier un waypoint, sélectionner un calque approprié." -#: ../src/curl_download.c:85 +#: ../src/curl_download.c:94 #, c-format msgid "%s() Curl perform failed: %s" msgstr "" @@ -107,7 +107,7 @@ msgstr "Lettre :" #: ../src/dialog.c:192 msgid "Waypoint Properties" -msgstr "" +msgstr "Propriétés du point d'intérêt" #: ../src/dialog.c:218 msgid "Name:" @@ -288,7 +288,7 @@ msgstr "Impossible d'ouvrir le fichier temporaire" #: ../src/globals.c:41 msgid "Degree format:" -msgstr "" +msgstr "Format des degrées :" #. Webtools #: ../src/google.c:34 @@ -351,19 +351,19 @@ msgstr "Acquis depuis le GPS" msgid "using cmdline '%s' and file '%s'\n" msgstr "exécute la commande '%s' avec le fichier '%s'\n" -#: ../src/datasource_gps.c:150 ../src/vikgpslayer.c:711 +#: ../src/datasource_gps.c:150 ../src/vikgpslayer.c:707 #, c-format msgid "Downloading %d waypoint..." msgid_plural "Downloading %d waypoints..." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Téléchargement de %d point d'intérêt..." +msgstr[1] "Téléchargement de %d points d'intérêt..." -#: ../src/datasource_gps.c:152 ../src/vikgpslayer.c:713 +#: ../src/datasource_gps.c:152 ../src/vikgpslayer.c:709 #, c-format msgid "Downloading %d trackpoint..." msgid_plural "Downloading %d trackpoints..." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Téléchargement de %d point de route..." +msgstr[1] "Téléchargement de %d points de route..." #: ../src/datasource_gps.c:170 #, c-format @@ -375,7 +375,7 @@ msgstr "%d sur %d %s téléchargés" msgid "Downloaded %d %s." msgstr "%d %s téléchargés" -#: ../src/datasource_gps.c:185 ../src/vikgpslayer.c:783 +#: ../src/datasource_gps.c:185 ../src/vikgpslayer.c:779 #, c-format msgid "GPS Device: %s" msgstr "Appareil GPS : %s" @@ -388,7 +388,7 @@ msgstr "Protocole GPS :" msgid "Serial Port:" msgstr "Port série :" -#: ../src/datasource_gps.c:299 ../src/vikgpslayer.c:1001 +#: ../src/datasource_gps.c:299 ../src/vikgpslayer.c:997 msgid "GPS device: N/A" msgstr "Appareil GPS : N/A" @@ -417,6 +417,10 @@ msgstr "Erreur de téléchargement : %s" #: ../src/file.c:426 ../src/file.c:430 #, c-format msgid "Draw mode '%s' no more supported" +msgstr "Le mode d'affichage '%s' n'est plus supporté" + +#: ../src/mapcache.c:63 +msgid "Mapcache memory size (MB):" msgstr "" #: ../src/print.c:53 @@ -461,11 +465,11 @@ msgstr "Ignorer les _marges de page" msgid "Image S_ize:" msgstr "Taille de l'_image :" -#: ../src/util.c:75 +#: ../src/util.c:76 msgid "Could not launch web browser." msgstr "Impossible de lancer le navigateur web." -#: ../src/util.c:86 +#: ../src/util.c:87 msgid "Could not create new email." msgstr "Impossible de créer un nouvel email." @@ -684,11 +688,11 @@ msgstr "" msgid "Downloading DEM %s" msgstr "Téléchargement du DEM %s" -#: ../src/vikfileentry.c:67 +#: ../src/vikfileentry.c:68 msgid "Browse..." msgstr "Parcourir…" -#: ../src/vikfileentry.c:94 +#: ../src/vikfileentry.c:96 msgid "Choose file" msgstr "Sélectionner un fichier" @@ -787,7 +791,7 @@ msgstr "" #: ../src/vikgpslayer.c:139 msgid "Moving Map Method:" -msgstr "" +msgstr "Méthode de déplacement de la carte :" #: ../src/vikgpslayer.c:140 msgid "Gpsd Host:" @@ -801,11 +805,11 @@ msgstr "Port gpsd :" msgid "Gpsd Retry Interval (seconds):" msgstr "" -#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:989 +#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:985 msgid "GPS Download" msgstr "Réception depuis GPS" -#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:989 +#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:985 msgid "GPS Upload" msgstr "Émission vers GPS" @@ -813,110 +817,110 @@ msgstr "Émission vers GPS" msgid "GPS Realtime Tracking" msgstr "Suivi en temps réel des traces GPS" -#: ../src/vikgpslayer.c:373 +#: ../src/vikgpslayer.c:371 msgid "Unknown GPS Protocol" msgstr "Protocole GPS inconnu" -#: ../src/vikgpslayer.c:379 +#: ../src/vikgpslayer.c:377 msgid "Unknown serial port device" msgstr "Port série inconnu" -#: ../src/vikgpslayer.c:444 +#: ../src/vikgpslayer.c:442 #, c-format msgid "%s: unknown parameter" msgstr "Paramètre inconnu : %s" -#: ../src/vikgpslayer.c:545 +#: ../src/vikgpslayer.c:541 msgid "Upload to GPS" msgstr "Émission vers le GPS" -#: ../src/vikgpslayer.c:550 +#: ../src/vikgpslayer.c:546 msgid "Download from GPS" msgstr "Réception depuis le GPS" -#: ../src/vikgpslayer.c:568 +#: ../src/vikgpslayer.c:564 msgid "Empty Upload" msgstr "Émission vide" -#: ../src/vikgpslayer.c:573 +#: ../src/vikgpslayer.c:569 msgid "Empty Download" msgstr "Réception vide" -#: ../src/vikgpslayer.c:578 +#: ../src/vikgpslayer.c:574 msgid "Empty All" msgstr "Tout effacer" -#: ../src/vikgpslayer.c:718 +#: ../src/vikgpslayer.c:714 #, c-format msgid "Uploading %d waypoint..." msgid_plural "Uploading %d waypoints..." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Envoie de %d point d'intérêt..." +msgstr[1] "Envoie de %d points d'intérêt..." -#: ../src/vikgpslayer.c:720 +#: ../src/vikgpslayer.c:716 #, c-format msgid "Uploading %d trackpoint..." msgid_plural "Uploading %d trackpoints..." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Envoie de %d point de route..." +msgstr[1] "Envoie de %d points de route..." -#: ../src/vikgpslayer.c:744 +#: ../src/vikgpslayer.c:740 #, c-format msgid "Downloaded %d out of %d waypoint..." msgid_plural "Downloaded %d out of %d waypoints..." msgstr[0] "%d sur %d position téléchargée…" msgstr[1] "%d sur %d positions téléchargées…" -#: ../src/vikgpslayer.c:746 +#: ../src/vikgpslayer.c:742 #, c-format msgid "Downloaded %d out of %d trackpoint..." msgid_plural "Downloaded %d out of %d trackpoints..." msgstr[0] "%d sur %d point de trace téléchargé…" msgstr[1] "%d sur %d points de trace téléchargés…" -#: ../src/vikgpslayer.c:750 +#: ../src/vikgpslayer.c:746 #, c-format msgid "Uploaded %d out of %d waypoint..." msgid_plural "Uploaded %d out of %d waypoints..." msgstr[0] "%d sur %d waypoint émis…" msgstr[1] "%d sur %d waypoints émis…" -#: ../src/vikgpslayer.c:752 +#: ../src/vikgpslayer.c:748 #, c-format msgid "Uploaded %d out of %d trackpoint..." msgid_plural "Uploaded %d out of %d trackpoints..." msgstr[0] "%d sur %d point de trace émis…" msgstr[1] "%d sur %d points de trace émis…" -#: ../src/vikgpslayer.c:759 +#: ../src/vikgpslayer.c:755 #, c-format msgid "Downloaded %d waypoint" msgid_plural "Downloaded %d waypoints" msgstr[0] "%d waypoint téléchargé" msgstr[1] "%d waypoints téléchargés" -#: ../src/vikgpslayer.c:761 +#: ../src/vikgpslayer.c:757 #, c-format msgid "Downloaded %d trackpoint" msgid_plural "Downloaded %d trackpoints" msgstr[0] "%d point de trace téléchargé" msgstr[1] "%d points de trace téléchargés" -#: ../src/vikgpslayer.c:765 +#: ../src/vikgpslayer.c:761 #, c-format msgid "Uploaded %d waypoint" msgid_plural "Uploaded %d waypoints" msgstr[0] "%d waypoint émis" msgstr[1] "%d waypoints émis" -#: ../src/vikgpslayer.c:767 +#: ../src/vikgpslayer.c:763 #, c-format msgid "Uploaded %d trackpoint" msgid_plural "Uploaded %d trackpoints" msgstr[0] "%d point de trace émis" msgstr[1] "%d points de trace émis" -#: ../src/vikgpslayer.c:952 +#: ../src/vikgpslayer.c:948 msgid "Error: couldn't find gpsbabel." msgstr "Erreur: impossible de trouver gpsbabel." @@ -970,8 +974,8 @@ msgid "Map Type:" msgstr "Type de carte :" #: ../src/vikmapslayer.c:120 -msgid "Maps Directory (Optional):" -msgstr "Répertoire des cartes (optionnel) :" +msgid "Maps Directory:" +msgstr "Répertoire des cartes :" #: ../src/vikmapslayer.c:121 msgid "Alpha:" @@ -1017,36 +1021,36 @@ msgid "" "factor" msgstr "Impossible d'afficher des cases en dessous du facteur de zoom %d." -#: ../src/vikmapslayer.c:924 +#: ../src/vikmapslayer.c:927 #, c-format msgid "Redownloading up to %d %s map..." msgid_plural "Redownloading up to %d %s maps..." msgstr[0] "" msgstr[1] "" -#: ../src/vikmapslayer.c:926 +#: ../src/vikmapslayer.c:929 #, c-format msgid "Redownloading %d %s map..." msgid_plural "Redownloading %d %s maps..." msgstr[0] "" msgstr[1] "" -#: ../src/vikmapslayer.c:930 ../src/vikmapslayer.c:1001 +#: ../src/vikmapslayer.c:933 ../src/vikmapslayer.c:1004 #, c-format msgid "Downloading %d %s map..." msgid_plural "Downloading %d %s maps..." msgstr[0] "Téléchargement de %d carte %s…" msgstr[1] "Téléchargement de %d cartes %s…" -#: ../src/vikmapslayer.c:1058 +#: ../src/vikmapslayer.c:1061 msgid "Redownload bad map(s)" msgstr "Retélécharger les mauvaises cartes" -#: ../src/vikmapslayer.c:1062 +#: ../src/vikmapslayer.c:1065 msgid "Redownload all map(s)" msgstr "Retélécharger toutes les cartes" -#: ../src/vikmapslayer.c:1142 +#: ../src/vikmapslayer.c:1145 #, c-format msgid "" "Wrong drawmode for this map.\n" @@ -1055,16 +1059,16 @@ msgstr "" "Mauvais mode d'affichage pour cette carte.\n" "Sélectionner \"%s\" dans le menu Vue et re-essayer." -#: ../src/vikmapslayer.c:1147 +#: ../src/vikmapslayer.c:1150 msgid "Wrong zoom level for this map." msgstr "Mauvais niveau de zoom pour cette carte." -#: ../src/vikmapslayer.c:1172 +#: ../src/vikmapslayer.c:1175 msgid "Download Onscreen Maps" msgstr "Télécharger dalles visibles" #. TODO Add GTK_STOCK_REFRESH icon -#: ../src/vikmapslayer.c:1178 +#: ../src/vikmapslayer.c:1181 msgid "Refresh Onscreen Tiles" msgstr "Rafraîchir dalles visibles" @@ -1252,12 +1256,12 @@ msgstr "Ce calque n'a pas de waypoints ou de traces." msgid "Export Layer" msgstr "Exporter le calque" -#: ../src/viktrwlayer.c:1565 ../src/vikwindow.c:1446 ../src/vikwindow.c:1820 +#: ../src/viktrwlayer.c:1565 ../src/vikwindow.c:1438 ../src/vikwindow.c:1817 #, c-format msgid "The file \"%s\" exists, do you wish to overwrite it?" msgstr "Le fichier \"%s\" existe déjà . Voulez-vous le remplacer ?" -#: ../src/viktrwlayer.c:1575 ../src/vikwindow.c:1464 +#: ../src/viktrwlayer.c:1575 ../src/vikwindow.c:1456 msgid "The filename you requested could not be opened for writing." msgstr "Le fichier choisi ne peut être ouvert en écriture." @@ -1273,78 +1277,78 @@ msgstr "Nom du waypoint :" msgid "Waypoint not found in this layer." msgstr "Aucun waypoint trouvé sur ce calque." -#: ../src/viktrwlayer.c:1724 +#: ../src/viktrwlayer.c:1723 msgid "Goto Center of Layer" msgstr "Aller au centre du calque" -#: ../src/viktrwlayer.c:1729 +#: ../src/viktrwlayer.c:1728 msgid "Goto Waypoint" msgstr "Aller au waypoint" -#: ../src/viktrwlayer.c:1735 +#: ../src/viktrwlayer.c:1734 msgid "Export layer" msgstr "Exporter le calque" -#: ../src/viktrwlayer.c:1740 +#: ../src/viktrwlayer.c:1739 msgid "Export as GPSPoint" msgstr "Exporter en tant que GPSPoint" -#: ../src/viktrwlayer.c:1745 +#: ../src/viktrwlayer.c:1744 msgid "Export as GPSMapper" msgstr "Exporter en tant que GPSMapper" -#: ../src/viktrwlayer.c:1750 +#: ../src/viktrwlayer.c:1749 msgid "Export as GPX" msgstr "Exporter en tant que GPX" -#: ../src/viktrwlayer.c:1755 ../src/viktrwlayer.c:2794 +#: ../src/viktrwlayer.c:1754 ../src/viktrwlayer.c:2794 msgid "New Waypoint" msgstr "Nouveau waypoint" -#: ../src/viktrwlayer.c:1762 +#: ../src/viktrwlayer.c:1761 msgid "Add Wikipedia Waypoints" msgstr "Ajouter les waypoints Wikipedia" -#: ../src/viktrwlayer.c:1767 +#: ../src/viktrwlayer.c:1766 msgid "Within layer bounds" msgstr "A l'intérieur de la couche courrante" -#: ../src/viktrwlayer.c:1772 +#: ../src/viktrwlayer.c:1771 msgid "Within current view" msgstr "A l'intérieur de la vue courrante" -#: ../src/viktrwlayer.c:1779 ../src/viktrwlayer.c:2760 +#: ../src/viktrwlayer.c:1778 ../src/viktrwlayer.c:2760 msgid "Upload to OSM" msgstr "Envoyer sur OSM" -#: ../src/viktrwlayer.c:2290 +#: ../src/viktrwlayer.c:2289 msgid "Failed. This track does not have timestamp" msgstr "Echec. Cette trace n'a pas d'information de temps." -#: ../src/viktrwlayer.c:2304 +#: ../src/viktrwlayer.c:2303 msgid "Failed. No other track in this layer has timestamp" msgstr "" "Echec. Aucune autre trace dans cette couche n'a d'information de temps." -#: ../src/viktrwlayer.c:2310 +#: ../src/viktrwlayer.c:2309 msgid "Merge with..." msgstr "Fusionner avec..." -#: ../src/viktrwlayer.c:2310 +#: ../src/viktrwlayer.c:2309 msgid "Select track to merge with" msgstr "Sélectionner la trace avec laquelle fusionner." -#: ../src/viktrwlayer.c:2347 +#: ../src/viktrwlayer.c:2346 msgid "Merge Threshold..." msgstr "Distance de fusionnement…" -#: ../src/viktrwlayer.c:2348 +#: ../src/viktrwlayer.c:2347 msgid "Merge when time between tracks less than:" msgstr "Fusionner quand le temps entre les points est moins que :" #: ../src/viktrwlayer.c:2439 msgid "Split Threshold..." -msgstr "" +msgstr "Distance de séparation…" #: ../src/viktrwlayer.c:2440 msgid "Split when time between trackpoints exceeds:" @@ -1414,131 +1418,133 @@ msgstr "" msgid "Use with filter" msgstr "" -#: ../src/viktrwlayer.c:3736 +#: ../src/viktrwlayer.c:3735 msgid "Could not launch eog to open file." msgstr "Impossible de lancer eog pour ouvrir ce fichier." -#: ../src/viktrwlayer.c:3790 +#: ../src/viktrwlayer.c:3789 #, c-format msgid "Creating %d Image Thumbnails..." msgstr "Création de %d miniatures…" -#: ../src/viktrwlayer.c:4010 +#: ../src/viktrwlayer.c:4009 msgid "No map layer in use. Create one first" msgstr "" -#: ../src/viktrwlayer_propwin.c:658 +#: ../src/viktrwlayer_propwin.c:661 msgid "Failed spliting track. Track unchanged" msgstr "Impossible de séparer la trace, qui n'a pas été modifiée." -#: ../src/viktrwlayer_propwin.c:675 +#: ../src/viktrwlayer_propwin.c:678 msgid "Operation Aborted. Track unchanged" msgstr "Opération annulée. La trace n'a pas été changée." -#: ../src/viktrwlayer_propwin.c:729 +#: ../src/viktrwlayer_propwin.c:732 #, c-format msgid "%s - Track Properties" msgstr "%s - Propriétés de la trace" -#: ../src/viktrwlayer_propwin.c:734 +#: ../src/viktrwlayer_propwin.c:737 msgid "Split at Marker" msgstr "Découper sur marqueur" -#: ../src/viktrwlayer_propwin.c:735 +#: ../src/viktrwlayer_propwin.c:738 msgid "Split Segments" msgstr "Découper les segments" -#: ../src/viktrwlayer_propwin.c:736 +#: ../src/viktrwlayer_propwin.c:739 msgid "Reverse" msgstr "Inverser" -#: ../src/viktrwlayer_propwin.c:737 +#: ../src/viktrwlayer_propwin.c:740 msgid "Delete Dupl." msgstr "Supprimer les doublons" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Comment:</b>" msgstr "<b>Commentaire :</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Track Length:</b>" msgstr "<b>Longueur :</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Trackpoints:</b>" msgstr "<b>Nombre de points :</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Segments:</b>" msgstr "<b>Segments :</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Duplicate Points:</b>" msgstr "<b>Points dupliqués :</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Max Speed:</b>" msgstr "<b>Vitesse maximale :</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Avg. Speed:</b>" msgstr "<b>Vitesse moyenne :</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Avg. Dist. Between TPs:</b>" msgstr "<b>Distance moyenne entre points :</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Elevation Range:</b>" msgstr "<b>Altitudes atteintes :</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Total Elevation Gain/Loss:</b>" msgstr "<b>Dénivelé total :</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Start:</b>" msgstr "<b>Départ :</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>End:</b>" msgstr "<b>Arrivée :</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Duration:</b>" msgstr "<b>Durée :</b>" -#: ../src/viktrwlayer_propwin.c:788 ../src/viktrwlayer_propwin.c:795 -#: ../src/viktrwlayer_propwin.c:804 ../src/viktrwlayer_propwin.c:811 -#: ../src/viktrwlayer_propwin.c:850 ../src/viktrwlayer_propwin.c:851 -#: ../src/viktrwlayer_propwin.c:852 ../src/viktrwlayer_propwin.c:874 -#: ../src/viktrwlayer_propwin.c:881 +#: ../src/viktrwlayer_propwin.c:791 ../src/viktrwlayer_propwin.c:798 +#: ../src/viktrwlayer_propwin.c:807 ../src/viktrwlayer_propwin.c:814 +#: ../src/viktrwlayer_propwin.c:853 ../src/viktrwlayer_propwin.c:854 +#: ../src/viktrwlayer_propwin.c:855 ../src/viktrwlayer_propwin.c:877 +#: ../src/viktrwlayer_propwin.c:884 #, c-format msgid "No Data" msgstr "Pas de données" -#: ../src/viktrwlayer_propwin.c:847 +#: ../src/viktrwlayer_propwin.c:850 #, c-format msgid "%d minutes" msgstr "%d minutes" -#: ../src/viktrwlayer_propwin.c:870 +#: ../src/viktrwlayer_propwin.c:873 msgid "Statistics" msgstr "Statistiques" -#: ../src/viktrwlayer_propwin.c:875 +#: ../src/viktrwlayer_propwin.c:878 msgid "<b>Track Distance:</b>" msgstr "" +"Copy text \t\r\n" +"<b>Distance de la trace :</b>" -#: ../src/viktrwlayer_propwin.c:876 +#: ../src/viktrwlayer_propwin.c:879 msgid "Elevation-distance" msgstr "Dénivelée/distance" -#: ../src/viktrwlayer_propwin.c:882 +#: ../src/viktrwlayer_propwin.c:885 msgid "<b>Track Time:</b>" -msgstr "" +msgstr "<b>Durée de la trace :</b>" -#: ../src/viktrwlayer_propwin.c:883 +#: ../src/viktrwlayer_propwin.c:886 msgid "Speed-time" msgstr "Vitesse/temps" @@ -1578,31 +1584,47 @@ msgstr "<b>Temps :</b>" msgid "<b>\"Speed\" Between:</b>" msgstr "<b>Vitesse :</b>" -#: ../src/viktrwlayer_tpwin.c:117 -msgid "Trackpoint" +#: ../src/viktrwlayer_tpwin.c:110 +msgid "<b>VDOP:</b>" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:111 +msgid "<b>HDOP:</b>" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:112 +msgid "<b>PDOP:</b>" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:113 +msgid "<b>SAT/FIX:</b>" msgstr "" #: ../src/viktrwlayer_tpwin.c:122 +msgid "Trackpoint" +msgstr "Point de route" + +#: ../src/viktrwlayer_tpwin.c:127 msgid "Split Here" msgstr "Découper ici" -#: ../src/viktrwlayer_tpwin.c:123 +#: ../src/viktrwlayer_tpwin.c:128 msgid "Join With Last" msgstr "Joindre avec le dernier" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Pan" msgstr "Déplacer" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Zoom" msgstr "Zoom" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Ruler" msgstr "Règle" -#: ../src/vikwindow.c:363 +#: ../src/vikwindow.c:364 #, c-format msgid "" "Do you want to save the changes you made to the document \"%s\"?\n" @@ -1613,53 +1635,53 @@ msgstr "" "\n" "Ces changements seront perdus si vous ne les enregistrez pas." -#: ../src/vikwindow.c:366 ../src/vikwindow.c:1314 +#: ../src/vikwindow.c:367 ../src/vikwindow.c:1306 msgid "Untitled" msgstr "SansTitre" -#: ../src/vikwindow.c:367 +#: ../src/vikwindow.c:368 msgid "Don't Save" msgstr "Ne pas enregistrer" -#: ../src/vikwindow.c:400 +#: ../src/vikwindow.c:401 msgid "mpp" msgstr "" -#: ../src/vikwindow.c:400 +#: ../src/vikwindow.c:401 msgid "pixelfact" msgstr "" -#: ../src/vikwindow.c:527 +#: ../src/vikwindow.c:528 #, c-format msgid "%s %s %dm" msgstr "" -#: ../src/vikwindow.c:529 +#: ../src/vikwindow.c:530 #, c-format msgid "%s %s" msgstr "" -#: ../src/vikwindow.c:1113 +#: ../src/vikwindow.c:1105 msgid "You must select a layer to show its properties." msgstr "Vous devez sélectionner un calque pour afficher ses propriétés" -#: ../src/vikwindow.c:1129 +#: ../src/vikwindow.c:1121 msgid "You must select a layer to delete." msgstr "Vous devez sélectionner un calque à supprimer." -#: ../src/vikwindow.c:1347 +#: ../src/vikwindow.c:1339 msgid "The file you requested could not be opened." msgstr "Le fichier choisi ne peut pas être ouvert." -#: ../src/vikwindow.c:1390 +#: ../src/vikwindow.c:1382 msgid "Please select a GPS data file to open. " msgstr "Sélectionner un fichier GPS à ouvrir. " -#: ../src/vikwindow.c:1433 +#: ../src/vikwindow.c:1425 msgid "Save as Viking File." msgstr "Enregistrer en tant que fichier Viking." -#: ../src/vikwindow.c:1667 +#: ../src/vikwindow.c:1664 msgid "" "Viewable region outside allowable pixel size bounds for image. Clipping " "width/height values." @@ -1668,396 +1690,400 @@ msgstr "" "d'une image. La largeur et la longueur de l'image générée sont donc " "tronquées." -#: ../src/vikwindow.c:1686 +#: ../src/vikwindow.c:1683 #, c-format msgid "Total area: %ldm x %ldm (%.3f sq. km)" msgstr "Surface totale %ldm x %ldm (%.3f km²)" #. todo: default for answers inside VikWindow or static (thruout instance) -#: ../src/vikwindow.c:1694 +#: ../src/vikwindow.c:1691 msgid "Save to Image File" msgstr "Enregistrer dans un fichier image" -#: ../src/vikwindow.c:1712 +#: ../src/vikwindow.c:1709 msgid "Width (pixels):" msgstr "Largeur (pixels) :" -#: ../src/vikwindow.c:1714 +#: ../src/vikwindow.c:1711 msgid "Height (pixels):" msgstr "Hauteur (pixels) :" -#: ../src/vikwindow.c:1717 +#: ../src/vikwindow.c:1714 msgid "Zoom (meters per pixel):" msgstr "Zoom (mètres par pixel) :" -#: ../src/vikwindow.c:1723 +#: ../src/vikwindow.c:1720 msgid "Area in current viewable window" msgstr "Surface visible dans la fenêtre principale" -#: ../src/vikwindow.c:1733 +#: ../src/vikwindow.c:1730 msgid "Save as PNG" msgstr "Enregistrer en tant que PNG" -#: ../src/vikwindow.c:1734 +#: ../src/vikwindow.c:1731 msgid "Save as JPEG" msgstr "Enregistrer en tant que JPEG" -#: ../src/vikwindow.c:1754 +#: ../src/vikwindow.c:1751 msgid "East-west image tiles:" msgstr "Nombre d'image est-ouest" -#: ../src/vikwindow.c:1756 +#: ../src/vikwindow.c:1753 msgid "North-south image tiles:" msgstr "Nombre d'images nord-sud" -#: ../src/vikwindow.c:1796 +#: ../src/vikwindow.c:1793 msgid "You must be in UTM mode to use this feature" msgstr "Vous devez être en mode UTM pour utiliser cette fonctionalité" -#: ../src/vikwindow.c:1807 +#: ../src/vikwindow.c:1804 msgid "Save Image" msgstr "Enregistrer l'image" -#: ../src/vikwindow.c:1834 +#: ../src/vikwindow.c:1831 msgid "Choose a directory to hold images" msgstr "Sélectionner un répertoire pour stocker les images" -#: ../src/vikwindow.c:1920 +#: ../src/vikwindow.c:1917 msgid "Choose a background color" msgstr "Choisir une couleur de fond" -#: ../src/vikwindow.c:1941 +#: ../src/vikwindow.c:1938 msgid "_File" msgstr "_Fichier" -#: ../src/vikwindow.c:1942 +#: ../src/vikwindow.c:1939 msgid "_Edit" msgstr "É_dition" -#: ../src/vikwindow.c:1943 +#: ../src/vikwindow.c:1940 msgid "_View" msgstr "_Vue" -#: ../src/vikwindow.c:1944 ../src/vikwindow.c:2015 +#: ../src/vikwindow.c:1941 ../src/vikwindow.c:2013 msgid "_Zoom" msgstr "_Zoom" -#: ../src/vikwindow.c:1945 ../src/vikwindow.c:2014 +#: ../src/vikwindow.c:1942 ../src/vikwindow.c:2012 msgid "_Pan" msgstr "_Déplacer" -#: ../src/vikwindow.c:1946 +#: ../src/vikwindow.c:1943 msgid "_Layers" msgstr "_Calques" -#: ../src/vikwindow.c:1947 +#: ../src/vikwindow.c:1944 msgid "_Tools" msgstr "_Outils" -#: ../src/vikwindow.c:1948 +#: ../src/vikwindow.c:1945 msgid "_Webtools" msgstr "_Outils web" -#: ../src/vikwindow.c:1949 +#: ../src/vikwindow.c:1946 msgid "_Help" msgstr "Aid_e" -#: ../src/vikwindow.c:1951 +#: ../src/vikwindow.c:1948 msgid "_New" msgstr "_Nouveau" -#: ../src/vikwindow.c:1951 +#: ../src/vikwindow.c:1948 msgid "New file" msgstr "Nouveau fichier" -#: ../src/vikwindow.c:1952 +#: ../src/vikwindow.c:1949 msgid "_Open" msgstr "_Ouvrir" -#: ../src/vikwindow.c:1952 +#: ../src/vikwindow.c:1949 msgid "Open a file" msgstr "Ouvrir un fichier" -#: ../src/vikwindow.c:1953 +#: ../src/vikwindow.c:1950 msgid "A_ppend File" msgstr "_Ajouter un fichier" -#: ../src/vikwindow.c:1953 +#: ../src/vikwindow.c:1950 msgid "Append data from a different file" msgstr "Ajouter des données d'un autre fichier" -#: ../src/vikwindow.c:1954 +#: ../src/vikwindow.c:1951 msgid "A_cquire" msgstr "_Récupérer" -#: ../src/vikwindow.c:1955 +#: ../src/vikwindow.c:1952 msgid "From _GPS" msgstr "À partir d'un _GPS" -#: ../src/vikwindow.c:1955 +#: ../src/vikwindow.c:1952 msgid "Transfer data from a GPS device" msgstr "Récupérer des données d'un GPS" -#: ../src/vikwindow.c:1956 +#: ../src/vikwindow.c:1953 msgid "Google _Directions" msgstr "_Directions Google" -#: ../src/vikwindow.c:1956 +#: ../src/vikwindow.c:1953 msgid "Get driving directions from Google" msgstr "Obtenir des indications de conduite à partir de Google" -#: ../src/vikwindow.c:1958 +#: ../src/vikwindow.c:1955 msgid "Geo_caches" msgstr "Geo_caches" -#: ../src/vikwindow.c:1958 +#: ../src/vikwindow.c:1955 msgid "Get Geocaches from geocaching.com" msgstr "Récupérer des Geocaches à partir de geocaching.com" -#: ../src/vikwindow.c:1960 +#: ../src/vikwindow.c:1957 msgid "_Save" msgstr "_Enregistrer" -#: ../src/vikwindow.c:1960 +#: ../src/vikwindow.c:1957 msgid "Save the file" msgstr "Enregistrer le fichier" -#: ../src/vikwindow.c:1961 +#: ../src/vikwindow.c:1958 msgid "Save _As" msgstr "Enregistrer _sous…" -#: ../src/vikwindow.c:1961 +#: ../src/vikwindow.c:1958 msgid "Save the file under different name" msgstr "Enregistrer le fichier sous un nom différent" -#: ../src/vikwindow.c:1962 +#: ../src/vikwindow.c:1959 msgid "_Generate Image File" msgstr "Enregistrer dans un fichier _image" -#: ../src/vikwindow.c:1962 +#: ../src/vikwindow.c:1959 msgid "Save a snapshot of the workspace into a file" msgstr "Enregistre une copie d'écran dans un fichier" -#: ../src/vikwindow.c:1963 +#: ../src/vikwindow.c:1960 msgid "Generate _Directory of Images" msgstr "Générer un _répertoire d'images" -#: ../src/vikwindow.c:1963 +#: ../src/vikwindow.c:1960 msgid "FIXME:IMGDIR" msgstr "" -#: ../src/vikwindow.c:1966 +#: ../src/vikwindow.c:1963 msgid "_Print..." msgstr "_Imprimer…" -#: ../src/vikwindow.c:1966 +#: ../src/vikwindow.c:1963 msgid "Print maps" msgstr "Imprimer les cartes" -#: ../src/vikwindow.c:1969 +#: ../src/vikwindow.c:1966 msgid "E_xit" msgstr "_Quitter" -#: ../src/vikwindow.c:1969 +#: ../src/vikwindow.c:1966 msgid "Exit the program" msgstr "Quitter le programme" -#: ../src/vikwindow.c:1970 +#: ../src/vikwindow.c:1967 msgid "Save and Exit" msgstr "Enregistrer et quitter" -#: ../src/vikwindow.c:1970 +#: ../src/vikwindow.c:1967 msgid "Save and Exit the program" msgstr "Enregistrer et quitter le programme" -#: ../src/vikwindow.c:1972 +#: ../src/vikwindow.c:1969 msgid "Go To location" -msgstr "" +msgstr "Aller à une position" -#: ../src/vikwindow.c:1972 +#: ../src/vikwindow.c:1969 msgid "Go to address/place using text search" -msgstr "" +msgstr "Aller à une adresse/lieu en utilisant une recherche textuelle" -#: ../src/vikwindow.c:1973 +#: ../src/vikwindow.c:1970 msgid "_Go to Lat\\/Lon..." msgstr "Choisir la _latitude/longitude…" -#: ../src/vikwindow.c:1973 +#: ../src/vikwindow.c:1970 msgid "Go to arbitrary lat\\/lon coordinate" msgstr "Aller à une coordonnée latitude/longitude donnée" -#: ../src/vikwindow.c:1974 +#: ../src/vikwindow.c:1971 msgid "Go to UTM..." msgstr "Choisir une coordonnée UTM…" -#: ../src/vikwindow.c:1974 +#: ../src/vikwindow.c:1971 msgid "Go to arbitrary UTM coordinate" msgstr "Aller à une coordonnée UTM donnée" -#: ../src/vikwindow.c:1975 +#: ../src/vikwindow.c:1972 msgid "Set Background Color..." msgstr "Modifier la couleur de fond…" -#: ../src/vikwindow.c:1976 +#: ../src/vikwindow.c:1973 msgid "Zoom _In" msgstr "Zoom _avant" -#: ../src/vikwindow.c:1977 +#: ../src/vikwindow.c:1974 msgid "Zoom _Out" msgstr "Zoom a_rrière" -#: ../src/vikwindow.c:1978 +#: ../src/vikwindow.c:1975 msgid "Zoom _To" msgstr "Zoom _optimal" -#: ../src/vikwindow.c:1979 +#: ../src/vikwindow.c:1976 msgid "0.25" msgstr "0,25" -#: ../src/vikwindow.c:1980 +#: ../src/vikwindow.c:1977 msgid "0.5" msgstr "0,5" -#: ../src/vikwindow.c:1981 +#: ../src/vikwindow.c:1978 msgid "1" msgstr "1" -#: ../src/vikwindow.c:1982 +#: ../src/vikwindow.c:1979 msgid "2" msgstr "2" -#: ../src/vikwindow.c:1983 +#: ../src/vikwindow.c:1980 msgid "4" msgstr "4" -#: ../src/vikwindow.c:1984 +#: ../src/vikwindow.c:1981 msgid "8" msgstr "8" -#: ../src/vikwindow.c:1985 +#: ../src/vikwindow.c:1982 msgid "16" msgstr "16" -#: ../src/vikwindow.c:1986 +#: ../src/vikwindow.c:1983 msgid "32" msgstr "32" -#: ../src/vikwindow.c:1987 +#: ../src/vikwindow.c:1984 msgid "64" msgstr "64" -#: ../src/vikwindow.c:1988 +#: ../src/vikwindow.c:1985 msgid "128" msgstr "128" -#: ../src/vikwindow.c:1989 +#: ../src/vikwindow.c:1986 msgid "Pan North" msgstr "Déplacer vers le Nord" -#: ../src/vikwindow.c:1990 +#: ../src/vikwindow.c:1987 msgid "Pan East" msgstr "Déplacer vers l'Est" -#: ../src/vikwindow.c:1991 +#: ../src/vikwindow.c:1988 msgid "Pan South" msgstr "Déplacer vers le Sud" -#: ../src/vikwindow.c:1992 +#: ../src/vikwindow.c:1989 msgid "Pan West" msgstr "Déplacer vers l'Ouest" -#: ../src/vikwindow.c:1993 +#: ../src/vikwindow.c:1990 msgid "Background _Jobs" msgstr "Tâches de fond" -#: ../src/vikwindow.c:1995 +#: ../src/vikwindow.c:1992 msgid "Cu_t" msgstr "Co_uper" -#: ../src/vikwindow.c:1996 +#: ../src/vikwindow.c:1993 msgid "_Copy" msgstr "Co_pier" -#: ../src/vikwindow.c:1997 +#: ../src/vikwindow.c:1994 msgid "_Paste" msgstr "C_oller" -#: ../src/vikwindow.c:1998 +#: ../src/vikwindow.c:1995 msgid "_Delete" msgstr "_Effacer" -#: ../src/vikwindow.c:1999 +#: ../src/vikwindow.c:1996 msgid "Delete All" msgstr "Tout effacer" -#: ../src/vikwindow.c:2000 +#: ../src/vikwindow.c:1997 +msgid "Flush Map cache" +msgstr "Purger le cache des cartes" + +#: ../src/vikwindow.c:1998 msgid "_Preferences..." msgstr "_Préférences…" -#: ../src/vikwindow.c:2001 +#: ../src/vikwindow.c:1999 msgid "_Properties" msgstr "Propriétés" -#: ../src/vikwindow.c:2003 +#: ../src/vikwindow.c:2001 msgid "_About" msgstr "À _propos" -#: ../src/vikwindow.c:2008 +#: ../src/vikwindow.c:2006 msgid "_UTM Mode" msgstr "Mode _UTM" -#: ../src/vikwindow.c:2009 +#: ../src/vikwindow.c:2007 msgid "_Expedia Mode" msgstr "Mode _Expedia" -#: ../src/vikwindow.c:2010 +#: ../src/vikwindow.c:2008 msgid "_Mercator Mode" msgstr "Mode _Mercator" -#: ../src/vikwindow.c:2014 +#: ../src/vikwindow.c:2012 msgid "Pan Tool" msgstr "Outil de déplacement" -#: ../src/vikwindow.c:2015 +#: ../src/vikwindow.c:2013 msgid "Zoom Tool" msgstr "Outil de zoom" -#: ../src/vikwindow.c:2016 +#: ../src/vikwindow.c:2014 msgid "_Ruler" msgstr "_Règle" -#: ../src/vikwindow.c:2016 +#: ../src/vikwindow.c:2014 msgid "Ruler Tool" msgstr "Règle" -#: ../src/vikwindow.c:2020 +#: ../src/vikwindow.c:2018 msgid "Show Scale" msgstr "Afficher l'échelle" -#: ../src/vikwindow.c:2021 +#: ../src/vikwindow.c:2019 msgid "Show Center Mark" msgstr "Afficher la croix centrale" -#: ../src/vikwindow.c:2022 +#: ../src/vikwindow.c:2020 msgid "Full Screen" msgstr "Plein écran" -#: ../src/vikwindow.c:2022 +#: ../src/vikwindow.c:2020 msgid "Activate full screen mode" msgstr "Activer le mode plein écran" -#: ../src/vikwindow.c:2023 +#: ../src/vikwindow.c:2021 msgid "Show Side Panel" msgstr "Afficher le panneau latéral" -#: ../src/vikwindow.c:2085 +#: ../src/vikwindow.c:2083 #, c-format msgid "New %s Layer" msgstr "Nouveau calque \"%s\"" #: ../src/viking.desktop.in.h:1 msgid "GPS Data Manager" -msgstr "" +msgstr "Gestionnaire de données GPS" #: ../src/viking.desktop.in.h:2 msgid "Map Based GPS Data Manager (live data capable)." @@ -2069,41 +2095,5 @@ msgstr "" msgid "Viking" msgstr "Viking" -#~ msgid "Transparent Google Maps" -#~ msgstr "Cartes Google (transparent)" - -#~ msgid "Google Satellite Images" -#~ msgstr "Images Satellite Google" - -#~ msgid "Google Terrain Maps" -#~ msgstr "Cartes de terrain Google" - -#~ msgid "Failed getting google version numbers" -#~ msgstr "Échec lors de la récupération de la version de Google" - -#~ msgid "Old Google Maps" -#~ msgstr "Anciennes cartes Google" - -#~ msgid "Keep current position at center" -#~ msgstr "Toujours centrer sur la position courante" - -#~ msgid "_Old Google Mode" -#~ msgstr "_Ancien mode Google" - -#~ msgid "Old _KH Mode" -#~ msgstr "Ancien mode _KH" - -#~ msgid "_Google Mode" -#~ msgstr "Mode _Google" - -#, c-format -#~ msgid "couldn't open temp file %s" -#~ msgstr "Impossible d'ouvrir le fichier temporaire %s" - -#, c-format -#~ msgid "Failed downloading %s" -#~ msgstr "Échec du téléchargement de %s" - -#~ msgid "Failed fetching Google numbers (\"GLoadApi\" not found)" -#~ msgstr "" -#~ "Échec lors de la récupération des nombres Google (\"GLoadApi\" not found)" +#~ msgid "Maps Directory (Optional):" +#~ msgstr "Répertoire des cartes (optionnel) :" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: viking\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-04 22:27+0100\n" +"POT-Creation-Date: 2009-08-20 09:50+0200\n" "PO-Revision-Date: 2008-08-18 20:47+0000\n" "Last-Translator: Krylov Ilya <Unknown>\n" "Language-Team: Hebrew <he@li.org>\n" @@ -15,7 +15,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-02-04 21:00+0000\n" +"X-Launchpad-Export-Date: 2009-09-09 20:12+0000\n" "X-Generator: Launchpad (build Unknown)\n" #: ../src/acquire.c:118 @@ -26,28 +26,28 @@ msgstr "עובד..." msgid "Error: acquisition failed." msgstr "" -#: ../src/acquire.c:149 ../src/vikgpslayer.c:957 +#: ../src/acquire.c:149 ../src/vikgpslayer.c:953 msgid "Done." msgstr "" -#: ../src/acquire.c:326 ../src/vikgpslayer.c:996 +#: ../src/acquire.c:326 ../src/vikgpslayer.c:992 msgid "Status: detecting gpsbabel" msgstr "" -#: ../src/background.c:54 +#: ../src/background.c:57 #, c-format msgid "%d items" msgstr "" -#: ../src/background.c:212 +#: ../src/background.c:224 msgid "Job" msgstr "" -#: ../src/background.c:216 +#: ../src/background.c:228 msgid "Progress" msgstr "" -#: ../src/background.c:227 +#: ../src/background.c:239 msgid "Viking Background Jobs" msgstr "" @@ -72,7 +72,7 @@ msgid "" "into." msgstr "" -#: ../src/curl_download.c:85 +#: ../src/curl_download.c:94 #, c-format msgid "%s() Curl perform failed: %s" msgstr "" @@ -344,14 +344,14 @@ msgstr "" msgid "using cmdline '%s' and file '%s'\n" msgstr "" -#: ../src/datasource_gps.c:150 ../src/vikgpslayer.c:711 +#: ../src/datasource_gps.c:150 ../src/vikgpslayer.c:707 #, c-format msgid "Downloading %d waypoint..." msgid_plural "Downloading %d waypoints..." msgstr[0] "" msgstr[1] "" -#: ../src/datasource_gps.c:152 ../src/vikgpslayer.c:713 +#: ../src/datasource_gps.c:152 ../src/vikgpslayer.c:709 #, c-format msgid "Downloading %d trackpoint..." msgid_plural "Downloading %d trackpoints..." @@ -368,7 +368,7 @@ msgstr "" msgid "Downloaded %d %s." msgstr "" -#: ../src/datasource_gps.c:185 ../src/vikgpslayer.c:783 +#: ../src/datasource_gps.c:185 ../src/vikgpslayer.c:779 #, c-format msgid "GPS Device: %s" msgstr "" @@ -381,7 +381,7 @@ msgstr "" msgid "Serial Port:" msgstr "" -#: ../src/datasource_gps.c:299 ../src/vikgpslayer.c:1001 +#: ../src/datasource_gps.c:299 ../src/vikgpslayer.c:997 msgid "GPS device: N/A" msgstr "" @@ -412,6 +412,10 @@ msgstr "" msgid "Draw mode '%s' no more supported" msgstr "" +#: ../src/mapcache.c:63 +msgid "Mapcache memory size (MB):" +msgstr "" + #: ../src/print.c:53 msgid "None" msgstr "" @@ -454,11 +458,11 @@ msgstr "" msgid "Image S_ize:" msgstr "" -#: ../src/util.c:75 +#: ../src/util.c:76 msgid "Could not launch web browser." msgstr "" -#: ../src/util.c:86 +#: ../src/util.c:87 msgid "Could not create new email." msgstr "" @@ -672,11 +676,11 @@ msgstr "" msgid "Downloading DEM %s" msgstr "" -#: ../src/vikfileentry.c:67 +#: ../src/vikfileentry.c:68 msgid "Browse..." msgstr "" -#: ../src/vikfileentry.c:94 +#: ../src/vikfileentry.c:96 msgid "Choose file" msgstr "" @@ -789,11 +793,11 @@ msgstr "" msgid "Gpsd Retry Interval (seconds):" msgstr "" -#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:989 +#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:985 msgid "GPS Download" msgstr "" -#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:989 +#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:985 msgid "GPS Upload" msgstr "" @@ -801,110 +805,110 @@ msgstr "" msgid "GPS Realtime Tracking" msgstr "" -#: ../src/vikgpslayer.c:373 +#: ../src/vikgpslayer.c:371 msgid "Unknown GPS Protocol" msgstr "" -#: ../src/vikgpslayer.c:379 +#: ../src/vikgpslayer.c:377 msgid "Unknown serial port device" msgstr "" -#: ../src/vikgpslayer.c:444 +#: ../src/vikgpslayer.c:442 #, c-format msgid "%s: unknown parameter" msgstr "" -#: ../src/vikgpslayer.c:545 +#: ../src/vikgpslayer.c:541 msgid "Upload to GPS" msgstr "" -#: ../src/vikgpslayer.c:550 +#: ../src/vikgpslayer.c:546 msgid "Download from GPS" msgstr "" -#: ../src/vikgpslayer.c:568 +#: ../src/vikgpslayer.c:564 msgid "Empty Upload" msgstr "" -#: ../src/vikgpslayer.c:573 +#: ../src/vikgpslayer.c:569 msgid "Empty Download" msgstr "" -#: ../src/vikgpslayer.c:578 +#: ../src/vikgpslayer.c:574 msgid "Empty All" msgstr "" -#: ../src/vikgpslayer.c:718 +#: ../src/vikgpslayer.c:714 #, c-format msgid "Uploading %d waypoint..." msgid_plural "Uploading %d waypoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:720 +#: ../src/vikgpslayer.c:716 #, c-format msgid "Uploading %d trackpoint..." msgid_plural "Uploading %d trackpoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:744 +#: ../src/vikgpslayer.c:740 #, c-format msgid "Downloaded %d out of %d waypoint..." msgid_plural "Downloaded %d out of %d waypoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:746 +#: ../src/vikgpslayer.c:742 #, c-format msgid "Downloaded %d out of %d trackpoint..." msgid_plural "Downloaded %d out of %d trackpoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:750 +#: ../src/vikgpslayer.c:746 #, c-format msgid "Uploaded %d out of %d waypoint..." msgid_plural "Uploaded %d out of %d waypoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:752 +#: ../src/vikgpslayer.c:748 #, c-format msgid "Uploaded %d out of %d trackpoint..." msgid_plural "Uploaded %d out of %d trackpoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:759 +#: ../src/vikgpslayer.c:755 #, c-format msgid "Downloaded %d waypoint" msgid_plural "Downloaded %d waypoints" msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:761 +#: ../src/vikgpslayer.c:757 #, c-format msgid "Downloaded %d trackpoint" msgid_plural "Downloaded %d trackpoints" msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:765 +#: ../src/vikgpslayer.c:761 #, c-format msgid "Uploaded %d waypoint" msgid_plural "Uploaded %d waypoints" msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:767 +#: ../src/vikgpslayer.c:763 #, c-format msgid "Uploaded %d trackpoint" msgid_plural "Uploaded %d trackpoints" msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:952 +#: ../src/vikgpslayer.c:948 msgid "Error: couldn't find gpsbabel." msgstr "" @@ -958,7 +962,7 @@ msgid "Map Type:" msgstr "" #: ../src/vikmapslayer.c:120 -msgid "Maps Directory (Optional):" +msgid "Maps Directory:" msgstr "" #: ../src/vikmapslayer.c:121 @@ -1003,52 +1007,52 @@ msgid "" "factor" msgstr "" -#: ../src/vikmapslayer.c:924 +#: ../src/vikmapslayer.c:927 #, c-format msgid "Redownloading up to %d %s map..." msgid_plural "Redownloading up to %d %s maps..." msgstr[0] "" msgstr[1] "" -#: ../src/vikmapslayer.c:926 +#: ../src/vikmapslayer.c:929 #, c-format msgid "Redownloading %d %s map..." msgid_plural "Redownloading %d %s maps..." msgstr[0] "" msgstr[1] "" -#: ../src/vikmapslayer.c:930 ../src/vikmapslayer.c:1001 +#: ../src/vikmapslayer.c:933 ../src/vikmapslayer.c:1004 #, c-format msgid "Downloading %d %s map..." msgid_plural "Downloading %d %s maps..." msgstr[0] "" msgstr[1] "" -#: ../src/vikmapslayer.c:1058 +#: ../src/vikmapslayer.c:1061 msgid "Redownload bad map(s)" msgstr "" -#: ../src/vikmapslayer.c:1062 +#: ../src/vikmapslayer.c:1065 msgid "Redownload all map(s)" msgstr "" -#: ../src/vikmapslayer.c:1142 +#: ../src/vikmapslayer.c:1145 #, c-format msgid "" "Wrong drawmode for this map.\n" "Select \"%s\" from View menu and try again." msgstr "" -#: ../src/vikmapslayer.c:1147 +#: ../src/vikmapslayer.c:1150 msgid "Wrong zoom level for this map." msgstr "" -#: ../src/vikmapslayer.c:1172 +#: ../src/vikmapslayer.c:1175 msgid "Download Onscreen Maps" msgstr "" #. TODO Add GTK_STOCK_REFRESH icon -#: ../src/vikmapslayer.c:1178 +#: ../src/vikmapslayer.c:1181 msgid "Refresh Onscreen Tiles" msgstr "" @@ -1236,12 +1240,12 @@ msgstr "" msgid "Export Layer" msgstr "" -#: ../src/viktrwlayer.c:1565 ../src/vikwindow.c:1446 ../src/vikwindow.c:1820 +#: ../src/viktrwlayer.c:1565 ../src/vikwindow.c:1438 ../src/vikwindow.c:1817 #, c-format msgid "The file \"%s\" exists, do you wish to overwrite it?" msgstr "" -#: ../src/viktrwlayer.c:1575 ../src/vikwindow.c:1464 +#: ../src/viktrwlayer.c:1575 ../src/vikwindow.c:1456 msgid "The filename you requested could not be opened for writing." msgstr "" @@ -1257,71 +1261,71 @@ msgstr "" msgid "Waypoint not found in this layer." msgstr "" -#: ../src/viktrwlayer.c:1724 +#: ../src/viktrwlayer.c:1723 msgid "Goto Center of Layer" msgstr "" -#: ../src/viktrwlayer.c:1729 +#: ../src/viktrwlayer.c:1728 msgid "Goto Waypoint" msgstr "" -#: ../src/viktrwlayer.c:1735 +#: ../src/viktrwlayer.c:1734 msgid "Export layer" msgstr "" -#: ../src/viktrwlayer.c:1740 +#: ../src/viktrwlayer.c:1739 msgid "Export as GPSPoint" msgstr "" -#: ../src/viktrwlayer.c:1745 +#: ../src/viktrwlayer.c:1744 msgid "Export as GPSMapper" msgstr "" -#: ../src/viktrwlayer.c:1750 +#: ../src/viktrwlayer.c:1749 msgid "Export as GPX" msgstr "" -#: ../src/viktrwlayer.c:1755 ../src/viktrwlayer.c:2794 +#: ../src/viktrwlayer.c:1754 ../src/viktrwlayer.c:2794 msgid "New Waypoint" msgstr "" -#: ../src/viktrwlayer.c:1762 +#: ../src/viktrwlayer.c:1761 msgid "Add Wikipedia Waypoints" msgstr "" -#: ../src/viktrwlayer.c:1767 +#: ../src/viktrwlayer.c:1766 msgid "Within layer bounds" msgstr "" -#: ../src/viktrwlayer.c:1772 +#: ../src/viktrwlayer.c:1771 msgid "Within current view" msgstr "" -#: ../src/viktrwlayer.c:1779 ../src/viktrwlayer.c:2760 +#: ../src/viktrwlayer.c:1778 ../src/viktrwlayer.c:2760 msgid "Upload to OSM" msgstr "" -#: ../src/viktrwlayer.c:2290 +#: ../src/viktrwlayer.c:2289 msgid "Failed. This track does not have timestamp" msgstr "" -#: ../src/viktrwlayer.c:2304 +#: ../src/viktrwlayer.c:2303 msgid "Failed. No other track in this layer has timestamp" msgstr "" -#: ../src/viktrwlayer.c:2310 +#: ../src/viktrwlayer.c:2309 msgid "Merge with..." msgstr "" -#: ../src/viktrwlayer.c:2310 +#: ../src/viktrwlayer.c:2309 msgid "Select track to merge with" msgstr "" -#: ../src/viktrwlayer.c:2347 +#: ../src/viktrwlayer.c:2346 msgid "Merge Threshold..." msgstr "" -#: ../src/viktrwlayer.c:2348 +#: ../src/viktrwlayer.c:2347 msgid "Merge when time between tracks less than:" msgstr "" @@ -1397,131 +1401,131 @@ msgstr "" msgid "Use with filter" msgstr "" -#: ../src/viktrwlayer.c:3736 +#: ../src/viktrwlayer.c:3735 msgid "Could not launch eog to open file." msgstr "" -#: ../src/viktrwlayer.c:3790 +#: ../src/viktrwlayer.c:3789 #, c-format msgid "Creating %d Image Thumbnails..." msgstr "" -#: ../src/viktrwlayer.c:4010 +#: ../src/viktrwlayer.c:4009 msgid "No map layer in use. Create one first" msgstr "" -#: ../src/viktrwlayer_propwin.c:658 +#: ../src/viktrwlayer_propwin.c:661 msgid "Failed spliting track. Track unchanged" msgstr "" -#: ../src/viktrwlayer_propwin.c:675 +#: ../src/viktrwlayer_propwin.c:678 msgid "Operation Aborted. Track unchanged" msgstr "" -#: ../src/viktrwlayer_propwin.c:729 +#: ../src/viktrwlayer_propwin.c:732 #, c-format msgid "%s - Track Properties" msgstr "" -#: ../src/viktrwlayer_propwin.c:734 +#: ../src/viktrwlayer_propwin.c:737 msgid "Split at Marker" msgstr "" -#: ../src/viktrwlayer_propwin.c:735 +#: ../src/viktrwlayer_propwin.c:738 msgid "Split Segments" msgstr "" -#: ../src/viktrwlayer_propwin.c:736 +#: ../src/viktrwlayer_propwin.c:739 msgid "Reverse" msgstr "" -#: ../src/viktrwlayer_propwin.c:737 +#: ../src/viktrwlayer_propwin.c:740 msgid "Delete Dupl." msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Comment:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Track Length:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Trackpoints:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Segments:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Duplicate Points:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Max Speed:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Avg. Speed:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Avg. Dist. Between TPs:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Elevation Range:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Total Elevation Gain/Loss:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Start:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>End:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Duration:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:788 ../src/viktrwlayer_propwin.c:795 -#: ../src/viktrwlayer_propwin.c:804 ../src/viktrwlayer_propwin.c:811 -#: ../src/viktrwlayer_propwin.c:850 ../src/viktrwlayer_propwin.c:851 -#: ../src/viktrwlayer_propwin.c:852 ../src/viktrwlayer_propwin.c:874 -#: ../src/viktrwlayer_propwin.c:881 +#: ../src/viktrwlayer_propwin.c:791 ../src/viktrwlayer_propwin.c:798 +#: ../src/viktrwlayer_propwin.c:807 ../src/viktrwlayer_propwin.c:814 +#: ../src/viktrwlayer_propwin.c:853 ../src/viktrwlayer_propwin.c:854 +#: ../src/viktrwlayer_propwin.c:855 ../src/viktrwlayer_propwin.c:877 +#: ../src/viktrwlayer_propwin.c:884 #, c-format msgid "No Data" msgstr "" -#: ../src/viktrwlayer_propwin.c:847 +#: ../src/viktrwlayer_propwin.c:850 #, c-format msgid "%d minutes" msgstr "" -#: ../src/viktrwlayer_propwin.c:870 +#: ../src/viktrwlayer_propwin.c:873 msgid "Statistics" msgstr "" -#: ../src/viktrwlayer_propwin.c:875 +#: ../src/viktrwlayer_propwin.c:878 msgid "<b>Track Distance:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:876 +#: ../src/viktrwlayer_propwin.c:879 msgid "Elevation-distance" msgstr "" -#: ../src/viktrwlayer_propwin.c:882 +#: ../src/viktrwlayer_propwin.c:885 msgid "<b>Track Time:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:883 +#: ../src/viktrwlayer_propwin.c:886 msgid "Speed-time" msgstr "" @@ -1561,31 +1565,47 @@ msgstr "" msgid "<b>\"Speed\" Between:</b>" msgstr "" -#: ../src/viktrwlayer_tpwin.c:117 -msgid "Trackpoint" +#: ../src/viktrwlayer_tpwin.c:110 +msgid "<b>VDOP:</b>" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:111 +msgid "<b>HDOP:</b>" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:112 +msgid "<b>PDOP:</b>" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:113 +msgid "<b>SAT/FIX:</b>" msgstr "" #: ../src/viktrwlayer_tpwin.c:122 +msgid "Trackpoint" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:127 msgid "Split Here" msgstr "" -#: ../src/viktrwlayer_tpwin.c:123 +#: ../src/viktrwlayer_tpwin.c:128 msgid "Join With Last" msgstr "" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Pan" msgstr "" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Zoom" msgstr "" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Ruler" msgstr "" -#: ../src/vikwindow.c:363 +#: ../src/vikwindow.c:364 #, c-format msgid "" "Do you want to save the changes you made to the document \"%s\"?\n" @@ -1593,441 +1613,445 @@ msgid "" "Your changes will be lost if you don't save them." msgstr "" -#: ../src/vikwindow.c:366 ../src/vikwindow.c:1314 +#: ../src/vikwindow.c:367 ../src/vikwindow.c:1306 msgid "Untitled" msgstr "" -#: ../src/vikwindow.c:367 +#: ../src/vikwindow.c:368 msgid "Don't Save" msgstr "" -#: ../src/vikwindow.c:400 +#: ../src/vikwindow.c:401 msgid "mpp" msgstr "" -#: ../src/vikwindow.c:400 +#: ../src/vikwindow.c:401 msgid "pixelfact" msgstr "" -#: ../src/vikwindow.c:527 +#: ../src/vikwindow.c:528 #, c-format msgid "%s %s %dm" msgstr "" -#: ../src/vikwindow.c:529 +#: ../src/vikwindow.c:530 #, c-format msgid "%s %s" msgstr "" -#: ../src/vikwindow.c:1113 +#: ../src/vikwindow.c:1105 msgid "You must select a layer to show its properties." msgstr "" -#: ../src/vikwindow.c:1129 +#: ../src/vikwindow.c:1121 msgid "You must select a layer to delete." msgstr "" -#: ../src/vikwindow.c:1347 +#: ../src/vikwindow.c:1339 msgid "The file you requested could not be opened." msgstr "" -#: ../src/vikwindow.c:1390 +#: ../src/vikwindow.c:1382 msgid "Please select a GPS data file to open. " msgstr "" -#: ../src/vikwindow.c:1433 +#: ../src/vikwindow.c:1425 msgid "Save as Viking File." msgstr "" -#: ../src/vikwindow.c:1667 +#: ../src/vikwindow.c:1664 msgid "" "Viewable region outside allowable pixel size bounds for image. Clipping " "width/height values." msgstr "" -#: ../src/vikwindow.c:1686 +#: ../src/vikwindow.c:1683 #, c-format msgid "Total area: %ldm x %ldm (%.3f sq. km)" msgstr "" #. todo: default for answers inside VikWindow or static (thruout instance) -#: ../src/vikwindow.c:1694 +#: ../src/vikwindow.c:1691 msgid "Save to Image File" msgstr "" -#: ../src/vikwindow.c:1712 +#: ../src/vikwindow.c:1709 msgid "Width (pixels):" msgstr "" -#: ../src/vikwindow.c:1714 +#: ../src/vikwindow.c:1711 msgid "Height (pixels):" msgstr "" -#: ../src/vikwindow.c:1717 +#: ../src/vikwindow.c:1714 msgid "Zoom (meters per pixel):" msgstr "" -#: ../src/vikwindow.c:1723 +#: ../src/vikwindow.c:1720 msgid "Area in current viewable window" msgstr "" -#: ../src/vikwindow.c:1733 +#: ../src/vikwindow.c:1730 msgid "Save as PNG" msgstr "" -#: ../src/vikwindow.c:1734 +#: ../src/vikwindow.c:1731 msgid "Save as JPEG" msgstr "" -#: ../src/vikwindow.c:1754 +#: ../src/vikwindow.c:1751 msgid "East-west image tiles:" msgstr "" -#: ../src/vikwindow.c:1756 +#: ../src/vikwindow.c:1753 msgid "North-south image tiles:" msgstr "" -#: ../src/vikwindow.c:1796 +#: ../src/vikwindow.c:1793 msgid "You must be in UTM mode to use this feature" msgstr "" -#: ../src/vikwindow.c:1807 +#: ../src/vikwindow.c:1804 msgid "Save Image" msgstr "" -#: ../src/vikwindow.c:1834 +#: ../src/vikwindow.c:1831 msgid "Choose a directory to hold images" msgstr "" -#: ../src/vikwindow.c:1920 +#: ../src/vikwindow.c:1917 msgid "Choose a background color" msgstr "" -#: ../src/vikwindow.c:1941 +#: ../src/vikwindow.c:1938 msgid "_File" msgstr "" -#: ../src/vikwindow.c:1942 +#: ../src/vikwindow.c:1939 msgid "_Edit" msgstr "" -#: ../src/vikwindow.c:1943 +#: ../src/vikwindow.c:1940 msgid "_View" msgstr "" -#: ../src/vikwindow.c:1944 ../src/vikwindow.c:2015 +#: ../src/vikwindow.c:1941 ../src/vikwindow.c:2013 msgid "_Zoom" msgstr "" -#: ../src/vikwindow.c:1945 ../src/vikwindow.c:2014 +#: ../src/vikwindow.c:1942 ../src/vikwindow.c:2012 msgid "_Pan" msgstr "" -#: ../src/vikwindow.c:1946 +#: ../src/vikwindow.c:1943 msgid "_Layers" msgstr "" -#: ../src/vikwindow.c:1947 +#: ../src/vikwindow.c:1944 msgid "_Tools" msgstr "" -#: ../src/vikwindow.c:1948 +#: ../src/vikwindow.c:1945 msgid "_Webtools" msgstr "" -#: ../src/vikwindow.c:1949 +#: ../src/vikwindow.c:1946 msgid "_Help" msgstr "" -#: ../src/vikwindow.c:1951 +#: ../src/vikwindow.c:1948 msgid "_New" msgstr "" -#: ../src/vikwindow.c:1951 +#: ../src/vikwindow.c:1948 msgid "New file" msgstr "" -#: ../src/vikwindow.c:1952 +#: ../src/vikwindow.c:1949 msgid "_Open" msgstr "" -#: ../src/vikwindow.c:1952 +#: ../src/vikwindow.c:1949 msgid "Open a file" msgstr "" -#: ../src/vikwindow.c:1953 +#: ../src/vikwindow.c:1950 msgid "A_ppend File" msgstr "" -#: ../src/vikwindow.c:1953 +#: ../src/vikwindow.c:1950 msgid "Append data from a different file" msgstr "" -#: ../src/vikwindow.c:1954 +#: ../src/vikwindow.c:1951 msgid "A_cquire" msgstr "" -#: ../src/vikwindow.c:1955 +#: ../src/vikwindow.c:1952 msgid "From _GPS" msgstr "" -#: ../src/vikwindow.c:1955 +#: ../src/vikwindow.c:1952 msgid "Transfer data from a GPS device" msgstr "" -#: ../src/vikwindow.c:1956 +#: ../src/vikwindow.c:1953 msgid "Google _Directions" msgstr "" -#: ../src/vikwindow.c:1956 +#: ../src/vikwindow.c:1953 msgid "Get driving directions from Google" msgstr "" -#: ../src/vikwindow.c:1958 +#: ../src/vikwindow.c:1955 msgid "Geo_caches" msgstr "" -#: ../src/vikwindow.c:1958 +#: ../src/vikwindow.c:1955 msgid "Get Geocaches from geocaching.com" msgstr "" -#: ../src/vikwindow.c:1960 +#: ../src/vikwindow.c:1957 msgid "_Save" msgstr "" -#: ../src/vikwindow.c:1960 +#: ../src/vikwindow.c:1957 msgid "Save the file" msgstr "" -#: ../src/vikwindow.c:1961 +#: ../src/vikwindow.c:1958 msgid "Save _As" msgstr "" -#: ../src/vikwindow.c:1961 +#: ../src/vikwindow.c:1958 msgid "Save the file under different name" msgstr "" -#: ../src/vikwindow.c:1962 +#: ../src/vikwindow.c:1959 msgid "_Generate Image File" msgstr "" -#: ../src/vikwindow.c:1962 +#: ../src/vikwindow.c:1959 msgid "Save a snapshot of the workspace into a file" msgstr "" -#: ../src/vikwindow.c:1963 +#: ../src/vikwindow.c:1960 msgid "Generate _Directory of Images" msgstr "" -#: ../src/vikwindow.c:1963 +#: ../src/vikwindow.c:1960 msgid "FIXME:IMGDIR" msgstr "" -#: ../src/vikwindow.c:1966 +#: ../src/vikwindow.c:1963 msgid "_Print..." msgstr "" -#: ../src/vikwindow.c:1966 +#: ../src/vikwindow.c:1963 msgid "Print maps" msgstr "" -#: ../src/vikwindow.c:1969 +#: ../src/vikwindow.c:1966 msgid "E_xit" msgstr "" -#: ../src/vikwindow.c:1969 +#: ../src/vikwindow.c:1966 msgid "Exit the program" msgstr "" -#: ../src/vikwindow.c:1970 +#: ../src/vikwindow.c:1967 msgid "Save and Exit" msgstr "" -#: ../src/vikwindow.c:1970 +#: ../src/vikwindow.c:1967 msgid "Save and Exit the program" msgstr "" -#: ../src/vikwindow.c:1972 +#: ../src/vikwindow.c:1969 msgid "Go To location" msgstr "" -#: ../src/vikwindow.c:1972 +#: ../src/vikwindow.c:1969 msgid "Go to address/place using text search" msgstr "" -#: ../src/vikwindow.c:1973 +#: ../src/vikwindow.c:1970 msgid "_Go to Lat\\/Lon..." msgstr "" -#: ../src/vikwindow.c:1973 +#: ../src/vikwindow.c:1970 msgid "Go to arbitrary lat\\/lon coordinate" msgstr "" -#: ../src/vikwindow.c:1974 +#: ../src/vikwindow.c:1971 msgid "Go to UTM..." msgstr "" -#: ../src/vikwindow.c:1974 +#: ../src/vikwindow.c:1971 msgid "Go to arbitrary UTM coordinate" msgstr "" -#: ../src/vikwindow.c:1975 +#: ../src/vikwindow.c:1972 msgid "Set Background Color..." msgstr "" -#: ../src/vikwindow.c:1976 +#: ../src/vikwindow.c:1973 msgid "Zoom _In" msgstr "" -#: ../src/vikwindow.c:1977 +#: ../src/vikwindow.c:1974 msgid "Zoom _Out" msgstr "" -#: ../src/vikwindow.c:1978 +#: ../src/vikwindow.c:1975 msgid "Zoom _To" msgstr "" -#: ../src/vikwindow.c:1979 +#: ../src/vikwindow.c:1976 msgid "0.25" msgstr "" -#: ../src/vikwindow.c:1980 +#: ../src/vikwindow.c:1977 msgid "0.5" msgstr "" -#: ../src/vikwindow.c:1981 +#: ../src/vikwindow.c:1978 msgid "1" msgstr "" -#: ../src/vikwindow.c:1982 +#: ../src/vikwindow.c:1979 msgid "2" msgstr "" -#: ../src/vikwindow.c:1983 +#: ../src/vikwindow.c:1980 msgid "4" msgstr "" -#: ../src/vikwindow.c:1984 +#: ../src/vikwindow.c:1981 msgid "8" msgstr "" -#: ../src/vikwindow.c:1985 +#: ../src/vikwindow.c:1982 msgid "16" msgstr "" -#: ../src/vikwindow.c:1986 +#: ../src/vikwindow.c:1983 msgid "32" msgstr "" -#: ../src/vikwindow.c:1987 +#: ../src/vikwindow.c:1984 msgid "64" msgstr "" -#: ../src/vikwindow.c:1988 +#: ../src/vikwindow.c:1985 msgid "128" msgstr "" -#: ../src/vikwindow.c:1989 +#: ../src/vikwindow.c:1986 msgid "Pan North" msgstr "" -#: ../src/vikwindow.c:1990 +#: ../src/vikwindow.c:1987 msgid "Pan East" msgstr "" -#: ../src/vikwindow.c:1991 +#: ../src/vikwindow.c:1988 msgid "Pan South" msgstr "" -#: ../src/vikwindow.c:1992 +#: ../src/vikwindow.c:1989 msgid "Pan West" msgstr "" -#: ../src/vikwindow.c:1993 +#: ../src/vikwindow.c:1990 msgid "Background _Jobs" msgstr "" -#: ../src/vikwindow.c:1995 +#: ../src/vikwindow.c:1992 msgid "Cu_t" msgstr "" -#: ../src/vikwindow.c:1996 +#: ../src/vikwindow.c:1993 msgid "_Copy" msgstr "" -#: ../src/vikwindow.c:1997 +#: ../src/vikwindow.c:1994 msgid "_Paste" msgstr "" -#: ../src/vikwindow.c:1998 +#: ../src/vikwindow.c:1995 msgid "_Delete" msgstr "" -#: ../src/vikwindow.c:1999 +#: ../src/vikwindow.c:1996 msgid "Delete All" msgstr "" -#: ../src/vikwindow.c:2000 +#: ../src/vikwindow.c:1997 +msgid "Flush Map cache" +msgstr "" + +#: ../src/vikwindow.c:1998 msgid "_Preferences..." msgstr "" -#: ../src/vikwindow.c:2001 +#: ../src/vikwindow.c:1999 msgid "_Properties" msgstr "" -#: ../src/vikwindow.c:2003 +#: ../src/vikwindow.c:2001 msgid "_About" msgstr "" -#: ../src/vikwindow.c:2008 +#: ../src/vikwindow.c:2006 msgid "_UTM Mode" msgstr "" -#: ../src/vikwindow.c:2009 +#: ../src/vikwindow.c:2007 msgid "_Expedia Mode" msgstr "" -#: ../src/vikwindow.c:2010 +#: ../src/vikwindow.c:2008 msgid "_Mercator Mode" msgstr "" -#: ../src/vikwindow.c:2014 +#: ../src/vikwindow.c:2012 msgid "Pan Tool" msgstr "" -#: ../src/vikwindow.c:2015 +#: ../src/vikwindow.c:2013 msgid "Zoom Tool" msgstr "" -#: ../src/vikwindow.c:2016 +#: ../src/vikwindow.c:2014 msgid "_Ruler" msgstr "" -#: ../src/vikwindow.c:2016 +#: ../src/vikwindow.c:2014 msgid "Ruler Tool" msgstr "" -#: ../src/vikwindow.c:2020 +#: ../src/vikwindow.c:2018 msgid "Show Scale" msgstr "" -#: ../src/vikwindow.c:2021 +#: ../src/vikwindow.c:2019 msgid "Show Center Mark" msgstr "" -#: ../src/vikwindow.c:2022 +#: ../src/vikwindow.c:2020 msgid "Full Screen" msgstr "" -#: ../src/vikwindow.c:2022 +#: ../src/vikwindow.c:2020 msgid "Activate full screen mode" msgstr "" -#: ../src/vikwindow.c:2023 +#: ../src/vikwindow.c:2021 msgid "Show Side Panel" msgstr "" -#: ../src/vikwindow.c:2085 +#: ../src/vikwindow.c:2083 #, c-format msgid "New %s Layer" msgstr "" @@ -7,15 +7,15 @@ msgid "" msgstr "" "Project-Id-Version: viking\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-04 22:47+0100\n" -"PO-Revision-Date: 2009-02-04 22:19+0000\n" -"Last-Translator: gianpietros <gianpietrosolazzi@libero.it>\n" +"POT-Creation-Date: 2009-08-20 09:50+0200\n" +"PO-Revision-Date: 2009-08-20 16:39+0000\n" +"Last-Translator: Alessi Andrea <knukun@gmail.com>\n" "Language-Team: Italian <it@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-02-08 13:36+0000\n" +"X-Launchpad-Export-Date: 2009-09-09 20:12+0000\n" "X-Generator: Launchpad (build Unknown)\n" #: ../src/acquire.c:118 @@ -24,30 +24,30 @@ msgstr "In esecuzione..." #: ../src/acquire.c:141 msgid "Error: acquisition failed." -msgstr "" +msgstr "Errore: acquisizione fallita." -#: ../src/acquire.c:149 ../src/vikgpslayer.c:957 +#: ../src/acquire.c:149 ../src/vikgpslayer.c:953 msgid "Done." msgstr "Fatto." -#: ../src/acquire.c:326 ../src/vikgpslayer.c:996 +#: ../src/acquire.c:326 ../src/vikgpslayer.c:992 msgid "Status: detecting gpsbabel" msgstr "Stato: rilevazione di gpsbabel in corso" -#: ../src/background.c:54 +#: ../src/background.c:57 #, c-format msgid "%d items" -msgstr "" +msgstr "%d elementi" -#: ../src/background.c:212 +#: ../src/background.c:224 msgid "Job" msgstr "Lavoro" -#: ../src/background.c:216 +#: ../src/background.c:228 msgid "Progress" msgstr "Avanzamento" -#: ../src/background.c:227 +#: ../src/background.c:239 msgid "Viking Background Jobs" msgstr "Processi in background di Viking" @@ -57,7 +57,7 @@ msgstr "Impossibile incollare" #: ../src/clipboard.c:94 msgid "wrong clipboard data size" -msgstr "" +msgstr "Dimensione dei dati negli appunti sbagliata" #: ../src/clipboard.c:113 #, c-format @@ -77,7 +77,7 @@ msgstr "" "Per incollare un waypoint, seleziona uno strato appropriato in cui " "incollarlo." -#: ../src/curl_download.c:85 +#: ../src/curl_download.c:94 #, c-format msgid "%s() Curl perform failed: %s" msgstr "%s() Curl perform errore: %s" @@ -114,7 +114,7 @@ msgstr "Lettera:" #: ../src/dialog.c:192 msgid "Waypoint Properties" -msgstr "" +msgstr "Proprietà Waypoint" #: ../src/dialog.c:218 msgid "Name:" @@ -152,7 +152,7 @@ msgstr "Il waypoint \"%s\" è già presente, desideri sovrascriverlo?" #: ../src/dialog.c:462 ../src/geonamessearch.c:301 msgid "Nothing was selected" -msgstr "" +msgstr "Niente di selezionato" #: ../src/dialog.c:470 msgid "Add Track" @@ -227,6 +227,19 @@ msgid "" "this program; if not, write to the Free Software Foundation, Inc., 59 Temple " "Place, Suite 330, Boston, MA 02111-1307, USA" msgstr "" +"This program is free software; you can redistribute it and/or modify it " +"under the terms of the GNU General Public License as published by the Free " +"Software Foundation; either version 2 of the License, or (at your option) " +"any later version.\n" +"\n" +"This program is distributed in the hope that it will be useful, but WITHOUT " +"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " +"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for " +"more details.\n" +"\n" +"You should have received a copy of the GNU General Public License along with " +"this program; if not, write to the Free Software Foundation, Inc., 59 Temple " +"Place, Suite 330, Boston, MA 02111-1307, USA" #: ../src/dialog.c:726 msgid "Download along track" @@ -276,7 +289,7 @@ msgstr "Cerca" #: ../src/geonamessearch.c:119 msgid "No entries found!" -msgstr "" +msgstr "Nessuna voce trovata!" #: ../src/geonamessearch.c:135 ../src/googlesearch.c:70 msgid "I don't know that place. Do you want another search?" @@ -296,7 +309,7 @@ msgstr "Impossibile aprire il file temporaneo" #: ../src/globals.c:41 msgid "Degree format:" -msgstr "" +msgstr "Formato coordinate:" #. Webtools #: ../src/google.c:34 @@ -332,7 +345,7 @@ msgstr "Numero geocache:" #: ../src/datasource_gc.c:171 msgid "Centered around:" -msgstr "" +msgstr "Centrata su:" #: ../src/datasource_google.c:49 ../src/datasource_google.c:50 msgid "Google Directions" @@ -348,25 +361,25 @@ msgstr "A:" #: ../src/datasource_gps.c:48 msgid "Acquire from GPS" -msgstr "" +msgstr "Acquisisci dal GPS" #: ../src/datasource_gps.c:49 msgid "Acquired from GPS" -msgstr "" +msgstr "Aquisiti dal GPS" #: ../src/datasource_gps.c:133 #, c-format msgid "using cmdline '%s' and file '%s'\n" msgstr "Sto utilizzando cmdline '%s' e file '%s'\n" -#: ../src/datasource_gps.c:150 ../src/vikgpslayer.c:711 +#: ../src/datasource_gps.c:150 ../src/vikgpslayer.c:707 #, c-format msgid "Downloading %d waypoint..." msgid_plural "Downloading %d waypoints..." msgstr[0] "Download in corso di %d waypoint" msgstr[1] "Download in corso di %d waypoint" -#: ../src/datasource_gps.c:152 ../src/vikgpslayer.c:713 +#: ../src/datasource_gps.c:152 ../src/vikgpslayer.c:709 #, c-format msgid "Downloading %d trackpoint..." msgid_plural "Downloading %d trackpoints..." @@ -383,7 +396,7 @@ msgstr "Scaricati %d di %d %s" msgid "Downloaded %d %s." msgstr "Scaricati %d %s." -#: ../src/datasource_gps.c:185 ../src/vikgpslayer.c:783 +#: ../src/datasource_gps.c:185 ../src/vikgpslayer.c:779 #, c-format msgid "GPS Device: %s" msgstr "Dispositivo GPS: %s" @@ -396,7 +409,7 @@ msgstr "Protocollo GPS:" msgid "Serial Port:" msgstr "Porta seriale:" -#: ../src/datasource_gps.c:299 ../src/vikgpslayer.c:1001 +#: ../src/datasource_gps.c:299 ../src/vikgpslayer.c:997 msgid "GPS device: N/A" msgstr "Dipositivo GPS: N/D" @@ -415,7 +428,7 @@ msgstr "DEM Classe B non corretta: attesa 1" #: ../src/dem.c:354 #, c-format msgid "Couldn't map file %s: %s" -msgstr "" +msgstr "Impossibile mappare il file %s: %s" #: ../src/download.c:121 #, c-format @@ -425,7 +438,11 @@ msgstr "Errore durante il download: %s" #: ../src/file.c:426 ../src/file.c:430 #, c-format msgid "Draw mode '%s' no more supported" -msgstr "" +msgstr "Modalità '%s' non più supportata" + +#: ../src/mapcache.c:63 +msgid "Mapcache memory size (MB):" +msgstr "Dimensione della Mapcache (MB)" #: ../src/print.c:53 msgid "None" @@ -469,13 +486,13 @@ msgstr "Ignora i _margini della pagina" msgid "Image S_ize:" msgstr "Dimen_sione immagine:" -#: ../src/util.c:75 +#: ../src/util.c:76 msgid "Could not launch web browser." msgstr "Impossibile eseguire il browser web." -#: ../src/util.c:86 +#: ../src/util.c:87 msgid "Could not create new email." -msgstr "" +msgstr "Impossibile creare una nuova email." #: ../src/vikcoordlayer.c:46 ../src/vikdemlayer.c:110 msgid "Color:" @@ -519,15 +536,15 @@ msgstr "Waypoint all'esterno di questo" #: ../src/main.c:116 msgid "Use smaller symbols for waypoints" -msgstr "" +msgstr "Utilizzare simboli più piccolo per i waypoint" #: ../src/main.c:117 msgid "Enable debug output" -msgstr "" +msgstr "Abilita output di debug" #: ../src/main.c:118 msgid "Enable verbose output" -msgstr "" +msgstr "Abilita output prolisso" #: ../src/main.c:119 msgid "Show version" @@ -535,23 +552,23 @@ msgstr "Mostra versione" #: ../src/osm.c:85 msgid "OSM (view)" -msgstr "" +msgstr "OSM (visualizza)" #: ../src/osm.c:89 msgid "OSM (edit)" -msgstr "" +msgstr "OSM (modifica)" #: ../src/osm.c:93 msgid "OSM (render)" -msgstr "" +msgstr "OSM (disegna)" #: ../src/osm-traces.c:77 msgid "OSM username:" -msgstr "" +msgstr "Username OSM:" #: ../src/osm-traces.c:78 msgid "OSM password:" -msgstr "" +msgstr "Password OSM:" #: ../src/osm-traces.c:218 #, c-format @@ -629,7 +646,7 @@ msgstr "Descrizione:" #: ../src/osm-traces.c:377 msgid "The description of the trace" -msgstr "" +msgstr "La descrizione della traccia" #: ../src/osm-traces.c:380 msgid "Tags:" @@ -637,7 +654,7 @@ msgstr "Tag:" #: ../src/osm-traces.c:387 msgid "The tags associated to the trace" -msgstr "" +msgstr "I tag associati alla traccia" #: ../src/osm-traces.c:390 msgid "Public" @@ -645,7 +662,7 @@ msgstr "Pubblico" #: ../src/osm-traces.c:396 msgid "Indicates if the trace is public or not" -msgstr "" +msgstr "Indica se la traccia è pubblica o no" #: ../src/osm-traces.c:417 #, c-format @@ -655,6 +672,7 @@ msgstr "Upload di %s su OSM" #: ../src/uibuilder.c:134 msgid "Take care that this password will be stored clearly in a plain file." msgstr "" +"Attenzione, questa password verrà memorizzata in chiaro in un file di testo." #: ../src/vikdemlayer.c:108 msgid "DEM Files:" @@ -691,11 +709,11 @@ msgstr "" msgid "Downloading DEM %s" msgstr "Download di DEM %s in corso" -#: ../src/vikfileentry.c:67 +#: ../src/vikfileentry.c:68 msgid "Browse..." msgstr "Sfoglia..." -#: ../src/vikfileentry.c:94 +#: ../src/vikfileentry.c:96 msgid "Choose file" msgstr "Seleziona il file" @@ -713,11 +731,11 @@ msgstr "Elimina" #: ../src/vikgeoreflayer.c:66 msgid "Georef Move Map" -msgstr "" +msgstr "Sposta Mappa Georef" #: ../src/vikgeoreflayer.c:70 msgid "Georef Zoom Tool" -msgstr "" +msgstr "Strumento di Zoom Georef" #: ../src/vikgeoreflayer.c:268 ../src/vikmapslayer.c:544 #, c-format @@ -795,7 +813,7 @@ msgstr "All'avvio salta alla posizione corrente" #: ../src/vikgpslayer.c:139 msgid "Moving Map Method:" -msgstr "" +msgstr "Metodo di Movimento Mappa:" #: ../src/vikgpslayer.c:140 msgid "Gpsd Host:" @@ -807,13 +825,13 @@ msgstr "Porta di Gpsd:" #: ../src/vikgpslayer.c:142 msgid "Gpsd Retry Interval (seconds):" -msgstr "" +msgstr "Intervallo di Prova Gpsd (secondi):" -#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:989 +#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:985 msgid "GPS Download" msgstr "Download GPS" -#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:989 +#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:985 msgid "GPS Upload" msgstr "Upload GPS" @@ -821,110 +839,110 @@ msgstr "Upload GPS" msgid "GPS Realtime Tracking" msgstr "Tracciamento GPS in tempo reale" -#: ../src/vikgpslayer.c:373 +#: ../src/vikgpslayer.c:371 msgid "Unknown GPS Protocol" msgstr "Protocollo GPS sconosciuto" -#: ../src/vikgpslayer.c:379 +#: ../src/vikgpslayer.c:377 msgid "Unknown serial port device" msgstr "Porta seriale del dispositivo sconosciuta" -#: ../src/vikgpslayer.c:444 +#: ../src/vikgpslayer.c:442 #, c-format msgid "%s: unknown parameter" msgstr "%s: parametro sconosciuto" -#: ../src/vikgpslayer.c:545 +#: ../src/vikgpslayer.c:541 msgid "Upload to GPS" msgstr "Upload su GPS" -#: ../src/vikgpslayer.c:550 +#: ../src/vikgpslayer.c:546 msgid "Download from GPS" msgstr "Scarica da GPS" -#: ../src/vikgpslayer.c:568 +#: ../src/vikgpslayer.c:564 msgid "Empty Upload" msgstr "Svuota Upload" -#: ../src/vikgpslayer.c:573 +#: ../src/vikgpslayer.c:569 msgid "Empty Download" msgstr "Svuota Download" -#: ../src/vikgpslayer.c:578 +#: ../src/vikgpslayer.c:574 msgid "Empty All" msgstr "Svuota tutto" -#: ../src/vikgpslayer.c:718 +#: ../src/vikgpslayer.c:714 #, c-format msgid "Uploading %d waypoint..." msgid_plural "Uploading %d waypoints..." msgstr[0] "Upload di %d waypoint in corso..." msgstr[1] "Upload di %d waypoint in corso..." -#: ../src/vikgpslayer.c:720 +#: ../src/vikgpslayer.c:716 #, c-format msgid "Uploading %d trackpoint..." msgid_plural "Uploading %d trackpoints..." msgstr[0] "Upload di %d trackpoint in corso..." msgstr[1] "Upload di %d trackpoint in corso..." -#: ../src/vikgpslayer.c:744 +#: ../src/vikgpslayer.c:740 #, c-format msgid "Downloaded %d out of %d waypoint..." msgid_plural "Downloaded %d out of %d waypoints..." msgstr[0] "Scaricati %d waypoint su %d..." msgstr[1] "Scaricati %d waypoint su %d..." -#: ../src/vikgpslayer.c:746 +#: ../src/vikgpslayer.c:742 #, c-format msgid "Downloaded %d out of %d trackpoint..." msgid_plural "Downloaded %d out of %d trackpoints..." msgstr[0] "Scaricati %d trackpoint su %d..." msgstr[1] "Scaricati %d trackpoint su %d..." -#: ../src/vikgpslayer.c:750 +#: ../src/vikgpslayer.c:746 #, c-format msgid "Uploaded %d out of %d waypoint..." msgid_plural "Uploaded %d out of %d waypoints..." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Caricati %d di %d waypoint..." +msgstr[1] "Caricati %d di of %d waypoint..." -#: ../src/vikgpslayer.c:752 +#: ../src/vikgpslayer.c:748 #, c-format msgid "Uploaded %d out of %d trackpoint..." msgid_plural "Uploaded %d out of %d trackpoints..." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Caricati %d di %d trackpoint..." +msgstr[1] "Caricati %d di %d trackpoint..." -#: ../src/vikgpslayer.c:759 +#: ../src/vikgpslayer.c:755 #, c-format msgid "Downloaded %d waypoint" msgid_plural "Downloaded %d waypoints" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Scaricati %d waypoint" +msgstr[1] "Scaricati %d waypoint" -#: ../src/vikgpslayer.c:761 +#: ../src/vikgpslayer.c:757 #, c-format msgid "Downloaded %d trackpoint" msgid_plural "Downloaded %d trackpoints" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Scaricati %d trackpoint" +msgstr[1] "Scaricati %d trackpoint" -#: ../src/vikgpslayer.c:765 +#: ../src/vikgpslayer.c:761 #, c-format msgid "Uploaded %d waypoint" msgid_plural "Uploaded %d waypoints" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Caricati %d waypoint" +msgstr[1] "Caricati %d waypoint" -#: ../src/vikgpslayer.c:767 +#: ../src/vikgpslayer.c:763 #, c-format msgid "Uploaded %d trackpoint" msgid_plural "Uploaded %d trackpoints" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Caricati %d trackpoint" +msgstr[1] "Caricati %d trackpoint" -#: ../src/vikgpslayer.c:952 +#: ../src/vikgpslayer.c:948 msgid "Error: couldn't find gpsbabel." msgstr "Errore: impossibile trovare gpsbabel." @@ -954,7 +972,7 @@ msgstr "Livello superiore" #: ../src/viklayerspanel.c:487 msgid "Aggregate Layers have no settable properties." -msgstr "" +msgstr "I livelli aggregati non hanno proprietà modificabili." #: ../src/viklayerspanel.c:537 msgid "You cannot cut the Top Layer." @@ -978,8 +996,8 @@ msgid "Map Type:" msgstr "Tipo di Mappa:" #: ../src/vikmapslayer.c:120 -msgid "Maps Directory (Optional):" -msgstr "Directory delle mappe (opzionale):" +msgid "Maps Directory:" +msgstr "Directory delle mappe" #: ../src/vikmapslayer.c:121 msgid "Alpha:" @@ -1025,37 +1043,38 @@ msgid "" "Cowardly refusing to draw tiles or existence of tiles beyond %d zoom out " "factor" msgstr "" +"Rappresentazione o esistenza di celle impossibile oltre il fattore di zoom %d" -#: ../src/vikmapslayer.c:924 +#: ../src/vikmapslayer.c:927 #, c-format msgid "Redownloading up to %d %s map..." msgid_plural "Redownloading up to %d %s maps..." msgstr[0] "Sto scaricando nuovamente fino a %d %s mappa..." msgstr[1] "Sto scaricando nuovamente fino a %d %s mappe..." -#: ../src/vikmapslayer.c:926 +#: ../src/vikmapslayer.c:929 #, c-format msgid "Redownloading %d %s map..." msgid_plural "Redownloading %d %s maps..." msgstr[0] "Sto scaricando nuovamente fino a %d %s mappa..." msgstr[1] "Sto scaricando nuovamente fino a %d %s mappe..." -#: ../src/vikmapslayer.c:930 ../src/vikmapslayer.c:1001 +#: ../src/vikmapslayer.c:933 ../src/vikmapslayer.c:1004 #, c-format msgid "Downloading %d %s map..." msgid_plural "Downloading %d %s maps..." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Scaricamento %d %s mappa..." +msgstr[1] "Scaricamento %d %s mappe..." -#: ../src/vikmapslayer.c:1058 +#: ../src/vikmapslayer.c:1061 msgid "Redownload bad map(s)" msgstr "Sto riscaricando mappa/e corrotte" -#: ../src/vikmapslayer.c:1062 +#: ../src/vikmapslayer.c:1065 msgid "Redownload all map(s)" msgstr "Sto riscaricando tutte le mappe" -#: ../src/vikmapslayer.c:1142 +#: ../src/vikmapslayer.c:1145 #, c-format msgid "" "Wrong drawmode for this map.\n" @@ -1064,18 +1083,18 @@ msgstr "" "Modalità di disegno non valida per questa mappa.\n" "Seleziona \"%s\" dal menu Visualizza e riprova." -#: ../src/vikmapslayer.c:1147 +#: ../src/vikmapslayer.c:1150 msgid "Wrong zoom level for this map." msgstr "Livello di zoom errato per questa mappa." -#: ../src/vikmapslayer.c:1172 +#: ../src/vikmapslayer.c:1175 msgid "Download Onscreen Maps" -msgstr "" +msgstr "Scaricamento Mappe Onscreen" #. TODO Add GTK_STOCK_REFRESH icon -#: ../src/vikmapslayer.c:1178 +#: ../src/vikmapslayer.c:1181 msgid "Refresh Onscreen Tiles" -msgstr "" +msgstr "Aggiorna celle Onscreen" #: ../src/viktreeview.c:203 msgid "Layer Name" @@ -1183,7 +1202,7 @@ msgstr "Disegna stop" #: ../src/viktrwlayer.c:370 msgid "Min Stop Length (seconds):" -msgstr "" +msgstr "Lunghezza Minima Stop (secondi):" #: ../src/viktrwlayer.c:372 msgid "Track Thickness:" @@ -1191,23 +1210,23 @@ msgstr "Spessore della Traccia:" #: ../src/viktrwlayer.c:373 msgid "Track BG Thickness:" -msgstr "" +msgstr "Spessore Traccia BG:" #: ../src/viktrwlayer.c:374 msgid "Track Background Color" -msgstr "" +msgstr "Colore di Sfondo Traccia" #: ../src/viktrwlayer.c:375 msgid "Min Track Velocity:" -msgstr "" +msgstr "Velocità Minima Traccia:" #: ../src/viktrwlayer.c:376 msgid "Max Track Velocity:" -msgstr "" +msgstr "Velocità Massima Traccia:" #: ../src/viktrwlayer.c:378 msgid "Draw Labels" -msgstr "" +msgstr "Disegna Etichette" #: ../src/viktrwlayer.c:379 msgid "Waypoint Color:" @@ -1223,11 +1242,11 @@ msgstr "Sfondo:" #: ../src/viktrwlayer.c:382 msgid "Fake BG Color Translucency:" -msgstr "" +msgstr "Trasparenza del colore di sfondo finta" #: ../src/viktrwlayer.c:383 msgid "Waypoint marker:" -msgstr "" +msgstr "Marker waypoint:" #: ../src/viktrwlayer.c:384 msgid "Waypoint size:" @@ -1261,12 +1280,12 @@ msgstr "Questo lviello non ha waypoint o trackpoint." msgid "Export Layer" msgstr "Esporta livello" -#: ../src/viktrwlayer.c:1565 ../src/vikwindow.c:1446 ../src/vikwindow.c:1820 +#: ../src/viktrwlayer.c:1565 ../src/vikwindow.c:1438 ../src/vikwindow.c:1817 #, c-format msgid "The file \"%s\" exists, do you wish to overwrite it?" msgstr "Il file \"%s\" è già esistente, desideri sovrascriverlo?" -#: ../src/viktrwlayer.c:1575 ../src/vikwindow.c:1464 +#: ../src/viktrwlayer.c:1575 ../src/vikwindow.c:1456 msgid "The filename you requested could not be opened for writing." msgstr "Non è stato possibile aprire il file richiesto in scrittura." @@ -1282,81 +1301,81 @@ msgstr "Nome del Waypoint:" msgid "Waypoint not found in this layer." msgstr "Waypoint non trovato in questo lviello." -#: ../src/viktrwlayer.c:1724 +#: ../src/viktrwlayer.c:1723 msgid "Goto Center of Layer" -msgstr "" +msgstr "Vai al Centro del Livello" -#: ../src/viktrwlayer.c:1729 +#: ../src/viktrwlayer.c:1728 msgid "Goto Waypoint" msgstr "Vai al Waypoint" -#: ../src/viktrwlayer.c:1735 +#: ../src/viktrwlayer.c:1734 msgid "Export layer" -msgstr "" +msgstr "Esporta livello" -#: ../src/viktrwlayer.c:1740 +#: ../src/viktrwlayer.c:1739 msgid "Export as GPSPoint" -msgstr "" +msgstr "Esporta come GPSPoint" -#: ../src/viktrwlayer.c:1745 +#: ../src/viktrwlayer.c:1744 msgid "Export as GPSMapper" -msgstr "" +msgstr "Esporta come GPSMapper" -#: ../src/viktrwlayer.c:1750 +#: ../src/viktrwlayer.c:1749 msgid "Export as GPX" -msgstr "" +msgstr "Esporta come GPX" -#: ../src/viktrwlayer.c:1755 ../src/viktrwlayer.c:2794 +#: ../src/viktrwlayer.c:1754 ../src/viktrwlayer.c:2794 msgid "New Waypoint" msgstr "Nuovo Waypoint" -#: ../src/viktrwlayer.c:1762 +#: ../src/viktrwlayer.c:1761 msgid "Add Wikipedia Waypoints" -msgstr "" +msgstr "Aggiungi Waypoint Wikipedia" -#: ../src/viktrwlayer.c:1767 +#: ../src/viktrwlayer.c:1766 msgid "Within layer bounds" -msgstr "" +msgstr "Entro i confini del livello" -#: ../src/viktrwlayer.c:1772 +#: ../src/viktrwlayer.c:1771 msgid "Within current view" -msgstr "" +msgstr "Entro la vista corrente" -#: ../src/viktrwlayer.c:1779 ../src/viktrwlayer.c:2760 +#: ../src/viktrwlayer.c:1778 ../src/viktrwlayer.c:2760 msgid "Upload to OSM" -msgstr "" +msgstr "Carica su OSM" -#: ../src/viktrwlayer.c:2290 +#: ../src/viktrwlayer.c:2289 msgid "Failed. This track does not have timestamp" -msgstr "" +msgstr "Fallito. Questo tracciato non ha un timestamp" -#: ../src/viktrwlayer.c:2304 +#: ../src/viktrwlayer.c:2303 msgid "Failed. No other track in this layer has timestamp" -msgstr "" +msgstr "Fallito. Nessun altro tracciato in questo livello ha un timestamp" -#: ../src/viktrwlayer.c:2310 +#: ../src/viktrwlayer.c:2309 msgid "Merge with..." -msgstr "" +msgstr "Unisci con..." -#: ../src/viktrwlayer.c:2310 +#: ../src/viktrwlayer.c:2309 msgid "Select track to merge with" -msgstr "" +msgstr "Selezionare il tracciato da unire" -#: ../src/viktrwlayer.c:2347 +#: ../src/viktrwlayer.c:2346 msgid "Merge Threshold..." -msgstr "" +msgstr "Unisci Soglia..." -#: ../src/viktrwlayer.c:2348 +#: ../src/viktrwlayer.c:2347 msgid "Merge when time between tracks less than:" -msgstr "" +msgstr "Unisci quando il tempo tra i tracciati è minore di:" #: ../src/viktrwlayer.c:2439 msgid "Split Threshold..." -msgstr "" +msgstr "Dividi Soglia..." #: ../src/viktrwlayer.c:2440 msgid "Split when time between trackpoints exceeds:" -msgstr "" +msgstr "Dividi quando il tempo tra i trackpoint supera i:" #: ../src/viktrwlayer.c:2523 msgid "Waypoint Already Exists" @@ -1392,7 +1411,7 @@ msgstr "Unisci per tempo" #: ../src/viktrwlayer.c:2729 msgid "Merge With Other Tracks..." -msgstr "" +msgstr "Unisci Con Altri Tracciati..." #: ../src/viktrwlayer.c:2734 msgid "Split By Time" @@ -1404,151 +1423,151 @@ msgstr "Scarica le mappe lungo la traccia..." #: ../src/viktrwlayer.c:2744 msgid "Apply DEM Data" -msgstr "" +msgstr "Applica Dati DEM" #: ../src/viktrwlayer.c:2749 msgid "Extend track end" -msgstr "" +msgstr "Estendi fine tracciato" #: ../src/viktrwlayer.c:2754 msgid "Extend using magic scissors" -msgstr "" +msgstr "Estendi utilizzando le magic scissors" #: ../src/viktrwlayer.c:2768 msgid "View Google Directions" -msgstr "" +msgstr "Mostra Google Directions" #: ../src/viktrwlayer.c:2774 msgid "Use with filter" -msgstr "" +msgstr "Usa con filtro" -#: ../src/viktrwlayer.c:3736 +#: ../src/viktrwlayer.c:3735 msgid "Could not launch eog to open file." -msgstr "" +msgstr "Esecuzione di eog per aprire il file fallita." -#: ../src/viktrwlayer.c:3790 +#: ../src/viktrwlayer.c:3789 #, c-format msgid "Creating %d Image Thumbnails..." -msgstr "" +msgstr "Creazione di %d Anteprime..." -#: ../src/viktrwlayer.c:4010 +#: ../src/viktrwlayer.c:4009 msgid "No map layer in use. Create one first" msgstr "Nessun livello di mappa in uno. Creane uno prima" -#: ../src/viktrwlayer_propwin.c:658 +#: ../src/viktrwlayer_propwin.c:661 msgid "Failed spliting track. Track unchanged" -msgstr "" +msgstr "Divisione del tracciato fallita. Tracciato invariato" -#: ../src/viktrwlayer_propwin.c:675 +#: ../src/viktrwlayer_propwin.c:678 msgid "Operation Aborted. Track unchanged" -msgstr "" +msgstr "Operazione interrotta. Tracciato invariato" -#: ../src/viktrwlayer_propwin.c:729 +#: ../src/viktrwlayer_propwin.c:732 #, c-format msgid "%s - Track Properties" msgstr "%s - Proprietà della Traccia" -#: ../src/viktrwlayer_propwin.c:734 +#: ../src/viktrwlayer_propwin.c:737 msgid "Split at Marker" -msgstr "" +msgstr "Dividi al Marker" -#: ../src/viktrwlayer_propwin.c:735 +#: ../src/viktrwlayer_propwin.c:738 msgid "Split Segments" msgstr "Suddividi segmenti" -#: ../src/viktrwlayer_propwin.c:736 +#: ../src/viktrwlayer_propwin.c:739 msgid "Reverse" msgstr "Inverti" -#: ../src/viktrwlayer_propwin.c:737 +#: ../src/viktrwlayer_propwin.c:740 msgid "Delete Dupl." msgstr "Elimina duplicato" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Comment:</b>" msgstr "<b>Commento:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Track Length:</b>" msgstr "<b>Lunghezza della Traccia:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Trackpoints:</b>" msgstr "" "Copy text \t\r\n" "<b>Trackpoints:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Segments:</b>" msgstr "<b>Segmenti:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Duplicate Points:</b>" msgstr "<b>Punti duplicati:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Max Speed:</b>" msgstr "<b>Velocità Massima:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Avg. Speed:</b>" msgstr "<b>Velocità Media:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Avg. Dist. Between TPs:</b>" msgstr "<b>Distanza Media fra TrackPoint:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Elevation Range:</b>" -msgstr "" +msgstr "<b>Range di Altitudine:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Total Elevation Gain/Loss:</b>" -msgstr "" +msgstr "<b>Dislivello totale/Perdita:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Start:</b>" msgstr "<b>Inizio:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>End:</b>" msgstr "<b>Fine:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Duration:</b>" msgstr "<b>Durata:</b>" -#: ../src/viktrwlayer_propwin.c:788 ../src/viktrwlayer_propwin.c:795 -#: ../src/viktrwlayer_propwin.c:804 ../src/viktrwlayer_propwin.c:811 -#: ../src/viktrwlayer_propwin.c:850 ../src/viktrwlayer_propwin.c:851 -#: ../src/viktrwlayer_propwin.c:852 ../src/viktrwlayer_propwin.c:874 -#: ../src/viktrwlayer_propwin.c:881 +#: ../src/viktrwlayer_propwin.c:791 ../src/viktrwlayer_propwin.c:798 +#: ../src/viktrwlayer_propwin.c:807 ../src/viktrwlayer_propwin.c:814 +#: ../src/viktrwlayer_propwin.c:853 ../src/viktrwlayer_propwin.c:854 +#: ../src/viktrwlayer_propwin.c:855 ../src/viktrwlayer_propwin.c:877 +#: ../src/viktrwlayer_propwin.c:884 #, c-format msgid "No Data" msgstr "Nessun dato" -#: ../src/viktrwlayer_propwin.c:847 +#: ../src/viktrwlayer_propwin.c:850 #, c-format msgid "%d minutes" msgstr "%d minuti" -#: ../src/viktrwlayer_propwin.c:870 +#: ../src/viktrwlayer_propwin.c:873 msgid "Statistics" -msgstr "" +msgstr "Statistiche" -#: ../src/viktrwlayer_propwin.c:875 +#: ../src/viktrwlayer_propwin.c:878 msgid "<b>Track Distance:</b>" -msgstr "" +msgstr "<b>Distanza Tracciato:</b>" -#: ../src/viktrwlayer_propwin.c:876 +#: ../src/viktrwlayer_propwin.c:879 msgid "Elevation-distance" msgstr "Elevazione-distanza" -#: ../src/viktrwlayer_propwin.c:882 +#: ../src/viktrwlayer_propwin.c:885 msgid "<b>Track Time:</b>" -msgstr "" +msgstr "<b>Durata Tracciato:</b>" -#: ../src/viktrwlayer_propwin.c:883 +#: ../src/viktrwlayer_propwin.c:886 msgid "Speed-time" msgstr "Velocità -tempo" @@ -1570,7 +1589,7 @@ msgstr "<b>Altitudine:</b>" #: ../src/viktrwlayer_tpwin.c:105 msgid "<b>Timestamp:</b>" -msgstr "" +msgstr "<b>Timestamp:</b>" #: ../src/viktrwlayer_tpwin.c:106 msgid "<b>Time:</b>" @@ -1588,31 +1607,47 @@ msgstr "<b>Differenza di Tempo:</b>" msgid "<b>\"Speed\" Between:</b>" msgstr "<b>\"Velocità \" Attraverso:</b>" -#: ../src/viktrwlayer_tpwin.c:117 +#: ../src/viktrwlayer_tpwin.c:110 +msgid "<b>VDOP:</b>" +msgstr "<b>VDOP:</b>" + +#: ../src/viktrwlayer_tpwin.c:111 +msgid "<b>HDOP:</b>" +msgstr "<b>HDOP:</b>" + +#: ../src/viktrwlayer_tpwin.c:112 +msgid "<b>PDOP:</b>" +msgstr "<b>PDOP:</b>" + +#: ../src/viktrwlayer_tpwin.c:113 +msgid "<b>SAT/FIX:</b>" +msgstr "<b>SAT/FIX:</b>" + +#: ../src/viktrwlayer_tpwin.c:122 msgid "Trackpoint" msgstr "Trackpoint" -#: ../src/viktrwlayer_tpwin.c:122 +#: ../src/viktrwlayer_tpwin.c:127 msgid "Split Here" msgstr "Suddividi qui" -#: ../src/viktrwlayer_tpwin.c:123 +#: ../src/viktrwlayer_tpwin.c:128 msgid "Join With Last" msgstr "Unisci con l'ultimo" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Pan" -msgstr "" +msgstr "Scorri" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Zoom" msgstr "Zoom" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Ruler" -msgstr "" +msgstr "Righello" -#: ../src/vikwindow.c:363 +#: ../src/vikwindow.c:364 #, c-format msgid "" "Do you want to save the changes you made to the document \"%s\"?\n" @@ -1622,479 +1657,462 @@ msgstr "" "Desideri salvare le modifiche effettuate al documento \"%s\"?\n" "Le modifiche effettuate saranno perse se non salvate." -#: ../src/vikwindow.c:366 ../src/vikwindow.c:1314 +#: ../src/vikwindow.c:367 ../src/vikwindow.c:1306 msgid "Untitled" msgstr "Senza titolo" -#: ../src/vikwindow.c:367 +#: ../src/vikwindow.c:368 msgid "Don't Save" msgstr "Non salvare" -#: ../src/vikwindow.c:400 +#: ../src/vikwindow.c:401 msgid "mpp" msgstr "mpp" -#: ../src/vikwindow.c:400 +#: ../src/vikwindow.c:401 msgid "pixelfact" -msgstr "" +msgstr "pixelfact" -#: ../src/vikwindow.c:527 +#: ../src/vikwindow.c:528 #, c-format msgid "%s %s %dm" -msgstr "" +msgstr "%s %s %dm" -#: ../src/vikwindow.c:529 +#: ../src/vikwindow.c:530 #, c-format msgid "%s %s" -msgstr "" +msgstr "%s %s" -#: ../src/vikwindow.c:1113 +#: ../src/vikwindow.c:1105 msgid "You must select a layer to show its properties." msgstr "Devi selezionare un livello per vederne le proprietà relative." -#: ../src/vikwindow.c:1129 +#: ../src/vikwindow.c:1121 msgid "You must select a layer to delete." msgstr "Devo selezionare un livello per l'eliminazione." -#: ../src/vikwindow.c:1347 +#: ../src/vikwindow.c:1339 msgid "The file you requested could not be opened." msgstr "Il file richiesto non può essere aperto." -#: ../src/vikwindow.c:1390 +#: ../src/vikwindow.c:1382 msgid "Please select a GPS data file to open. " msgstr "Seleziona un archivio GPS da aprire. " -#: ../src/vikwindow.c:1433 +#: ../src/vikwindow.c:1425 msgid "Save as Viking File." msgstr "Salva come Viking File." -#: ../src/vikwindow.c:1667 +#: ../src/vikwindow.c:1664 msgid "" "Viewable region outside allowable pixel size bounds for image. Clipping " "width/height values." msgstr "" +"Regione visibile fuori dal bordo della dimensione pixel consentita per " +"l'immagine. Regolazione dei valori larghezza/altezza." -#: ../src/vikwindow.c:1686 +#: ../src/vikwindow.c:1683 #, c-format msgid "Total area: %ldm x %ldm (%.3f sq. km)" msgstr "Area Totale: %ldm x %ldm (%.3f kmq)" #. todo: default for answers inside VikWindow or static (thruout instance) -#: ../src/vikwindow.c:1694 +#: ../src/vikwindow.c:1691 msgid "Save to Image File" msgstr "Salva come file immagine" -#: ../src/vikwindow.c:1712 +#: ../src/vikwindow.c:1709 msgid "Width (pixels):" msgstr "Larghezza (pixel):" -#: ../src/vikwindow.c:1714 +#: ../src/vikwindow.c:1711 msgid "Height (pixels):" msgstr "Altezza (pixel):" -#: ../src/vikwindow.c:1717 +#: ../src/vikwindow.c:1714 msgid "Zoom (meters per pixel):" msgstr "Zoom (metri per pixel):" -#: ../src/vikwindow.c:1723 +#: ../src/vikwindow.c:1720 msgid "Area in current viewable window" -msgstr "" +msgstr "Area nella finestra correntemente visibile" -#: ../src/vikwindow.c:1733 +#: ../src/vikwindow.c:1730 msgid "Save as PNG" msgstr "Salva come PNG" -#: ../src/vikwindow.c:1734 +#: ../src/vikwindow.c:1731 msgid "Save as JPEG" msgstr "Salva come JPEG" -#: ../src/vikwindow.c:1754 +#: ../src/vikwindow.c:1751 msgid "East-west image tiles:" -msgstr "" +msgstr "Celle dell'immagine est-ovest:" -#: ../src/vikwindow.c:1756 +#: ../src/vikwindow.c:1753 msgid "North-south image tiles:" -msgstr "" +msgstr "Celle dell'immagine nord-sud:" -#: ../src/vikwindow.c:1796 +#: ../src/vikwindow.c:1793 msgid "You must be in UTM mode to use this feature" msgstr "Devi essere in modalità UTM per utilizzare questa funzione" -#: ../src/vikwindow.c:1807 +#: ../src/vikwindow.c:1804 msgid "Save Image" msgstr "Salva immagine" -#: ../src/vikwindow.c:1834 +#: ../src/vikwindow.c:1831 msgid "Choose a directory to hold images" -msgstr "" +msgstr "Selezionare una cartella dove conservare le immagini" -#: ../src/vikwindow.c:1920 +#: ../src/vikwindow.c:1917 msgid "Choose a background color" msgstr "Seleziona un colore di sfondo" -#: ../src/vikwindow.c:1941 +#: ../src/vikwindow.c:1938 msgid "_File" msgstr "_File" -#: ../src/vikwindow.c:1942 +#: ../src/vikwindow.c:1939 msgid "_Edit" msgstr "_Modifica" -#: ../src/vikwindow.c:1943 +#: ../src/vikwindow.c:1940 msgid "_View" msgstr "_Visualizza" -#: ../src/vikwindow.c:1944 ../src/vikwindow.c:2015 +#: ../src/vikwindow.c:1941 ../src/vikwindow.c:2013 msgid "_Zoom" msgstr "_Zoom" -#: ../src/vikwindow.c:1945 ../src/vikwindow.c:2014 +#: ../src/vikwindow.c:1942 ../src/vikwindow.c:2012 msgid "_Pan" -msgstr "" +msgstr "_Scorri" -#: ../src/vikwindow.c:1946 +#: ../src/vikwindow.c:1943 msgid "_Layers" msgstr "_Livelli" -#: ../src/vikwindow.c:1947 +#: ../src/vikwindow.c:1944 msgid "_Tools" msgstr "S_trumenti" -#: ../src/vikwindow.c:1948 +#: ../src/vikwindow.c:1945 msgid "_Webtools" -msgstr "" +msgstr "_Strumenti Web" -#: ../src/vikwindow.c:1949 +#: ../src/vikwindow.c:1946 msgid "_Help" msgstr "Aiuto (_H)" -#: ../src/vikwindow.c:1951 +#: ../src/vikwindow.c:1948 msgid "_New" msgstr "_Nuovo" -#: ../src/vikwindow.c:1951 +#: ../src/vikwindow.c:1948 msgid "New file" msgstr "Nuovo file" -#: ../src/vikwindow.c:1952 +#: ../src/vikwindow.c:1949 msgid "_Open" msgstr "_Apri" -#: ../src/vikwindow.c:1952 +#: ../src/vikwindow.c:1949 msgid "Open a file" msgstr "Apri un file" -#: ../src/vikwindow.c:1953 +#: ../src/vikwindow.c:1950 msgid "A_ppend File" -msgstr "" +msgstr "A_ppendi File" -#: ../src/vikwindow.c:1953 +#: ../src/vikwindow.c:1950 msgid "Append data from a different file" -msgstr "" +msgstr "Appendi dati da un file differente" -#: ../src/vikwindow.c:1954 +#: ../src/vikwindow.c:1951 msgid "A_cquire" msgstr "A_cquisisci" -#: ../src/vikwindow.c:1955 +#: ../src/vikwindow.c:1952 msgid "From _GPS" msgstr "Da _GPS" -#: ../src/vikwindow.c:1955 +#: ../src/vikwindow.c:1952 msgid "Transfer data from a GPS device" msgstr "Trasferisci dati da un dispositivo GPS" -#: ../src/vikwindow.c:1956 +#: ../src/vikwindow.c:1953 msgid "Google _Directions" msgstr "Percorsi _di Google" -#: ../src/vikwindow.c:1956 +#: ../src/vikwindow.c:1953 msgid "Get driving directions from Google" msgstr "Ottieni indicazioni di guida da Google" -#: ../src/vikwindow.c:1958 +#: ../src/vikwindow.c:1955 msgid "Geo_caches" msgstr "Geo_caches" -#: ../src/vikwindow.c:1958 +#: ../src/vikwindow.c:1955 msgid "Get Geocaches from geocaching.com" msgstr "Ottieni Geocaches da geocaching.com" -#: ../src/vikwindow.c:1960 +#: ../src/vikwindow.c:1957 msgid "_Save" msgstr "_Salva" -#: ../src/vikwindow.c:1960 +#: ../src/vikwindow.c:1957 msgid "Save the file" msgstr "Salva il file" -#: ../src/vikwindow.c:1961 +#: ../src/vikwindow.c:1958 msgid "Save _As" msgstr "S_alva con nome" -#: ../src/vikwindow.c:1961 +#: ../src/vikwindow.c:1958 msgid "Save the file under different name" msgstr "Sala il file con un nome differente" -#: ../src/vikwindow.c:1962 +#: ../src/vikwindow.c:1959 msgid "_Generate Image File" msgstr "_Genera File Immagine" -#: ../src/vikwindow.c:1962 +#: ../src/vikwindow.c:1959 msgid "Save a snapshot of the workspace into a file" -msgstr "" +msgstr "Salva una schermata della pagina in un file" -#: ../src/vikwindow.c:1963 +#: ../src/vikwindow.c:1960 msgid "Generate _Directory of Images" -msgstr "" +msgstr "Genera _Cartella di Immagini" -#: ../src/vikwindow.c:1963 +#: ../src/vikwindow.c:1960 msgid "FIXME:IMGDIR" msgstr "FIXME:IMGDIR" -#: ../src/vikwindow.c:1966 +#: ../src/vikwindow.c:1963 msgid "_Print..." msgstr "Stam_pa" -#: ../src/vikwindow.c:1966 +#: ../src/vikwindow.c:1963 msgid "Print maps" msgstr "Stampa mappe" -#: ../src/vikwindow.c:1969 +#: ../src/vikwindow.c:1966 msgid "E_xit" msgstr "_Esci" -#: ../src/vikwindow.c:1969 +#: ../src/vikwindow.c:1966 msgid "Exit the program" msgstr "Esci dal programma" -#: ../src/vikwindow.c:1970 +#: ../src/vikwindow.c:1967 msgid "Save and Exit" msgstr "Salva ed Esci" -#: ../src/vikwindow.c:1970 +#: ../src/vikwindow.c:1967 msgid "Save and Exit the program" msgstr "Salva ed Esci dal programma" -#: ../src/vikwindow.c:1972 +#: ../src/vikwindow.c:1969 msgid "Go To location" -msgstr "" +msgstr "Vai Alla posizione" -#: ../src/vikwindow.c:1972 +#: ../src/vikwindow.c:1969 msgid "Go to address/place using text search" -msgstr "" +msgstr "Vai all'indirizzo/posizione usando la ricerca testuale" -#: ../src/vikwindow.c:1973 +#: ../src/vikwindow.c:1970 msgid "_Go to Lat\\/Lon..." -msgstr "" +msgstr "_Vai a Lat\\/Lon..." -#: ../src/vikwindow.c:1973 +#: ../src/vikwindow.c:1970 msgid "Go to arbitrary lat\\/lon coordinate" -msgstr "" +msgstr "Vai a coordinate lat\\/lon arbitrarie" -#: ../src/vikwindow.c:1974 +#: ../src/vikwindow.c:1971 msgid "Go to UTM..." msgstr "Modalità UTM..." -#: ../src/vikwindow.c:1974 +#: ../src/vikwindow.c:1971 msgid "Go to arbitrary UTM coordinate" -msgstr "" +msgstr "Vai a coordinate UTM arbitrarie" -#: ../src/vikwindow.c:1975 +#: ../src/vikwindow.c:1972 msgid "Set Background Color..." msgstr "Imposta colore di sfondo..." -#: ../src/vikwindow.c:1976 +#: ../src/vikwindow.c:1973 msgid "Zoom _In" msgstr "Aumenta _ingrandimento" -#: ../src/vikwindow.c:1977 +#: ../src/vikwindow.c:1974 msgid "Zoom _Out" msgstr "Riduci ingrandiment_o" -#: ../src/vikwindow.c:1978 +#: ../src/vikwindow.c:1975 msgid "Zoom _To" -msgstr "" +msgstr "Zoom _Verso" -#: ../src/vikwindow.c:1979 +#: ../src/vikwindow.c:1976 msgid "0.25" msgstr "0.25" -#: ../src/vikwindow.c:1980 +#: ../src/vikwindow.c:1977 msgid "0.5" msgstr "0.5" -#: ../src/vikwindow.c:1981 +#: ../src/vikwindow.c:1978 msgid "1" msgstr "1" -#: ../src/vikwindow.c:1982 +#: ../src/vikwindow.c:1979 msgid "2" msgstr "2" -#: ../src/vikwindow.c:1983 +#: ../src/vikwindow.c:1980 msgid "4" msgstr "4" -#: ../src/vikwindow.c:1984 +#: ../src/vikwindow.c:1981 msgid "8" msgstr "8" -#: ../src/vikwindow.c:1985 +#: ../src/vikwindow.c:1982 msgid "16" msgstr "16" -#: ../src/vikwindow.c:1986 +#: ../src/vikwindow.c:1983 msgid "32" msgstr "32" -#: ../src/vikwindow.c:1987 +#: ../src/vikwindow.c:1984 msgid "64" msgstr "64" -#: ../src/vikwindow.c:1988 +#: ../src/vikwindow.c:1985 msgid "128" msgstr "128" -#: ../src/vikwindow.c:1989 +#: ../src/vikwindow.c:1986 msgid "Pan North" -msgstr "" +msgstr "Scorri verso Nord" -#: ../src/vikwindow.c:1990 +#: ../src/vikwindow.c:1987 msgid "Pan East" -msgstr "" +msgstr "Scorri verso Est" -#: ../src/vikwindow.c:1991 +#: ../src/vikwindow.c:1988 msgid "Pan South" -msgstr "" +msgstr "Scorri verso Sud" -#: ../src/vikwindow.c:1992 +#: ../src/vikwindow.c:1989 msgid "Pan West" -msgstr "" +msgstr "Scorri verso Ovest" -#: ../src/vikwindow.c:1993 +#: ../src/vikwindow.c:1990 msgid "Background _Jobs" -msgstr "" +msgstr "_Lavori in Background" -#: ../src/vikwindow.c:1995 +#: ../src/vikwindow.c:1992 msgid "Cu_t" msgstr "_Taglia" -#: ../src/vikwindow.c:1996 +#: ../src/vikwindow.c:1993 msgid "_Copy" msgstr "_Copia" -#: ../src/vikwindow.c:1997 +#: ../src/vikwindow.c:1994 msgid "_Paste" msgstr "Inco_lla" -#: ../src/vikwindow.c:1998 +#: ../src/vikwindow.c:1995 msgid "_Delete" msgstr "_Elimina" -#: ../src/vikwindow.c:1999 +#: ../src/vikwindow.c:1996 msgid "Delete All" msgstr "Elimina Tutto" -#: ../src/vikwindow.c:2000 +#: ../src/vikwindow.c:1997 +msgid "Flush Map cache" +msgstr "Aggiorna la cache della mappe" + +#: ../src/vikwindow.c:1998 msgid "_Preferences..." msgstr "_Preferenze..." -#: ../src/vikwindow.c:2001 +#: ../src/vikwindow.c:1999 msgid "_Properties" msgstr "_Proprietà " -#: ../src/vikwindow.c:2003 +#: ../src/vikwindow.c:2001 msgid "_About" msgstr "Inform_azioni" -#: ../src/vikwindow.c:2008 +#: ../src/vikwindow.c:2006 msgid "_UTM Mode" msgstr "Modalità _UTM" -#: ../src/vikwindow.c:2009 +#: ../src/vikwindow.c:2007 msgid "_Expedia Mode" msgstr "Modalità _Expedia" -#: ../src/vikwindow.c:2010 +#: ../src/vikwindow.c:2008 msgid "_Mercator Mode" msgstr "Modalità _Mercator" -#: ../src/vikwindow.c:2014 +#: ../src/vikwindow.c:2012 msgid "Pan Tool" -msgstr "" +msgstr "Strumento di scorrimento" -#: ../src/vikwindow.c:2015 +#: ../src/vikwindow.c:2013 msgid "Zoom Tool" msgstr "Strumento di Zoom" -#: ../src/vikwindow.c:2016 +#: ../src/vikwindow.c:2014 msgid "_Ruler" -msgstr "" +msgstr "_Righello" -#: ../src/vikwindow.c:2016 +#: ../src/vikwindow.c:2014 msgid "Ruler Tool" -msgstr "" +msgstr "Strumento Righello" -#: ../src/vikwindow.c:2020 +#: ../src/vikwindow.c:2018 msgid "Show Scale" msgstr "Mostra Scala" -#: ../src/vikwindow.c:2021 +#: ../src/vikwindow.c:2019 msgid "Show Center Mark" -msgstr "" +msgstr "Mostra segnale centrale" -#: ../src/vikwindow.c:2022 +#: ../src/vikwindow.c:2020 msgid "Full Screen" msgstr "Schermo intero" -#: ../src/vikwindow.c:2022 +#: ../src/vikwindow.c:2020 msgid "Activate full screen mode" -msgstr "" +msgstr "Attiva modalità schermo intero" -#: ../src/vikwindow.c:2023 +#: ../src/vikwindow.c:2021 msgid "Show Side Panel" -msgstr "" +msgstr "Mostra Pannello Laterale" -#: ../src/vikwindow.c:2085 +#: ../src/vikwindow.c:2083 #, c-format msgid "New %s Layer" msgstr "Nuovo %s Livello" #: ../src/viking.desktop.in.h:1 msgid "GPS Data Manager" -msgstr "" +msgstr "Gestiore Dati GPS" #: ../src/viking.desktop.in.h:2 msgid "Map Based GPS Data Manager (live data capable)." -msgstr "" +msgstr "Gestore Dati GPS Basato su Mappa (dati in tempo reale)." #: ../src/viking.desktop.in.h:3 msgid "Viking" -msgstr "" - -#~ msgid "Transparent Google Maps" -#~ msgstr "Mappe di Google Maps trasparenti" +msgstr "Viking" -#~ msgid "Google Satellite Images" -#~ msgstr "Immagini satellitari di Google" - -#~ msgid "Google Terrain Maps" -#~ msgstr "Mappe del terreno da Google" - -#~ msgid "Failed getting google version numbers" -#~ msgstr "Errore durante l'acquisizione dei numeri di versione di google" - -#~ msgid "Old Google Maps" -#~ msgstr "Mappe di Google Maps precedenti" - -#~ msgid "Keep current position at center" -#~ msgstr "Mantieni la posizione corrente al centro" - -#, c-format -#~ msgid "couldn't open temp file %s" -#~ msgstr "Impossibile aprire il file temporaneo %s" - -#, c-format -#~ msgid "Failed downloading %s" -#~ msgstr "Download di %s fallito" +#~ msgid "Maps Directory (Optional):" +#~ msgstr "Directory delle mappe (opzionale):" @@ -7,15 +7,15 @@ msgid "" msgstr "" "Project-Id-Version: viking\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-04 22:27+0100\n" -"PO-Revision-Date: 2008-10-19 22:20+0000\n" -"Last-Translator: Katz Kawai <Unknown>\n" +"POT-Creation-Date: 2009-08-20 09:50+0200\n" +"PO-Revision-Date: 2009-02-04 22:18+0000\n" +"Last-Translator: Guilhem Bonnefille <guilhem.bonnefille@gmail.com>\n" "Language-Team: Japanese <ja@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2009-02-04 21:00+0000\n" +"X-Launchpad-Export-Date: 2009-09-09 20:12+0000\n" "X-Generator: Launchpad (build Unknown)\n" #: ../src/acquire.c:118 @@ -26,28 +26,28 @@ msgstr "処ç†ä¸..." msgid "Error: acquisition failed." msgstr "エラー: å–得失敗。" -#: ../src/acquire.c:149 ../src/vikgpslayer.c:957 +#: ../src/acquire.c:149 ../src/vikgpslayer.c:953 msgid "Done." msgstr "完了。" -#: ../src/acquire.c:326 ../src/vikgpslayer.c:996 +#: ../src/acquire.c:326 ../src/vikgpslayer.c:992 msgid "Status: detecting gpsbabel" msgstr "状態: gpsbableを探ã—ã¦ã„ã¾ã™" -#: ../src/background.c:54 +#: ../src/background.c:57 #, c-format msgid "%d items" msgstr "" -#: ../src/background.c:212 +#: ../src/background.c:224 msgid "Job" msgstr "ジョブ" -#: ../src/background.c:216 +#: ../src/background.c:228 msgid "Progress" msgstr "進æ—状æ³" -#: ../src/background.c:227 +#: ../src/background.c:239 msgid "Viking Background Jobs" msgstr "Viking ãƒãƒƒã‚¯ã‚°ãƒ©ã‚¦ãƒ³ãƒ‰ã‚¸ãƒ§ãƒ–" @@ -72,7 +72,7 @@ msgid "" "into." msgstr "" -#: ../src/curl_download.c:85 +#: ../src/curl_download.c:94 #, c-format msgid "%s() Curl perform failed: %s" msgstr "" @@ -344,14 +344,14 @@ msgstr "" msgid "using cmdline '%s' and file '%s'\n" msgstr "" -#: ../src/datasource_gps.c:150 ../src/vikgpslayer.c:711 +#: ../src/datasource_gps.c:150 ../src/vikgpslayer.c:707 #, c-format msgid "Downloading %d waypoint..." msgid_plural "Downloading %d waypoints..." msgstr[0] "" msgstr[1] "" -#: ../src/datasource_gps.c:152 ../src/vikgpslayer.c:713 +#: ../src/datasource_gps.c:152 ../src/vikgpslayer.c:709 #, c-format msgid "Downloading %d trackpoint..." msgid_plural "Downloading %d trackpoints..." @@ -368,7 +368,7 @@ msgstr "" msgid "Downloaded %d %s." msgstr "" -#: ../src/datasource_gps.c:185 ../src/vikgpslayer.c:783 +#: ../src/datasource_gps.c:185 ../src/vikgpslayer.c:779 #, c-format msgid "GPS Device: %s" msgstr "" @@ -381,7 +381,7 @@ msgstr "" msgid "Serial Port:" msgstr "" -#: ../src/datasource_gps.c:299 ../src/vikgpslayer.c:1001 +#: ../src/datasource_gps.c:299 ../src/vikgpslayer.c:997 msgid "GPS device: N/A" msgstr "" @@ -412,6 +412,10 @@ msgstr "" msgid "Draw mode '%s' no more supported" msgstr "" +#: ../src/mapcache.c:63 +msgid "Mapcache memory size (MB):" +msgstr "" + #: ../src/print.c:53 msgid "None" msgstr "ãªã—" @@ -454,11 +458,11 @@ msgstr "" msgid "Image S_ize:" msgstr "" -#: ../src/util.c:75 +#: ../src/util.c:76 msgid "Could not launch web browser." msgstr "" -#: ../src/util.c:86 +#: ../src/util.c:87 msgid "Could not create new email." msgstr "" @@ -672,11 +676,11 @@ msgstr "" msgid "Downloading DEM %s" msgstr "" -#: ../src/vikfileentry.c:67 +#: ../src/vikfileentry.c:68 msgid "Browse..." msgstr "" -#: ../src/vikfileentry.c:94 +#: ../src/vikfileentry.c:96 msgid "Choose file" msgstr "" @@ -789,11 +793,11 @@ msgstr "" msgid "Gpsd Retry Interval (seconds):" msgstr "" -#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:989 +#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:985 msgid "GPS Download" msgstr "" -#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:989 +#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:985 msgid "GPS Upload" msgstr "" @@ -801,110 +805,110 @@ msgstr "" msgid "GPS Realtime Tracking" msgstr "" -#: ../src/vikgpslayer.c:373 +#: ../src/vikgpslayer.c:371 msgid "Unknown GPS Protocol" msgstr "" -#: ../src/vikgpslayer.c:379 +#: ../src/vikgpslayer.c:377 msgid "Unknown serial port device" msgstr "" -#: ../src/vikgpslayer.c:444 +#: ../src/vikgpslayer.c:442 #, c-format msgid "%s: unknown parameter" msgstr "" -#: ../src/vikgpslayer.c:545 +#: ../src/vikgpslayer.c:541 msgid "Upload to GPS" msgstr "" -#: ../src/vikgpslayer.c:550 +#: ../src/vikgpslayer.c:546 msgid "Download from GPS" msgstr "" -#: ../src/vikgpslayer.c:568 +#: ../src/vikgpslayer.c:564 msgid "Empty Upload" msgstr "" -#: ../src/vikgpslayer.c:573 +#: ../src/vikgpslayer.c:569 msgid "Empty Download" msgstr "" -#: ../src/vikgpslayer.c:578 +#: ../src/vikgpslayer.c:574 msgid "Empty All" msgstr "" -#: ../src/vikgpslayer.c:718 +#: ../src/vikgpslayer.c:714 #, c-format msgid "Uploading %d waypoint..." msgid_plural "Uploading %d waypoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:720 +#: ../src/vikgpslayer.c:716 #, c-format msgid "Uploading %d trackpoint..." msgid_plural "Uploading %d trackpoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:744 +#: ../src/vikgpslayer.c:740 #, c-format msgid "Downloaded %d out of %d waypoint..." msgid_plural "Downloaded %d out of %d waypoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:746 +#: ../src/vikgpslayer.c:742 #, c-format msgid "Downloaded %d out of %d trackpoint..." msgid_plural "Downloaded %d out of %d trackpoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:750 +#: ../src/vikgpslayer.c:746 #, c-format msgid "Uploaded %d out of %d waypoint..." msgid_plural "Uploaded %d out of %d waypoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:752 +#: ../src/vikgpslayer.c:748 #, c-format msgid "Uploaded %d out of %d trackpoint..." msgid_plural "Uploaded %d out of %d trackpoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:759 +#: ../src/vikgpslayer.c:755 #, c-format msgid "Downloaded %d waypoint" msgid_plural "Downloaded %d waypoints" msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:761 +#: ../src/vikgpslayer.c:757 #, c-format msgid "Downloaded %d trackpoint" msgid_plural "Downloaded %d trackpoints" msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:765 +#: ../src/vikgpslayer.c:761 #, c-format msgid "Uploaded %d waypoint" msgid_plural "Uploaded %d waypoints" msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:767 +#: ../src/vikgpslayer.c:763 #, c-format msgid "Uploaded %d trackpoint" msgid_plural "Uploaded %d trackpoints" msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:952 +#: ../src/vikgpslayer.c:948 msgid "Error: couldn't find gpsbabel." msgstr "エラー: gpsbabelを見ã¤ã‘ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸã€‚" @@ -958,7 +962,7 @@ msgid "Map Type:" msgstr "" #: ../src/vikmapslayer.c:120 -msgid "Maps Directory (Optional):" +msgid "Maps Directory:" msgstr "" #: ../src/vikmapslayer.c:121 @@ -1003,52 +1007,52 @@ msgid "" "factor" msgstr "" -#: ../src/vikmapslayer.c:924 +#: ../src/vikmapslayer.c:927 #, c-format msgid "Redownloading up to %d %s map..." msgid_plural "Redownloading up to %d %s maps..." msgstr[0] "" msgstr[1] "" -#: ../src/vikmapslayer.c:926 +#: ../src/vikmapslayer.c:929 #, c-format msgid "Redownloading %d %s map..." msgid_plural "Redownloading %d %s maps..." msgstr[0] "" msgstr[1] "" -#: ../src/vikmapslayer.c:930 ../src/vikmapslayer.c:1001 +#: ../src/vikmapslayer.c:933 ../src/vikmapslayer.c:1004 #, c-format msgid "Downloading %d %s map..." msgid_plural "Downloading %d %s maps..." msgstr[0] "" msgstr[1] "" -#: ../src/vikmapslayer.c:1058 +#: ../src/vikmapslayer.c:1061 msgid "Redownload bad map(s)" msgstr "" -#: ../src/vikmapslayer.c:1062 +#: ../src/vikmapslayer.c:1065 msgid "Redownload all map(s)" msgstr "" -#: ../src/vikmapslayer.c:1142 +#: ../src/vikmapslayer.c:1145 #, c-format msgid "" "Wrong drawmode for this map.\n" "Select \"%s\" from View menu and try again." msgstr "" -#: ../src/vikmapslayer.c:1147 +#: ../src/vikmapslayer.c:1150 msgid "Wrong zoom level for this map." msgstr "" -#: ../src/vikmapslayer.c:1172 +#: ../src/vikmapslayer.c:1175 msgid "Download Onscreen Maps" msgstr "" #. TODO Add GTK_STOCK_REFRESH icon -#: ../src/vikmapslayer.c:1178 +#: ../src/vikmapslayer.c:1181 msgid "Refresh Onscreen Tiles" msgstr "" @@ -1236,12 +1240,12 @@ msgstr "" msgid "Export Layer" msgstr "" -#: ../src/viktrwlayer.c:1565 ../src/vikwindow.c:1446 ../src/vikwindow.c:1820 +#: ../src/viktrwlayer.c:1565 ../src/vikwindow.c:1438 ../src/vikwindow.c:1817 #, c-format msgid "The file \"%s\" exists, do you wish to overwrite it?" msgstr "" -#: ../src/viktrwlayer.c:1575 ../src/vikwindow.c:1464 +#: ../src/viktrwlayer.c:1575 ../src/vikwindow.c:1456 msgid "The filename you requested could not be opened for writing." msgstr "" @@ -1257,71 +1261,71 @@ msgstr "" msgid "Waypoint not found in this layer." msgstr "" -#: ../src/viktrwlayer.c:1724 +#: ../src/viktrwlayer.c:1723 msgid "Goto Center of Layer" msgstr "" -#: ../src/viktrwlayer.c:1729 +#: ../src/viktrwlayer.c:1728 msgid "Goto Waypoint" msgstr "" -#: ../src/viktrwlayer.c:1735 +#: ../src/viktrwlayer.c:1734 msgid "Export layer" msgstr "" -#: ../src/viktrwlayer.c:1740 +#: ../src/viktrwlayer.c:1739 msgid "Export as GPSPoint" msgstr "" -#: ../src/viktrwlayer.c:1745 +#: ../src/viktrwlayer.c:1744 msgid "Export as GPSMapper" msgstr "" -#: ../src/viktrwlayer.c:1750 +#: ../src/viktrwlayer.c:1749 msgid "Export as GPX" msgstr "" -#: ../src/viktrwlayer.c:1755 ../src/viktrwlayer.c:2794 +#: ../src/viktrwlayer.c:1754 ../src/viktrwlayer.c:2794 msgid "New Waypoint" msgstr "" -#: ../src/viktrwlayer.c:1762 +#: ../src/viktrwlayer.c:1761 msgid "Add Wikipedia Waypoints" msgstr "" -#: ../src/viktrwlayer.c:1767 +#: ../src/viktrwlayer.c:1766 msgid "Within layer bounds" msgstr "" -#: ../src/viktrwlayer.c:1772 +#: ../src/viktrwlayer.c:1771 msgid "Within current view" msgstr "" -#: ../src/viktrwlayer.c:1779 ../src/viktrwlayer.c:2760 +#: ../src/viktrwlayer.c:1778 ../src/viktrwlayer.c:2760 msgid "Upload to OSM" msgstr "" -#: ../src/viktrwlayer.c:2290 +#: ../src/viktrwlayer.c:2289 msgid "Failed. This track does not have timestamp" msgstr "" -#: ../src/viktrwlayer.c:2304 +#: ../src/viktrwlayer.c:2303 msgid "Failed. No other track in this layer has timestamp" msgstr "" -#: ../src/viktrwlayer.c:2310 +#: ../src/viktrwlayer.c:2309 msgid "Merge with..." msgstr "" -#: ../src/viktrwlayer.c:2310 +#: ../src/viktrwlayer.c:2309 msgid "Select track to merge with" msgstr "" -#: ../src/viktrwlayer.c:2347 +#: ../src/viktrwlayer.c:2346 msgid "Merge Threshold..." msgstr "" -#: ../src/viktrwlayer.c:2348 +#: ../src/viktrwlayer.c:2347 msgid "Merge when time between tracks less than:" msgstr "" @@ -1397,131 +1401,131 @@ msgstr "" msgid "Use with filter" msgstr "" -#: ../src/viktrwlayer.c:3736 +#: ../src/viktrwlayer.c:3735 msgid "Could not launch eog to open file." msgstr "" -#: ../src/viktrwlayer.c:3790 +#: ../src/viktrwlayer.c:3789 #, c-format msgid "Creating %d Image Thumbnails..." msgstr "" -#: ../src/viktrwlayer.c:4010 +#: ../src/viktrwlayer.c:4009 msgid "No map layer in use. Create one first" msgstr "" -#: ../src/viktrwlayer_propwin.c:658 +#: ../src/viktrwlayer_propwin.c:661 msgid "Failed spliting track. Track unchanged" msgstr "" -#: ../src/viktrwlayer_propwin.c:675 +#: ../src/viktrwlayer_propwin.c:678 msgid "Operation Aborted. Track unchanged" msgstr "" -#: ../src/viktrwlayer_propwin.c:729 +#: ../src/viktrwlayer_propwin.c:732 #, c-format msgid "%s - Track Properties" msgstr "" -#: ../src/viktrwlayer_propwin.c:734 +#: ../src/viktrwlayer_propwin.c:737 msgid "Split at Marker" msgstr "" -#: ../src/viktrwlayer_propwin.c:735 +#: ../src/viktrwlayer_propwin.c:738 msgid "Split Segments" msgstr "" -#: ../src/viktrwlayer_propwin.c:736 +#: ../src/viktrwlayer_propwin.c:739 msgid "Reverse" msgstr "" -#: ../src/viktrwlayer_propwin.c:737 +#: ../src/viktrwlayer_propwin.c:740 msgid "Delete Dupl." msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Comment:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Track Length:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Trackpoints:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Segments:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Duplicate Points:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Max Speed:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Avg. Speed:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Avg. Dist. Between TPs:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Elevation Range:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Total Elevation Gain/Loss:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Start:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>End:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Duration:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:788 ../src/viktrwlayer_propwin.c:795 -#: ../src/viktrwlayer_propwin.c:804 ../src/viktrwlayer_propwin.c:811 -#: ../src/viktrwlayer_propwin.c:850 ../src/viktrwlayer_propwin.c:851 -#: ../src/viktrwlayer_propwin.c:852 ../src/viktrwlayer_propwin.c:874 -#: ../src/viktrwlayer_propwin.c:881 +#: ../src/viktrwlayer_propwin.c:791 ../src/viktrwlayer_propwin.c:798 +#: ../src/viktrwlayer_propwin.c:807 ../src/viktrwlayer_propwin.c:814 +#: ../src/viktrwlayer_propwin.c:853 ../src/viktrwlayer_propwin.c:854 +#: ../src/viktrwlayer_propwin.c:855 ../src/viktrwlayer_propwin.c:877 +#: ../src/viktrwlayer_propwin.c:884 #, c-format msgid "No Data" msgstr "" -#: ../src/viktrwlayer_propwin.c:847 +#: ../src/viktrwlayer_propwin.c:850 #, c-format msgid "%d minutes" msgstr "" -#: ../src/viktrwlayer_propwin.c:870 +#: ../src/viktrwlayer_propwin.c:873 msgid "Statistics" msgstr "" -#: ../src/viktrwlayer_propwin.c:875 +#: ../src/viktrwlayer_propwin.c:878 msgid "<b>Track Distance:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:876 +#: ../src/viktrwlayer_propwin.c:879 msgid "Elevation-distance" msgstr "" -#: ../src/viktrwlayer_propwin.c:882 +#: ../src/viktrwlayer_propwin.c:885 msgid "<b>Track Time:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:883 +#: ../src/viktrwlayer_propwin.c:886 msgid "Speed-time" msgstr "" @@ -1561,31 +1565,47 @@ msgstr "" msgid "<b>\"Speed\" Between:</b>" msgstr "" -#: ../src/viktrwlayer_tpwin.c:117 -msgid "Trackpoint" +#: ../src/viktrwlayer_tpwin.c:110 +msgid "<b>VDOP:</b>" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:111 +msgid "<b>HDOP:</b>" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:112 +msgid "<b>PDOP:</b>" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:113 +msgid "<b>SAT/FIX:</b>" msgstr "" #: ../src/viktrwlayer_tpwin.c:122 +msgid "Trackpoint" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:127 msgid "Split Here" msgstr "" -#: ../src/viktrwlayer_tpwin.c:123 +#: ../src/viktrwlayer_tpwin.c:128 msgid "Join With Last" msgstr "" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Pan" msgstr "" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Zoom" msgstr "" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Ruler" msgstr "" -#: ../src/vikwindow.c:363 +#: ../src/vikwindow.c:364 #, c-format msgid "" "Do you want to save the changes you made to the document \"%s\"?\n" @@ -1593,441 +1613,445 @@ msgid "" "Your changes will be lost if you don't save them." msgstr "" -#: ../src/vikwindow.c:366 ../src/vikwindow.c:1314 +#: ../src/vikwindow.c:367 ../src/vikwindow.c:1306 msgid "Untitled" msgstr "" -#: ../src/vikwindow.c:367 +#: ../src/vikwindow.c:368 msgid "Don't Save" msgstr "" -#: ../src/vikwindow.c:400 +#: ../src/vikwindow.c:401 msgid "mpp" msgstr "" -#: ../src/vikwindow.c:400 +#: ../src/vikwindow.c:401 msgid "pixelfact" msgstr "" -#: ../src/vikwindow.c:527 +#: ../src/vikwindow.c:528 #, c-format msgid "%s %s %dm" msgstr "" -#: ../src/vikwindow.c:529 +#: ../src/vikwindow.c:530 #, c-format msgid "%s %s" msgstr "" -#: ../src/vikwindow.c:1113 +#: ../src/vikwindow.c:1105 msgid "You must select a layer to show its properties." msgstr "" -#: ../src/vikwindow.c:1129 +#: ../src/vikwindow.c:1121 msgid "You must select a layer to delete." msgstr "" -#: ../src/vikwindow.c:1347 +#: ../src/vikwindow.c:1339 msgid "The file you requested could not be opened." msgstr "" -#: ../src/vikwindow.c:1390 +#: ../src/vikwindow.c:1382 msgid "Please select a GPS data file to open. " msgstr "" -#: ../src/vikwindow.c:1433 +#: ../src/vikwindow.c:1425 msgid "Save as Viking File." msgstr "" -#: ../src/vikwindow.c:1667 +#: ../src/vikwindow.c:1664 msgid "" "Viewable region outside allowable pixel size bounds for image. Clipping " "width/height values." msgstr "" -#: ../src/vikwindow.c:1686 +#: ../src/vikwindow.c:1683 #, c-format msgid "Total area: %ldm x %ldm (%.3f sq. km)" msgstr "" #. todo: default for answers inside VikWindow or static (thruout instance) -#: ../src/vikwindow.c:1694 +#: ../src/vikwindow.c:1691 msgid "Save to Image File" msgstr "" -#: ../src/vikwindow.c:1712 +#: ../src/vikwindow.c:1709 msgid "Width (pixels):" msgstr "" -#: ../src/vikwindow.c:1714 +#: ../src/vikwindow.c:1711 msgid "Height (pixels):" msgstr "" -#: ../src/vikwindow.c:1717 +#: ../src/vikwindow.c:1714 msgid "Zoom (meters per pixel):" msgstr "" -#: ../src/vikwindow.c:1723 +#: ../src/vikwindow.c:1720 msgid "Area in current viewable window" msgstr "" -#: ../src/vikwindow.c:1733 +#: ../src/vikwindow.c:1730 msgid "Save as PNG" msgstr "" -#: ../src/vikwindow.c:1734 +#: ../src/vikwindow.c:1731 msgid "Save as JPEG" msgstr "" -#: ../src/vikwindow.c:1754 +#: ../src/vikwindow.c:1751 msgid "East-west image tiles:" msgstr "" -#: ../src/vikwindow.c:1756 +#: ../src/vikwindow.c:1753 msgid "North-south image tiles:" msgstr "" -#: ../src/vikwindow.c:1796 +#: ../src/vikwindow.c:1793 msgid "You must be in UTM mode to use this feature" msgstr "" -#: ../src/vikwindow.c:1807 +#: ../src/vikwindow.c:1804 msgid "Save Image" msgstr "" -#: ../src/vikwindow.c:1834 +#: ../src/vikwindow.c:1831 msgid "Choose a directory to hold images" msgstr "" -#: ../src/vikwindow.c:1920 +#: ../src/vikwindow.c:1917 msgid "Choose a background color" msgstr "" -#: ../src/vikwindow.c:1941 +#: ../src/vikwindow.c:1938 msgid "_File" msgstr "" -#: ../src/vikwindow.c:1942 +#: ../src/vikwindow.c:1939 msgid "_Edit" msgstr "" -#: ../src/vikwindow.c:1943 +#: ../src/vikwindow.c:1940 msgid "_View" msgstr "" -#: ../src/vikwindow.c:1944 ../src/vikwindow.c:2015 +#: ../src/vikwindow.c:1941 ../src/vikwindow.c:2013 msgid "_Zoom" msgstr "" -#: ../src/vikwindow.c:1945 ../src/vikwindow.c:2014 +#: ../src/vikwindow.c:1942 ../src/vikwindow.c:2012 msgid "_Pan" msgstr "" -#: ../src/vikwindow.c:1946 +#: ../src/vikwindow.c:1943 msgid "_Layers" msgstr "" -#: ../src/vikwindow.c:1947 +#: ../src/vikwindow.c:1944 msgid "_Tools" msgstr "" -#: ../src/vikwindow.c:1948 +#: ../src/vikwindow.c:1945 msgid "_Webtools" msgstr "" -#: ../src/vikwindow.c:1949 +#: ../src/vikwindow.c:1946 msgid "_Help" msgstr "" -#: ../src/vikwindow.c:1951 +#: ../src/vikwindow.c:1948 msgid "_New" msgstr "" -#: ../src/vikwindow.c:1951 +#: ../src/vikwindow.c:1948 msgid "New file" msgstr "" -#: ../src/vikwindow.c:1952 +#: ../src/vikwindow.c:1949 msgid "_Open" msgstr "" -#: ../src/vikwindow.c:1952 +#: ../src/vikwindow.c:1949 msgid "Open a file" msgstr "" -#: ../src/vikwindow.c:1953 +#: ../src/vikwindow.c:1950 msgid "A_ppend File" msgstr "" -#: ../src/vikwindow.c:1953 +#: ../src/vikwindow.c:1950 msgid "Append data from a different file" msgstr "" -#: ../src/vikwindow.c:1954 +#: ../src/vikwindow.c:1951 msgid "A_cquire" msgstr "" -#: ../src/vikwindow.c:1955 +#: ../src/vikwindow.c:1952 msgid "From _GPS" msgstr "" -#: ../src/vikwindow.c:1955 +#: ../src/vikwindow.c:1952 msgid "Transfer data from a GPS device" msgstr "" -#: ../src/vikwindow.c:1956 +#: ../src/vikwindow.c:1953 msgid "Google _Directions" msgstr "" -#: ../src/vikwindow.c:1956 +#: ../src/vikwindow.c:1953 msgid "Get driving directions from Google" msgstr "" -#: ../src/vikwindow.c:1958 +#: ../src/vikwindow.c:1955 msgid "Geo_caches" msgstr "" -#: ../src/vikwindow.c:1958 +#: ../src/vikwindow.c:1955 msgid "Get Geocaches from geocaching.com" msgstr "" -#: ../src/vikwindow.c:1960 +#: ../src/vikwindow.c:1957 msgid "_Save" msgstr "" -#: ../src/vikwindow.c:1960 +#: ../src/vikwindow.c:1957 msgid "Save the file" msgstr "" -#: ../src/vikwindow.c:1961 +#: ../src/vikwindow.c:1958 msgid "Save _As" msgstr "" -#: ../src/vikwindow.c:1961 +#: ../src/vikwindow.c:1958 msgid "Save the file under different name" msgstr "" -#: ../src/vikwindow.c:1962 +#: ../src/vikwindow.c:1959 msgid "_Generate Image File" msgstr "" -#: ../src/vikwindow.c:1962 +#: ../src/vikwindow.c:1959 msgid "Save a snapshot of the workspace into a file" msgstr "" -#: ../src/vikwindow.c:1963 +#: ../src/vikwindow.c:1960 msgid "Generate _Directory of Images" msgstr "" -#: ../src/vikwindow.c:1963 +#: ../src/vikwindow.c:1960 msgid "FIXME:IMGDIR" msgstr "" -#: ../src/vikwindow.c:1966 +#: ../src/vikwindow.c:1963 msgid "_Print..." msgstr "" -#: ../src/vikwindow.c:1966 +#: ../src/vikwindow.c:1963 msgid "Print maps" msgstr "" -#: ../src/vikwindow.c:1969 +#: ../src/vikwindow.c:1966 msgid "E_xit" msgstr "" -#: ../src/vikwindow.c:1969 +#: ../src/vikwindow.c:1966 msgid "Exit the program" msgstr "" -#: ../src/vikwindow.c:1970 +#: ../src/vikwindow.c:1967 msgid "Save and Exit" msgstr "" -#: ../src/vikwindow.c:1970 +#: ../src/vikwindow.c:1967 msgid "Save and Exit the program" msgstr "" -#: ../src/vikwindow.c:1972 +#: ../src/vikwindow.c:1969 msgid "Go To location" msgstr "" -#: ../src/vikwindow.c:1972 +#: ../src/vikwindow.c:1969 msgid "Go to address/place using text search" msgstr "" -#: ../src/vikwindow.c:1973 +#: ../src/vikwindow.c:1970 msgid "_Go to Lat\\/Lon..." msgstr "" -#: ../src/vikwindow.c:1973 +#: ../src/vikwindow.c:1970 msgid "Go to arbitrary lat\\/lon coordinate" msgstr "" -#: ../src/vikwindow.c:1974 +#: ../src/vikwindow.c:1971 msgid "Go to UTM..." msgstr "" -#: ../src/vikwindow.c:1974 +#: ../src/vikwindow.c:1971 msgid "Go to arbitrary UTM coordinate" msgstr "" -#: ../src/vikwindow.c:1975 +#: ../src/vikwindow.c:1972 msgid "Set Background Color..." msgstr "" -#: ../src/vikwindow.c:1976 +#: ../src/vikwindow.c:1973 msgid "Zoom _In" msgstr "" -#: ../src/vikwindow.c:1977 +#: ../src/vikwindow.c:1974 msgid "Zoom _Out" msgstr "" -#: ../src/vikwindow.c:1978 +#: ../src/vikwindow.c:1975 msgid "Zoom _To" msgstr "" -#: ../src/vikwindow.c:1979 +#: ../src/vikwindow.c:1976 msgid "0.25" msgstr "" -#: ../src/vikwindow.c:1980 +#: ../src/vikwindow.c:1977 msgid "0.5" msgstr "" -#: ../src/vikwindow.c:1981 +#: ../src/vikwindow.c:1978 msgid "1" msgstr "" -#: ../src/vikwindow.c:1982 +#: ../src/vikwindow.c:1979 msgid "2" msgstr "" -#: ../src/vikwindow.c:1983 +#: ../src/vikwindow.c:1980 msgid "4" msgstr "" -#: ../src/vikwindow.c:1984 +#: ../src/vikwindow.c:1981 msgid "8" msgstr "" -#: ../src/vikwindow.c:1985 +#: ../src/vikwindow.c:1982 msgid "16" msgstr "" -#: ../src/vikwindow.c:1986 +#: ../src/vikwindow.c:1983 msgid "32" msgstr "" -#: ../src/vikwindow.c:1987 +#: ../src/vikwindow.c:1984 msgid "64" msgstr "" -#: ../src/vikwindow.c:1988 +#: ../src/vikwindow.c:1985 msgid "128" msgstr "" -#: ../src/vikwindow.c:1989 +#: ../src/vikwindow.c:1986 msgid "Pan North" msgstr "" -#: ../src/vikwindow.c:1990 +#: ../src/vikwindow.c:1987 msgid "Pan East" msgstr "" -#: ../src/vikwindow.c:1991 +#: ../src/vikwindow.c:1988 msgid "Pan South" msgstr "" -#: ../src/vikwindow.c:1992 +#: ../src/vikwindow.c:1989 msgid "Pan West" msgstr "" -#: ../src/vikwindow.c:1993 +#: ../src/vikwindow.c:1990 msgid "Background _Jobs" msgstr "" -#: ../src/vikwindow.c:1995 +#: ../src/vikwindow.c:1992 msgid "Cu_t" msgstr "" -#: ../src/vikwindow.c:1996 +#: ../src/vikwindow.c:1993 msgid "_Copy" msgstr "" -#: ../src/vikwindow.c:1997 +#: ../src/vikwindow.c:1994 msgid "_Paste" msgstr "" -#: ../src/vikwindow.c:1998 +#: ../src/vikwindow.c:1995 msgid "_Delete" msgstr "" -#: ../src/vikwindow.c:1999 +#: ../src/vikwindow.c:1996 msgid "Delete All" msgstr "" -#: ../src/vikwindow.c:2000 +#: ../src/vikwindow.c:1997 +msgid "Flush Map cache" +msgstr "" + +#: ../src/vikwindow.c:1998 msgid "_Preferences..." msgstr "" -#: ../src/vikwindow.c:2001 +#: ../src/vikwindow.c:1999 msgid "_Properties" msgstr "" -#: ../src/vikwindow.c:2003 +#: ../src/vikwindow.c:2001 msgid "_About" msgstr "" -#: ../src/vikwindow.c:2008 +#: ../src/vikwindow.c:2006 msgid "_UTM Mode" msgstr "" -#: ../src/vikwindow.c:2009 +#: ../src/vikwindow.c:2007 msgid "_Expedia Mode" msgstr "" -#: ../src/vikwindow.c:2010 +#: ../src/vikwindow.c:2008 msgid "_Mercator Mode" msgstr "" -#: ../src/vikwindow.c:2014 +#: ../src/vikwindow.c:2012 msgid "Pan Tool" msgstr "" -#: ../src/vikwindow.c:2015 +#: ../src/vikwindow.c:2013 msgid "Zoom Tool" msgstr "" -#: ../src/vikwindow.c:2016 +#: ../src/vikwindow.c:2014 msgid "_Ruler" msgstr "" -#: ../src/vikwindow.c:2016 +#: ../src/vikwindow.c:2014 msgid "Ruler Tool" msgstr "" -#: ../src/vikwindow.c:2020 +#: ../src/vikwindow.c:2018 msgid "Show Scale" msgstr "" -#: ../src/vikwindow.c:2021 +#: ../src/vikwindow.c:2019 msgid "Show Center Mark" msgstr "" -#: ../src/vikwindow.c:2022 +#: ../src/vikwindow.c:2020 msgid "Full Screen" msgstr "" -#: ../src/vikwindow.c:2022 +#: ../src/vikwindow.c:2020 msgid "Activate full screen mode" msgstr "" -#: ../src/vikwindow.c:2023 +#: ../src/vikwindow.c:2021 msgid "Show Side Panel" msgstr "" -#: ../src/vikwindow.c:2085 +#: ../src/vikwindow.c:2083 #, c-format msgid "New %s Layer" msgstr "" @@ -7,58 +7,58 @@ msgid "" msgstr "" "Project-Id-Version: viking\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-04 22:27+0100\n" -"PO-Revision-Date: 2008-09-17 03:28+0000\n" -"Last-Translator: Guilhem Bonnefille <guilhem.bonnefille@gmail.com>\n" +"POT-Creation-Date: 2009-08-20 09:50+0200\n" +"PO-Revision-Date: 2009-08-20 11:17+0000\n" +"Last-Translator: Dainius Sakalinskas <dinuxlt@gmail.com>\n" "Language-Team: Lithuanian <lt@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%" -"100<10 || n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2009-02-04 21:00+0000\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"(n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Launchpad-Export-Date: 2009-09-09 20:12+0000\n" "X-Generator: Launchpad (build Unknown)\n" #: ../src/acquire.c:118 msgid "Working..." -msgstr "Dirbama..." +msgstr "Vykdoma..." #: ../src/acquire.c:141 msgid "Error: acquisition failed." -msgstr "" +msgstr "Klaida: pasiekti nepavyko." -#: ../src/acquire.c:149 ../src/vikgpslayer.c:957 +#: ../src/acquire.c:149 ../src/vikgpslayer.c:953 msgid "Done." msgstr "Baigta." -#: ../src/acquire.c:326 ../src/vikgpslayer.c:996 +#: ../src/acquire.c:326 ../src/vikgpslayer.c:992 msgid "Status: detecting gpsbabel" -msgstr "" +msgstr "BÅ«sena: aptinkamas gpsbabel" -#: ../src/background.c:54 +#: ../src/background.c:57 #, c-format msgid "%d items" -msgstr "" +msgstr "%d dalykai" -#: ../src/background.c:212 +#: ../src/background.c:224 msgid "Job" msgstr "Užduotis" -#: ../src/background.c:216 +#: ../src/background.c:228 msgid "Progress" msgstr "Eiga" -#: ../src/background.c:227 +#: ../src/background.c:239 msgid "Viking Background Jobs" msgstr "Viking fono darbai" #: ../src/clipboard.c:84 msgid "paste failed" -msgstr "Kopijavymas nepavyko" +msgstr "įterpti nepavyko" #: ../src/clipboard.c:94 msgid "wrong clipboard data size" -msgstr "" +msgstr "Klaidingas iÅ¡karpos duomenų dydis" #: ../src/clipboard.c:113 #, c-format @@ -66,21 +66,23 @@ msgid "" "The clipboard contains sublayer data for a %s layers.You must select a layer " "of this type to paste the clipboard data." msgstr "" +"IÅ¡karpÄ… sudaro posluoksniniai duomenys sluoksnyje %s. JÅ«s privalote " +"pasirinkti Å¡io tipo sluoksnį, kad galÄ—tumÄ—te įterpti iÅ¡karpos duomenis." #: ../src/clipboard.c:219 msgid "" "In order to paste a waypoint, please select an appropriate layer to paste " "into." -msgstr "" +msgstr "Pasirinkite tinkamÄ… sluoksnį, kad įterptumÄ—te marÅ¡ruto taÅ¡kÄ…." -#: ../src/curl_download.c:85 +#: ../src/curl_download.c:94 #, c-format msgid "%s() Curl perform failed: %s" -msgstr "" +msgstr "%s() Curl įvykdymas nepavyko: %s" #: ../src/dialog.c:54 ../src/dialog.c:102 msgid "Go to Lat/Lon" -msgstr "" +msgstr "Eiti į Pla/Ilg" #: ../src/dialog.c:66 ../src/dialog.c:230 msgid "Latitude:" @@ -92,23 +94,23 @@ msgstr "Ilguma:" #: ../src/dialog.c:115 msgid "Northing:" -msgstr "" +msgstr "Å iaurÄ—s kryptis:" #: ../src/dialog.c:121 msgid "Easting:" -msgstr "" +msgstr "Rytų kryptis:" #: ../src/dialog.c:128 msgid "Zone:" -msgstr "" +msgstr "Zona" #: ../src/dialog.c:131 msgid "Letter:" -msgstr "" +msgstr "RaidÄ—:" #: ../src/dialog.c:192 msgid "Waypoint Properties" -msgstr "" +msgstr "MarÅ¡ruto taÅ¡ko ypatybÄ—s" #: ../src/dialog.c:218 msgid "Name:" @@ -116,7 +118,7 @@ msgstr "Pavadinimas:" #: ../src/dialog.c:240 msgid "Altitude:" -msgstr "" +msgstr "AukÅ¡tis:" #: ../src/dialog.c:245 msgid "Comment:" @@ -137,53 +139,53 @@ msgstr "(nÄ—ra)" #. TODO: other checks (isalpha or whatever ) #: ../src/dialog.c:328 msgid "Please enter a name for the waypoint." -msgstr "" +msgstr "Ä®veskite marÅ¡ruto taÅ¡ko pavadinimÄ…." #: ../src/dialog.c:332 #, c-format msgid "The waypoint \"%s\" exists, do you want to overwrite it?" -msgstr "" +msgstr "MarÅ¡ruto taÅ¡kas \"%s\" jau yra, ar norite pakeisti?" #: ../src/dialog.c:462 ../src/geonamessearch.c:301 msgid "Nothing was selected" -msgstr "" +msgstr "Niekas nepasirinkta" #: ../src/dialog.c:470 msgid "Add Track" -msgstr "" +msgstr "PridÄ—ti keliÄ…" #: ../src/dialog.c:478 msgid "Track Name:" -msgstr "" +msgstr "Kelio pavadinimas:" #: ../src/dialog.c:493 msgid "Please enter a name for the track." -msgstr "" +msgstr "Ä®veskite kelio pavadinimÄ…." #: ../src/dialog.c:497 #, c-format msgid "The track \"%s\" exists, do you want to overwrite it?" -msgstr "" +msgstr "Kelias \"%s\" jau yra, ar norite pakeisti?" #: ../src/dialog.c:559 msgid "Zoom Factors..." -msgstr "" +msgstr "Mastelio veiksniai..." #: ../src/dialog.c:573 msgid "Zoom factor (in meters per pixel:" -msgstr "" +msgstr "Mastelio veiksnys (metrais į taÅ¡kÄ…):" #: ../src/dialog.c:574 msgid "X (easting): " -msgstr "" +msgstr "X (rytinis): " #: ../src/dialog.c:575 msgid "Y (northing): " -msgstr "" +msgstr "Y (Å¡iaurinis): " #: ../src/dialog.c:580 msgid "X and Y zoom factors must be equal" -msgstr "" +msgstr "X ir Y mastelio veiksniai privalo bÅ«ti lygÅ«s" #: ../src/dialog.c:633 msgid "1 min" @@ -199,11 +201,11 @@ msgstr "1 diena" #: ../src/dialog.c:636 msgid "Custom (in minutes):" -msgstr "" +msgstr "Kita (minutÄ—mis)" #: ../src/dialog.c:691 msgid "GPS Data and Topo Analyzer, Explorer, and Manager." -msgstr "" +msgstr "GPS duomenų ir topografijos analizatorius, tyrÄ—jas ir vedlys" #: ../src/dialog.c:692 msgid "" @@ -221,10 +223,22 @@ msgid "" "this program; if not, write to the Free Software Foundation, Inc., 59 Temple " "Place, Suite 330, Boston, MA 02111-1307, USA" msgstr "" +"Å i programa yra laisva programinÄ— įranga; jÄ… galite pakartotinai platinti " +"ir/arba keisti pagal GNU General Public License kaippaskelbÄ— Free Software " +"Foundation; arba bet kuri 2 licencijosversija, arba (JÅ«sų pasirinkimu) bet " +"kuri vÄ—lesnÄ— versija.\n" +"\n" +"Å i programa yra platinama tikintis, kad ji bus naudinga, taÄiauBE JOKIOS " +"GARANTIJOS; netgi be numanomos garantijosKOMERCINIAM arba TINKAMUMO TAM " +"TIKRAM TIKSLUI.Daugiau informacijos rasite GNU General Public License.\n" +"\n" +"JÅ«s turÄ—tumÄ—te gauti GNU General Public License kopijÄ… kartu suÅ¡ia programa; " +"jei ne, raÅ¡ykite į Free Software Foundation, Inc.,59 Temple Place, Suite " +"330, Boston, MA 02111-1307 USA" #: ../src/dialog.c:726 msgid "Download along track" -msgstr "" +msgstr "Atsiųsti iÅ¡ilgai kelio" #: ../src/dialog.c:728 msgid "Map type:" @@ -232,15 +246,15 @@ msgstr "ŽemÄ—lapio tipas:" #: ../src/dialog.c:733 msgid "Zoom level:" -msgstr "" +msgstr "Mastelio lygis:" #: ../src/expedia.c:51 msgid "Expedia Street Maps" -msgstr "" +msgstr "Expedia gatvių žemÄ—lapiai" #: ../src/expedia.c:79 msgid "Invalid expedia altitude" -msgstr "" +msgstr "Negalimas expedia aukÅ¡tis" #: ../src/expedia.c:110 #, c-format @@ -248,6 +262,8 @@ msgid "" "Couldn't open EXPEDIA image file (right after successful download! Please " "report and delete image file!): %s" msgstr "" +"Neįmanoma atverti EXPEDIA atvaizdo rinkmenos (iÅ¡kart po sÄ—kmingo " +"atsisiuntimo! PraneÅ¡kite ir iÅ¡trinkite atvaizdo rinkmenÄ…!): %s" #: ../src/expedia.c:123 #, c-format @@ -255,6 +271,8 @@ msgid "" "Couldn't save EXPEDIA image file (right after successful download! Please " "report and delete image file!): %s" msgstr "" +"Neįmanoma iÅ¡saugoti EXPEDIA atvaizdo rinkmenos (iÅ¡kart po sÄ—kmingo " +"atsisiuntimo! PraneÅ¡kite ir iÅ¡trinkite atvaizdo rinkmenÄ…!): %s" #: ../src/geonamessearch.c:117 ../src/geonamessearch.c:133 #: ../src/geonamessearch.c:151 ../src/googlesearch.c:68 @@ -264,11 +282,11 @@ msgstr "PaieÅ¡ka" #: ../src/geonamessearch.c:119 msgid "No entries found!" -msgstr "" +msgstr "Ä®rašų nerasta!" #: ../src/geonamessearch.c:135 ../src/googlesearch.c:70 msgid "I don't know that place. Do you want another search?" -msgstr "" +msgstr "AÅ¡ nežinau Å¡ios vietovÄ—s. Ar norÄ—site kitos paieÅ¡kos?" #: ../src/geonamessearch.c:153 ../src/googlesearch.c:88 msgid "Enter address or place name:" @@ -276,15 +294,15 @@ msgstr "Ä®veskite adresÄ… ar vietos pavadinimÄ…:" #: ../src/geonamessearch.c:327 ../src/googlesearch.c:127 msgid "couldn't map temp file" -msgstr "" +msgstr "neįmanoma iÅ¡dÄ—styti laikinos rinkmenos" #: ../src/geonamessearch.c:509 ../src/googlesearch.c:200 msgid "couldn't open temp file" -msgstr "negaliu atverti laikinos bylos" +msgstr "neįmanoma atverti laikinos bylos" #: ../src/globals.c:41 msgid "Degree format:" -msgstr "" +msgstr "Laipsnių formatas:" #. Webtools #: ../src/google.c:34 @@ -293,11 +311,11 @@ msgstr "Google" #: ../src/datasource_gc.c:62 msgid "Download Geocaches" -msgstr "AtsiÅ«sti Geocaches" +msgstr "Atsiųsti Geocaches" #: ../src/datasource_gc.c:63 msgid "Geocaching.com Caches" -msgstr "" +msgstr "Geocaching.com atsargos" #: ../src/datasource_gc.c:78 msgid "geocaching.com username:" @@ -310,15 +328,15 @@ msgstr "geocaching.com slaptažodis:" #: ../src/datasource_gc.c:107 msgid "" "Can't find gcget in path! Check that you have installed gcget correctly." -msgstr "" +msgstr "Nerandamas gcget! Patikrinkite, ar tinkamai yra įdiegtas gcget." #: ../src/datasource_gc.c:169 msgid "Number geocaches:" -msgstr "" +msgstr "Geocaches skaiÄius:" #: ../src/datasource_gc.c:171 msgid "Centered around:" -msgstr "" +msgstr "Centruotas apie:" #: ../src/datasource_google.c:49 ../src/datasource_google.c:50 msgid "Google Directions" @@ -334,74 +352,76 @@ msgstr "Iki:" #: ../src/datasource_gps.c:48 msgid "Acquire from GPS" -msgstr "" +msgstr "Gauti duomenis iÅ¡ GPS" #: ../src/datasource_gps.c:49 msgid "Acquired from GPS" -msgstr "" +msgstr "Gaunami duomenys iÅ¡ GPS" #: ../src/datasource_gps.c:133 #, c-format msgid "using cmdline '%s' and file '%s'\n" -msgstr "" +msgstr "naudojant komantinÄ™ eilutÄ™ '%s' ir rinkmenÄ… '%s'\n" -#: ../src/datasource_gps.c:150 ../src/vikgpslayer.c:711 +#: ../src/datasource_gps.c:150 ../src/vikgpslayer.c:707 #, c-format msgid "Downloading %d waypoint..." msgid_plural "Downloading %d waypoints..." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "AtsiunÄiamas %d marÅ¡ruto taÅ¡kas..." +msgstr[1] "AtsiunÄiami %d marÅ¡ruto taÅ¡kai..." +msgstr[2] "AtsiunÄiama %d marÅ¡ruto taÅ¡kų..." -#: ../src/datasource_gps.c:152 ../src/vikgpslayer.c:713 +#: ../src/datasource_gps.c:152 ../src/vikgpslayer.c:709 #, c-format msgid "Downloading %d trackpoint..." msgid_plural "Downloading %d trackpoints..." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "AtsiunÄiamas %d kelio taÅ¡kas..." +msgstr[1] "AtsiunÄiami %d kelio taÅ¡kai..." +msgstr[2] "AtsiunÄiama %d kelio taÅ¡kų..." #: ../src/datasource_gps.c:170 #, c-format msgid "Downloaded %d out of %d %s..." -msgstr "" +msgstr "Atsiųsta %d iÅ¡ %d %s..." #: ../src/datasource_gps.c:172 #, c-format msgid "Downloaded %d %s." -msgstr "" +msgstr "Atsiųsta %d %s." -#: ../src/datasource_gps.c:185 ../src/vikgpslayer.c:783 +#: ../src/datasource_gps.c:185 ../src/vikgpslayer.c:779 #, c-format msgid "GPS Device: %s" msgstr "GPS įrenginys: %s" #: ../src/datasource_gps.c:262 ../src/vikgpslayer.c:133 msgid "GPS Protocol:" -msgstr "GPS protokolas" +msgstr "GPS protokolas:" #: ../src/datasource_gps.c:269 ../src/vikgpslayer.c:134 msgid "Serial Port:" -msgstr "" +msgstr "Nuoseklusis prievadas:" -#: ../src/datasource_gps.c:299 ../src/vikgpslayer.c:1001 +#: ../src/datasource_gps.c:299 ../src/vikgpslayer.c:997 msgid "GPS device: N/A" msgstr "GPS įrenginys: N/D" #: ../src/dem.c:59 ../src/dem.c:73 msgid "Invalid DEM" -msgstr "" +msgstr "Klaidingas DEM" #: ../src/dem.c:115 msgid "Invalid DEM header" -msgstr "" +msgstr "Klaidinga DEM antraÅ¡tÄ—" #: ../src/dem.c:184 ../src/dem.c:197 msgid "Incorrect DEM Class B record: expected 1" -msgstr "" +msgstr "Neteisingas DEM B klasÄ—s įraÅ¡as: sulauktas 1" #: ../src/dem.c:354 #, c-format msgid "Couldn't map file %s: %s" -msgstr "" +msgstr "Neįmanoma iÅ¡dÄ—styti rinkmenos %s: %s" #: ../src/download.c:121 #, c-format @@ -411,6 +431,10 @@ msgstr "Atsiuntimo klaida: %s" #: ../src/file.c:426 ../src/file.c:430 #, c-format msgid "Draw mode '%s' no more supported" +msgstr "Braižymo režimas '%s' daugiau nepalaikomas" + +#: ../src/mapcache.c:63 +msgid "Mapcache memory size (MB):" msgstr "" #: ../src/print.c:53 @@ -435,12 +459,12 @@ msgstr "PaveikslÄ—lio parametrai" #: ../src/print.c:550 msgid "done" -msgstr "atlikta" +msgstr "Atlikta" #. Page Size #: ../src/print.c:579 msgid "_Adjust Page Size and Orientation" -msgstr "_Koreguoti puslapio dydį ir padÄ—tį" +msgstr "_Keisti puslapio dydį ir padÄ—tį" #: ../src/print.c:595 msgid "C_enter:" @@ -453,15 +477,15 @@ msgstr "Nepaisyti puslapio _paraÅ¡Äių" #: ../src/print.c:632 msgid "Image S_ize:" -msgstr "" +msgstr "Atvaizdo _dydis:" -#: ../src/util.c:75 +#: ../src/util.c:76 msgid "Could not launch web browser." -msgstr "" +msgstr "Neįmanoma paleisti web narÅ¡yklÄ—s." -#: ../src/util.c:86 +#: ../src/util.c:87 msgid "Could not create new email." -msgstr "" +msgstr "Neįmanoma sukurti naujo el. paÅ¡to." #: ../src/vikcoordlayer.c:46 ../src/vikdemlayer.c:110 msgid "Color:" @@ -469,51 +493,51 @@ msgstr "Spalva:" #: ../src/vikcoordlayer.c:47 msgid "Minutes Width:" -msgstr "" +msgstr "MinuÄių plotis:" #: ../src/vikcoordlayer.c:48 ../src/vikdemlayer.c:113 msgid "Line Thickness:" -msgstr "" +msgstr "Linijos storis:" #: ../src/datasource_bfilter.c:46 msgid "Max number of points:" -msgstr "" +msgstr "Didžiausias taÅ¡kų skaiÄius:" #: ../src/datasource_bfilter.c:54 msgid "Simplify All Tracks" -msgstr "" +msgstr "Supaprastinti visus kelius" #: ../src/datasource_bfilter.c:55 msgid "Simplified Tracks" -msgstr "" +msgstr "Supaprastinti keliai" #: ../src/datasource_bfilter.c:87 ../src/datasource_bfilter.c:88 msgid "Remove Duplicate Waypoints" -msgstr "" +msgstr "PaÅ¡alinti dubliuotus marÅ¡ruto taÅ¡kus" #: ../src/datasource_bfilter.c:117 msgid "Waypoints Inside This" -msgstr "" +msgstr "MarÅ¡ruto taÅ¡kai viduje" #: ../src/datasource_bfilter.c:118 ../src/datasource_bfilter.c:151 msgid "Polygonzied Layer" -msgstr "" +msgstr "Apjungtas sluoksnis" #: ../src/datasource_bfilter.c:150 msgid "Waypoints Outside This" -msgstr "" +msgstr "MarÅ¡ruto taÅ¡kai iÅ¡orÄ—je" #: ../src/main.c:116 msgid "Use smaller symbols for waypoints" -msgstr "" +msgstr "Naudoti mažesnius marÅ¡ruto taÅ¡kų simbolius" #: ../src/main.c:117 msgid "Enable debug output" -msgstr "" +msgstr "Ä®jungti klaidų aptikimo iÅ¡vedimus" #: ../src/main.c:118 msgid "Enable verbose output" -msgstr "" +msgstr "Ä®jungti daugiakalbį iÅ¡vedimÄ…" #: ../src/main.c:119 msgid "Show version" @@ -521,52 +545,52 @@ msgstr "Rodyti versijÄ…" #: ../src/osm.c:85 msgid "OSM (view)" -msgstr "" +msgstr "OSM (peržiÅ«ra)" #: ../src/osm.c:89 msgid "OSM (edit)" -msgstr "" +msgstr "OSM (taisa)" #: ../src/osm.c:93 msgid "OSM (render)" -msgstr "" +msgstr "OSM (teikti)" #: ../src/osm-traces.c:77 msgid "OSM username:" -msgstr "" +msgstr "OSM vartotojas:" #: ../src/osm-traces.c:78 msgid "OSM password:" -msgstr "" +msgstr "OSM slaptažodis:" #: ../src/osm-traces.c:218 #, c-format msgid "failed to upload data: HTTP response is %ld" -msgstr "" +msgstr "nepavyko iÅ¡siųsti duomenų: HTTP atsakas yra %ld" #: ../src/osm-traces.c:221 #, c-format msgid "curl_easy_getinfo failed: %d" -msgstr "" +msgstr "Nepavyko curl_easy_getinfo: %d" #: ../src/osm-traces.c:225 #, c-format msgid "curl request failed: %s" -msgstr "" +msgstr "curl užklausa nepavyko: %s" #: ../src/osm-traces.c:253 #, c-format msgid "failed to open temporary file: %s" -msgstr "" +msgstr "nepavyko atverti lainos rinkmenos: %s" #: ../src/osm-traces.c:287 #, c-format msgid "failed to unlink temporary file: %s" -msgstr "" +msgstr "nepavyko atjungti laikinosios rinkmenos: %s" #: ../src/osm-traces.c:299 msgid "OSM upload" -msgstr "" +msgstr "OSM iÅ¡siuntimas" #: ../src/osm-traces.c:322 msgid "Email:" @@ -574,11 +598,12 @@ msgstr "El. paÅ¡tas:" #: ../src/osm-traces.c:335 msgid "The email used as login" -msgstr "" +msgstr "El. paÅ¡tas naudojamas prisijungimui" #: ../src/osm-traces.c:336 msgid "Enter the email you use to login into www.openstreetmap.org." msgstr "" +"Ä®veskite el. paÅ¡tÄ…, kurį naudojate jungiantis prie www.openstreetmap.org." #: ../src/osm-traces.c:338 msgid "Password:" @@ -586,25 +611,27 @@ msgstr "Slaptažodis:" #: ../src/osm-traces.c:351 msgid "The password used to login" -msgstr "" +msgstr "Slaptažodis naudojamas prisijungimui" #: ../src/osm-traces.c:352 msgid "Enter the password you use to login into www.openstreetmap.org." msgstr "" +"Ä®veskite slaptažodį, kurį naudojate junkdamiesi prie www.openstreetmap.org." #: ../src/osm-traces.c:354 msgid "File's name:" -msgstr "" +msgstr "Rinkmenos pavadinimas:" #: ../src/osm-traces.c:366 msgid "The name of the file on OSM" -msgstr "" +msgstr "OSM rinkmenos pavadinimas" #: ../src/osm-traces.c:367 msgid "" "This is the name of the file created on the server. This is not the name of " "the local file." msgstr "" +"Å is rinkmenos vardas sukurtas serveryje. Tai nÄ—ra vietinÄ—s rinkmenos vardas." #: ../src/osm-traces.c:370 msgid "Description:" @@ -612,7 +639,7 @@ msgstr "ApraÅ¡ymas:" #: ../src/osm-traces.c:377 msgid "The description of the trace" -msgstr "" +msgstr "Takelio apraÅ¡as" #: ../src/osm-traces.c:380 msgid "Tags:" @@ -620,7 +647,7 @@ msgstr "Žymos:" #: ../src/osm-traces.c:387 msgid "The tags associated to the trace" -msgstr "" +msgstr "Žyma suriÅ¡ta su takeliu" #: ../src/osm-traces.c:390 msgid "Public" @@ -628,62 +655,64 @@ msgstr "VieÅ¡as" #: ../src/osm-traces.c:396 msgid "Indicates if the trace is public or not" -msgstr "" +msgstr "Rodo, ar takelis yra vieÅ¡as ar ne" #: ../src/osm-traces.c:417 #, c-format msgid "Uploading %s to OSM" -msgstr "" +msgstr "IÅ¡siunÄiamas %s į OSM" #: ../src/uibuilder.c:134 msgid "Take care that this password will be stored clearly in a plain file." msgstr "" +"BÅ«kite atidus, nes Å¡is slaptažodis bus iÅ¡saugotas tiesiog paprastoje " +"rinkmenoje." #: ../src/vikdemlayer.c:108 msgid "DEM Files:" -msgstr "DEB bylos:" +msgstr "DEB rinkmenos:" #: ../src/vikdemlayer.c:109 msgid "Download Source:" -msgstr "" +msgstr "Atsisiuntimų Å¡altinis:" #: ../src/vikdemlayer.c:111 msgid "Min Elev:" -msgstr "" +msgstr "Min aukÅ¡tis:" #: ../src/vikdemlayer.c:112 msgid "Max Elev:" -msgstr "" +msgstr "Max aukÅ¡tis:" #: ../src/vikdemlayer.c:124 msgid "DEM Download/Import" -msgstr "" +msgstr "DEM atsiuntimas/importavimas" #: ../src/vikdemlayer.c:754 #, c-format msgid "No SRTM data available for %f, %f" -msgstr "" +msgstr "Negalimi SRTM duomenys %f, %f" #: ../src/vikdemlayer.c:992 msgid "No download source selected. Edit layer properties." -msgstr "" +msgstr "Nepasirinktas atsisiuntimo Å¡altinis. Keiskite sluoksnio ypatybes." #: ../src/vikdemlayer.c:1015 #, c-format msgid "Downloading DEM %s" -msgstr "" +msgstr "AtsiunÄiamas DEM %s" -#: ../src/vikfileentry.c:67 +#: ../src/vikfileentry.c:68 msgid "Browse..." msgstr "NarÅ¡yti..." -#: ../src/vikfileentry.c:94 +#: ../src/vikfileentry.c:96 msgid "Choose file" -msgstr "Pasirinkite bylÄ…" +msgstr "Pasirinkite rinkmenÄ…" #: ../src/vikfilelist.c:47 msgid "Choose file(s)" -msgstr "Pasirinkite bylÄ… (-as)" +msgstr "Pasirinkite rinkmenÄ… (-as)" #: ../src/vikfilelist.c:126 msgid "Add..." @@ -691,72 +720,72 @@ msgstr "PridÄ—ti..." #: ../src/vikfilelist.c:127 msgid "Delete" -msgstr "Å alinti" +msgstr "IÅ¡trinti" #: ../src/vikgeoreflayer.c:66 msgid "Georef Move Map" -msgstr "" +msgstr "Georef judantis žemÄ—lapis" #: ../src/vikgeoreflayer.c:70 msgid "Georef Zoom Tool" -msgstr "" +msgstr "Georef mastelio įrankis" #: ../src/vikgeoreflayer.c:268 ../src/vikmapslayer.c:544 #, c-format msgid "Couldn't open image file: %s" -msgstr "" +msgstr "Negalima atverti atvaizdo rinkmenos: %s" #: ../src/vikgeoreflayer.c:293 msgid "Unexpected end of file reading World file." -msgstr "" +msgstr "NetikÄ—ta pasaulinÄ—s rinkmenos skaitymo pabaiga." #: ../src/vikgeoreflayer.c:309 ../src/vikgeoreflayer.c:354 msgid "Choose World file" -msgstr "" +msgstr "Pasirinkti pasaulinÄ™ rinkmenÄ…" #: ../src/vikgeoreflayer.c:322 msgid "The World file you requested could not be opened for reading." -msgstr "" +msgstr "PasaulinÄ—s rinkmenos, kuriÄ… užklausÄ—te, neįmanoma atverti skaitymui." #: ../src/vikgeoreflayer.c:367 msgid "The file you requested could not be opened for writing." -msgstr "" +msgstr "Rinkmena, kurio užklausÄ—te, negali bÅ«ti atverta raÅ¡ymui." #: ../src/vikgeoreflayer.c:384 msgid "Layer Properties" -msgstr "Sluoksnio savybÄ—s" +msgstr "Sluoksnio ypatybÄ—s" #: ../src/vikgeoreflayer.c:400 msgid "World File Parameters:" -msgstr "" +msgstr "PasaulinÄ—s rinkmenos parametrai:" #: ../src/vikgeoreflayer.c:401 msgid "Load From File..." -msgstr "" +msgstr "Ä®kelti iÅ¡ rinkmenos..." #: ../src/vikgeoreflayer.c:406 msgid "Corner pixel easting:" -msgstr "" +msgstr "KraÅ¡tinis rytų taÅ¡kas:" #: ../src/vikgeoreflayer.c:409 msgid "Corner pixel northing:" -msgstr "" +msgstr "KraÅ¡tinis Å¡iaurÄ—s taÅ¡kas:" #: ../src/vikgeoreflayer.c:412 msgid "X (easting) scale (mpp): " -msgstr "" +msgstr "X (rytinÄ—) padala (mpp): " #: ../src/vikgeoreflayer.c:413 msgid "Y (northing) scale (mpp): " -msgstr "" +msgstr "Y (Å¡iaurinÄ—) padala (mpp): " #: ../src/vikgeoreflayer.c:418 msgid "Map Image:" -msgstr "" +msgstr "ŽemÄ—lapio atvaizdas:" #: ../src/vikgeoreflayer.c:522 msgid "Zoom to Fit Map" -msgstr "" +msgstr "ŽemÄ—lapio mastelio pritaikymas" #: ../src/vikgeoreflayer.c:527 msgid "Goto Map Center" @@ -764,231 +793,241 @@ msgstr "Eiti į žemÄ—lapio centrÄ…" #: ../src/vikgeoreflayer.c:532 msgid "Export to World File" -msgstr "" +msgstr "Eksportuoti į pasaulinÄ™ rinkmenÄ…" #: ../src/vikgpslayer.c:137 msgid "Recording tracks" -msgstr "" +msgstr "Ä®raÅ¡omi keliai" #: ../src/vikgpslayer.c:138 msgid "Jump to current position on start" -msgstr "" +msgstr "PerÅ¡okti į esamÄ… vietÄ… paleidus programÄ…" #: ../src/vikgpslayer.c:139 msgid "Moving Map Method:" -msgstr "" +msgstr "Perkeliamo žemÄ—lapio metodas:" #: ../src/vikgpslayer.c:140 msgid "Gpsd Host:" -msgstr "" +msgstr "Gpsd Å¡eimininkas:" #: ../src/vikgpslayer.c:141 msgid "Gpsd Port:" -msgstr "" +msgstr "Gpsd prievadas:" #: ../src/vikgpslayer.c:142 msgid "Gpsd Retry Interval (seconds):" -msgstr "" +msgstr "Gpsd bandymų intervalas (sekundÄ—mis):" -#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:989 +#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:985 msgid "GPS Download" -msgstr "" +msgstr "GPS atsiuntimas" -#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:989 +#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:985 msgid "GPS Upload" -msgstr "" +msgstr "GPS iÅ¡siuntimas" #: ../src/vikgpslayer.c:208 msgid "GPS Realtime Tracking" msgstr "GPS realaus laiko sekimas" -#: ../src/vikgpslayer.c:373 +#: ../src/vikgpslayer.c:371 msgid "Unknown GPS Protocol" -msgstr "" +msgstr "Nežinomas GPS protokolas" -#: ../src/vikgpslayer.c:379 +#: ../src/vikgpslayer.c:377 msgid "Unknown serial port device" -msgstr "" +msgstr "Nežinomas įrenginio nuoseklusis prievadas" -#: ../src/vikgpslayer.c:444 +#: ../src/vikgpslayer.c:442 #, c-format msgid "%s: unknown parameter" msgstr "%s: nežinomas parametras" -#: ../src/vikgpslayer.c:545 +#: ../src/vikgpslayer.c:541 msgid "Upload to GPS" -msgstr "" +msgstr "Nusiųsti į GPS" -#: ../src/vikgpslayer.c:550 +#: ../src/vikgpslayer.c:546 msgid "Download from GPS" -msgstr "" +msgstr "Atsisiųsti iÅ¡ GPS" -#: ../src/vikgpslayer.c:568 +#: ../src/vikgpslayer.c:564 msgid "Empty Upload" -msgstr "" +msgstr "IÅ¡valyti iÅ¡siuntimus" -#: ../src/vikgpslayer.c:573 +#: ../src/vikgpslayer.c:569 msgid "Empty Download" -msgstr "" +msgstr "IÅ¡valyti atsiuntimus" -#: ../src/vikgpslayer.c:578 +#: ../src/vikgpslayer.c:574 msgid "Empty All" -msgstr "" +msgstr "IÅ¡valyti visus" -#: ../src/vikgpslayer.c:718 +#: ../src/vikgpslayer.c:714 #, c-format msgid "Uploading %d waypoint..." msgid_plural "Uploading %d waypoints..." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "IÅ¡siunÄiamas %d marÅ¡ruto taÅ¡kas..." +msgstr[1] "IÅ¡siunÄiami %d marÅ¡ruto taÅ¡kai..." +msgstr[2] "IÅ¡siunÄiama %d marÅ¡ruto taÅ¡kų..." -#: ../src/vikgpslayer.c:720 +#: ../src/vikgpslayer.c:716 #, c-format msgid "Uploading %d trackpoint..." msgid_plural "Uploading %d trackpoints..." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "IÅ¡siunÄiamas %d kelio taÅ¡kas..." +msgstr[1] "IÅ¡siunÄiami %d kelio taÅ¡kai..." +msgstr[2] "IÅ¡siunÄiama %d kelio taÅ¡kų..." -#: ../src/vikgpslayer.c:744 +#: ../src/vikgpslayer.c:740 #, c-format msgid "Downloaded %d out of %d waypoint..." msgid_plural "Downloaded %d out of %d waypoints..." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Atsiųstas %d iÅ¡ %d marÅ¡ruto taÅ¡kų..." +msgstr[1] "Atsiųsti %d iÅ¡ %d marÅ¡ruto taÅ¡kų..." +msgstr[2] "Atsiųsta %d iÅ¡ %d marÅ¡ruto taÅ¡kų..." -#: ../src/vikgpslayer.c:746 +#: ../src/vikgpslayer.c:742 #, c-format msgid "Downloaded %d out of %d trackpoint..." msgid_plural "Downloaded %d out of %d trackpoints..." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Atsiųstas %d iÅ¡ %d kelio taÅ¡kų..." +msgstr[1] "Atsiųsti %d iÅ¡ %d kelio taÅ¡kų..." +msgstr[2] "Atsiųsta %d iÅ¡ %d kelio taÅ¡kų..." -#: ../src/vikgpslayer.c:750 +#: ../src/vikgpslayer.c:746 #, c-format msgid "Uploaded %d out of %d waypoint..." msgid_plural "Uploaded %d out of %d waypoints..." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "IÅ¡siųstas %d iÅ¡ %d marÅ¡ruto taÅ¡kų..." +msgstr[1] "IÅ¡siųsti %d iÅ¡ %d marÅ¡ruto taÅ¡kų..." +msgstr[2] "IÅ¡siųsta %d iÅ¡ %d marÅ¡ruto taÅ¡kų..." -#: ../src/vikgpslayer.c:752 +#: ../src/vikgpslayer.c:748 #, c-format msgid "Uploaded %d out of %d trackpoint..." msgid_plural "Uploaded %d out of %d trackpoints..." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "IÅ¡siųstas %d iÅ¡ %d kelio taÅ¡kų..." +msgstr[1] "IÅ¡siųsti %d iÅ¡ %d kelio taÅ¡kų..." +msgstr[2] "IÅ¡siųsta %d iÅ¡ %d kelio taÅ¡kų..." -#: ../src/vikgpslayer.c:759 +#: ../src/vikgpslayer.c:755 #, c-format msgid "Downloaded %d waypoint" msgid_plural "Downloaded %d waypoints" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Atsiųstas %d marÅ¡ruto taÅ¡kas" +msgstr[1] "Atsiųsti %d marÅ¡ruto taÅ¡kai" +msgstr[2] "Atsiųsta %d marÅ¡ruto taÅ¡kų" -#: ../src/vikgpslayer.c:761 +#: ../src/vikgpslayer.c:757 #, c-format msgid "Downloaded %d trackpoint" msgid_plural "Downloaded %d trackpoints" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Atsiųstas %d kelio taÅ¡kas" +msgstr[1] "Atsiųsti %d kelio taÅ¡kai" +msgstr[2] "Atsiųsta %d kelio taÅ¡kų" -#: ../src/vikgpslayer.c:765 +#: ../src/vikgpslayer.c:761 #, c-format msgid "Uploaded %d waypoint" msgid_plural "Uploaded %d waypoints" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "IÅ¡siųstas %d marÅ¡ruto taÅ¡kas" +msgstr[1] "IÅ¡siųsti %d marÅ¡ruto taÅ¡kai" +msgstr[2] "IÅ¡siųsta %d marÅ¡ruto taÅ¡kų" -#: ../src/vikgpslayer.c:767 +#: ../src/vikgpslayer.c:763 #, c-format msgid "Uploaded %d trackpoint" msgid_plural "Uploaded %d trackpoints" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "IÅ¡siųstas %d kelio taÅ¡kas" +msgstr[1] "IÅ¡siųsti %d kelio taÅ¡kai" +msgstr[2] "IÅ¡siųsta %d kelio taÅ¡kų" -#: ../src/vikgpslayer.c:952 +#: ../src/vikgpslayer.c:948 msgid "Error: couldn't find gpsbabel." -msgstr "" +msgstr "Klaida: neįmanoma surasti gpsbabel." #: ../src/viklayerspanel.c:59 msgid "/C_ut" -msgstr "" +msgstr "/_IÅ¡kirpti" #: ../src/viklayerspanel.c:60 msgid "/_Copy" -msgstr "" +msgstr "/_Kopijuoti" #: ../src/viklayerspanel.c:61 msgid "/_Paste" -msgstr "" +msgstr "/Ä®_terpti" #: ../src/viklayerspanel.c:62 msgid "/_Delete" -msgstr "" +msgstr "/_IÅ¡trinti" #: ../src/viklayerspanel.c:63 msgid "/New Layer" -msgstr "" +msgstr "/Naujas sluoksnis" #: ../src/viklayerspanel.c:152 msgid "Top Layer" -msgstr "" +msgstr "VirÅ¡utinis sluoksnis" #: ../src/viklayerspanel.c:487 msgid "Aggregate Layers have no settable properties." -msgstr "" +msgstr "Bendri sluoksniai neturi nustatomų ypatybių." #: ../src/viklayerspanel.c:537 msgid "You cannot cut the Top Layer." -msgstr "" +msgstr "JÅ«s negalite iÅ¡kirpti virÅ¡utinio sluoksnio." #: ../src/viklayerspanel.c:592 msgid "You cannot delete the Top Layer." -msgstr "" +msgstr "JÅ«s negalite iÅ¡trinti virÅ¡utinio sluoksnio." #: ../src/viklayerspanel.c:676 msgid "Are you sure you wish to delete all layers?" -msgstr "" +msgstr "Ar tikrai norite iÅ¡trinti visus sluoksnius?" #. ******* MAPZOOMS ******** #: ../src/vikmapslayer.c:88 msgid "Use Viking Zoom Level" -msgstr "" +msgstr "Naudoti Viking mastelio lygį" #: ../src/vikmapslayer.c:119 msgid "Map Type:" -msgstr "" +msgstr "ŽemÄ—lapio tipas:" #: ../src/vikmapslayer.c:120 -msgid "Maps Directory (Optional):" -msgstr "" +msgid "Maps Directory:" +msgstr "ŽemÄ—lapių katalogas:" #: ../src/vikmapslayer.c:121 msgid "Alpha:" -msgstr "" +msgstr "Alfa:" #: ../src/vikmapslayer.c:122 msgid "Autodownload maps:" -msgstr "" +msgstr "AutomatiÅ¡kai atsiųsti žemÄ—lapiai:" #: ../src/vikmapslayer.c:123 msgid "Zoom Level:" -msgstr "" +msgstr "Mastelio lygis:" #: ../src/vikmapslayer.c:129 msgid "Maps Download" -msgstr "" +msgstr "Atsiųsti žemÄ—lapiai" #: ../src/vikmapslayer.c:135 msgid "Map" -msgstr "" +msgstr "ŽemÄ—lapis" #: ../src/vikmapslayer.c:388 msgid "Unknown map type" -msgstr "" +msgstr "Nežinomas žemÄ—lapio tipas" #: ../src/vikmapslayer.c:398 msgid "Unknown Map Zoom" -msgstr "" +msgstr "Nežinomas žemÄ—lapio mastelis" #: ../src/vikmapslayer.c:467 #, c-format @@ -996,6 +1035,8 @@ msgid "" "New map cannot be displayed in the current drawmode.\n" "Select \"%s\" from View menu to view it." msgstr "" +"Naujas žemÄ—lapis neįmanoma parodyti dabartiniame braižymo režime.\n" +"Pasirinkite \"%s\" iÅ¡ Rodyti meniu, kad galÄ—tumÄ—te peržiÅ«rÄ—ti jį." #: ../src/vikmapslayer.c:609 #, c-format @@ -1003,248 +1044,255 @@ msgid "" "Cowardly refusing to draw tiles or existence of tiles beyond %d zoom out " "factor" msgstr "" +"Bailiai atsisakyti brėžti kvadratus arba esanÄius kvadratų už %d mastelio " +"faktoriaus" -#: ../src/vikmapslayer.c:924 +#: ../src/vikmapslayer.c:927 #, c-format msgid "Redownloading up to %d %s map..." msgid_plural "Redownloading up to %d %s maps..." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Pakartotinai atsiunÄiama iki %d %s žemÄ—lapio..." +msgstr[1] "Pakartotinai atsiunÄiama iki %d %s žemÄ—lapių..." +msgstr[2] "Pakartotinai atsiunÄiama iki %d %s žemÄ—lapių..." -#: ../src/vikmapslayer.c:926 +#: ../src/vikmapslayer.c:929 #, c-format msgid "Redownloading %d %s map..." msgid_plural "Redownloading %d %s maps..." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Pakartotinai atsiunÄiamas %d %s žemÄ—lapis..." +msgstr[1] "Pakartotinai atsiunÄiami %d %s žemÄ—lapiai..." +msgstr[2] "Pakartotinai atsiunÄiama %d %s žemÄ—lapių..." -#: ../src/vikmapslayer.c:930 ../src/vikmapslayer.c:1001 +#: ../src/vikmapslayer.c:933 ../src/vikmapslayer.c:1004 #, c-format msgid "Downloading %d %s map..." msgid_plural "Downloading %d %s maps..." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "AtsiunÄiamas %d %s žemÄ—lapis..." +msgstr[1] "AtsiunÄiami %d %s žemÄ—lapiai..." +msgstr[2] "AtsiunÄiama %d %s žemÄ—lapių..." -#: ../src/vikmapslayer.c:1058 +#: ../src/vikmapslayer.c:1061 msgid "Redownload bad map(s)" -msgstr "" +msgstr "Pakartotinai atsiųsti blogus žemÄ—lapius" -#: ../src/vikmapslayer.c:1062 +#: ../src/vikmapslayer.c:1065 msgid "Redownload all map(s)" -msgstr "" +msgstr "Pakartotinai atsiųsti visus žemÄ—lapius" -#: ../src/vikmapslayer.c:1142 +#: ../src/vikmapslayer.c:1145 #, c-format msgid "" "Wrong drawmode for this map.\n" "Select \"%s\" from View menu and try again." msgstr "" +"Klaidingas Å¡io žemÄ—lapio braižymo režimas.\n" +"Pasirinkite iÅ¡ meniu \"%s\" ir bandykite dar kartÄ…." -#: ../src/vikmapslayer.c:1147 +#: ../src/vikmapslayer.c:1150 msgid "Wrong zoom level for this map." -msgstr "" +msgstr "Klaidingas Å¡io žemÄ—lapio mastelio lygis." -#: ../src/vikmapslayer.c:1172 +#: ../src/vikmapslayer.c:1175 msgid "Download Onscreen Maps" -msgstr "" +msgstr "Atsiųsti matomus žemÄ—lapius" #. TODO Add GTK_STOCK_REFRESH icon -#: ../src/vikmapslayer.c:1178 +#: ../src/vikmapslayer.c:1181 msgid "Refresh Onscreen Tiles" -msgstr "" +msgstr "Atnaujinti matomus kvadratus" #: ../src/viktreeview.c:203 msgid "Layer Name" -msgstr "" +msgstr "Sluoksnio pavadinimas" #: ../src/viktreeview.c:624 #, c-format msgid "delete data from %s\n" -msgstr "" +msgstr "iÅ¡trinti duomenis iÅ¡ %s\n" #: ../src/viktrwlayer.c:307 msgid "Create Waypoint" -msgstr "" +msgstr "Sukurti marÅ¡ruto taÅ¡kÄ…" #: ../src/viktrwlayer.c:310 msgid "Create Track" -msgstr "" +msgstr "Sukurti keliÄ…" #: ../src/viktrwlayer.c:314 msgid "Begin Track" -msgstr "" +msgstr "PradÄ—ti keliÄ…" #: ../src/viktrwlayer.c:317 msgid "Edit Waypoint" -msgstr "" +msgstr "Keisti marÅ¡ruto taÅ¡kus" #: ../src/viktrwlayer.c:322 msgid "Edit Trackpoint" -msgstr "" +msgstr "Keisti kelio taÅ¡kus" #: ../src/viktrwlayer.c:327 msgid "Show Picture" -msgstr "" +msgstr "Rodyti nuotraukÄ…" #: ../src/viktrwlayer.c:330 msgid "Magic Scissors" -msgstr "" +msgstr "Stebuklingos žirklÄ—s" #. ***** PARAMETERS ***** #: ../src/viktrwlayer.c:337 ../src/viktrwlayer.c:1399 #: ../src/viktrwlayer.c:1401 msgid "Waypoints" -msgstr "" +msgstr "MarÅ¡ruto taÅ¡kai" #: ../src/viktrwlayer.c:337 ../src/viktrwlayer.c:1389 #: ../src/viktrwlayer.c:1391 msgid "Tracks" -msgstr "" +msgstr "Keliai" #: ../src/viktrwlayer.c:337 msgid "Waypoint Images" -msgstr "" +msgstr "MarÅ¡ruto taÅ¡kų atvaizdai" #: ../src/viktrwlayer.c:340 msgid "Draw by Track" -msgstr "" +msgstr "Brėžti pagal keliÄ…" #: ../src/viktrwlayer.c:340 msgid "Draw by Velocity" -msgstr "" +msgstr "Brėžti pagal dažnį" #: ../src/viktrwlayer.c:340 msgid "All Tracks Black" -msgstr "" +msgstr "Visi keliai juodi" #: ../src/viktrwlayer.c:341 msgid "Filled Square" -msgstr "" +msgstr "Užpildytas kvadratas" #: ../src/viktrwlayer.c:341 msgid "Square" -msgstr "" +msgstr "Kvadratas" #: ../src/viktrwlayer.c:341 msgid "Circle" -msgstr "" +msgstr "Apskritimas" #: ../src/viktrwlayer.c:341 msgid "X" -msgstr "" +msgstr "X" #: ../src/viktrwlayer.c:363 msgid "Track Drawing Mode:" -msgstr "" +msgstr "Kelio brėžimo režimas:" #: ../src/viktrwlayer.c:364 msgid "Draw Track Lines" -msgstr "" +msgstr "Brėžti kelio linijas" #: ../src/viktrwlayer.c:365 msgid "Draw Trackpoints" -msgstr "" +msgstr "Brėžti kelio taÅ¡kus" #: ../src/viktrwlayer.c:366 msgid "Draw Elevation" -msgstr "" +msgstr "Brėžti aukÅ¡tį" #: ../src/viktrwlayer.c:367 msgid "Draw Elevation Height %:" -msgstr "" +msgstr "Brėžiamas kilimo aukÅ¡tis %:" #: ../src/viktrwlayer.c:369 msgid "Draw Stops" -msgstr "" +msgstr "Brėžimas sustabdytas" #: ../src/viktrwlayer.c:370 msgid "Min Stop Length (seconds):" -msgstr "" +msgstr "Min sustojimo laikas (sekundÄ—mis):" #: ../src/viktrwlayer.c:372 msgid "Track Thickness:" -msgstr "" +msgstr "Kelio storis:" #: ../src/viktrwlayer.c:373 msgid "Track BG Thickness:" -msgstr "" +msgstr "Kelio fono storis:" #: ../src/viktrwlayer.c:374 msgid "Track Background Color" -msgstr "" +msgstr "Kelio fono spalva" #: ../src/viktrwlayer.c:375 msgid "Min Track Velocity:" -msgstr "" +msgstr "Min kelio dažnis:" #: ../src/viktrwlayer.c:376 msgid "Max Track Velocity:" -msgstr "" +msgstr "Max kelio dažnis:" #: ../src/viktrwlayer.c:378 msgid "Draw Labels" -msgstr "" +msgstr "Brėžinio kortelÄ—s" #: ../src/viktrwlayer.c:379 msgid "Waypoint Color:" -msgstr "" +msgstr "MarÅ¡ruto taÅ¡ko spalva:" #: ../src/viktrwlayer.c:380 msgid "Waypoint Text:" -msgstr "" +msgstr "MarÅ¡ruto taÅ¡ko tekstas:" #: ../src/viktrwlayer.c:381 msgid "Background:" -msgstr "" +msgstr "Fonas:" #: ../src/viktrwlayer.c:382 msgid "Fake BG Color Translucency:" -msgstr "" +msgstr "Netinkamas fono spalvos skaidrumas:" #: ../src/viktrwlayer.c:383 msgid "Waypoint marker:" -msgstr "" +msgstr "MarÅ¡ruto taÅ¡ko žymeklis:" #: ../src/viktrwlayer.c:384 msgid "Waypoint size:" -msgstr "" +msgstr "MarÅ¡ruto taÅ¡ko dydis:" #: ../src/viktrwlayer.c:385 msgid "Draw Waypoint Symbols:" -msgstr "" +msgstr "Brėžti marÅ¡ruto taÅ¡ko simbolius:" #: ../src/viktrwlayer.c:387 msgid "Draw Waypoint Images" -msgstr "" +msgstr "Brėžti marÅ¡ruto taÅ¡ko atvaizdus" #: ../src/viktrwlayer.c:388 msgid "Image Size (pixels):" -msgstr "" +msgstr "Atvaizdo dydis (taÅ¡kais):" #: ../src/viktrwlayer.c:389 msgid "Image Alpha:" -msgstr "" +msgstr "Alfa atvaizdas:" #: ../src/viktrwlayer.c:390 msgid "Image Memory Cache Size:" -msgstr "" +msgstr "Atvaizdi spartinanÄiosios atminties dydis:" #: ../src/viktrwlayer.c:1538 msgid "This layer has no waypoints or trackpoints." -msgstr "" +msgstr "Å is sluoksnis neturi marÅ¡ruto ir kelio taÅ¡kų." #: ../src/viktrwlayer.c:1546 msgid "Export Layer" -msgstr "" +msgstr "Eksportavimo sluoksnis" -#: ../src/viktrwlayer.c:1565 ../src/vikwindow.c:1446 ../src/vikwindow.c:1820 +#: ../src/viktrwlayer.c:1565 ../src/vikwindow.c:1438 ../src/vikwindow.c:1817 #, c-format msgid "The file \"%s\" exists, do you wish to overwrite it?" -msgstr "" +msgstr "Rinkmena \"%s\" jau yra, ar norite pakeisti?" -#: ../src/viktrwlayer.c:1575 ../src/vikwindow.c:1464 +#: ../src/viktrwlayer.c:1575 ../src/vikwindow.c:1456 msgid "The filename you requested could not be opened for writing." -msgstr "" +msgstr "Rinkmena, kuriÄ… užklausÄ—te, negali bÅ«ti atverta raÅ¡ymui." #: ../src/viktrwlayer.c:1596 msgid "Create" @@ -1252,816 +1300,820 @@ msgstr "Sukurti" #: ../src/viktrwlayer.c:1606 msgid "Waypoint Name:" -msgstr "" +msgstr "MarÅ¡ruto taÅ¡ko pavadinimas:" #: ../src/viktrwlayer.c:1626 msgid "Waypoint not found in this layer." -msgstr "" +msgstr "MarÅ¡ruto taÅ¡kas nerastas Å¡iame sluoksnyje." -#: ../src/viktrwlayer.c:1724 +#: ../src/viktrwlayer.c:1723 msgid "Goto Center of Layer" -msgstr "" +msgstr "Eiti į sluoksnio centrÄ…" -#: ../src/viktrwlayer.c:1729 +#: ../src/viktrwlayer.c:1728 msgid "Goto Waypoint" -msgstr "" +msgstr "Eiti į marÅ¡ruto taÅ¡kÄ…" -#: ../src/viktrwlayer.c:1735 +#: ../src/viktrwlayer.c:1734 msgid "Export layer" -msgstr "" +msgstr "Eksportuoti sluoksnį" -#: ../src/viktrwlayer.c:1740 +#: ../src/viktrwlayer.c:1739 msgid "Export as GPSPoint" -msgstr "" +msgstr "Eksportuoti kaip GPSPoint" -#: ../src/viktrwlayer.c:1745 +#: ../src/viktrwlayer.c:1744 msgid "Export as GPSMapper" -msgstr "" +msgstr "Eksportuoti kaip GPSMapper" -#: ../src/viktrwlayer.c:1750 +#: ../src/viktrwlayer.c:1749 msgid "Export as GPX" -msgstr "" +msgstr "Eksportuoti kaip GPX" -#: ../src/viktrwlayer.c:1755 ../src/viktrwlayer.c:2794 +#: ../src/viktrwlayer.c:1754 ../src/viktrwlayer.c:2794 msgid "New Waypoint" -msgstr "" +msgstr "Naujas marÅ¡ruto taÅ¡kas" -#: ../src/viktrwlayer.c:1762 +#: ../src/viktrwlayer.c:1761 msgid "Add Wikipedia Waypoints" -msgstr "" +msgstr "PridÄ—ti Wikipedia marÅ¡ruto taÅ¡kus" -#: ../src/viktrwlayer.c:1767 +#: ../src/viktrwlayer.c:1766 msgid "Within layer bounds" -msgstr "" +msgstr "Be sluoksnio ribų" -#: ../src/viktrwlayer.c:1772 +#: ../src/viktrwlayer.c:1771 msgid "Within current view" -msgstr "" +msgstr "Be esamos peržiÅ«ros" -#: ../src/viktrwlayer.c:1779 ../src/viktrwlayer.c:2760 +#: ../src/viktrwlayer.c:1778 ../src/viktrwlayer.c:2760 msgid "Upload to OSM" -msgstr "" +msgstr "IÅ¡siųsti į OSM" -#: ../src/viktrwlayer.c:2290 +#: ../src/viktrwlayer.c:2289 msgid "Failed. This track does not have timestamp" -msgstr "" +msgstr "Nepavyko. Å is kelias neturi laiko žymų" -#: ../src/viktrwlayer.c:2304 +#: ../src/viktrwlayer.c:2303 msgid "Failed. No other track in this layer has timestamp" -msgstr "" +msgstr "Nepavyko. Jokie kiti keliai neturi laiko žymų Å¡iame sluoksnyje" -#: ../src/viktrwlayer.c:2310 +#: ../src/viktrwlayer.c:2309 msgid "Merge with..." -msgstr "" +msgstr "Sujungti su..." -#: ../src/viktrwlayer.c:2310 +#: ../src/viktrwlayer.c:2309 msgid "Select track to merge with" -msgstr "" +msgstr "Pasirinkite keliÄ… sujungimui su" -#: ../src/viktrwlayer.c:2347 +#: ../src/viktrwlayer.c:2346 msgid "Merge Threshold..." -msgstr "" +msgstr "Sujungti slenkstį..." -#: ../src/viktrwlayer.c:2348 +#: ../src/viktrwlayer.c:2347 msgid "Merge when time between tracks less than:" -msgstr "" +msgstr "Sujungti, jei tarp laiko ir kelių mažiau negu:" #: ../src/viktrwlayer.c:2439 msgid "Split Threshold..." -msgstr "" +msgstr "IÅ¡skirti slengstį..." #: ../src/viktrwlayer.c:2440 msgid "Split when time between trackpoints exceeds:" -msgstr "" +msgstr "Skaidyti, jei tarp laiko ir kelio taÅ¡kų virÅ¡yjama:" #: ../src/viktrwlayer.c:2523 msgid "Waypoint Already Exists" -msgstr "" +msgstr "MarÅ¡ruto taÅ¡kas jau yra" #: ../src/viktrwlayer.c:2564 msgid "Track Already Exists" -msgstr "" +msgstr "Kelias jau yra" #: ../src/viktrwlayer.c:2686 msgid "Goto" -msgstr "" +msgstr "Eiti į" #: ../src/viktrwlayer.c:2694 msgid "Visit Geocache Webpage" -msgstr "" +msgstr "Aplankykite Geocache tinklapį" #: ../src/viktrwlayer.c:2709 msgid "Goto Startpoint" -msgstr "" +msgstr "Eiti į pradinį taÅ¡kÄ…" #: ../src/viktrwlayer.c:2714 msgid "Goto \"Center\"" -msgstr "" +msgstr "Eiti į \"centrÄ…\"" #: ../src/viktrwlayer.c:2719 msgid "Goto Endpoint" -msgstr "" +msgstr "Eiti į galinį taÅ¡kÄ…" #: ../src/viktrwlayer.c:2724 msgid "Merge By Time" -msgstr "" +msgstr "Sujungti pagal laikÄ…" #: ../src/viktrwlayer.c:2729 msgid "Merge With Other Tracks..." -msgstr "" +msgstr "Sujungti su kitais keliais..." #: ../src/viktrwlayer.c:2734 msgid "Split By Time" -msgstr "" +msgstr "IÅ¡skaidyti pagal laikÄ…" #: ../src/viktrwlayer.c:2739 msgid "Download maps along track..." -msgstr "" +msgstr "Atsiųsti žemÄ—lapius iÅ¡ilgai kelio..." #: ../src/viktrwlayer.c:2744 msgid "Apply DEM Data" -msgstr "" +msgstr "Pritaikyti DEM duomenis" #: ../src/viktrwlayer.c:2749 msgid "Extend track end" -msgstr "" +msgstr "PraplÄ—sti kelio galÄ…" #: ../src/viktrwlayer.c:2754 msgid "Extend using magic scissors" -msgstr "" +msgstr "PraplÄ—sti naudojantis stebuklingomis žirklÄ—mis" #: ../src/viktrwlayer.c:2768 msgid "View Google Directions" -msgstr "" +msgstr "Rodyti Google marÅ¡rutus" #: ../src/viktrwlayer.c:2774 msgid "Use with filter" -msgstr "" +msgstr "Naudoti su filtru" -#: ../src/viktrwlayer.c:3736 +#: ../src/viktrwlayer.c:3735 msgid "Could not launch eog to open file." -msgstr "" +msgstr "Rinkmenos atverimui neįmanoma paleisti eog." -#: ../src/viktrwlayer.c:3790 +#: ../src/viktrwlayer.c:3789 #, c-format msgid "Creating %d Image Thumbnails..." -msgstr "" +msgstr "SukÅ«riamos %d atvaizdo miniatiÅ«ros..." -#: ../src/viktrwlayer.c:4010 +#: ../src/viktrwlayer.c:4009 msgid "No map layer in use. Create one first" -msgstr "" +msgstr "NÄ—ra naudojamų žemÄ—lapio sluoksnių. Sukurkite." -#: ../src/viktrwlayer_propwin.c:658 +#: ../src/viktrwlayer_propwin.c:661 msgid "Failed spliting track. Track unchanged" -msgstr "" +msgstr "Nepavyko atskirti kelio. Kelias liko nepakeistas." -#: ../src/viktrwlayer_propwin.c:675 +#: ../src/viktrwlayer_propwin.c:678 msgid "Operation Aborted. Track unchanged" -msgstr "" +msgstr "Veiksmas nutrauktas. Kelias liko nepakeistas." -#: ../src/viktrwlayer_propwin.c:729 +#: ../src/viktrwlayer_propwin.c:732 #, c-format msgid "%s - Track Properties" -msgstr "" +msgstr "%s - Kelio ypatybÄ—s" -#: ../src/viktrwlayer_propwin.c:734 +#: ../src/viktrwlayer_propwin.c:737 msgid "Split at Marker" -msgstr "" +msgstr "Atskirti ties žymeliu" -#: ../src/viktrwlayer_propwin.c:735 +#: ../src/viktrwlayer_propwin.c:738 msgid "Split Segments" -msgstr "" +msgstr "Skaidyti atkarpomis" -#: ../src/viktrwlayer_propwin.c:736 +#: ../src/viktrwlayer_propwin.c:739 msgid "Reverse" -msgstr "" +msgstr "AtvirkÅ¡tinis" -#: ../src/viktrwlayer_propwin.c:737 +#: ../src/viktrwlayer_propwin.c:740 msgid "Delete Dupl." -msgstr "" +msgstr "IÅ¡trinti dublikatus" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Comment:</b>" -msgstr "" +msgstr "<b>Komentaras:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Track Length:</b>" -msgstr "" +msgstr "<b>Kelio ilgis:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Trackpoints:</b>" -msgstr "" +msgstr "<b>Kelio taÅ¡kai:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Segments:</b>" -msgstr "" +msgstr "<b>Atkarpos:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Duplicate Points:</b>" -msgstr "" +msgstr "<b>Sudubliuoti taÅ¡kai:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Max Speed:</b>" -msgstr "" +msgstr "<b>Didžiausias greitis:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Avg. Speed:</b>" -msgstr "" +msgstr "<b>Vidutinis greitis:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Avg. Dist. Between TPs:</b>" -msgstr "" +msgstr "<b>Vid. nuot. tarp :</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Elevation Range:</b>" -msgstr "" +msgstr "<b>AukÅ¡Äio intervalas:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Total Elevation Gain/Loss:</b>" -msgstr "" +msgstr "<b>Visas aukÅ¡Äio intervalas:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Start:</b>" -msgstr "" +msgstr "<b>Pradžia:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>End:</b>" -msgstr "" +msgstr "<b>Pabaiga:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Duration:</b>" -msgstr "" +msgstr "<b>TrukmÄ—:</b>" -#: ../src/viktrwlayer_propwin.c:788 ../src/viktrwlayer_propwin.c:795 -#: ../src/viktrwlayer_propwin.c:804 ../src/viktrwlayer_propwin.c:811 -#: ../src/viktrwlayer_propwin.c:850 ../src/viktrwlayer_propwin.c:851 -#: ../src/viktrwlayer_propwin.c:852 ../src/viktrwlayer_propwin.c:874 -#: ../src/viktrwlayer_propwin.c:881 +#: ../src/viktrwlayer_propwin.c:791 ../src/viktrwlayer_propwin.c:798 +#: ../src/viktrwlayer_propwin.c:807 ../src/viktrwlayer_propwin.c:814 +#: ../src/viktrwlayer_propwin.c:853 ../src/viktrwlayer_propwin.c:854 +#: ../src/viktrwlayer_propwin.c:855 ../src/viktrwlayer_propwin.c:877 +#: ../src/viktrwlayer_propwin.c:884 #, c-format msgid "No Data" -msgstr "" +msgstr "NÄ—ra duomenų" -#: ../src/viktrwlayer_propwin.c:847 +#: ../src/viktrwlayer_propwin.c:850 #, c-format msgid "%d minutes" -msgstr "" +msgstr "%d minuÄių" -#: ../src/viktrwlayer_propwin.c:870 +#: ../src/viktrwlayer_propwin.c:873 msgid "Statistics" -msgstr "" +msgstr "Statistika" -#: ../src/viktrwlayer_propwin.c:875 +#: ../src/viktrwlayer_propwin.c:878 msgid "<b>Track Distance:</b>" -msgstr "" +msgstr "<b>Kelio nuotolis:</b>" -#: ../src/viktrwlayer_propwin.c:876 +#: ../src/viktrwlayer_propwin.c:879 msgid "Elevation-distance" -msgstr "" +msgstr "AukÅ¡tis-nuotolis" -#: ../src/viktrwlayer_propwin.c:882 +#: ../src/viktrwlayer_propwin.c:885 msgid "<b>Track Time:</b>" -msgstr "" +msgstr "<b>Kelio laikas:</b>" -#: ../src/viktrwlayer_propwin.c:883 +#: ../src/viktrwlayer_propwin.c:886 msgid "Speed-time" -msgstr "" +msgstr "Greitis-laikas" #: ../src/viktrwlayer_tpwin.c:101 msgid "<b>Part of Track:</b>" -msgstr "" +msgstr "<b>Kelio dalis:</b>" #: ../src/viktrwlayer_tpwin.c:102 msgid "<b>Latitude:</b>" -msgstr "" +msgstr "<b>Platuma:</b>" #: ../src/viktrwlayer_tpwin.c:103 msgid "<b>Longitude:</b>" -msgstr "" +msgstr "<b>Ilguma:</b>" #: ../src/viktrwlayer_tpwin.c:104 msgid "<b>Altitude:</b>" -msgstr "" +msgstr "<b>AukÅ¡tis:</b>" #: ../src/viktrwlayer_tpwin.c:105 msgid "<b>Timestamp:</b>" -msgstr "" +msgstr "Laiko žyma:" #: ../src/viktrwlayer_tpwin.c:106 msgid "<b>Time:</b>" -msgstr "" +msgstr "<b>Laikas:</b>" #: ../src/viktrwlayer_tpwin.c:107 msgid "<b>Distance Difference:</b>" -msgstr "" +msgstr "<b>Nuotolio skirtumas:</b>" #: ../src/viktrwlayer_tpwin.c:108 msgid "<b>Time Difference:</b>" -msgstr "" +msgstr "<b>Laiko skirtumas:</b>" #: ../src/viktrwlayer_tpwin.c:109 msgid "<b>\"Speed\" Between:</b>" +msgstr "<b>\"Greitis\" tarp:</b>" + +#: ../src/viktrwlayer_tpwin.c:110 +msgid "<b>VDOP:</b>" msgstr "" -#: ../src/viktrwlayer_tpwin.c:117 -msgid "Trackpoint" +#: ../src/viktrwlayer_tpwin.c:111 +msgid "<b>HDOP:</b>" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:112 +msgid "<b>PDOP:</b>" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:113 +msgid "<b>SAT/FIX:</b>" msgstr "" #: ../src/viktrwlayer_tpwin.c:122 +msgid "Trackpoint" +msgstr "Kelio taÅ¡kas" + +#: ../src/viktrwlayer_tpwin.c:127 msgid "Split Here" -msgstr "" +msgstr "Skaidyti Äia" -#: ../src/viktrwlayer_tpwin.c:123 +#: ../src/viktrwlayer_tpwin.c:128 msgid "Join With Last" -msgstr "" +msgstr "Sujungti su paskutiniu" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Pan" -msgstr "" +msgstr "PerkÄ—limas" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Zoom" -msgstr "" +msgstr "Mastelis" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Ruler" -msgstr "" +msgstr "LiniuotÄ—" -#: ../src/vikwindow.c:363 +#: ../src/vikwindow.c:364 #, c-format msgid "" "Do you want to save the changes you made to the document \"%s\"?\n" "\n" "Your changes will be lost if you don't save them." msgstr "" +"Ar norite iÅ¡saugoti dokumento pakeitimus \"%s\"?\n" +"\n" +"JÅ«sų pakeitimai dings, jeigu jų neiÅ¡saugosite." -#: ../src/vikwindow.c:366 ../src/vikwindow.c:1314 +#: ../src/vikwindow.c:367 ../src/vikwindow.c:1306 msgid "Untitled" -msgstr "" +msgstr "Be pavadinimo" -#: ../src/vikwindow.c:367 +#: ../src/vikwindow.c:368 msgid "Don't Save" -msgstr "" +msgstr "NeiÅ¡saugoti" -#: ../src/vikwindow.c:400 +#: ../src/vikwindow.c:401 msgid "mpp" -msgstr "" +msgstr "mpp" -#: ../src/vikwindow.c:400 +#: ../src/vikwindow.c:401 msgid "pixelfact" -msgstr "" +msgstr "Tikrasis taÅ¡kas" -#: ../src/vikwindow.c:527 +#: ../src/vikwindow.c:528 #, c-format msgid "%s %s %dm" -msgstr "" +msgstr "%s %s %dm" -#: ../src/vikwindow.c:529 +#: ../src/vikwindow.c:530 #, c-format msgid "%s %s" -msgstr "" +msgstr "%s %s" -#: ../src/vikwindow.c:1113 +#: ../src/vikwindow.c:1105 msgid "You must select a layer to show its properties." -msgstr "" +msgstr "Turite pasirinkti sluoksnį, kad pamatytumÄ—te jo ypatybes." -#: ../src/vikwindow.c:1129 +#: ../src/vikwindow.c:1121 msgid "You must select a layer to delete." -msgstr "" +msgstr "Turite pasirinkti sluoksnį, kad iÅ¡trintumÄ—te." -#: ../src/vikwindow.c:1347 +#: ../src/vikwindow.c:1339 msgid "The file you requested could not be opened." -msgstr "" +msgstr "Užklaustos rinkmenos neįmanoma atverti." -#: ../src/vikwindow.c:1390 +#: ../src/vikwindow.c:1382 msgid "Please select a GPS data file to open. " -msgstr "" +msgstr "Pasirinkite atverimui GPS duomenų rinkmenÄ…. " -#: ../src/vikwindow.c:1433 +#: ../src/vikwindow.c:1425 msgid "Save as Viking File." -msgstr "" +msgstr "IÅ¡saugoti kaip Viking rinkmenÄ…" -#: ../src/vikwindow.c:1667 +#: ../src/vikwindow.c:1664 msgid "" "Viewable region outside allowable pixel size bounds for image. Clipping " "width/height values." msgstr "" +"Matoma sritis už leidžiamo taÅ¡ko nustato atvaizdo ribas. Kerpamas " +"ploÄio/aukÅ¡Äio vertÄ—s." -#: ../src/vikwindow.c:1686 +#: ../src/vikwindow.c:1683 #, c-format msgid "Total area: %ldm x %ldm (%.3f sq. km)" -msgstr "" +msgstr "Visas plotas: %ldm x %ldm (%.3f kv. km)" #. todo: default for answers inside VikWindow or static (thruout instance) -#: ../src/vikwindow.c:1694 +#: ../src/vikwindow.c:1691 msgid "Save to Image File" -msgstr "" +msgstr "IÅ¡saugoti atvaizdÄ… į rinkmenÄ…" -#: ../src/vikwindow.c:1712 +#: ../src/vikwindow.c:1709 msgid "Width (pixels):" -msgstr "" +msgstr "Plotis (taÅ¡kais)" -#: ../src/vikwindow.c:1714 +#: ../src/vikwindow.c:1711 msgid "Height (pixels):" -msgstr "" +msgstr "AukÅ¡tis (taÅ¡kais)" -#: ../src/vikwindow.c:1717 +#: ../src/vikwindow.c:1714 msgid "Zoom (meters per pixel):" -msgstr "" +msgstr "Mastelis (metrai į taÅ¡kÄ…):" -#: ../src/vikwindow.c:1723 +#: ../src/vikwindow.c:1720 msgid "Area in current viewable window" -msgstr "" +msgstr "Plotas matomame lange" -#: ../src/vikwindow.c:1733 +#: ../src/vikwindow.c:1730 msgid "Save as PNG" -msgstr "" +msgstr "IÅ¡saugoti kaip PNG" -#: ../src/vikwindow.c:1734 +#: ../src/vikwindow.c:1731 msgid "Save as JPEG" -msgstr "" +msgstr "IÅ¡saugoti kaip JPEG" -#: ../src/vikwindow.c:1754 +#: ../src/vikwindow.c:1751 msgid "East-west image tiles:" -msgstr "" +msgstr "Rytiniai-vakariniai atvaizdų kvadratai:" -#: ../src/vikwindow.c:1756 +#: ../src/vikwindow.c:1753 msgid "North-south image tiles:" -msgstr "" +msgstr "Å iauriniai-pietiniai atvaizdų kvadratai:" -#: ../src/vikwindow.c:1796 +#: ../src/vikwindow.c:1793 msgid "You must be in UTM mode to use this feature" -msgstr "" +msgstr "JÅ«s privalote bÅ«ti UTM režime, kad galÄ—tumÄ—te naudoti Å¡ias ypatybes." -#: ../src/vikwindow.c:1807 +#: ../src/vikwindow.c:1804 msgid "Save Image" -msgstr "" +msgstr "IÅ¡saugoti atvaizdÄ…" -#: ../src/vikwindow.c:1834 +#: ../src/vikwindow.c:1831 msgid "Choose a directory to hold images" -msgstr "" +msgstr "Pasirinkite aplankalÄ… atvaizdams saugoti" -#: ../src/vikwindow.c:1920 +#: ../src/vikwindow.c:1917 msgid "Choose a background color" -msgstr "" +msgstr "Keisti fono spalvÄ…" -#: ../src/vikwindow.c:1941 +#: ../src/vikwindow.c:1938 msgid "_File" -msgstr "" +msgstr "_Rinkmena" -#: ../src/vikwindow.c:1942 +#: ../src/vikwindow.c:1939 msgid "_Edit" -msgstr "" +msgstr "_Keisti" -#: ../src/vikwindow.c:1943 +#: ../src/vikwindow.c:1940 msgid "_View" -msgstr "" +msgstr "_Rodymas" -#: ../src/vikwindow.c:1944 ../src/vikwindow.c:2015 +#: ../src/vikwindow.c:1941 ../src/vikwindow.c:2013 msgid "_Zoom" -msgstr "" +msgstr "_Mastelis" -#: ../src/vikwindow.c:1945 ../src/vikwindow.c:2014 +#: ../src/vikwindow.c:1942 ../src/vikwindow.c:2012 msgid "_Pan" -msgstr "" +msgstr "_PerkÄ—limas" -#: ../src/vikwindow.c:1946 +#: ../src/vikwindow.c:1943 msgid "_Layers" -msgstr "" +msgstr "_Sluoksniai" -#: ../src/vikwindow.c:1947 +#: ../src/vikwindow.c:1944 msgid "_Tools" -msgstr "" +msgstr "Ä®_rankiai" -#: ../src/vikwindow.c:1948 +#: ../src/vikwindow.c:1945 msgid "_Webtools" -msgstr "" +msgstr "_Web įrankiai" -#: ../src/vikwindow.c:1949 +#: ../src/vikwindow.c:1946 msgid "_Help" -msgstr "" +msgstr "_Pagalba" -#: ../src/vikwindow.c:1951 +#: ../src/vikwindow.c:1948 msgid "_New" -msgstr "" +msgstr "_Nauja" -#: ../src/vikwindow.c:1951 +#: ../src/vikwindow.c:1948 msgid "New file" -msgstr "" +msgstr "Nauja rinkmena" -#: ../src/vikwindow.c:1952 +#: ../src/vikwindow.c:1949 msgid "_Open" -msgstr "" +msgstr "_Atverti" -#: ../src/vikwindow.c:1952 +#: ../src/vikwindow.c:1949 msgid "Open a file" -msgstr "" +msgstr "Atverti rinkmenÄ…" -#: ../src/vikwindow.c:1953 +#: ../src/vikwindow.c:1950 msgid "A_ppend File" -msgstr "" +msgstr "_PridÄ—ti rinkmenÄ…" -#: ../src/vikwindow.c:1953 +#: ../src/vikwindow.c:1950 msgid "Append data from a different file" -msgstr "" +msgstr "PridÄ—ti duomenis iÅ¡ kitos rinkmenos" -#: ../src/vikwindow.c:1954 +#: ../src/vikwindow.c:1951 msgid "A_cquire" -msgstr "" +msgstr "_Gauti duomenis" -#: ../src/vikwindow.c:1955 +#: ../src/vikwindow.c:1952 msgid "From _GPS" -msgstr "" +msgstr "IÅ¡ _GPS" -#: ../src/vikwindow.c:1955 +#: ../src/vikwindow.c:1952 msgid "Transfer data from a GPS device" -msgstr "" +msgstr "Perkelti duomenis iÅ¡ GPS įrenginio" -#: ../src/vikwindow.c:1956 +#: ../src/vikwindow.c:1953 msgid "Google _Directions" -msgstr "" +msgstr "Google _marÅ¡rutai" -#: ../src/vikwindow.c:1956 +#: ../src/vikwindow.c:1953 msgid "Get driving directions from Google" -msgstr "" +msgstr "Gauti iÅ¡ Google kelionÄ—s marÅ¡rutÄ…" -#: ../src/vikwindow.c:1958 +#: ../src/vikwindow.c:1955 msgid "Geo_caches" -msgstr "" +msgstr "Geo_caches" -#: ../src/vikwindow.c:1958 +#: ../src/vikwindow.c:1955 msgid "Get Geocaches from geocaching.com" -msgstr "" +msgstr "Gauti Geocaches iÅ¡ geocaching.com" -#: ../src/vikwindow.c:1960 +#: ../src/vikwindow.c:1957 msgid "_Save" -msgstr "" +msgstr "_IÅ¡saugoti" -#: ../src/vikwindow.c:1960 +#: ../src/vikwindow.c:1957 msgid "Save the file" -msgstr "" +msgstr "IÅ¡saugoti rinkmenÄ…" -#: ../src/vikwindow.c:1961 +#: ../src/vikwindow.c:1958 msgid "Save _As" -msgstr "" +msgstr "IÅ¡saugoti _kaip" -#: ../src/vikwindow.c:1961 +#: ../src/vikwindow.c:1958 msgid "Save the file under different name" -msgstr "" +msgstr "IÅ¡saugoti rinkmenÄ… kitu pavadinimu" -#: ../src/vikwindow.c:1962 +#: ../src/vikwindow.c:1959 msgid "_Generate Image File" -msgstr "" +msgstr "_Sukurti atvaizdo rinkmenÄ…" -#: ../src/vikwindow.c:1962 +#: ../src/vikwindow.c:1959 msgid "Save a snapshot of the workspace into a file" -msgstr "" +msgstr "IÅ¡saugoti darbo aplinkos atvaizdÄ… į rinkmenÄ…" -#: ../src/vikwindow.c:1963 +#: ../src/vikwindow.c:1960 msgid "Generate _Directory of Images" -msgstr "" +msgstr "Sukurti a_tvaizdų aplankalÄ…" -#: ../src/vikwindow.c:1963 +#: ../src/vikwindow.c:1960 msgid "FIXME:IMGDIR" -msgstr "" +msgstr "FIXME:IMGDIR" -#: ../src/vikwindow.c:1966 +#: ../src/vikwindow.c:1963 msgid "_Print..." -msgstr "" +msgstr "_Spausdinti" -#: ../src/vikwindow.c:1966 +#: ../src/vikwindow.c:1963 msgid "Print maps" -msgstr "" +msgstr "Spausdinti žemÄ—lapius" -#: ../src/vikwindow.c:1969 +#: ../src/vikwindow.c:1966 msgid "E_xit" -msgstr "" +msgstr "IÅ¡_eiti" -#: ../src/vikwindow.c:1969 +#: ../src/vikwindow.c:1966 msgid "Exit the program" -msgstr "" +msgstr "IÅ¡eiti iÅ¡ programos" -#: ../src/vikwindow.c:1970 +#: ../src/vikwindow.c:1967 msgid "Save and Exit" -msgstr "" +msgstr "IÅ¡sa_ugoti ir IÅ¡eiti" -#: ../src/vikwindow.c:1970 +#: ../src/vikwindow.c:1967 msgid "Save and Exit the program" -msgstr "" +msgstr "IÅ¡saugoti ir IÅ¡eiti iÅ¡ programos" -#: ../src/vikwindow.c:1972 +#: ../src/vikwindow.c:1969 msgid "Go To location" -msgstr "" +msgstr "Eiti į vietÄ…" -#: ../src/vikwindow.c:1972 +#: ../src/vikwindow.c:1969 msgid "Go to address/place using text search" -msgstr "" +msgstr "Eiti į adresÄ…/vietÄ… naudojant tekstinÄ™ paieÅ¡kÄ…" -#: ../src/vikwindow.c:1973 +#: ../src/vikwindow.c:1970 msgid "_Go to Lat\\/Lon..." -msgstr "" +msgstr "Eiti į PlatumÄ…/IlgumÄ…..." -#: ../src/vikwindow.c:1973 +#: ../src/vikwindow.c:1970 msgid "Go to arbitrary lat\\/lon coordinate" -msgstr "" +msgstr "Eiti į pasirinktas pla\\/ilg koordinates" -#: ../src/vikwindow.c:1974 +#: ../src/vikwindow.c:1971 msgid "Go to UTM..." -msgstr "" +msgstr "Eiti į UTM..." -#: ../src/vikwindow.c:1974 +#: ../src/vikwindow.c:1971 msgid "Go to arbitrary UTM coordinate" -msgstr "" +msgstr "Eiti į pasirinktas UTM koordinates" -#: ../src/vikwindow.c:1975 +#: ../src/vikwindow.c:1972 msgid "Set Background Color..." -msgstr "" +msgstr "Nustatyti fono spalvÄ…..." -#: ../src/vikwindow.c:1976 +#: ../src/vikwindow.c:1973 msgid "Zoom _In" -msgstr "" +msgstr "_Didinti" -#: ../src/vikwindow.c:1977 +#: ../src/vikwindow.c:1974 msgid "Zoom _Out" -msgstr "" +msgstr "M_ažinti" -#: ../src/vikwindow.c:1978 +#: ../src/vikwindow.c:1975 msgid "Zoom _To" -msgstr "" +msgstr "Didinti _iki" -#: ../src/vikwindow.c:1979 +#: ../src/vikwindow.c:1976 msgid "0.25" -msgstr "" +msgstr "0,25" -#: ../src/vikwindow.c:1980 +#: ../src/vikwindow.c:1977 msgid "0.5" -msgstr "" +msgstr "0,5" -#: ../src/vikwindow.c:1981 +#: ../src/vikwindow.c:1978 msgid "1" -msgstr "" +msgstr "1" -#: ../src/vikwindow.c:1982 +#: ../src/vikwindow.c:1979 msgid "2" -msgstr "" +msgstr "2" -#: ../src/vikwindow.c:1983 +#: ../src/vikwindow.c:1980 msgid "4" -msgstr "" +msgstr "4" -#: ../src/vikwindow.c:1984 +#: ../src/vikwindow.c:1981 msgid "8" -msgstr "" +msgstr "8" -#: ../src/vikwindow.c:1985 +#: ../src/vikwindow.c:1982 msgid "16" -msgstr "" +msgstr "16" -#: ../src/vikwindow.c:1986 +#: ../src/vikwindow.c:1983 msgid "32" -msgstr "" +msgstr "32" -#: ../src/vikwindow.c:1987 +#: ../src/vikwindow.c:1984 msgid "64" -msgstr "" +msgstr "64" -#: ../src/vikwindow.c:1988 +#: ../src/vikwindow.c:1985 msgid "128" -msgstr "" +msgstr "128" -#: ../src/vikwindow.c:1989 +#: ../src/vikwindow.c:1986 msgid "Pan North" -msgstr "" +msgstr "Å iaurinÄ— pusÄ—" -#: ../src/vikwindow.c:1990 +#: ../src/vikwindow.c:1987 msgid "Pan East" -msgstr "" +msgstr "RytinÄ— pusÄ—" -#: ../src/vikwindow.c:1991 +#: ../src/vikwindow.c:1988 msgid "Pan South" -msgstr "" +msgstr "PietinÄ— pusÄ—" -#: ../src/vikwindow.c:1992 +#: ../src/vikwindow.c:1989 msgid "Pan West" -msgstr "" +msgstr "VakarinÄ— pusÄ—" -#: ../src/vikwindow.c:1993 +#: ../src/vikwindow.c:1990 msgid "Background _Jobs" -msgstr "" +msgstr "Fono _darbai" -#: ../src/vikwindow.c:1995 +#: ../src/vikwindow.c:1992 msgid "Cu_t" -msgstr "" +msgstr "_IÅ¡kirpti" -#: ../src/vikwindow.c:1996 +#: ../src/vikwindow.c:1993 msgid "_Copy" -msgstr "" +msgstr "_Kopijuoti" -#: ../src/vikwindow.c:1997 +#: ../src/vikwindow.c:1994 msgid "_Paste" -msgstr "" +msgstr "Ä®_terpti" -#: ../src/vikwindow.c:1998 +#: ../src/vikwindow.c:1995 msgid "_Delete" -msgstr "" +msgstr "_IÅ¡trinti" -#: ../src/vikwindow.c:1999 +#: ../src/vikwindow.c:1996 msgid "Delete All" +msgstr "IÅ¡trinti visus" + +#: ../src/vikwindow.c:1997 +msgid "Flush Map cache" msgstr "" -#: ../src/vikwindow.c:2000 +#: ../src/vikwindow.c:1998 msgid "_Preferences..." -msgstr "" +msgstr "_Nustatymai" -#: ../src/vikwindow.c:2001 +#: ../src/vikwindow.c:1999 msgid "_Properties" -msgstr "" +msgstr "_YpatybÄ—s" -#: ../src/vikwindow.c:2003 +#: ../src/vikwindow.c:2001 msgid "_About" -msgstr "" +msgstr "_Apie" -#: ../src/vikwindow.c:2008 +#: ../src/vikwindow.c:2006 msgid "_UTM Mode" -msgstr "" +msgstr "_UTM režimas" -#: ../src/vikwindow.c:2009 +#: ../src/vikwindow.c:2007 msgid "_Expedia Mode" -msgstr "" +msgstr "_Expedia režimas" -#: ../src/vikwindow.c:2010 +#: ../src/vikwindow.c:2008 msgid "_Mercator Mode" -msgstr "" +msgstr "_Merkatorinis režimas" -#: ../src/vikwindow.c:2014 +#: ../src/vikwindow.c:2012 msgid "Pan Tool" -msgstr "" +msgstr "PerkÄ—limo įrankis" -#: ../src/vikwindow.c:2015 +#: ../src/vikwindow.c:2013 msgid "Zoom Tool" -msgstr "" +msgstr "Mastelio įrankis" -#: ../src/vikwindow.c:2016 +#: ../src/vikwindow.c:2014 msgid "_Ruler" -msgstr "" +msgstr "_LiniuotÄ—" -#: ../src/vikwindow.c:2016 +#: ../src/vikwindow.c:2014 msgid "Ruler Tool" -msgstr "" +msgstr "Matavimo įrankis" -#: ../src/vikwindow.c:2020 +#: ../src/vikwindow.c:2018 msgid "Show Scale" -msgstr "" +msgstr "Rodyti padalas" -#: ../src/vikwindow.c:2021 +#: ../src/vikwindow.c:2019 msgid "Show Center Mark" -msgstr "" +msgstr "Rodyti centrinį žymeklį" -#: ../src/vikwindow.c:2022 +#: ../src/vikwindow.c:2020 msgid "Full Screen" -msgstr "" +msgstr "Visas ekranas" -#: ../src/vikwindow.c:2022 +#: ../src/vikwindow.c:2020 msgid "Activate full screen mode" -msgstr "" +msgstr "Viso ekrano režimas" -#: ../src/vikwindow.c:2023 +#: ../src/vikwindow.c:2021 msgid "Show Side Panel" -msgstr "" +msgstr "Rodyti Å¡oninį skydelį" -#: ../src/vikwindow.c:2085 +#: ../src/vikwindow.c:2083 #, c-format msgid "New %s Layer" -msgstr "" +msgstr "Naujas %s sluoksnis" #: ../src/viking.desktop.in.h:1 msgid "GPS Data Manager" -msgstr "" +msgstr "GPS duomenų vedlys" #: ../src/viking.desktop.in.h:2 msgid "Map Based GPS Data Manager (live data capable)." -msgstr "" +msgstr "ŽemÄ—lapiais paremtas GPS duomenų vedlys (duomenys realiu laiku)." #: ../src/viking.desktop.in.h:3 msgid "Viking" -msgstr "" - -#~ msgid "Transparent Google Maps" -#~ msgstr "Permatomi Google žemÄ—lapiai" - -#~ msgid "Google Satellite Images" -#~ msgstr "Google palidovo vaizdas" - -#~ msgid "Google Terrain Maps" -#~ msgstr "Google reljefinis vaizdas" - -#~ msgid "couldn't open temp file %s" -#~ msgstr "negaliu atverti laikinos bylos %s" - -#~ msgid "Failed downloading %s" -#~ msgstr "Klaida atsiunÄiant %s" - -#~ msgid "Failed getting google version numbers" -#~ msgstr "Klaida gaunant google versijos numerius" - -#~ msgid "Old Google Maps" -#~ msgstr "Seni Google žemlapiai" +msgstr "Viking" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: viking\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-04 22:47+0100\n" +"POT-Creation-Date: 2009-08-20 09:50+0200\n" "PO-Revision-Date: 2009-02-04 22:18+0000\n" "Last-Translator: Guilhem Bonnefille <guilhem.bonnefille@gmail.com>\n" "Language-Team: Norwegian Bokmal <nb@li.org>\n" @@ -15,7 +15,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-02-08 13:36+0000\n" +"X-Launchpad-Export-Date: 2009-09-09 20:12+0000\n" "X-Generator: Launchpad (build Unknown)\n" #: ../src/acquire.c:118 @@ -26,28 +26,28 @@ msgstr "Arbeider..." msgid "Error: acquisition failed." msgstr "" -#: ../src/acquire.c:149 ../src/vikgpslayer.c:957 +#: ../src/acquire.c:149 ../src/vikgpslayer.c:953 msgid "Done." msgstr "Ferdig." -#: ../src/acquire.c:326 ../src/vikgpslayer.c:996 +#: ../src/acquire.c:326 ../src/vikgpslayer.c:992 msgid "Status: detecting gpsbabel" msgstr "" -#: ../src/background.c:54 +#: ../src/background.c:57 #, c-format msgid "%d items" msgstr "" -#: ../src/background.c:212 +#: ../src/background.c:224 msgid "Job" msgstr "Jobb" -#: ../src/background.c:216 +#: ../src/background.c:228 msgid "Progress" msgstr "Fremdrift" -#: ../src/background.c:227 +#: ../src/background.c:239 msgid "Viking Background Jobs" msgstr "" @@ -72,7 +72,7 @@ msgid "" "into." msgstr "" -#: ../src/curl_download.c:85 +#: ../src/curl_download.c:94 #, c-format msgid "%s() Curl perform failed: %s" msgstr "" @@ -344,14 +344,14 @@ msgstr "Hentet fra GPS" msgid "using cmdline '%s' and file '%s'\n" msgstr "" -#: ../src/datasource_gps.c:150 ../src/vikgpslayer.c:711 +#: ../src/datasource_gps.c:150 ../src/vikgpslayer.c:707 #, c-format msgid "Downloading %d waypoint..." msgid_plural "Downloading %d waypoints..." msgstr[0] "" msgstr[1] "" -#: ../src/datasource_gps.c:152 ../src/vikgpslayer.c:713 +#: ../src/datasource_gps.c:152 ../src/vikgpslayer.c:709 #, c-format msgid "Downloading %d trackpoint..." msgid_plural "Downloading %d trackpoints..." @@ -368,7 +368,7 @@ msgstr "Lastet ned %d av %d %s..." msgid "Downloaded %d %s." msgstr "Lastet ned %d %s." -#: ../src/datasource_gps.c:185 ../src/vikgpslayer.c:783 +#: ../src/datasource_gps.c:185 ../src/vikgpslayer.c:779 #, c-format msgid "GPS Device: %s" msgstr "GPS-enhet: %s" @@ -381,7 +381,7 @@ msgstr "GPS-protokoll" msgid "Serial Port:" msgstr "" -#: ../src/datasource_gps.c:299 ../src/vikgpslayer.c:1001 +#: ../src/datasource_gps.c:299 ../src/vikgpslayer.c:997 msgid "GPS device: N/A" msgstr "" @@ -412,6 +412,10 @@ msgstr "Nedlastingsfeil: %s" msgid "Draw mode '%s' no more supported" msgstr "" +#: ../src/mapcache.c:63 +msgid "Mapcache memory size (MB):" +msgstr "" + #: ../src/print.c:53 msgid "None" msgstr "Ingen" @@ -454,11 +458,11 @@ msgstr "" msgid "Image S_ize:" msgstr "B_ildestørrelse:" -#: ../src/util.c:75 +#: ../src/util.c:76 msgid "Could not launch web browser." msgstr "Kunne ikke starte nettleser." -#: ../src/util.c:86 +#: ../src/util.c:87 msgid "Could not create new email." msgstr "" @@ -673,11 +677,11 @@ msgstr "Ingen nedlastingskilde valgt. Endre lagegenskaper." msgid "Downloading DEM %s" msgstr "Laster ned DEM %s" -#: ../src/vikfileentry.c:67 +#: ../src/vikfileentry.c:68 msgid "Browse..." msgstr "" -#: ../src/vikfileentry.c:94 +#: ../src/vikfileentry.c:96 msgid "Choose file" msgstr "Velg fil" @@ -790,11 +794,11 @@ msgstr "" msgid "Gpsd Retry Interval (seconds):" msgstr "" -#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:989 +#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:985 msgid "GPS Download" msgstr "GPS-nedlasting" -#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:989 +#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:985 msgid "GPS Upload" msgstr "GPS-opplasting" @@ -802,109 +806,109 @@ msgstr "GPS-opplasting" msgid "GPS Realtime Tracking" msgstr "" -#: ../src/vikgpslayer.c:373 +#: ../src/vikgpslayer.c:371 msgid "Unknown GPS Protocol" msgstr "Ukjent GPS-protokoll" -#: ../src/vikgpslayer.c:379 +#: ../src/vikgpslayer.c:377 msgid "Unknown serial port device" msgstr "" -#: ../src/vikgpslayer.c:444 +#: ../src/vikgpslayer.c:442 #, c-format msgid "%s: unknown parameter" msgstr "%s: ukjent parameter" -#: ../src/vikgpslayer.c:545 +#: ../src/vikgpslayer.c:541 msgid "Upload to GPS" msgstr "Last opp til GPS" -#: ../src/vikgpslayer.c:550 +#: ../src/vikgpslayer.c:546 msgid "Download from GPS" msgstr "Last ned fra GPS" -#: ../src/vikgpslayer.c:568 +#: ../src/vikgpslayer.c:564 msgid "Empty Upload" msgstr "Tøm opplasting" -#: ../src/vikgpslayer.c:573 +#: ../src/vikgpslayer.c:569 msgid "Empty Download" msgstr "Tøm nedlasting" -#: ../src/vikgpslayer.c:578 +#: ../src/vikgpslayer.c:574 msgid "Empty All" msgstr "Tøm alle" -#: ../src/vikgpslayer.c:718 +#: ../src/vikgpslayer.c:714 #, c-format msgid "Uploading %d waypoint..." msgid_plural "Uploading %d waypoints..." msgstr[0] "Laster opp %d waypoint..." -#: ../src/vikgpslayer.c:720 +#: ../src/vikgpslayer.c:716 #, c-format msgid "Uploading %d trackpoint..." msgid_plural "Uploading %d trackpoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:744 +#: ../src/vikgpslayer.c:740 #, c-format msgid "Downloaded %d out of %d waypoint..." msgid_plural "Downloaded %d out of %d waypoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:746 +#: ../src/vikgpslayer.c:742 #, c-format msgid "Downloaded %d out of %d trackpoint..." msgid_plural "Downloaded %d out of %d trackpoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:750 +#: ../src/vikgpslayer.c:746 #, c-format msgid "Uploaded %d out of %d waypoint..." msgid_plural "Uploaded %d out of %d waypoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:752 +#: ../src/vikgpslayer.c:748 #, c-format msgid "Uploaded %d out of %d trackpoint..." msgid_plural "Uploaded %d out of %d trackpoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:759 +#: ../src/vikgpslayer.c:755 #, c-format msgid "Downloaded %d waypoint" msgid_plural "Downloaded %d waypoints" msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:761 +#: ../src/vikgpslayer.c:757 #, c-format msgid "Downloaded %d trackpoint" msgid_plural "Downloaded %d trackpoints" msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:765 +#: ../src/vikgpslayer.c:761 #, c-format msgid "Uploaded %d waypoint" msgid_plural "Uploaded %d waypoints" msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:767 +#: ../src/vikgpslayer.c:763 #, c-format msgid "Uploaded %d trackpoint" msgid_plural "Uploaded %d trackpoints" msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:952 +#: ../src/vikgpslayer.c:948 msgid "Error: couldn't find gpsbabel." msgstr "" @@ -958,7 +962,7 @@ msgid "Map Type:" msgstr "Karttype:" #: ../src/vikmapslayer.c:120 -msgid "Maps Directory (Optional):" +msgid "Maps Directory:" msgstr "" #: ../src/vikmapslayer.c:121 @@ -1003,51 +1007,51 @@ msgid "" "factor" msgstr "" -#: ../src/vikmapslayer.c:924 +#: ../src/vikmapslayer.c:927 #, c-format msgid "Redownloading up to %d %s map..." msgid_plural "Redownloading up to %d %s maps..." msgstr[0] "" msgstr[1] "" -#: ../src/vikmapslayer.c:926 +#: ../src/vikmapslayer.c:929 #, c-format msgid "Redownloading %d %s map..." msgid_plural "Redownloading %d %s maps..." msgstr[0] "" msgstr[1] "" -#: ../src/vikmapslayer.c:930 ../src/vikmapslayer.c:1001 +#: ../src/vikmapslayer.c:933 ../src/vikmapslayer.c:1004 #, c-format msgid "Downloading %d %s map..." msgid_plural "Downloading %d %s maps..." msgstr[0] "Laster ned %d %s kart..." -#: ../src/vikmapslayer.c:1058 +#: ../src/vikmapslayer.c:1061 msgid "Redownload bad map(s)" msgstr "" -#: ../src/vikmapslayer.c:1062 +#: ../src/vikmapslayer.c:1065 msgid "Redownload all map(s)" msgstr "" -#: ../src/vikmapslayer.c:1142 +#: ../src/vikmapslayer.c:1145 #, c-format msgid "" "Wrong drawmode for this map.\n" "Select \"%s\" from View menu and try again." msgstr "" -#: ../src/vikmapslayer.c:1147 +#: ../src/vikmapslayer.c:1150 msgid "Wrong zoom level for this map." msgstr "Feil zoomnviÃ¥ for dette kartet." -#: ../src/vikmapslayer.c:1172 +#: ../src/vikmapslayer.c:1175 msgid "Download Onscreen Maps" msgstr "" #. TODO Add GTK_STOCK_REFRESH icon -#: ../src/vikmapslayer.c:1178 +#: ../src/vikmapslayer.c:1181 msgid "Refresh Onscreen Tiles" msgstr "" @@ -1235,12 +1239,12 @@ msgstr "" msgid "Export Layer" msgstr "Eksporter lag" -#: ../src/viktrwlayer.c:1565 ../src/vikwindow.c:1446 ../src/vikwindow.c:1820 +#: ../src/viktrwlayer.c:1565 ../src/vikwindow.c:1438 ../src/vikwindow.c:1817 #, c-format msgid "The file \"%s\" exists, do you wish to overwrite it?" msgstr "Filen \"%s\" eksisterer. Vil du overskrive den?" -#: ../src/viktrwlayer.c:1575 ../src/vikwindow.c:1464 +#: ../src/viktrwlayer.c:1575 ../src/vikwindow.c:1456 msgid "The filename you requested could not be opened for writing." msgstr "" @@ -1256,71 +1260,71 @@ msgstr "" msgid "Waypoint not found in this layer." msgstr "" -#: ../src/viktrwlayer.c:1724 +#: ../src/viktrwlayer.c:1723 msgid "Goto Center of Layer" msgstr "" -#: ../src/viktrwlayer.c:1729 +#: ../src/viktrwlayer.c:1728 msgid "Goto Waypoint" msgstr "" -#: ../src/viktrwlayer.c:1735 +#: ../src/viktrwlayer.c:1734 msgid "Export layer" msgstr "Eksporter lag" -#: ../src/viktrwlayer.c:1740 +#: ../src/viktrwlayer.c:1739 msgid "Export as GPSPoint" msgstr "Eksporter som GPSPoint" -#: ../src/viktrwlayer.c:1745 +#: ../src/viktrwlayer.c:1744 msgid "Export as GPSMapper" msgstr "Eksporter som GPSMapper" -#: ../src/viktrwlayer.c:1750 +#: ../src/viktrwlayer.c:1749 msgid "Export as GPX" msgstr "Eksporter som GPX" -#: ../src/viktrwlayer.c:1755 ../src/viktrwlayer.c:2794 +#: ../src/viktrwlayer.c:1754 ../src/viktrwlayer.c:2794 msgid "New Waypoint" msgstr "" -#: ../src/viktrwlayer.c:1762 +#: ../src/viktrwlayer.c:1761 msgid "Add Wikipedia Waypoints" msgstr "" -#: ../src/viktrwlayer.c:1767 +#: ../src/viktrwlayer.c:1766 msgid "Within layer bounds" msgstr "" -#: ../src/viktrwlayer.c:1772 +#: ../src/viktrwlayer.c:1771 msgid "Within current view" msgstr "" -#: ../src/viktrwlayer.c:1779 ../src/viktrwlayer.c:2760 +#: ../src/viktrwlayer.c:1778 ../src/viktrwlayer.c:2760 msgid "Upload to OSM" msgstr "Last opp til OSM" -#: ../src/viktrwlayer.c:2290 +#: ../src/viktrwlayer.c:2289 msgid "Failed. This track does not have timestamp" msgstr "" -#: ../src/viktrwlayer.c:2304 +#: ../src/viktrwlayer.c:2303 msgid "Failed. No other track in this layer has timestamp" msgstr "" -#: ../src/viktrwlayer.c:2310 +#: ../src/viktrwlayer.c:2309 msgid "Merge with..." msgstr "" -#: ../src/viktrwlayer.c:2310 +#: ../src/viktrwlayer.c:2309 msgid "Select track to merge with" msgstr "" -#: ../src/viktrwlayer.c:2347 +#: ../src/viktrwlayer.c:2346 msgid "Merge Threshold..." msgstr "" -#: ../src/viktrwlayer.c:2348 +#: ../src/viktrwlayer.c:2347 msgid "Merge when time between tracks less than:" msgstr "" @@ -1396,131 +1400,131 @@ msgstr "" msgid "Use with filter" msgstr "Bruk med filter" -#: ../src/viktrwlayer.c:3736 +#: ../src/viktrwlayer.c:3735 msgid "Could not launch eog to open file." msgstr "Kunne ikke starte eog for Ã¥ Ã¥pne fil." -#: ../src/viktrwlayer.c:3790 +#: ../src/viktrwlayer.c:3789 #, c-format msgid "Creating %d Image Thumbnails..." msgstr "" -#: ../src/viktrwlayer.c:4010 +#: ../src/viktrwlayer.c:4009 msgid "No map layer in use. Create one first" msgstr "Ingen kartlag i bruk. Opprett ett først" -#: ../src/viktrwlayer_propwin.c:658 +#: ../src/viktrwlayer_propwin.c:661 msgid "Failed spliting track. Track unchanged" msgstr "Kunne ikke dele spor. Spor uendret" -#: ../src/viktrwlayer_propwin.c:675 +#: ../src/viktrwlayer_propwin.c:678 msgid "Operation Aborted. Track unchanged" msgstr "Operasjon avbrutt. Spor uendret" -#: ../src/viktrwlayer_propwin.c:729 +#: ../src/viktrwlayer_propwin.c:732 #, c-format msgid "%s - Track Properties" msgstr "%s - Sporegenskaper" -#: ../src/viktrwlayer_propwin.c:734 +#: ../src/viktrwlayer_propwin.c:737 msgid "Split at Marker" msgstr "" -#: ../src/viktrwlayer_propwin.c:735 +#: ../src/viktrwlayer_propwin.c:738 msgid "Split Segments" msgstr "" -#: ../src/viktrwlayer_propwin.c:736 +#: ../src/viktrwlayer_propwin.c:739 msgid "Reverse" msgstr "" -#: ../src/viktrwlayer_propwin.c:737 +#: ../src/viktrwlayer_propwin.c:740 msgid "Delete Dupl." msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Comment:</b>" msgstr "<b>Kommentar:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Track Length:</b>" msgstr "<b>Sporlengde:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Trackpoints:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Segments:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Duplicate Points:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Max Speed:</b>" msgstr "Høyeste hastighet" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Avg. Speed:</b>" msgstr "Snitthastighet" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Avg. Dist. Between TPs:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Elevation Range:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Total Elevation Gain/Loss:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Start:</b>" msgstr "<b>Start:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>End:</b>" msgstr "<b>Slutt:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Duration:</b>" msgstr "<b>Varighet:</b>" -#: ../src/viktrwlayer_propwin.c:788 ../src/viktrwlayer_propwin.c:795 -#: ../src/viktrwlayer_propwin.c:804 ../src/viktrwlayer_propwin.c:811 -#: ../src/viktrwlayer_propwin.c:850 ../src/viktrwlayer_propwin.c:851 -#: ../src/viktrwlayer_propwin.c:852 ../src/viktrwlayer_propwin.c:874 -#: ../src/viktrwlayer_propwin.c:881 +#: ../src/viktrwlayer_propwin.c:791 ../src/viktrwlayer_propwin.c:798 +#: ../src/viktrwlayer_propwin.c:807 ../src/viktrwlayer_propwin.c:814 +#: ../src/viktrwlayer_propwin.c:853 ../src/viktrwlayer_propwin.c:854 +#: ../src/viktrwlayer_propwin.c:855 ../src/viktrwlayer_propwin.c:877 +#: ../src/viktrwlayer_propwin.c:884 #, c-format msgid "No Data" msgstr "Ingen data" -#: ../src/viktrwlayer_propwin.c:847 +#: ../src/viktrwlayer_propwin.c:850 #, c-format msgid "%d minutes" msgstr "%d minutter" -#: ../src/viktrwlayer_propwin.c:870 +#: ../src/viktrwlayer_propwin.c:873 msgid "Statistics" msgstr "Statistikk" -#: ../src/viktrwlayer_propwin.c:875 +#: ../src/viktrwlayer_propwin.c:878 msgid "<b>Track Distance:</b>" msgstr "<b>Spordistanse:</b>" -#: ../src/viktrwlayer_propwin.c:876 +#: ../src/viktrwlayer_propwin.c:879 msgid "Elevation-distance" msgstr "" -#: ../src/viktrwlayer_propwin.c:882 +#: ../src/viktrwlayer_propwin.c:885 msgid "<b>Track Time:</b>" msgstr "<b>Sportid:</b>" -#: ../src/viktrwlayer_propwin.c:883 +#: ../src/viktrwlayer_propwin.c:886 msgid "Speed-time" msgstr "Hastighet-tid" @@ -1560,31 +1564,47 @@ msgstr "<b>Tidsforskjell:</b>" msgid "<b>\"Speed\" Between:</b>" msgstr "<b>\"Hastighet\" mellom:</b>" -#: ../src/viktrwlayer_tpwin.c:117 -msgid "Trackpoint" +#: ../src/viktrwlayer_tpwin.c:110 +msgid "<b>VDOP:</b>" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:111 +msgid "<b>HDOP:</b>" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:112 +msgid "<b>PDOP:</b>" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:113 +msgid "<b>SAT/FIX:</b>" msgstr "" #: ../src/viktrwlayer_tpwin.c:122 +msgid "Trackpoint" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:127 msgid "Split Here" msgstr "Del her" -#: ../src/viktrwlayer_tpwin.c:123 +#: ../src/viktrwlayer_tpwin.c:128 msgid "Join With Last" msgstr "" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Pan" msgstr "Panorér" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Zoom" msgstr "Zoom" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Ruler" msgstr "Linjal" -#: ../src/vikwindow.c:363 +#: ../src/vikwindow.c:364 #, c-format msgid "" "Do you want to save the changes you made to the document \"%s\"?\n" @@ -1595,441 +1615,445 @@ msgstr "" "\n" "Endringene vil gÃ¥ tapt om du ikke lagrer dem." -#: ../src/vikwindow.c:366 ../src/vikwindow.c:1314 +#: ../src/vikwindow.c:367 ../src/vikwindow.c:1306 msgid "Untitled" msgstr "Uten tittel" -#: ../src/vikwindow.c:367 +#: ../src/vikwindow.c:368 msgid "Don't Save" msgstr "Ikke lagre" -#: ../src/vikwindow.c:400 +#: ../src/vikwindow.c:401 msgid "mpp" msgstr "" -#: ../src/vikwindow.c:400 +#: ../src/vikwindow.c:401 msgid "pixelfact" msgstr "" -#: ../src/vikwindow.c:527 +#: ../src/vikwindow.c:528 #, c-format msgid "%s %s %dm" msgstr "" -#: ../src/vikwindow.c:529 +#: ../src/vikwindow.c:530 #, c-format msgid "%s %s" msgstr "%s %s" -#: ../src/vikwindow.c:1113 +#: ../src/vikwindow.c:1105 msgid "You must select a layer to show its properties." msgstr "Du mÃ¥ velge et lag for Ã¥ kunne se dets egenskaper." -#: ../src/vikwindow.c:1129 +#: ../src/vikwindow.c:1121 msgid "You must select a layer to delete." msgstr "Du mÃ¥ velge et lag Ã¥ slette." -#: ../src/vikwindow.c:1347 +#: ../src/vikwindow.c:1339 msgid "The file you requested could not be opened." msgstr "Filen du valgte kunne ikke Ã¥pnes." -#: ../src/vikwindow.c:1390 +#: ../src/vikwindow.c:1382 msgid "Please select a GPS data file to open. " msgstr "Vennligst velg en GPS-datafil Ã¥ Ã¥pne. " -#: ../src/vikwindow.c:1433 +#: ../src/vikwindow.c:1425 msgid "Save as Viking File." msgstr "Lagre som Viking-fil." -#: ../src/vikwindow.c:1667 +#: ../src/vikwindow.c:1664 msgid "" "Viewable region outside allowable pixel size bounds for image. Clipping " "width/height values." msgstr "" -#: ../src/vikwindow.c:1686 +#: ../src/vikwindow.c:1683 #, c-format msgid "Total area: %ldm x %ldm (%.3f sq. km)" msgstr "" #. todo: default for answers inside VikWindow or static (thruout instance) -#: ../src/vikwindow.c:1694 +#: ../src/vikwindow.c:1691 msgid "Save to Image File" msgstr "Lagre til bildefil" -#: ../src/vikwindow.c:1712 +#: ../src/vikwindow.c:1709 msgid "Width (pixels):" msgstr "Bredde (piksler):" -#: ../src/vikwindow.c:1714 +#: ../src/vikwindow.c:1711 msgid "Height (pixels):" msgstr "Høyde (piksler):" -#: ../src/vikwindow.c:1717 +#: ../src/vikwindow.c:1714 msgid "Zoom (meters per pixel):" msgstr "Zoom (meter pr pixel):" -#: ../src/vikwindow.c:1723 +#: ../src/vikwindow.c:1720 msgid "Area in current viewable window" msgstr "" -#: ../src/vikwindow.c:1733 +#: ../src/vikwindow.c:1730 msgid "Save as PNG" msgstr "Lagre som PNG" -#: ../src/vikwindow.c:1734 +#: ../src/vikwindow.c:1731 msgid "Save as JPEG" msgstr "Lagre som JPEG" -#: ../src/vikwindow.c:1754 +#: ../src/vikwindow.c:1751 msgid "East-west image tiles:" msgstr "" -#: ../src/vikwindow.c:1756 +#: ../src/vikwindow.c:1753 msgid "North-south image tiles:" msgstr "" -#: ../src/vikwindow.c:1796 +#: ../src/vikwindow.c:1793 msgid "You must be in UTM mode to use this feature" msgstr "Du mÃ¥ være i UTM-modus for Ã¥ bruke denne funksjonen" -#: ../src/vikwindow.c:1807 +#: ../src/vikwindow.c:1804 msgid "Save Image" msgstr "Lagre bilde" -#: ../src/vikwindow.c:1834 +#: ../src/vikwindow.c:1831 msgid "Choose a directory to hold images" msgstr "Velg en mappe til Ã¥ lagre bilder" -#: ../src/vikwindow.c:1920 +#: ../src/vikwindow.c:1917 msgid "Choose a background color" msgstr "Velg en bakgrunnsfarge" -#: ../src/vikwindow.c:1941 +#: ../src/vikwindow.c:1938 msgid "_File" msgstr "_Fil" -#: ../src/vikwindow.c:1942 +#: ../src/vikwindow.c:1939 msgid "_Edit" msgstr "R_ediger" -#: ../src/vikwindow.c:1943 +#: ../src/vikwindow.c:1940 msgid "_View" msgstr "_Vis" -#: ../src/vikwindow.c:1944 ../src/vikwindow.c:2015 +#: ../src/vikwindow.c:1941 ../src/vikwindow.c:2013 msgid "_Zoom" msgstr "_Zoom" -#: ../src/vikwindow.c:1945 ../src/vikwindow.c:2014 +#: ../src/vikwindow.c:1942 ../src/vikwindow.c:2012 msgid "_Pan" msgstr "" -#: ../src/vikwindow.c:1946 +#: ../src/vikwindow.c:1943 msgid "_Layers" msgstr "_Lag" -#: ../src/vikwindow.c:1947 +#: ../src/vikwindow.c:1944 msgid "_Tools" msgstr "Verk_tøy" -#: ../src/vikwindow.c:1948 +#: ../src/vikwindow.c:1945 msgid "_Webtools" msgstr "" -#: ../src/vikwindow.c:1949 +#: ../src/vikwindow.c:1946 msgid "_Help" msgstr "_Hjelp" -#: ../src/vikwindow.c:1951 +#: ../src/vikwindow.c:1948 msgid "_New" msgstr "_Ny" -#: ../src/vikwindow.c:1951 +#: ../src/vikwindow.c:1948 msgid "New file" msgstr "Ny fil" -#: ../src/vikwindow.c:1952 +#: ../src/vikwindow.c:1949 msgid "_Open" msgstr "_Ã…pne" -#: ../src/vikwindow.c:1952 +#: ../src/vikwindow.c:1949 msgid "Open a file" msgstr "Ã…pne en fil" -#: ../src/vikwindow.c:1953 +#: ../src/vikwindow.c:1950 msgid "A_ppend File" msgstr "" -#: ../src/vikwindow.c:1953 +#: ../src/vikwindow.c:1950 msgid "Append data from a different file" msgstr "" -#: ../src/vikwindow.c:1954 +#: ../src/vikwindow.c:1951 msgid "A_cquire" msgstr "" -#: ../src/vikwindow.c:1955 +#: ../src/vikwindow.c:1952 msgid "From _GPS" msgstr "Fra _GPS" -#: ../src/vikwindow.c:1955 +#: ../src/vikwindow.c:1952 msgid "Transfer data from a GPS device" msgstr "Overfør data fra GPS-enhet" -#: ../src/vikwindow.c:1956 +#: ../src/vikwindow.c:1953 msgid "Google _Directions" msgstr "" -#: ../src/vikwindow.c:1956 +#: ../src/vikwindow.c:1953 msgid "Get driving directions from Google" msgstr "FÃ¥ kjøreanvisninger fra Google" -#: ../src/vikwindow.c:1958 +#: ../src/vikwindow.c:1955 msgid "Geo_caches" msgstr "Geo_cacher" -#: ../src/vikwindow.c:1958 +#: ../src/vikwindow.c:1955 msgid "Get Geocaches from geocaching.com" msgstr "FÃ¥ Geocacher fra geocaching.com" -#: ../src/vikwindow.c:1960 +#: ../src/vikwindow.c:1957 msgid "_Save" msgstr "" -#: ../src/vikwindow.c:1960 +#: ../src/vikwindow.c:1957 msgid "Save the file" msgstr "Lagre filen" -#: ../src/vikwindow.c:1961 +#: ../src/vikwindow.c:1958 msgid "Save _As" msgstr "Lagre _som" -#: ../src/vikwindow.c:1961 +#: ../src/vikwindow.c:1958 msgid "Save the file under different name" msgstr "Lagre filen med et annet navn" -#: ../src/vikwindow.c:1962 +#: ../src/vikwindow.c:1959 msgid "_Generate Image File" msgstr "_Generer bildefil" -#: ../src/vikwindow.c:1962 +#: ../src/vikwindow.c:1959 msgid "Save a snapshot of the workspace into a file" msgstr "" -#: ../src/vikwindow.c:1963 +#: ../src/vikwindow.c:1960 msgid "Generate _Directory of Images" msgstr "" -#: ../src/vikwindow.c:1963 +#: ../src/vikwindow.c:1960 msgid "FIXME:IMGDIR" msgstr "" -#: ../src/vikwindow.c:1966 +#: ../src/vikwindow.c:1963 msgid "_Print..." msgstr "" -#: ../src/vikwindow.c:1966 +#: ../src/vikwindow.c:1963 msgid "Print maps" msgstr "Skriv ut kart" -#: ../src/vikwindow.c:1969 +#: ../src/vikwindow.c:1966 msgid "E_xit" msgstr "" -#: ../src/vikwindow.c:1969 +#: ../src/vikwindow.c:1966 msgid "Exit the program" msgstr "Avslutt programmet" -#: ../src/vikwindow.c:1970 +#: ../src/vikwindow.c:1967 msgid "Save and Exit" msgstr "Lagre og avslutt" -#: ../src/vikwindow.c:1970 +#: ../src/vikwindow.c:1967 msgid "Save and Exit the program" msgstr "Lagre og avslutt programmet" -#: ../src/vikwindow.c:1972 +#: ../src/vikwindow.c:1969 msgid "Go To location" msgstr "" -#: ../src/vikwindow.c:1972 +#: ../src/vikwindow.c:1969 msgid "Go to address/place using text search" msgstr "" -#: ../src/vikwindow.c:1973 +#: ../src/vikwindow.c:1970 msgid "_Go to Lat\\/Lon..." msgstr "" -#: ../src/vikwindow.c:1973 +#: ../src/vikwindow.c:1970 msgid "Go to arbitrary lat\\/lon coordinate" msgstr "" -#: ../src/vikwindow.c:1974 +#: ../src/vikwindow.c:1971 msgid "Go to UTM..." msgstr "GÃ¥ til UTM..." -#: ../src/vikwindow.c:1974 +#: ../src/vikwindow.c:1971 msgid "Go to arbitrary UTM coordinate" msgstr "" -#: ../src/vikwindow.c:1975 +#: ../src/vikwindow.c:1972 msgid "Set Background Color..." msgstr "Velg bakgrunnsfarge" -#: ../src/vikwindow.c:1976 +#: ../src/vikwindow.c:1973 msgid "Zoom _In" msgstr "Zoom _inn" -#: ../src/vikwindow.c:1977 +#: ../src/vikwindow.c:1974 msgid "Zoom _Out" msgstr "Zoom _ut" -#: ../src/vikwindow.c:1978 +#: ../src/vikwindow.c:1975 msgid "Zoom _To" msgstr "Zoom _til" -#: ../src/vikwindow.c:1979 +#: ../src/vikwindow.c:1976 msgid "0.25" msgstr "0.25" -#: ../src/vikwindow.c:1980 +#: ../src/vikwindow.c:1977 msgid "0.5" msgstr "0.5" -#: ../src/vikwindow.c:1981 +#: ../src/vikwindow.c:1978 msgid "1" msgstr "1" -#: ../src/vikwindow.c:1982 +#: ../src/vikwindow.c:1979 msgid "2" msgstr "2" -#: ../src/vikwindow.c:1983 +#: ../src/vikwindow.c:1980 msgid "4" msgstr "4" -#: ../src/vikwindow.c:1984 +#: ../src/vikwindow.c:1981 msgid "8" msgstr "8" -#: ../src/vikwindow.c:1985 +#: ../src/vikwindow.c:1982 msgid "16" msgstr "16" -#: ../src/vikwindow.c:1986 +#: ../src/vikwindow.c:1983 msgid "32" msgstr "32" -#: ../src/vikwindow.c:1987 +#: ../src/vikwindow.c:1984 msgid "64" msgstr "64" -#: ../src/vikwindow.c:1988 +#: ../src/vikwindow.c:1985 msgid "128" msgstr "128" -#: ../src/vikwindow.c:1989 +#: ../src/vikwindow.c:1986 msgid "Pan North" msgstr "" -#: ../src/vikwindow.c:1990 +#: ../src/vikwindow.c:1987 msgid "Pan East" msgstr "" -#: ../src/vikwindow.c:1991 +#: ../src/vikwindow.c:1988 msgid "Pan South" msgstr "" -#: ../src/vikwindow.c:1992 +#: ../src/vikwindow.c:1989 msgid "Pan West" msgstr "" -#: ../src/vikwindow.c:1993 +#: ../src/vikwindow.c:1990 msgid "Background _Jobs" msgstr "Bakgrunns_jobb" -#: ../src/vikwindow.c:1995 +#: ../src/vikwindow.c:1992 msgid "Cu_t" msgstr "Klipp _ut" -#: ../src/vikwindow.c:1996 +#: ../src/vikwindow.c:1993 msgid "_Copy" msgstr "_Kopier" -#: ../src/vikwindow.c:1997 +#: ../src/vikwindow.c:1994 msgid "_Paste" msgstr "_Lim inn" -#: ../src/vikwindow.c:1998 +#: ../src/vikwindow.c:1995 msgid "_Delete" msgstr "Sle_tt" -#: ../src/vikwindow.c:1999 +#: ../src/vikwindow.c:1996 msgid "Delete All" msgstr "Slett alle" -#: ../src/vikwindow.c:2000 +#: ../src/vikwindow.c:1997 +msgid "Flush Map cache" +msgstr "" + +#: ../src/vikwindow.c:1998 msgid "_Preferences..." msgstr "_Innstillinger..." -#: ../src/vikwindow.c:2001 +#: ../src/vikwindow.c:1999 msgid "_Properties" msgstr "_Egenskaper" -#: ../src/vikwindow.c:2003 +#: ../src/vikwindow.c:2001 msgid "_About" msgstr "_Om" -#: ../src/vikwindow.c:2008 +#: ../src/vikwindow.c:2006 msgid "_UTM Mode" msgstr "_UTM-modus" -#: ../src/vikwindow.c:2009 +#: ../src/vikwindow.c:2007 msgid "_Expedia Mode" msgstr "_Expedia-modus" -#: ../src/vikwindow.c:2010 +#: ../src/vikwindow.c:2008 msgid "_Mercator Mode" msgstr "_Mercator-modus" -#: ../src/vikwindow.c:2014 +#: ../src/vikwindow.c:2012 msgid "Pan Tool" msgstr "" -#: ../src/vikwindow.c:2015 +#: ../src/vikwindow.c:2013 msgid "Zoom Tool" msgstr "Zoomverktøy" -#: ../src/vikwindow.c:2016 +#: ../src/vikwindow.c:2014 msgid "_Ruler" msgstr "_Linjal" -#: ../src/vikwindow.c:2016 +#: ../src/vikwindow.c:2014 msgid "Ruler Tool" msgstr "Linjalverktøy" -#: ../src/vikwindow.c:2020 +#: ../src/vikwindow.c:2018 msgid "Show Scale" msgstr "" -#: ../src/vikwindow.c:2021 +#: ../src/vikwindow.c:2019 msgid "Show Center Mark" msgstr "" -#: ../src/vikwindow.c:2022 +#: ../src/vikwindow.c:2020 msgid "Full Screen" msgstr "Fullskjerm" -#: ../src/vikwindow.c:2022 +#: ../src/vikwindow.c:2020 msgid "Activate full screen mode" msgstr "Aktiver fullskjerm" -#: ../src/vikwindow.c:2023 +#: ../src/vikwindow.c:2021 msgid "Show Side Panel" msgstr "" -#: ../src/vikwindow.c:2085 +#: ../src/vikwindow.c:2083 #, c-format msgid "New %s Layer" msgstr "Nytt %s lag" @@ -2045,14 +2069,3 @@ msgstr "" #: ../src/viking.desktop.in.h:3 msgid "Viking" msgstr "Viking" - -#~ msgid "_Google Mode" -#~ msgstr "_Google-modus" - -#, c-format -#~ msgid "couldn't open temp file %s" -#~ msgstr "kunne ikke Ã¥pne tempfil %s" - -#, c-format -#~ msgid "Failed downloading %s" -#~ msgstr "Kunne ikke laste ned %s" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: viking\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-04 22:47+0100\n" +"POT-Creation-Date: 2009-08-20 09:50+0200\n" "PO-Revision-Date: 2008-09-17 06:21+0000\n" "Last-Translator: Guilhem Bonnefille <guilhem.bonnefille@gmail.com>\n" "Language-Team: Dutch <nl@li.org>\n" @@ -15,7 +15,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-02-08 13:36+0000\n" +"X-Launchpad-Export-Date: 2009-09-09 20:12+0000\n" "X-Generator: Launchpad (build Unknown)\n" #: ../src/acquire.c:118 @@ -26,28 +26,28 @@ msgstr "Bezig…" msgid "Error: acquisition failed." msgstr "" -#: ../src/acquire.c:149 ../src/vikgpslayer.c:957 +#: ../src/acquire.c:149 ../src/vikgpslayer.c:953 msgid "Done." msgstr "Klaar." -#: ../src/acquire.c:326 ../src/vikgpslayer.c:996 +#: ../src/acquire.c:326 ../src/vikgpslayer.c:992 msgid "Status: detecting gpsbabel" msgstr "Status: bezig met het waarnemen van gpsbabel" -#: ../src/background.c:54 +#: ../src/background.c:57 #, c-format msgid "%d items" msgstr "%d items" -#: ../src/background.c:212 +#: ../src/background.c:224 msgid "Job" msgstr "Opdracht" -#: ../src/background.c:216 +#: ../src/background.c:228 msgid "Progress" msgstr "Voortgang" -#: ../src/background.c:227 +#: ../src/background.c:239 msgid "Viking Background Jobs" msgstr "Viking achtergrond precessen" @@ -74,7 +74,7 @@ msgstr "" "Selecteert u alstublieft een passende laag om informatie in te plakken om " "een wegpunt te plakken." -#: ../src/curl_download.c:85 +#: ../src/curl_download.c:94 #, c-format msgid "%s() Curl perform failed: %s" msgstr "" @@ -346,14 +346,14 @@ msgstr "" msgid "using cmdline '%s' and file '%s'\n" msgstr "" -#: ../src/datasource_gps.c:150 ../src/vikgpslayer.c:711 +#: ../src/datasource_gps.c:150 ../src/vikgpslayer.c:707 #, c-format msgid "Downloading %d waypoint..." msgid_plural "Downloading %d waypoints..." msgstr[0] "" msgstr[1] "" -#: ../src/datasource_gps.c:152 ../src/vikgpslayer.c:713 +#: ../src/datasource_gps.c:152 ../src/vikgpslayer.c:709 #, c-format msgid "Downloading %d trackpoint..." msgid_plural "Downloading %d trackpoints..." @@ -370,7 +370,7 @@ msgstr "" msgid "Downloaded %d %s." msgstr "" -#: ../src/datasource_gps.c:185 ../src/vikgpslayer.c:783 +#: ../src/datasource_gps.c:185 ../src/vikgpslayer.c:779 #, c-format msgid "GPS Device: %s" msgstr "" @@ -383,7 +383,7 @@ msgstr "" msgid "Serial Port:" msgstr "" -#: ../src/datasource_gps.c:299 ../src/vikgpslayer.c:1001 +#: ../src/datasource_gps.c:299 ../src/vikgpslayer.c:997 msgid "GPS device: N/A" msgstr "" @@ -414,6 +414,10 @@ msgstr "" msgid "Draw mode '%s' no more supported" msgstr "" +#: ../src/mapcache.c:63 +msgid "Mapcache memory size (MB):" +msgstr "" + #: ../src/print.c:53 msgid "None" msgstr "" @@ -456,11 +460,11 @@ msgstr "" msgid "Image S_ize:" msgstr "" -#: ../src/util.c:75 +#: ../src/util.c:76 msgid "Could not launch web browser." msgstr "" -#: ../src/util.c:86 +#: ../src/util.c:87 msgid "Could not create new email." msgstr "" @@ -674,11 +678,11 @@ msgstr "" msgid "Downloading DEM %s" msgstr "" -#: ../src/vikfileentry.c:67 +#: ../src/vikfileentry.c:68 msgid "Browse..." msgstr "" -#: ../src/vikfileentry.c:94 +#: ../src/vikfileentry.c:96 msgid "Choose file" msgstr "" @@ -791,11 +795,11 @@ msgstr "" msgid "Gpsd Retry Interval (seconds):" msgstr "" -#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:989 +#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:985 msgid "GPS Download" msgstr "" -#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:989 +#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:985 msgid "GPS Upload" msgstr "" @@ -803,110 +807,110 @@ msgstr "" msgid "GPS Realtime Tracking" msgstr "" -#: ../src/vikgpslayer.c:373 +#: ../src/vikgpslayer.c:371 msgid "Unknown GPS Protocol" msgstr "" -#: ../src/vikgpslayer.c:379 +#: ../src/vikgpslayer.c:377 msgid "Unknown serial port device" msgstr "" -#: ../src/vikgpslayer.c:444 +#: ../src/vikgpslayer.c:442 #, c-format msgid "%s: unknown parameter" msgstr "" -#: ../src/vikgpslayer.c:545 +#: ../src/vikgpslayer.c:541 msgid "Upload to GPS" msgstr "" -#: ../src/vikgpslayer.c:550 +#: ../src/vikgpslayer.c:546 msgid "Download from GPS" msgstr "" -#: ../src/vikgpslayer.c:568 +#: ../src/vikgpslayer.c:564 msgid "Empty Upload" msgstr "" -#: ../src/vikgpslayer.c:573 +#: ../src/vikgpslayer.c:569 msgid "Empty Download" msgstr "" -#: ../src/vikgpslayer.c:578 +#: ../src/vikgpslayer.c:574 msgid "Empty All" msgstr "" -#: ../src/vikgpslayer.c:718 +#: ../src/vikgpslayer.c:714 #, c-format msgid "Uploading %d waypoint..." msgid_plural "Uploading %d waypoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:720 +#: ../src/vikgpslayer.c:716 #, c-format msgid "Uploading %d trackpoint..." msgid_plural "Uploading %d trackpoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:744 +#: ../src/vikgpslayer.c:740 #, c-format msgid "Downloaded %d out of %d waypoint..." msgid_plural "Downloaded %d out of %d waypoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:746 +#: ../src/vikgpslayer.c:742 #, c-format msgid "Downloaded %d out of %d trackpoint..." msgid_plural "Downloaded %d out of %d trackpoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:750 +#: ../src/vikgpslayer.c:746 #, c-format msgid "Uploaded %d out of %d waypoint..." msgid_plural "Uploaded %d out of %d waypoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:752 +#: ../src/vikgpslayer.c:748 #, c-format msgid "Uploaded %d out of %d trackpoint..." msgid_plural "Uploaded %d out of %d trackpoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:759 +#: ../src/vikgpslayer.c:755 #, c-format msgid "Downloaded %d waypoint" msgid_plural "Downloaded %d waypoints" msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:761 +#: ../src/vikgpslayer.c:757 #, c-format msgid "Downloaded %d trackpoint" msgid_plural "Downloaded %d trackpoints" msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:765 +#: ../src/vikgpslayer.c:761 #, c-format msgid "Uploaded %d waypoint" msgid_plural "Uploaded %d waypoints" msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:767 +#: ../src/vikgpslayer.c:763 #, c-format msgid "Uploaded %d trackpoint" msgid_plural "Uploaded %d trackpoints" msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:952 +#: ../src/vikgpslayer.c:948 msgid "Error: couldn't find gpsbabel." msgstr "Fout: kon gpsbabel niet vinden" @@ -960,7 +964,7 @@ msgid "Map Type:" msgstr "" #: ../src/vikmapslayer.c:120 -msgid "Maps Directory (Optional):" +msgid "Maps Directory:" msgstr "" #: ../src/vikmapslayer.c:121 @@ -1005,52 +1009,52 @@ msgid "" "factor" msgstr "" -#: ../src/vikmapslayer.c:924 +#: ../src/vikmapslayer.c:927 #, c-format msgid "Redownloading up to %d %s map..." msgid_plural "Redownloading up to %d %s maps..." msgstr[0] "" msgstr[1] "" -#: ../src/vikmapslayer.c:926 +#: ../src/vikmapslayer.c:929 #, c-format msgid "Redownloading %d %s map..." msgid_plural "Redownloading %d %s maps..." msgstr[0] "" msgstr[1] "" -#: ../src/vikmapslayer.c:930 ../src/vikmapslayer.c:1001 +#: ../src/vikmapslayer.c:933 ../src/vikmapslayer.c:1004 #, c-format msgid "Downloading %d %s map..." msgid_plural "Downloading %d %s maps..." msgstr[0] "" msgstr[1] "" -#: ../src/vikmapslayer.c:1058 +#: ../src/vikmapslayer.c:1061 msgid "Redownload bad map(s)" msgstr "" -#: ../src/vikmapslayer.c:1062 +#: ../src/vikmapslayer.c:1065 msgid "Redownload all map(s)" msgstr "" -#: ../src/vikmapslayer.c:1142 +#: ../src/vikmapslayer.c:1145 #, c-format msgid "" "Wrong drawmode for this map.\n" "Select \"%s\" from View menu and try again." msgstr "" -#: ../src/vikmapslayer.c:1147 +#: ../src/vikmapslayer.c:1150 msgid "Wrong zoom level for this map." msgstr "" -#: ../src/vikmapslayer.c:1172 +#: ../src/vikmapslayer.c:1175 msgid "Download Onscreen Maps" msgstr "" #. TODO Add GTK_STOCK_REFRESH icon -#: ../src/vikmapslayer.c:1178 +#: ../src/vikmapslayer.c:1181 msgid "Refresh Onscreen Tiles" msgstr "" @@ -1238,12 +1242,12 @@ msgstr "" msgid "Export Layer" msgstr "" -#: ../src/viktrwlayer.c:1565 ../src/vikwindow.c:1446 ../src/vikwindow.c:1820 +#: ../src/viktrwlayer.c:1565 ../src/vikwindow.c:1438 ../src/vikwindow.c:1817 #, c-format msgid "The file \"%s\" exists, do you wish to overwrite it?" msgstr "" -#: ../src/viktrwlayer.c:1575 ../src/vikwindow.c:1464 +#: ../src/viktrwlayer.c:1575 ../src/vikwindow.c:1456 msgid "The filename you requested could not be opened for writing." msgstr "" @@ -1259,71 +1263,71 @@ msgstr "" msgid "Waypoint not found in this layer." msgstr "" -#: ../src/viktrwlayer.c:1724 +#: ../src/viktrwlayer.c:1723 msgid "Goto Center of Layer" msgstr "" -#: ../src/viktrwlayer.c:1729 +#: ../src/viktrwlayer.c:1728 msgid "Goto Waypoint" msgstr "" -#: ../src/viktrwlayer.c:1735 +#: ../src/viktrwlayer.c:1734 msgid "Export layer" msgstr "" -#: ../src/viktrwlayer.c:1740 +#: ../src/viktrwlayer.c:1739 msgid "Export as GPSPoint" msgstr "" -#: ../src/viktrwlayer.c:1745 +#: ../src/viktrwlayer.c:1744 msgid "Export as GPSMapper" msgstr "" -#: ../src/viktrwlayer.c:1750 +#: ../src/viktrwlayer.c:1749 msgid "Export as GPX" msgstr "" -#: ../src/viktrwlayer.c:1755 ../src/viktrwlayer.c:2794 +#: ../src/viktrwlayer.c:1754 ../src/viktrwlayer.c:2794 msgid "New Waypoint" msgstr "" -#: ../src/viktrwlayer.c:1762 +#: ../src/viktrwlayer.c:1761 msgid "Add Wikipedia Waypoints" msgstr "" -#: ../src/viktrwlayer.c:1767 +#: ../src/viktrwlayer.c:1766 msgid "Within layer bounds" msgstr "" -#: ../src/viktrwlayer.c:1772 +#: ../src/viktrwlayer.c:1771 msgid "Within current view" msgstr "" -#: ../src/viktrwlayer.c:1779 ../src/viktrwlayer.c:2760 +#: ../src/viktrwlayer.c:1778 ../src/viktrwlayer.c:2760 msgid "Upload to OSM" msgstr "" -#: ../src/viktrwlayer.c:2290 +#: ../src/viktrwlayer.c:2289 msgid "Failed. This track does not have timestamp" msgstr "" -#: ../src/viktrwlayer.c:2304 +#: ../src/viktrwlayer.c:2303 msgid "Failed. No other track in this layer has timestamp" msgstr "" -#: ../src/viktrwlayer.c:2310 +#: ../src/viktrwlayer.c:2309 msgid "Merge with..." msgstr "" -#: ../src/viktrwlayer.c:2310 +#: ../src/viktrwlayer.c:2309 msgid "Select track to merge with" msgstr "" -#: ../src/viktrwlayer.c:2347 +#: ../src/viktrwlayer.c:2346 msgid "Merge Threshold..." msgstr "" -#: ../src/viktrwlayer.c:2348 +#: ../src/viktrwlayer.c:2347 msgid "Merge when time between tracks less than:" msgstr "" @@ -1399,131 +1403,131 @@ msgstr "" msgid "Use with filter" msgstr "" -#: ../src/viktrwlayer.c:3736 +#: ../src/viktrwlayer.c:3735 msgid "Could not launch eog to open file." msgstr "" -#: ../src/viktrwlayer.c:3790 +#: ../src/viktrwlayer.c:3789 #, c-format msgid "Creating %d Image Thumbnails..." msgstr "" -#: ../src/viktrwlayer.c:4010 +#: ../src/viktrwlayer.c:4009 msgid "No map layer in use. Create one first" msgstr "" -#: ../src/viktrwlayer_propwin.c:658 +#: ../src/viktrwlayer_propwin.c:661 msgid "Failed spliting track. Track unchanged" msgstr "" -#: ../src/viktrwlayer_propwin.c:675 +#: ../src/viktrwlayer_propwin.c:678 msgid "Operation Aborted. Track unchanged" msgstr "" -#: ../src/viktrwlayer_propwin.c:729 +#: ../src/viktrwlayer_propwin.c:732 #, c-format msgid "%s - Track Properties" msgstr "" -#: ../src/viktrwlayer_propwin.c:734 +#: ../src/viktrwlayer_propwin.c:737 msgid "Split at Marker" msgstr "" -#: ../src/viktrwlayer_propwin.c:735 +#: ../src/viktrwlayer_propwin.c:738 msgid "Split Segments" msgstr "" -#: ../src/viktrwlayer_propwin.c:736 +#: ../src/viktrwlayer_propwin.c:739 msgid "Reverse" msgstr "" -#: ../src/viktrwlayer_propwin.c:737 +#: ../src/viktrwlayer_propwin.c:740 msgid "Delete Dupl." msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Comment:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Track Length:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Trackpoints:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Segments:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Duplicate Points:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Max Speed:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Avg. Speed:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Avg. Dist. Between TPs:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Elevation Range:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Total Elevation Gain/Loss:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Start:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>End:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Duration:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:788 ../src/viktrwlayer_propwin.c:795 -#: ../src/viktrwlayer_propwin.c:804 ../src/viktrwlayer_propwin.c:811 -#: ../src/viktrwlayer_propwin.c:850 ../src/viktrwlayer_propwin.c:851 -#: ../src/viktrwlayer_propwin.c:852 ../src/viktrwlayer_propwin.c:874 -#: ../src/viktrwlayer_propwin.c:881 +#: ../src/viktrwlayer_propwin.c:791 ../src/viktrwlayer_propwin.c:798 +#: ../src/viktrwlayer_propwin.c:807 ../src/viktrwlayer_propwin.c:814 +#: ../src/viktrwlayer_propwin.c:853 ../src/viktrwlayer_propwin.c:854 +#: ../src/viktrwlayer_propwin.c:855 ../src/viktrwlayer_propwin.c:877 +#: ../src/viktrwlayer_propwin.c:884 #, c-format msgid "No Data" msgstr "" -#: ../src/viktrwlayer_propwin.c:847 +#: ../src/viktrwlayer_propwin.c:850 #, c-format msgid "%d minutes" msgstr "" -#: ../src/viktrwlayer_propwin.c:870 +#: ../src/viktrwlayer_propwin.c:873 msgid "Statistics" msgstr "" -#: ../src/viktrwlayer_propwin.c:875 +#: ../src/viktrwlayer_propwin.c:878 msgid "<b>Track Distance:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:876 +#: ../src/viktrwlayer_propwin.c:879 msgid "Elevation-distance" msgstr "" -#: ../src/viktrwlayer_propwin.c:882 +#: ../src/viktrwlayer_propwin.c:885 msgid "<b>Track Time:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:883 +#: ../src/viktrwlayer_propwin.c:886 msgid "Speed-time" msgstr "" @@ -1563,31 +1567,47 @@ msgstr "" msgid "<b>\"Speed\" Between:</b>" msgstr "" -#: ../src/viktrwlayer_tpwin.c:117 -msgid "Trackpoint" +#: ../src/viktrwlayer_tpwin.c:110 +msgid "<b>VDOP:</b>" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:111 +msgid "<b>HDOP:</b>" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:112 +msgid "<b>PDOP:</b>" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:113 +msgid "<b>SAT/FIX:</b>" msgstr "" #: ../src/viktrwlayer_tpwin.c:122 +msgid "Trackpoint" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:127 msgid "Split Here" msgstr "" -#: ../src/viktrwlayer_tpwin.c:123 +#: ../src/viktrwlayer_tpwin.c:128 msgid "Join With Last" msgstr "" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Pan" msgstr "" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Zoom" msgstr "" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Ruler" msgstr "" -#: ../src/vikwindow.c:363 +#: ../src/vikwindow.c:364 #, c-format msgid "" "Do you want to save the changes you made to the document \"%s\"?\n" @@ -1595,441 +1615,445 @@ msgid "" "Your changes will be lost if you don't save them." msgstr "" -#: ../src/vikwindow.c:366 ../src/vikwindow.c:1314 +#: ../src/vikwindow.c:367 ../src/vikwindow.c:1306 msgid "Untitled" msgstr "" -#: ../src/vikwindow.c:367 +#: ../src/vikwindow.c:368 msgid "Don't Save" msgstr "" -#: ../src/vikwindow.c:400 +#: ../src/vikwindow.c:401 msgid "mpp" msgstr "" -#: ../src/vikwindow.c:400 +#: ../src/vikwindow.c:401 msgid "pixelfact" msgstr "" -#: ../src/vikwindow.c:527 +#: ../src/vikwindow.c:528 #, c-format msgid "%s %s %dm" msgstr "" -#: ../src/vikwindow.c:529 +#: ../src/vikwindow.c:530 #, c-format msgid "%s %s" msgstr "" -#: ../src/vikwindow.c:1113 +#: ../src/vikwindow.c:1105 msgid "You must select a layer to show its properties." msgstr "" -#: ../src/vikwindow.c:1129 +#: ../src/vikwindow.c:1121 msgid "You must select a layer to delete." msgstr "" -#: ../src/vikwindow.c:1347 +#: ../src/vikwindow.c:1339 msgid "The file you requested could not be opened." msgstr "" -#: ../src/vikwindow.c:1390 +#: ../src/vikwindow.c:1382 msgid "Please select a GPS data file to open. " msgstr "" -#: ../src/vikwindow.c:1433 +#: ../src/vikwindow.c:1425 msgid "Save as Viking File." msgstr "" -#: ../src/vikwindow.c:1667 +#: ../src/vikwindow.c:1664 msgid "" "Viewable region outside allowable pixel size bounds for image. Clipping " "width/height values." msgstr "" -#: ../src/vikwindow.c:1686 +#: ../src/vikwindow.c:1683 #, c-format msgid "Total area: %ldm x %ldm (%.3f sq. km)" msgstr "" #. todo: default for answers inside VikWindow or static (thruout instance) -#: ../src/vikwindow.c:1694 +#: ../src/vikwindow.c:1691 msgid "Save to Image File" msgstr "" -#: ../src/vikwindow.c:1712 +#: ../src/vikwindow.c:1709 msgid "Width (pixels):" msgstr "" -#: ../src/vikwindow.c:1714 +#: ../src/vikwindow.c:1711 msgid "Height (pixels):" msgstr "" -#: ../src/vikwindow.c:1717 +#: ../src/vikwindow.c:1714 msgid "Zoom (meters per pixel):" msgstr "" -#: ../src/vikwindow.c:1723 +#: ../src/vikwindow.c:1720 msgid "Area in current viewable window" msgstr "" -#: ../src/vikwindow.c:1733 +#: ../src/vikwindow.c:1730 msgid "Save as PNG" msgstr "" -#: ../src/vikwindow.c:1734 +#: ../src/vikwindow.c:1731 msgid "Save as JPEG" msgstr "" -#: ../src/vikwindow.c:1754 +#: ../src/vikwindow.c:1751 msgid "East-west image tiles:" msgstr "" -#: ../src/vikwindow.c:1756 +#: ../src/vikwindow.c:1753 msgid "North-south image tiles:" msgstr "" -#: ../src/vikwindow.c:1796 +#: ../src/vikwindow.c:1793 msgid "You must be in UTM mode to use this feature" msgstr "" -#: ../src/vikwindow.c:1807 +#: ../src/vikwindow.c:1804 msgid "Save Image" msgstr "" -#: ../src/vikwindow.c:1834 +#: ../src/vikwindow.c:1831 msgid "Choose a directory to hold images" msgstr "" -#: ../src/vikwindow.c:1920 +#: ../src/vikwindow.c:1917 msgid "Choose a background color" msgstr "" -#: ../src/vikwindow.c:1941 +#: ../src/vikwindow.c:1938 msgid "_File" msgstr "" -#: ../src/vikwindow.c:1942 +#: ../src/vikwindow.c:1939 msgid "_Edit" msgstr "" -#: ../src/vikwindow.c:1943 +#: ../src/vikwindow.c:1940 msgid "_View" msgstr "" -#: ../src/vikwindow.c:1944 ../src/vikwindow.c:2015 +#: ../src/vikwindow.c:1941 ../src/vikwindow.c:2013 msgid "_Zoom" msgstr "" -#: ../src/vikwindow.c:1945 ../src/vikwindow.c:2014 +#: ../src/vikwindow.c:1942 ../src/vikwindow.c:2012 msgid "_Pan" msgstr "" -#: ../src/vikwindow.c:1946 +#: ../src/vikwindow.c:1943 msgid "_Layers" msgstr "" -#: ../src/vikwindow.c:1947 +#: ../src/vikwindow.c:1944 msgid "_Tools" msgstr "" -#: ../src/vikwindow.c:1948 +#: ../src/vikwindow.c:1945 msgid "_Webtools" msgstr "" -#: ../src/vikwindow.c:1949 +#: ../src/vikwindow.c:1946 msgid "_Help" msgstr "" -#: ../src/vikwindow.c:1951 +#: ../src/vikwindow.c:1948 msgid "_New" msgstr "" -#: ../src/vikwindow.c:1951 +#: ../src/vikwindow.c:1948 msgid "New file" msgstr "" -#: ../src/vikwindow.c:1952 +#: ../src/vikwindow.c:1949 msgid "_Open" msgstr "" -#: ../src/vikwindow.c:1952 +#: ../src/vikwindow.c:1949 msgid "Open a file" msgstr "" -#: ../src/vikwindow.c:1953 +#: ../src/vikwindow.c:1950 msgid "A_ppend File" msgstr "" -#: ../src/vikwindow.c:1953 +#: ../src/vikwindow.c:1950 msgid "Append data from a different file" msgstr "" -#: ../src/vikwindow.c:1954 +#: ../src/vikwindow.c:1951 msgid "A_cquire" msgstr "" -#: ../src/vikwindow.c:1955 +#: ../src/vikwindow.c:1952 msgid "From _GPS" msgstr "" -#: ../src/vikwindow.c:1955 +#: ../src/vikwindow.c:1952 msgid "Transfer data from a GPS device" msgstr "" -#: ../src/vikwindow.c:1956 +#: ../src/vikwindow.c:1953 msgid "Google _Directions" msgstr "" -#: ../src/vikwindow.c:1956 +#: ../src/vikwindow.c:1953 msgid "Get driving directions from Google" msgstr "" -#: ../src/vikwindow.c:1958 +#: ../src/vikwindow.c:1955 msgid "Geo_caches" msgstr "" -#: ../src/vikwindow.c:1958 +#: ../src/vikwindow.c:1955 msgid "Get Geocaches from geocaching.com" msgstr "" -#: ../src/vikwindow.c:1960 +#: ../src/vikwindow.c:1957 msgid "_Save" msgstr "" -#: ../src/vikwindow.c:1960 +#: ../src/vikwindow.c:1957 msgid "Save the file" msgstr "" -#: ../src/vikwindow.c:1961 +#: ../src/vikwindow.c:1958 msgid "Save _As" msgstr "" -#: ../src/vikwindow.c:1961 +#: ../src/vikwindow.c:1958 msgid "Save the file under different name" msgstr "" -#: ../src/vikwindow.c:1962 +#: ../src/vikwindow.c:1959 msgid "_Generate Image File" msgstr "" -#: ../src/vikwindow.c:1962 +#: ../src/vikwindow.c:1959 msgid "Save a snapshot of the workspace into a file" msgstr "" -#: ../src/vikwindow.c:1963 +#: ../src/vikwindow.c:1960 msgid "Generate _Directory of Images" msgstr "" -#: ../src/vikwindow.c:1963 +#: ../src/vikwindow.c:1960 msgid "FIXME:IMGDIR" msgstr "" -#: ../src/vikwindow.c:1966 +#: ../src/vikwindow.c:1963 msgid "_Print..." msgstr "" -#: ../src/vikwindow.c:1966 +#: ../src/vikwindow.c:1963 msgid "Print maps" msgstr "" -#: ../src/vikwindow.c:1969 +#: ../src/vikwindow.c:1966 msgid "E_xit" msgstr "" -#: ../src/vikwindow.c:1969 +#: ../src/vikwindow.c:1966 msgid "Exit the program" msgstr "" -#: ../src/vikwindow.c:1970 +#: ../src/vikwindow.c:1967 msgid "Save and Exit" msgstr "" -#: ../src/vikwindow.c:1970 +#: ../src/vikwindow.c:1967 msgid "Save and Exit the program" msgstr "" -#: ../src/vikwindow.c:1972 +#: ../src/vikwindow.c:1969 msgid "Go To location" msgstr "" -#: ../src/vikwindow.c:1972 +#: ../src/vikwindow.c:1969 msgid "Go to address/place using text search" msgstr "" -#: ../src/vikwindow.c:1973 +#: ../src/vikwindow.c:1970 msgid "_Go to Lat\\/Lon..." msgstr "" -#: ../src/vikwindow.c:1973 +#: ../src/vikwindow.c:1970 msgid "Go to arbitrary lat\\/lon coordinate" msgstr "" -#: ../src/vikwindow.c:1974 +#: ../src/vikwindow.c:1971 msgid "Go to UTM..." msgstr "" -#: ../src/vikwindow.c:1974 +#: ../src/vikwindow.c:1971 msgid "Go to arbitrary UTM coordinate" msgstr "" -#: ../src/vikwindow.c:1975 +#: ../src/vikwindow.c:1972 msgid "Set Background Color..." msgstr "" -#: ../src/vikwindow.c:1976 +#: ../src/vikwindow.c:1973 msgid "Zoom _In" msgstr "" -#: ../src/vikwindow.c:1977 +#: ../src/vikwindow.c:1974 msgid "Zoom _Out" msgstr "" -#: ../src/vikwindow.c:1978 +#: ../src/vikwindow.c:1975 msgid "Zoom _To" msgstr "" -#: ../src/vikwindow.c:1979 +#: ../src/vikwindow.c:1976 msgid "0.25" msgstr "" -#: ../src/vikwindow.c:1980 +#: ../src/vikwindow.c:1977 msgid "0.5" msgstr "" -#: ../src/vikwindow.c:1981 +#: ../src/vikwindow.c:1978 msgid "1" msgstr "" -#: ../src/vikwindow.c:1982 +#: ../src/vikwindow.c:1979 msgid "2" msgstr "" -#: ../src/vikwindow.c:1983 +#: ../src/vikwindow.c:1980 msgid "4" msgstr "" -#: ../src/vikwindow.c:1984 +#: ../src/vikwindow.c:1981 msgid "8" msgstr "" -#: ../src/vikwindow.c:1985 +#: ../src/vikwindow.c:1982 msgid "16" msgstr "" -#: ../src/vikwindow.c:1986 +#: ../src/vikwindow.c:1983 msgid "32" msgstr "" -#: ../src/vikwindow.c:1987 +#: ../src/vikwindow.c:1984 msgid "64" msgstr "" -#: ../src/vikwindow.c:1988 +#: ../src/vikwindow.c:1985 msgid "128" msgstr "" -#: ../src/vikwindow.c:1989 +#: ../src/vikwindow.c:1986 msgid "Pan North" msgstr "" -#: ../src/vikwindow.c:1990 +#: ../src/vikwindow.c:1987 msgid "Pan East" msgstr "" -#: ../src/vikwindow.c:1991 +#: ../src/vikwindow.c:1988 msgid "Pan South" msgstr "" -#: ../src/vikwindow.c:1992 +#: ../src/vikwindow.c:1989 msgid "Pan West" msgstr "" -#: ../src/vikwindow.c:1993 +#: ../src/vikwindow.c:1990 msgid "Background _Jobs" msgstr "" -#: ../src/vikwindow.c:1995 +#: ../src/vikwindow.c:1992 msgid "Cu_t" msgstr "" -#: ../src/vikwindow.c:1996 +#: ../src/vikwindow.c:1993 msgid "_Copy" msgstr "" -#: ../src/vikwindow.c:1997 +#: ../src/vikwindow.c:1994 msgid "_Paste" msgstr "" -#: ../src/vikwindow.c:1998 +#: ../src/vikwindow.c:1995 msgid "_Delete" msgstr "" -#: ../src/vikwindow.c:1999 +#: ../src/vikwindow.c:1996 msgid "Delete All" msgstr "" -#: ../src/vikwindow.c:2000 +#: ../src/vikwindow.c:1997 +msgid "Flush Map cache" +msgstr "" + +#: ../src/vikwindow.c:1998 msgid "_Preferences..." msgstr "" -#: ../src/vikwindow.c:2001 +#: ../src/vikwindow.c:1999 msgid "_Properties" msgstr "" -#: ../src/vikwindow.c:2003 +#: ../src/vikwindow.c:2001 msgid "_About" msgstr "" -#: ../src/vikwindow.c:2008 +#: ../src/vikwindow.c:2006 msgid "_UTM Mode" msgstr "" -#: ../src/vikwindow.c:2009 +#: ../src/vikwindow.c:2007 msgid "_Expedia Mode" msgstr "" -#: ../src/vikwindow.c:2010 +#: ../src/vikwindow.c:2008 msgid "_Mercator Mode" msgstr "" -#: ../src/vikwindow.c:2014 +#: ../src/vikwindow.c:2012 msgid "Pan Tool" msgstr "" -#: ../src/vikwindow.c:2015 +#: ../src/vikwindow.c:2013 msgid "Zoom Tool" msgstr "" -#: ../src/vikwindow.c:2016 +#: ../src/vikwindow.c:2014 msgid "_Ruler" msgstr "" -#: ../src/vikwindow.c:2016 +#: ../src/vikwindow.c:2014 msgid "Ruler Tool" msgstr "" -#: ../src/vikwindow.c:2020 +#: ../src/vikwindow.c:2018 msgid "Show Scale" msgstr "" -#: ../src/vikwindow.c:2021 +#: ../src/vikwindow.c:2019 msgid "Show Center Mark" msgstr "" -#: ../src/vikwindow.c:2022 +#: ../src/vikwindow.c:2020 msgid "Full Screen" msgstr "" -#: ../src/vikwindow.c:2022 +#: ../src/vikwindow.c:2020 msgid "Activate full screen mode" msgstr "" -#: ../src/vikwindow.c:2023 +#: ../src/vikwindow.c:2021 msgid "Show Side Panel" msgstr "" -#: ../src/vikwindow.c:2085 +#: ../src/vikwindow.c:2083 #, c-format msgid "New %s Layer" msgstr "" @@ -7,16 +7,16 @@ msgid "" msgstr "" "Project-Id-Version: viking\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-04 22:27+0100\n" -"PO-Revision-Date: 2008-09-17 05:28+0000\n" -"Last-Translator: Guilhem Bonnefille <guilhem.bonnefille@gmail.com>\n" +"POT-Creation-Date: 2009-08-20 09:50+0200\n" +"PO-Revision-Date: 2009-07-20 13:25+0000\n" +"Last-Translator: skrzat <Unknown>\n" "Language-Team: Polish <pl@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2009-02-04 21:00+0000\n" +"X-Launchpad-Export-Date: 2009-09-09 20:12+0000\n" "X-Generator: Launchpad (build Unknown)\n" #: ../src/acquire.c:118 @@ -27,34 +27,34 @@ msgstr "PracujÄ™..." msgid "Error: acquisition failed." msgstr "" -#: ../src/acquire.c:149 ../src/vikgpslayer.c:957 +#: ../src/acquire.c:149 ../src/vikgpslayer.c:953 msgid "Done." msgstr "Wykonano." -#: ../src/acquire.c:326 ../src/vikgpslayer.c:996 +#: ../src/acquire.c:326 ../src/vikgpslayer.c:992 msgid "Status: detecting gpsbabel" msgstr "" -#: ../src/background.c:54 +#: ../src/background.c:57 #, c-format msgid "%d items" -msgstr "" +msgstr "%d elementów" -#: ../src/background.c:212 +#: ../src/background.c:224 msgid "Job" -msgstr "" +msgstr "Zadanie" -#: ../src/background.c:216 +#: ../src/background.c:228 msgid "Progress" msgstr "PostÄ™p" -#: ../src/background.c:227 +#: ../src/background.c:239 msgid "Viking Background Jobs" msgstr "" #: ../src/clipboard.c:84 msgid "paste failed" -msgstr "" +msgstr "bÅ‚Ä…d wstawiania" #: ../src/clipboard.c:94 msgid "wrong clipboard data size" @@ -73,14 +73,14 @@ msgid "" "into." msgstr "" -#: ../src/curl_download.c:85 +#: ../src/curl_download.c:94 #, c-format msgid "%s() Curl perform failed: %s" msgstr "" #: ../src/dialog.c:54 ../src/dialog.c:102 msgid "Go to Lat/Lon" -msgstr "" +msgstr "Idź do szer/dÅ‚ug" #: ../src/dialog.c:66 ../src/dialog.c:230 msgid "Latitude:" @@ -100,15 +100,15 @@ msgstr "" #: ../src/dialog.c:128 msgid "Zone:" -msgstr "" +msgstr "Strefa:" #: ../src/dialog.c:131 msgid "Letter:" -msgstr "" +msgstr "Litera:" #: ../src/dialog.c:192 msgid "Waypoint Properties" -msgstr "" +msgstr "WÅ‚aÅ›ciwoÅ›ci punktu orientacyjnego" #: ../src/dialog.c:218 msgid "Name:" @@ -128,46 +128,46 @@ msgstr "Obraz:" #: ../src/dialog.c:264 msgid "Symbol:" -msgstr "" +msgstr "Symbol:" #: ../src/dialog.c:273 msgid "(none)" -msgstr "" +msgstr "(brak)" #. TODO: other checks (isalpha or whatever ) #: ../src/dialog.c:328 msgid "Please enter a name for the waypoint." -msgstr "" +msgstr "ProszÄ™ wprowadzić nazwÄ™ punktu orientacyjnego." #: ../src/dialog.c:332 #, c-format msgid "The waypoint \"%s\" exists, do you want to overwrite it?" -msgstr "" +msgstr "Punkt orientacyjny \"%s\" istnieje, czy nadpisać go?" #: ../src/dialog.c:462 ../src/geonamessearch.c:301 msgid "Nothing was selected" -msgstr "" +msgstr "Nic nie zaznaczono" #: ../src/dialog.c:470 msgid "Add Track" -msgstr "" +msgstr "Dodaj Å›cieżkÄ™" #: ../src/dialog.c:478 msgid "Track Name:" -msgstr "" +msgstr "Nazwa Å›cieżki:" #: ../src/dialog.c:493 msgid "Please enter a name for the track." -msgstr "" +msgstr "PoszÄ™ podać nazwÄ™ dla Å›cieżki." #: ../src/dialog.c:497 #, c-format msgid "The track \"%s\" exists, do you want to overwrite it?" -msgstr "" +msgstr "Åšcieżka \"%s\" istnieje, czy nadpisać?" #: ../src/dialog.c:559 msgid "Zoom Factors..." -msgstr "" +msgstr "Współczynniki zbliżenia..." #: ../src/dialog.c:573 msgid "Zoom factor (in meters per pixel:" @@ -195,7 +195,7 @@ msgstr "1 godzina" #: ../src/dialog.c:635 msgid "1 day" -msgstr "" +msgstr "1 dzieÅ„" #: ../src/dialog.c:636 msgid "Custom (in minutes):" @@ -228,11 +228,11 @@ msgstr "" #: ../src/dialog.c:728 msgid "Map type:" -msgstr "" +msgstr "Typ mapy:" #: ../src/dialog.c:733 msgid "Zoom level:" -msgstr "" +msgstr "Poziom zbliżenia:" #: ../src/expedia.c:51 msgid "Expedia Street Maps" @@ -260,19 +260,19 @@ msgstr "" #: ../src/geonamessearch.c:151 ../src/googlesearch.c:68 #: ../src/googlesearch.c:86 msgid "Search" -msgstr "" +msgstr "Szukaj" #: ../src/geonamessearch.c:119 msgid "No entries found!" -msgstr "" +msgstr "Nie znaleziono wpisów!" #: ../src/geonamessearch.c:135 ../src/googlesearch.c:70 msgid "I don't know that place. Do you want another search?" -msgstr "" +msgstr "Nie znam tego miejsca. Czy chcesz wyszukać inne?" #: ../src/geonamessearch.c:153 ../src/googlesearch.c:88 msgid "Enter address or place name:" -msgstr "" +msgstr "Wprowadź adres lub nazwÄ™ miejsca:" #: ../src/geonamessearch.c:327 ../src/googlesearch.c:127 msgid "couldn't map temp file" @@ -280,16 +280,16 @@ msgstr "" #: ../src/geonamessearch.c:509 ../src/googlesearch.c:200 msgid "couldn't open temp file" -msgstr "" +msgstr "nie można otworzyć pliku tymczasowego" #: ../src/globals.c:41 msgid "Degree format:" -msgstr "" +msgstr "Format stopni:" #. Webtools #: ../src/google.c:34 msgid "Google" -msgstr "" +msgstr "Google" #: ../src/datasource_gc.c:62 msgid "Download Geocaches" @@ -301,11 +301,11 @@ msgstr "" #: ../src/datasource_gc.c:78 msgid "geocaching.com username:" -msgstr "" +msgstr "Użytkownik geocaching.com:" #: ../src/datasource_gc.c:79 msgid "geocaching.com password:" -msgstr "" +msgstr "HasÅ‚o geocaching.com:" #: ../src/datasource_gc.c:107 msgid "" @@ -326,33 +326,34 @@ msgstr "" #: ../src/datasource_google.c:74 msgid "From:" -msgstr "" +msgstr "Z:" #: ../src/datasource_google.c:76 msgid "To:" -msgstr "" +msgstr "Do:" #: ../src/datasource_gps.c:48 msgid "Acquire from GPS" -msgstr "" +msgstr "Pobierz z GPS" #: ../src/datasource_gps.c:49 msgid "Acquired from GPS" -msgstr "" +msgstr "Pobrano z GPS" #: ../src/datasource_gps.c:133 #, c-format msgid "using cmdline '%s' and file '%s'\n" msgstr "" -#: ../src/datasource_gps.c:150 ../src/vikgpslayer.c:711 +#: ../src/datasource_gps.c:150 ../src/vikgpslayer.c:707 #, c-format msgid "Downloading %d waypoint..." msgid_plural "Downloading %d waypoints..." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Pobieranie %d punktu poÅ›redniego..." +msgstr[1] "Pobieranie %d punktów poÅ›rednich..." +msgstr[2] "Pobieranie %d punktów poÅ›rednich..." -#: ../src/datasource_gps.c:152 ../src/vikgpslayer.c:713 +#: ../src/datasource_gps.c:152 ../src/vikgpslayer.c:709 #, c-format msgid "Downloading %d trackpoint..." msgid_plural "Downloading %d trackpoints..." @@ -362,37 +363,37 @@ msgstr[1] "" #: ../src/datasource_gps.c:170 #, c-format msgid "Downloaded %d out of %d %s..." -msgstr "" +msgstr "Pobrano %d z %d %s..." #: ../src/datasource_gps.c:172 #, c-format msgid "Downloaded %d %s." -msgstr "" +msgstr "Pobrano %d %s." -#: ../src/datasource_gps.c:185 ../src/vikgpslayer.c:783 +#: ../src/datasource_gps.c:185 ../src/vikgpslayer.c:779 #, c-format msgid "GPS Device: %s" -msgstr "" +msgstr "UrzÄ…dzenie GPS: %s" #: ../src/datasource_gps.c:262 ../src/vikgpslayer.c:133 msgid "GPS Protocol:" -msgstr "" +msgstr "Protokół GPS:" #: ../src/datasource_gps.c:269 ../src/vikgpslayer.c:134 msgid "Serial Port:" -msgstr "" +msgstr "Port szeregowy:" -#: ../src/datasource_gps.c:299 ../src/vikgpslayer.c:1001 +#: ../src/datasource_gps.c:299 ../src/vikgpslayer.c:997 msgid "GPS device: N/A" -msgstr "" +msgstr "UrzÄ…dzenie GPS: N/A" #: ../src/dem.c:59 ../src/dem.c:73 msgid "Invalid DEM" -msgstr "" +msgstr "NieprawidÅ‚owy DEM" #: ../src/dem.c:115 msgid "Invalid DEM header" -msgstr "" +msgstr "NieprawidÅ‚owy nagłówek DEM" #: ../src/dem.c:184 ../src/dem.c:197 msgid "Incorrect DEM Class B record: expected 1" @@ -406,41 +407,45 @@ msgstr "" #: ../src/download.c:121 #, c-format msgid "Download error: %s" -msgstr "" +msgstr "BÅ‚Ä…d pobierania: %s" #: ../src/file.c:426 ../src/file.c:430 #, c-format msgid "Draw mode '%s' no more supported" msgstr "" +#: ../src/mapcache.c:63 +msgid "Mapcache memory size (MB):" +msgstr "" + #: ../src/print.c:53 msgid "None" -msgstr "" +msgstr "Å»aden" #: ../src/print.c:54 msgid "Horizontally" -msgstr "" +msgstr "Poziomo" #: ../src/print.c:55 msgid "Vertically" -msgstr "" +msgstr "Pionowo" #: ../src/print.c:56 msgid "Both" -msgstr "" +msgstr "Obydwa" #: ../src/print.c:120 msgid "Image Settings" -msgstr "" +msgstr "Ustawienia obrazu" #: ../src/print.c:550 msgid "done" -msgstr "" +msgstr "wykonano" #. Page Size #: ../src/print.c:579 msgid "_Adjust Page Size and Orientation" -msgstr "" +msgstr "_Dopasuj rozmiar i orientacjÄ™ strony" #: ../src/print.c:595 msgid "C_enter:" @@ -449,23 +454,23 @@ msgstr "" #. ignore page margins #: ../src/print.c:613 msgid "Ignore Page _Margins" -msgstr "" +msgstr "Ignoruj _marginesy strony" #: ../src/print.c:632 msgid "Image S_ize:" -msgstr "" +msgstr "_Rozmiar obrazu:" -#: ../src/util.c:75 +#: ../src/util.c:76 msgid "Could not launch web browser." -msgstr "" +msgstr "Nie można otworzyć przeglÄ…darki internetowej." -#: ../src/util.c:86 +#: ../src/util.c:87 msgid "Could not create new email." -msgstr "" +msgstr "Nie można utworzyć nowej wiadomoÅ›ci." #: ../src/vikcoordlayer.c:46 ../src/vikdemlayer.c:110 msgid "Color:" -msgstr "" +msgstr "Kolor:" #: ../src/vikcoordlayer.c:47 msgid "Minutes Width:" @@ -473,11 +478,11 @@ msgstr "" #: ../src/vikcoordlayer.c:48 ../src/vikdemlayer.c:113 msgid "Line Thickness:" -msgstr "" +msgstr "Grubość linii:" #: ../src/datasource_bfilter.c:46 msgid "Max number of points:" -msgstr "" +msgstr "Maksymalna liczba punktów:" #: ../src/datasource_bfilter.c:54 msgid "Simplify All Tracks" @@ -489,7 +494,7 @@ msgstr "" #: ../src/datasource_bfilter.c:87 ../src/datasource_bfilter.c:88 msgid "Remove Duplicate Waypoints" -msgstr "" +msgstr "UsuÅ„ powielone punkty orientacyjne" #: ../src/datasource_bfilter.c:117 msgid "Waypoints Inside This" @@ -517,15 +522,15 @@ msgstr "" #: ../src/main.c:119 msgid "Show version" -msgstr "" +msgstr "Pokaż wersjÄ™" #: ../src/osm.c:85 msgid "OSM (view)" -msgstr "" +msgstr "OSM (podglÄ…d)" #: ../src/osm.c:89 msgid "OSM (edit)" -msgstr "" +msgstr "OSM (edycja)" #: ../src/osm.c:93 msgid "OSM (render)" @@ -533,11 +538,11 @@ msgstr "" #: ../src/osm-traces.c:77 msgid "OSM username:" -msgstr "" +msgstr "Nazwa użytkownika OSM:" #: ../src/osm-traces.c:78 msgid "OSM password:" -msgstr "" +msgstr "HasÅ‚o OSM:" #: ../src/osm-traces.c:218 #, c-format @@ -557,7 +562,7 @@ msgstr "" #: ../src/osm-traces.c:253 #, c-format msgid "failed to open temporary file: %s" -msgstr "" +msgstr "bÅ‚Ä…d otwarcia pliku tymczasowego: %s" #: ../src/osm-traces.c:287 #, c-format @@ -570,57 +575,60 @@ msgstr "" #: ../src/osm-traces.c:322 msgid "Email:" -msgstr "" +msgstr "Email:" #: ../src/osm-traces.c:335 msgid "The email used as login" -msgstr "" +msgstr "Adres email używany do logowania" #: ../src/osm-traces.c:336 msgid "Enter the email you use to login into www.openstreetmap.org." msgstr "" +"Wprowadź adres email, który używasz do logowania na www.openstreetmap.org." #: ../src/osm-traces.c:338 msgid "Password:" -msgstr "" +msgstr "HasÅ‚o:" #: ../src/osm-traces.c:351 msgid "The password used to login" -msgstr "" +msgstr "HasÅ‚o używane do logowania" #: ../src/osm-traces.c:352 msgid "Enter the password you use to login into www.openstreetmap.org." -msgstr "" +msgstr "Wprowadź hasÅ‚o, które używasz do logowania na www.openstreetmap.org." #: ../src/osm-traces.c:354 msgid "File's name:" -msgstr "" +msgstr "Nazwa pliku:" #: ../src/osm-traces.c:366 msgid "The name of the file on OSM" -msgstr "" +msgstr "Nazwa pliku w OSM" #: ../src/osm-traces.c:367 msgid "" "This is the name of the file created on the server. This is not the name of " "the local file." msgstr "" +"Jest to nazwa pliku utworzonego na serwerze. Nie jest to nazwa dla lokalnego " +"pliku." #: ../src/osm-traces.c:370 msgid "Description:" -msgstr "" +msgstr "Opis:" #: ../src/osm-traces.c:377 msgid "The description of the trace" -msgstr "" +msgstr "Opis Å›ladu" #: ../src/osm-traces.c:380 msgid "Tags:" -msgstr "" +msgstr "Etykiety:" #: ../src/osm-traces.c:387 msgid "The tags associated to the trace" -msgstr "" +msgstr "Etykiety zwiÄ…zane ze Å›ladem" #: ../src/osm-traces.c:390 msgid "Public" @@ -638,10 +646,12 @@ msgstr "" #: ../src/uibuilder.c:134 msgid "Take care that this password will be stored clearly in a plain file." msgstr "" +"Musisz mieć na uwadze, że to hasÅ‚o bÄ™dzie przechowywane w czystej formie w " +"zwykÅ‚ym pliku" #: ../src/vikdemlayer.c:108 msgid "DEM Files:" -msgstr "" +msgstr "Pliki DEM:" #: ../src/vikdemlayer.c:109 msgid "Download Source:" @@ -649,15 +659,15 @@ msgstr "" #: ../src/vikdemlayer.c:111 msgid "Min Elev:" -msgstr "" +msgstr "Min wys:" #: ../src/vikdemlayer.c:112 msgid "Max Elev:" -msgstr "" +msgstr "Maks wys:" #: ../src/vikdemlayer.c:124 msgid "DEM Download/Import" -msgstr "" +msgstr "Pobierz/Importuj DEM" #: ../src/vikdemlayer.c:754 #, c-format @@ -671,27 +681,27 @@ msgstr "" #: ../src/vikdemlayer.c:1015 #, c-format msgid "Downloading DEM %s" -msgstr "" +msgstr "Pobieranie DEM %s" -#: ../src/vikfileentry.c:67 +#: ../src/vikfileentry.c:68 msgid "Browse..." -msgstr "" +msgstr "PrzeglÄ…daj..." -#: ../src/vikfileentry.c:94 +#: ../src/vikfileentry.c:96 msgid "Choose file" -msgstr "" +msgstr "Wskaż plik" #: ../src/vikfilelist.c:47 msgid "Choose file(s)" -msgstr "" +msgstr "Wskaż plik(i)" #: ../src/vikfilelist.c:126 msgid "Add..." -msgstr "" +msgstr "Dodaj..." #: ../src/vikfilelist.c:127 msgid "Delete" -msgstr "" +msgstr "Skasuj" #: ../src/vikgeoreflayer.c:66 msgid "Georef Move Map" @@ -704,35 +714,35 @@ msgstr "" #: ../src/vikgeoreflayer.c:268 ../src/vikmapslayer.c:544 #, c-format msgid "Couldn't open image file: %s" -msgstr "" +msgstr "Nie można otworzyć pliku obrazu: %s" #: ../src/vikgeoreflayer.c:293 msgid "Unexpected end of file reading World file." -msgstr "" +msgstr "Nieoczekiwany koniec pliku World" #: ../src/vikgeoreflayer.c:309 ../src/vikgeoreflayer.c:354 msgid "Choose World file" -msgstr "" +msgstr "Wskaż plik World" #: ../src/vikgeoreflayer.c:322 msgid "The World file you requested could not be opened for reading." -msgstr "" +msgstr "Plik World, który wskazaÅ‚eÅ› nie może być otwarty do odczytu." #: ../src/vikgeoreflayer.c:367 msgid "The file you requested could not be opened for writing." -msgstr "" +msgstr "Plik, który wskazaÅ‚eÅ› nie może być otwarty do zapisu." #: ../src/vikgeoreflayer.c:384 msgid "Layer Properties" -msgstr "" +msgstr "WÅ‚aÅ›ciwoÅ›ci warstwy" #: ../src/vikgeoreflayer.c:400 msgid "World File Parameters:" -msgstr "" +msgstr "Parametry pliku World:" #: ../src/vikgeoreflayer.c:401 msgid "Load From File..." -msgstr "" +msgstr "Åaduj z pliku..." #: ../src/vikgeoreflayer.c:406 msgid "Corner pixel easting:" @@ -764,19 +774,19 @@ msgstr "" #: ../src/vikgeoreflayer.c:532 msgid "Export to World File" -msgstr "" +msgstr "Eksportuj plik World" #: ../src/vikgpslayer.c:137 msgid "Recording tracks" -msgstr "" +msgstr "Nagrywanie Å›cieżek" #: ../src/vikgpslayer.c:138 msgid "Jump to current position on start" -msgstr "" +msgstr "Skocz do aktualnej pozycji przy starcie" #: ../src/vikgpslayer.c:139 msgid "Moving Map Method:" -msgstr "" +msgstr "Metoda przesuwania mapy:" #: ../src/vikgpslayer.c:140 msgid "Gpsd Host:" @@ -790,11 +800,11 @@ msgstr "" msgid "Gpsd Retry Interval (seconds):" msgstr "" -#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:989 +#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:985 msgid "GPS Download" msgstr "" -#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:989 +#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:985 msgid "GPS Upload" msgstr "" @@ -802,132 +812,134 @@ msgstr "" msgid "GPS Realtime Tracking" msgstr "" -#: ../src/vikgpslayer.c:373 +#: ../src/vikgpslayer.c:371 msgid "Unknown GPS Protocol" -msgstr "" +msgstr "Nieznany protokół GPS" -#: ../src/vikgpslayer.c:379 +#: ../src/vikgpslayer.c:377 msgid "Unknown serial port device" -msgstr "" +msgstr "Nieznany port szeregowy urzÄ…dzenia" -#: ../src/vikgpslayer.c:444 +#: ../src/vikgpslayer.c:442 #, c-format msgid "%s: unknown parameter" -msgstr "" +msgstr "%s: nieznany parametr" -#: ../src/vikgpslayer.c:545 +#: ../src/vikgpslayer.c:541 msgid "Upload to GPS" msgstr "" -#: ../src/vikgpslayer.c:550 +#: ../src/vikgpslayer.c:546 msgid "Download from GPS" -msgstr "" +msgstr "Pobierz z GPS" -#: ../src/vikgpslayer.c:568 +#: ../src/vikgpslayer.c:564 msgid "Empty Upload" msgstr "" -#: ../src/vikgpslayer.c:573 +#: ../src/vikgpslayer.c:569 msgid "Empty Download" msgstr "" -#: ../src/vikgpslayer.c:578 +#: ../src/vikgpslayer.c:574 msgid "Empty All" -msgstr "" +msgstr "Wyczyść wszystko" -#: ../src/vikgpslayer.c:718 +#: ../src/vikgpslayer.c:714 #, c-format msgid "Uploading %d waypoint..." msgid_plural "Uploading %d waypoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:720 +#: ../src/vikgpslayer.c:716 #, c-format msgid "Uploading %d trackpoint..." msgid_plural "Uploading %d trackpoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:744 +#: ../src/vikgpslayer.c:740 #, c-format msgid "Downloaded %d out of %d waypoint..." msgid_plural "Downloaded %d out of %d waypoints..." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Pobrano %d z %d punktu orientacyjnego..." +msgstr[1] "Pobrano %d z %d punktów orientacyjnych..." +msgstr[2] "Pobrano %d z %d punktów orientacyjnych..." -#: ../src/vikgpslayer.c:746 +#: ../src/vikgpslayer.c:742 #, c-format msgid "Downloaded %d out of %d trackpoint..." msgid_plural "Downloaded %d out of %d trackpoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:750 +#: ../src/vikgpslayer.c:746 #, c-format msgid "Uploaded %d out of %d waypoint..." msgid_plural "Uploaded %d out of %d waypoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:752 +#: ../src/vikgpslayer.c:748 #, c-format msgid "Uploaded %d out of %d trackpoint..." msgid_plural "Uploaded %d out of %d trackpoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:759 +#: ../src/vikgpslayer.c:755 #, c-format msgid "Downloaded %d waypoint" msgid_plural "Downloaded %d waypoints" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Pobrano %d punkt orientacyjny" +msgstr[1] "Pobrano %d punktów orientacyjnych" +msgstr[2] "Pobrano %d punktów orientacyjnych" -#: ../src/vikgpslayer.c:761 +#: ../src/vikgpslayer.c:757 #, c-format msgid "Downloaded %d trackpoint" msgid_plural "Downloaded %d trackpoints" msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:765 +#: ../src/vikgpslayer.c:761 #, c-format msgid "Uploaded %d waypoint" msgid_plural "Uploaded %d waypoints" msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:767 +#: ../src/vikgpslayer.c:763 #, c-format msgid "Uploaded %d trackpoint" msgid_plural "Uploaded %d trackpoints" msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:952 +#: ../src/vikgpslayer.c:948 msgid "Error: couldn't find gpsbabel." msgstr "" #: ../src/viklayerspanel.c:59 msgid "/C_ut" -msgstr "" +msgstr "/Wytnij" #: ../src/viklayerspanel.c:60 msgid "/_Copy" -msgstr "" +msgstr "/_Kopiuj" #: ../src/viklayerspanel.c:61 msgid "/_Paste" -msgstr "" +msgstr "/_Wklej" #: ../src/viklayerspanel.c:62 msgid "/_Delete" -msgstr "" +msgstr "/_Skasuj" #: ../src/viklayerspanel.c:63 msgid "/New Layer" -msgstr "" +msgstr "/Nowa warstwa" #: ../src/viklayerspanel.c:152 msgid "Top Layer" @@ -947,7 +959,7 @@ msgstr "" #: ../src/viklayerspanel.c:676 msgid "Are you sure you wish to delete all layers?" -msgstr "" +msgstr "Czy na pewno skasować wszystkie warstwy?" #. ******* MAPZOOMS ******** #: ../src/vikmapslayer.c:88 @@ -956,10 +968,10 @@ msgstr "" #: ../src/vikmapslayer.c:119 msgid "Map Type:" -msgstr "" +msgstr "Typ mapy:" #: ../src/vikmapslayer.c:120 -msgid "Maps Directory (Optional):" +msgid "Maps Directory:" msgstr "" #: ../src/vikmapslayer.c:121 @@ -972,7 +984,7 @@ msgstr "" #: ../src/vikmapslayer.c:123 msgid "Zoom Level:" -msgstr "" +msgstr "Poziom zbliżenia:" #: ../src/vikmapslayer.c:129 msgid "Maps Download" @@ -980,11 +992,11 @@ msgstr "" #: ../src/vikmapslayer.c:135 msgid "Map" -msgstr "" +msgstr "Mapa" #: ../src/vikmapslayer.c:388 msgid "Unknown map type" -msgstr "" +msgstr "Nieznany typ mapy" #: ../src/vikmapslayer.c:398 msgid "Unknown Map Zoom" @@ -1004,79 +1016,80 @@ msgid "" "factor" msgstr "" -#: ../src/vikmapslayer.c:924 +#: ../src/vikmapslayer.c:927 #, c-format msgid "Redownloading up to %d %s map..." msgid_plural "Redownloading up to %d %s maps..." msgstr[0] "" msgstr[1] "" -#: ../src/vikmapslayer.c:926 +#: ../src/vikmapslayer.c:929 #, c-format msgid "Redownloading %d %s map..." msgid_plural "Redownloading %d %s maps..." msgstr[0] "" msgstr[1] "" -#: ../src/vikmapslayer.c:930 ../src/vikmapslayer.c:1001 +#: ../src/vikmapslayer.c:933 ../src/vikmapslayer.c:1004 #, c-format msgid "Downloading %d %s map..." msgid_plural "Downloading %d %s maps..." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Pobieranie %d %s mapy..." +msgstr[1] "Pobieranie %d %s map..." +msgstr[2] "Pobieranie %d %s map..." -#: ../src/vikmapslayer.c:1058 +#: ../src/vikmapslayer.c:1061 msgid "Redownload bad map(s)" -msgstr "" +msgstr "Pobierz ponownie zÅ‚e mapy" -#: ../src/vikmapslayer.c:1062 +#: ../src/vikmapslayer.c:1065 msgid "Redownload all map(s)" -msgstr "" +msgstr "Pobierz ponownie wszystkie mapy" -#: ../src/vikmapslayer.c:1142 +#: ../src/vikmapslayer.c:1145 #, c-format msgid "" "Wrong drawmode for this map.\n" "Select \"%s\" from View menu and try again." msgstr "" -#: ../src/vikmapslayer.c:1147 +#: ../src/vikmapslayer.c:1150 msgid "Wrong zoom level for this map." msgstr "" -#: ../src/vikmapslayer.c:1172 +#: ../src/vikmapslayer.c:1175 msgid "Download Onscreen Maps" msgstr "" #. TODO Add GTK_STOCK_REFRESH icon -#: ../src/vikmapslayer.c:1178 +#: ../src/vikmapslayer.c:1181 msgid "Refresh Onscreen Tiles" msgstr "" #: ../src/viktreeview.c:203 msgid "Layer Name" -msgstr "" +msgstr "Nazwa warstwy" #: ../src/viktreeview.c:624 #, c-format msgid "delete data from %s\n" -msgstr "" +msgstr "usuÅ„ dane z %s\n" #: ../src/viktrwlayer.c:307 msgid "Create Waypoint" -msgstr "" +msgstr "Utwórz punkt orientacyjny" #: ../src/viktrwlayer.c:310 msgid "Create Track" -msgstr "" +msgstr "Utwórz Å›cieżkÄ™" #: ../src/viktrwlayer.c:314 msgid "Begin Track" -msgstr "" +msgstr "Rozpocznij Å›cieżkÄ™" #: ../src/viktrwlayer.c:317 msgid "Edit Waypoint" -msgstr "" +msgstr "Edytuj punkt orientacyjny" #: ../src/viktrwlayer.c:322 msgid "Edit Trackpoint" @@ -1084,22 +1097,22 @@ msgstr "" #: ../src/viktrwlayer.c:327 msgid "Show Picture" -msgstr "" +msgstr "Pokaż zdjÄ™cie" #: ../src/viktrwlayer.c:330 msgid "Magic Scissors" -msgstr "" +msgstr "Magiczne nożyczki" #. ***** PARAMETERS ***** #: ../src/viktrwlayer.c:337 ../src/viktrwlayer.c:1399 #: ../src/viktrwlayer.c:1401 msgid "Waypoints" -msgstr "" +msgstr "Punkty orientacyjne" #: ../src/viktrwlayer.c:337 ../src/viktrwlayer.c:1389 #: ../src/viktrwlayer.c:1391 msgid "Tracks" -msgstr "" +msgstr "Åšcieżki" #: ../src/viktrwlayer.c:337 msgid "Waypoint Images" @@ -1107,27 +1120,27 @@ msgstr "" #: ../src/viktrwlayer.c:340 msgid "Draw by Track" -msgstr "" +msgstr "Rysuj wg Å›cieżki" #: ../src/viktrwlayer.c:340 msgid "Draw by Velocity" -msgstr "" +msgstr "Rysuj wg prÄ™dkoÅ›ci" #: ../src/viktrwlayer.c:340 msgid "All Tracks Black" -msgstr "" +msgstr "Wszystkie Å›cieżki czarne" #: ../src/viktrwlayer.c:341 msgid "Filled Square" -msgstr "" +msgstr "Kwadrat wypeÅ‚niony" #: ../src/viktrwlayer.c:341 msgid "Square" -msgstr "" +msgstr "Kwadrat" #: ../src/viktrwlayer.c:341 msgid "Circle" -msgstr "" +msgstr "OkrÄ…g" #: ../src/viktrwlayer.c:341 msgid "X" @@ -1135,11 +1148,11 @@ msgstr "" #: ../src/viktrwlayer.c:363 msgid "Track Drawing Mode:" -msgstr "" +msgstr "Tryb rysowania Å›cieżki:" #: ../src/viktrwlayer.c:364 msgid "Draw Track Lines" -msgstr "" +msgstr "Trysuj linie Å›cieżki" #: ../src/viktrwlayer.c:365 msgid "Draw Trackpoints" @@ -1147,7 +1160,7 @@ msgstr "" #: ../src/viktrwlayer.c:366 msgid "Draw Elevation" -msgstr "" +msgstr "Rysuj wysokość" #: ../src/viktrwlayer.c:367 msgid "Draw Elevation Height %:" @@ -1155,15 +1168,15 @@ msgstr "" #: ../src/viktrwlayer.c:369 msgid "Draw Stops" -msgstr "" +msgstr "Rysuj postoje" #: ../src/viktrwlayer.c:370 msgid "Min Stop Length (seconds):" -msgstr "" +msgstr "Min dÅ‚ugość postoju (sekundy):" #: ../src/viktrwlayer.c:372 msgid "Track Thickness:" -msgstr "" +msgstr "Grubość Å›cieżki:" #: ../src/viktrwlayer.c:373 msgid "Track BG Thickness:" @@ -1175,27 +1188,27 @@ msgstr "" #: ../src/viktrwlayer.c:375 msgid "Min Track Velocity:" -msgstr "" +msgstr "Min prÄ™dkość Å›cieżki:" #: ../src/viktrwlayer.c:376 msgid "Max Track Velocity:" -msgstr "" +msgstr "Maks prÄ™dkość Å›cieżki:" #: ../src/viktrwlayer.c:378 msgid "Draw Labels" -msgstr "" +msgstr "Rysuj etykiety" #: ../src/viktrwlayer.c:379 msgid "Waypoint Color:" -msgstr "" +msgstr "Kolor punktu orientacyjnego:" #: ../src/viktrwlayer.c:380 msgid "Waypoint Text:" -msgstr "" +msgstr "Opis punktu orientacyjnego:" #: ../src/viktrwlayer.c:381 msgid "Background:" -msgstr "" +msgstr "TÅ‚o:" #: ../src/viktrwlayer.c:382 msgid "Fake BG Color Translucency:" @@ -1203,15 +1216,15 @@ msgstr "" #: ../src/viktrwlayer.c:383 msgid "Waypoint marker:" -msgstr "" +msgstr "Znacznik puktu orientacyjnego:" #: ../src/viktrwlayer.c:384 msgid "Waypoint size:" -msgstr "" +msgstr "Rozmiar punktu orientacyjnego:" #: ../src/viktrwlayer.c:385 msgid "Draw Waypoint Symbols:" -msgstr "" +msgstr "Rysuj symbole puktów orientacyjnych:" #: ../src/viktrwlayer.c:387 msgid "Draw Waypoint Images" @@ -1219,7 +1232,7 @@ msgstr "" #: ../src/viktrwlayer.c:388 msgid "Image Size (pixels):" -msgstr "" +msgstr "Rozmiar obrazu (piksele):" #: ../src/viktrwlayer.c:389 msgid "Image Alpha:" @@ -1227,7 +1240,7 @@ msgstr "" #: ../src/viktrwlayer.c:390 msgid "Image Memory Cache Size:" -msgstr "" +msgstr "Rozmiar pamiÄ™ci podrÄ™cznej obrazu:" #: ../src/viktrwlayer.c:1538 msgid "This layer has no waypoints or trackpoints." @@ -1235,16 +1248,16 @@ msgstr "" #: ../src/viktrwlayer.c:1546 msgid "Export Layer" -msgstr "" +msgstr "Eksportuj warstwÄ™" -#: ../src/viktrwlayer.c:1565 ../src/vikwindow.c:1446 ../src/vikwindow.c:1820 +#: ../src/viktrwlayer.c:1565 ../src/vikwindow.c:1438 ../src/vikwindow.c:1817 #, c-format msgid "The file \"%s\" exists, do you wish to overwrite it?" -msgstr "" +msgstr "Plik %s istnieje, czy nadpisać go?" -#: ../src/viktrwlayer.c:1575 ../src/vikwindow.c:1464 +#: ../src/viktrwlayer.c:1575 ../src/vikwindow.c:1456 msgid "The filename you requested could not be opened for writing." -msgstr "" +msgstr "Nazwa pliku, którÄ… wskazaÅ‚eÅ›, nie może być otwarta do zapisu." #: ../src/viktrwlayer.c:1596 msgid "Create" @@ -1252,77 +1265,77 @@ msgstr "Utwórz" #: ../src/viktrwlayer.c:1606 msgid "Waypoint Name:" -msgstr "" +msgstr "Nazwa punktu orientacyjnego:" #: ../src/viktrwlayer.c:1626 msgid "Waypoint not found in this layer." -msgstr "" +msgstr "Punkt orientacyjny nie znaleziony w tej warstwie." -#: ../src/viktrwlayer.c:1724 +#: ../src/viktrwlayer.c:1723 msgid "Goto Center of Layer" msgstr "" -#: ../src/viktrwlayer.c:1729 +#: ../src/viktrwlayer.c:1728 msgid "Goto Waypoint" -msgstr "" +msgstr "Idź do punktu orientacyjnego" -#: ../src/viktrwlayer.c:1735 +#: ../src/viktrwlayer.c:1734 msgid "Export layer" -msgstr "" +msgstr "Eksportuj warstwÄ™" -#: ../src/viktrwlayer.c:1740 +#: ../src/viktrwlayer.c:1739 msgid "Export as GPSPoint" -msgstr "" +msgstr "Eksportuj jako GPSPoint" -#: ../src/viktrwlayer.c:1745 +#: ../src/viktrwlayer.c:1744 msgid "Export as GPSMapper" -msgstr "" +msgstr "Eksportuj jako GPSMapper" -#: ../src/viktrwlayer.c:1750 +#: ../src/viktrwlayer.c:1749 msgid "Export as GPX" -msgstr "" +msgstr "Eksportuj jako GPX" -#: ../src/viktrwlayer.c:1755 ../src/viktrwlayer.c:2794 +#: ../src/viktrwlayer.c:1754 ../src/viktrwlayer.c:2794 msgid "New Waypoint" -msgstr "" +msgstr "Nowy punkt orientacyjny" -#: ../src/viktrwlayer.c:1762 +#: ../src/viktrwlayer.c:1761 msgid "Add Wikipedia Waypoints" msgstr "" -#: ../src/viktrwlayer.c:1767 +#: ../src/viktrwlayer.c:1766 msgid "Within layer bounds" msgstr "" -#: ../src/viktrwlayer.c:1772 +#: ../src/viktrwlayer.c:1771 msgid "Within current view" msgstr "" -#: ../src/viktrwlayer.c:1779 ../src/viktrwlayer.c:2760 +#: ../src/viktrwlayer.c:1778 ../src/viktrwlayer.c:2760 msgid "Upload to OSM" msgstr "" -#: ../src/viktrwlayer.c:2290 +#: ../src/viktrwlayer.c:2289 msgid "Failed. This track does not have timestamp" -msgstr "" +msgstr "BÅ‚Ä…d. Ta Å›cieżka nie ma znacznika czasowego." -#: ../src/viktrwlayer.c:2304 +#: ../src/viktrwlayer.c:2303 msgid "Failed. No other track in this layer has timestamp" msgstr "" -#: ../src/viktrwlayer.c:2310 +#: ../src/viktrwlayer.c:2309 msgid "Merge with..." -msgstr "" +msgstr "ÅÄ…cz z..." -#: ../src/viktrwlayer.c:2310 +#: ../src/viktrwlayer.c:2309 msgid "Select track to merge with" -msgstr "" +msgstr "Wybież sieżkÄ™, z którÄ… poÅ‚Ä…czyć" -#: ../src/viktrwlayer.c:2347 +#: ../src/viktrwlayer.c:2346 msgid "Merge Threshold..." msgstr "" -#: ../src/viktrwlayer.c:2348 +#: ../src/viktrwlayer.c:2347 msgid "Merge when time between tracks less than:" msgstr "" @@ -1336,7 +1349,7 @@ msgstr "" #: ../src/viktrwlayer.c:2523 msgid "Waypoint Already Exists" -msgstr "" +msgstr "Pukt orientacyjny już istnieje" #: ../src/viktrwlayer.c:2564 msgid "Track Already Exists" @@ -1344,7 +1357,7 @@ msgstr "" #: ../src/viktrwlayer.c:2686 msgid "Goto" -msgstr "" +msgstr "Idź do" #: ../src/viktrwlayer.c:2694 msgid "Visit Geocache Webpage" @@ -1364,19 +1377,19 @@ msgstr "" #: ../src/viktrwlayer.c:2724 msgid "Merge By Time" -msgstr "" +msgstr "ÅÄ…cz wg czasu" #: ../src/viktrwlayer.c:2729 msgid "Merge With Other Tracks..." -msgstr "" +msgstr "ÅÄ…cz z innymi Å›cieżkami..." #: ../src/viktrwlayer.c:2734 msgid "Split By Time" -msgstr "" +msgstr "Podziel wg czasu" #: ../src/viktrwlayer.c:2739 msgid "Download maps along track..." -msgstr "" +msgstr "Pobierz mapy wzdÅ‚uż Å›cieżki..." #: ../src/viktrwlayer.c:2744 msgid "Apply DEM Data" @@ -1398,644 +1411,667 @@ msgstr "" msgid "Use with filter" msgstr "" -#: ../src/viktrwlayer.c:3736 +#: ../src/viktrwlayer.c:3735 msgid "Could not launch eog to open file." msgstr "" -#: ../src/viktrwlayer.c:3790 +#: ../src/viktrwlayer.c:3789 #, c-format msgid "Creating %d Image Thumbnails..." msgstr "" -#: ../src/viktrwlayer.c:4010 +#: ../src/viktrwlayer.c:4009 msgid "No map layer in use. Create one first" msgstr "" -#: ../src/viktrwlayer_propwin.c:658 +#: ../src/viktrwlayer_propwin.c:661 msgid "Failed spliting track. Track unchanged" msgstr "" -#: ../src/viktrwlayer_propwin.c:675 +#: ../src/viktrwlayer_propwin.c:678 msgid "Operation Aborted. Track unchanged" msgstr "" -#: ../src/viktrwlayer_propwin.c:729 +#: ../src/viktrwlayer_propwin.c:732 #, c-format msgid "%s - Track Properties" -msgstr "" +msgstr "%s - WÅ‚aÅ›ciwoÅ›ci Å›cieżki" -#: ../src/viktrwlayer_propwin.c:734 +#: ../src/viktrwlayer_propwin.c:737 msgid "Split at Marker" -msgstr "" +msgstr "Podziel przy znaczniku" -#: ../src/viktrwlayer_propwin.c:735 +#: ../src/viktrwlayer_propwin.c:738 msgid "Split Segments" -msgstr "" +msgstr "Podziel segmenty" -#: ../src/viktrwlayer_propwin.c:736 +#: ../src/viktrwlayer_propwin.c:739 msgid "Reverse" -msgstr "" +msgstr "Odwróć" -#: ../src/viktrwlayer_propwin.c:737 +#: ../src/viktrwlayer_propwin.c:740 msgid "Delete Dupl." -msgstr "" +msgstr "UsuÅ„ dupl." -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Comment:</b>" -msgstr "" +msgstr "<b>Komentarz:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Track Length:</b>" -msgstr "" +msgstr "<b>DÅ‚ugość Å›cieżki:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Trackpoints:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Segments:</b>" -msgstr "" +msgstr "<b>Segmenty:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Duplicate Points:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Max Speed:</b>" -msgstr "" +msgstr "<b>Maksymalna prÄ™dkość:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Avg. Speed:</b>" -msgstr "" +msgstr "<b>Åšrednia prÄ™dkość:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Avg. Dist. Between TPs:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Elevation Range:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Total Elevation Gain/Loss:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Start:</b>" -msgstr "" +msgstr "<b>Start:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>End:</b>" -msgstr "" +msgstr "<b>Koniec:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Duration:</b>" -msgstr "" +msgstr "<b>Czas trwania:</b>" -#: ../src/viktrwlayer_propwin.c:788 ../src/viktrwlayer_propwin.c:795 -#: ../src/viktrwlayer_propwin.c:804 ../src/viktrwlayer_propwin.c:811 -#: ../src/viktrwlayer_propwin.c:850 ../src/viktrwlayer_propwin.c:851 -#: ../src/viktrwlayer_propwin.c:852 ../src/viktrwlayer_propwin.c:874 -#: ../src/viktrwlayer_propwin.c:881 +#: ../src/viktrwlayer_propwin.c:791 ../src/viktrwlayer_propwin.c:798 +#: ../src/viktrwlayer_propwin.c:807 ../src/viktrwlayer_propwin.c:814 +#: ../src/viktrwlayer_propwin.c:853 ../src/viktrwlayer_propwin.c:854 +#: ../src/viktrwlayer_propwin.c:855 ../src/viktrwlayer_propwin.c:877 +#: ../src/viktrwlayer_propwin.c:884 #, c-format msgid "No Data" -msgstr "" +msgstr "Brak danych" -#: ../src/viktrwlayer_propwin.c:847 +#: ../src/viktrwlayer_propwin.c:850 #, c-format msgid "%d minutes" -msgstr "" +msgstr "%d minute" -#: ../src/viktrwlayer_propwin.c:870 +#: ../src/viktrwlayer_propwin.c:873 msgid "Statistics" -msgstr "" +msgstr "Statystyki" -#: ../src/viktrwlayer_propwin.c:875 +#: ../src/viktrwlayer_propwin.c:878 msgid "<b>Track Distance:</b>" -msgstr "" +msgstr "<b>DÅ‚ugość Å›cieżki:</b>" -#: ../src/viktrwlayer_propwin.c:876 +#: ../src/viktrwlayer_propwin.c:879 msgid "Elevation-distance" -msgstr "" +msgstr "Wysokość-odlegÅ‚ość" -#: ../src/viktrwlayer_propwin.c:882 +#: ../src/viktrwlayer_propwin.c:885 msgid "<b>Track Time:</b>" -msgstr "" +msgstr "<b>Czas Å›cieżki:</b>" -#: ../src/viktrwlayer_propwin.c:883 +#: ../src/viktrwlayer_propwin.c:886 msgid "Speed-time" -msgstr "" +msgstr "PrÄ™dkość-czas" #: ../src/viktrwlayer_tpwin.c:101 msgid "<b>Part of Track:</b>" -msgstr "" +msgstr "<b>Część Å›cieżki:</b>" #: ../src/viktrwlayer_tpwin.c:102 msgid "<b>Latitude:</b>" -msgstr "" +msgstr "<b>Szerokość geograficzna:</b>" #: ../src/viktrwlayer_tpwin.c:103 msgid "<b>Longitude:</b>" -msgstr "" +msgstr "<b>DÅ‚ugość geograficzna:</b>" #: ../src/viktrwlayer_tpwin.c:104 msgid "<b>Altitude:</b>" -msgstr "" +msgstr "<b>Wysokość:</b>" #: ../src/viktrwlayer_tpwin.c:105 msgid "<b>Timestamp:</b>" -msgstr "" +msgstr "<b>TZnacznik czasowy:</b>" #: ../src/viktrwlayer_tpwin.c:106 msgid "<b>Time:</b>" -msgstr "" +msgstr "<b>Czas:</b>" #: ../src/viktrwlayer_tpwin.c:107 msgid "<b>Distance Difference:</b>" -msgstr "" +msgstr "<b>Różnica odlegÅ‚oÅ›ci:</b>" #: ../src/viktrwlayer_tpwin.c:108 msgid "<b>Time Difference:</b>" -msgstr "" +msgstr "<b>Różnica czasu:</b>" #: ../src/viktrwlayer_tpwin.c:109 msgid "<b>\"Speed\" Between:</b>" +msgstr "<b>\"PrÄ™dkość\" pomiÄ™dzy:</b>" + +#: ../src/viktrwlayer_tpwin.c:110 +msgid "<b>VDOP:</b>" msgstr "" -#: ../src/viktrwlayer_tpwin.c:117 -msgid "Trackpoint" +#: ../src/viktrwlayer_tpwin.c:111 +msgid "<b>HDOP:</b>" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:112 +msgid "<b>PDOP:</b>" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:113 +msgid "<b>SAT/FIX:</b>" msgstr "" #: ../src/viktrwlayer_tpwin.c:122 -msgid "Split Here" +msgid "Trackpoint" msgstr "" -#: ../src/viktrwlayer_tpwin.c:123 +#: ../src/viktrwlayer_tpwin.c:127 +msgid "Split Here" +msgstr "Podziel tutaj" + +#: ../src/viktrwlayer_tpwin.c:128 msgid "Join With Last" msgstr "" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Pan" msgstr "" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Zoom" -msgstr "" +msgstr "Zbliżenie" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Ruler" -msgstr "" +msgstr "Linijka" -#: ../src/vikwindow.c:363 +#: ../src/vikwindow.c:364 #, c-format msgid "" "Do you want to save the changes you made to the document \"%s\"?\n" "\n" "Your changes will be lost if you don't save them." msgstr "" +"Czy chcesz zapisać zmiany do dokumentu \"%s\"?\n" +"\n" +"JeÅ›i nie zapiszesz zmian, zostanÄ… utracone." -#: ../src/vikwindow.c:366 ../src/vikwindow.c:1314 +#: ../src/vikwindow.c:367 ../src/vikwindow.c:1306 msgid "Untitled" -msgstr "" +msgstr "Bez nazwy" -#: ../src/vikwindow.c:367 +#: ../src/vikwindow.c:368 msgid "Don't Save" -msgstr "" +msgstr "Nie zapisuj" -#: ../src/vikwindow.c:400 +#: ../src/vikwindow.c:401 msgid "mpp" msgstr "" -#: ../src/vikwindow.c:400 +#: ../src/vikwindow.c:401 msgid "pixelfact" msgstr "" -#: ../src/vikwindow.c:527 +#: ../src/vikwindow.c:528 #, c-format msgid "%s %s %dm" -msgstr "" +msgstr "%s %s %dm" -#: ../src/vikwindow.c:529 +#: ../src/vikwindow.c:530 #, c-format msgid "%s %s" -msgstr "" +msgstr "%s %s" -#: ../src/vikwindow.c:1113 +#: ../src/vikwindow.c:1105 msgid "You must select a layer to show its properties." msgstr "" -#: ../src/vikwindow.c:1129 +#: ../src/vikwindow.c:1121 msgid "You must select a layer to delete." -msgstr "" +msgstr "Musisz zaznaczyć warstwÄ™ do skasowania." -#: ../src/vikwindow.c:1347 +#: ../src/vikwindow.c:1339 msgid "The file you requested could not be opened." -msgstr "" +msgstr "Nie można otworzyć żądanego pliku." -#: ../src/vikwindow.c:1390 +#: ../src/vikwindow.c:1382 msgid "Please select a GPS data file to open. " -msgstr "" +msgstr "ProszÄ™ wybrać plik danych GPS do otwarcia. " -#: ../src/vikwindow.c:1433 +#: ../src/vikwindow.c:1425 msgid "Save as Viking File." -msgstr "" +msgstr "Zapisz jako plik Viking." -#: ../src/vikwindow.c:1667 +#: ../src/vikwindow.c:1664 msgid "" "Viewable region outside allowable pixel size bounds for image. Clipping " "width/height values." msgstr "" -#: ../src/vikwindow.c:1686 +#: ../src/vikwindow.c:1683 #, c-format msgid "Total area: %ldm x %ldm (%.3f sq. km)" -msgstr "" +msgstr "Obszar caÅ‚kowity: %ldm x %ldm (%.3f km kw.)" #. todo: default for answers inside VikWindow or static (thruout instance) -#: ../src/vikwindow.c:1694 +#: ../src/vikwindow.c:1691 msgid "Save to Image File" msgstr "" -#: ../src/vikwindow.c:1712 +#: ../src/vikwindow.c:1709 msgid "Width (pixels):" -msgstr "" +msgstr "Szerokość (piksele):" -#: ../src/vikwindow.c:1714 +#: ../src/vikwindow.c:1711 msgid "Height (pixels):" -msgstr "" +msgstr "Wysokość (piksele):" -#: ../src/vikwindow.c:1717 +#: ../src/vikwindow.c:1714 msgid "Zoom (meters per pixel):" msgstr "" -#: ../src/vikwindow.c:1723 +#: ../src/vikwindow.c:1720 msgid "Area in current viewable window" msgstr "" -#: ../src/vikwindow.c:1733 +#: ../src/vikwindow.c:1730 msgid "Save as PNG" -msgstr "" +msgstr "Zapisz jako PNG" -#: ../src/vikwindow.c:1734 +#: ../src/vikwindow.c:1731 msgid "Save as JPEG" -msgstr "" +msgstr "Zapisz jako JPEG" -#: ../src/vikwindow.c:1754 +#: ../src/vikwindow.c:1751 msgid "East-west image tiles:" msgstr "" -#: ../src/vikwindow.c:1756 +#: ../src/vikwindow.c:1753 msgid "North-south image tiles:" msgstr "" -#: ../src/vikwindow.c:1796 +#: ../src/vikwindow.c:1793 msgid "You must be in UTM mode to use this feature" msgstr "" -#: ../src/vikwindow.c:1807 +#: ../src/vikwindow.c:1804 msgid "Save Image" -msgstr "" +msgstr "Zapisz obraz" -#: ../src/vikwindow.c:1834 +#: ../src/vikwindow.c:1831 msgid "Choose a directory to hold images" -msgstr "" +msgstr "Wskaż katalog dla przechowywania obrazów" -#: ../src/vikwindow.c:1920 +#: ../src/vikwindow.c:1917 msgid "Choose a background color" -msgstr "" +msgstr "Wskaż kolor tÅ‚a" -#: ../src/vikwindow.c:1941 +#: ../src/vikwindow.c:1938 msgid "_File" -msgstr "" +msgstr "_Plik" -#: ../src/vikwindow.c:1942 +#: ../src/vikwindow.c:1939 msgid "_Edit" -msgstr "" +msgstr "_Edycja" -#: ../src/vikwindow.c:1943 +#: ../src/vikwindow.c:1940 msgid "_View" -msgstr "" +msgstr "_PodglÄ…d" -#: ../src/vikwindow.c:1944 ../src/vikwindow.c:2015 +#: ../src/vikwindow.c:1941 ../src/vikwindow.c:2013 msgid "_Zoom" -msgstr "" +msgstr "_Zbliżenie" -#: ../src/vikwindow.c:1945 ../src/vikwindow.c:2014 +#: ../src/vikwindow.c:1942 ../src/vikwindow.c:2012 msgid "_Pan" msgstr "" -#: ../src/vikwindow.c:1946 +#: ../src/vikwindow.c:1943 msgid "_Layers" -msgstr "" +msgstr "_Warstwy" -#: ../src/vikwindow.c:1947 +#: ../src/vikwindow.c:1944 msgid "_Tools" -msgstr "" +msgstr "_NarzÄ™dzia" -#: ../src/vikwindow.c:1948 +#: ../src/vikwindow.c:1945 msgid "_Webtools" msgstr "" -#: ../src/vikwindow.c:1949 +#: ../src/vikwindow.c:1946 msgid "_Help" -msgstr "" +msgstr "_Pomoc" -#: ../src/vikwindow.c:1951 +#: ../src/vikwindow.c:1948 msgid "_New" -msgstr "" +msgstr "_Nowy" -#: ../src/vikwindow.c:1951 +#: ../src/vikwindow.c:1948 msgid "New file" -msgstr "" +msgstr "Nowy plik" -#: ../src/vikwindow.c:1952 +#: ../src/vikwindow.c:1949 msgid "_Open" -msgstr "" +msgstr "_Otwórz" -#: ../src/vikwindow.c:1952 +#: ../src/vikwindow.c:1949 msgid "Open a file" -msgstr "" +msgstr "Otwórz plik" -#: ../src/vikwindow.c:1953 +#: ../src/vikwindow.c:1950 msgid "A_ppend File" -msgstr "" +msgstr "_DoÅ‚Ä…cz plik" -#: ../src/vikwindow.c:1953 +#: ../src/vikwindow.c:1950 msgid "Append data from a different file" -msgstr "" +msgstr "DoÅ‚Ä…cz dane z innego pliku" -#: ../src/vikwindow.c:1954 +#: ../src/vikwindow.c:1951 msgid "A_cquire" msgstr "" -#: ../src/vikwindow.c:1955 +#: ../src/vikwindow.c:1952 msgid "From _GPS" -msgstr "" +msgstr "Z _GPS" -#: ../src/vikwindow.c:1955 +#: ../src/vikwindow.c:1952 msgid "Transfer data from a GPS device" -msgstr "" +msgstr "Transferuj dane z urzÄ…dzenia GPS" -#: ../src/vikwindow.c:1956 +#: ../src/vikwindow.c:1953 msgid "Google _Directions" msgstr "" -#: ../src/vikwindow.c:1956 +#: ../src/vikwindow.c:1953 msgid "Get driving directions from Google" msgstr "" -#: ../src/vikwindow.c:1958 +#: ../src/vikwindow.c:1955 msgid "Geo_caches" msgstr "" -#: ../src/vikwindow.c:1958 +#: ../src/vikwindow.c:1955 msgid "Get Geocaches from geocaching.com" msgstr "" -#: ../src/vikwindow.c:1960 +#: ../src/vikwindow.c:1957 msgid "_Save" -msgstr "" +msgstr "_Zapisz" -#: ../src/vikwindow.c:1960 +#: ../src/vikwindow.c:1957 msgid "Save the file" -msgstr "" +msgstr "Zapisz plik" -#: ../src/vikwindow.c:1961 +#: ../src/vikwindow.c:1958 msgid "Save _As" -msgstr "" +msgstr "Zapisz _jako" -#: ../src/vikwindow.c:1961 +#: ../src/vikwindow.c:1958 msgid "Save the file under different name" -msgstr "" +msgstr "Zapisz plik pod innÄ… nazwÄ…" -#: ../src/vikwindow.c:1962 +#: ../src/vikwindow.c:1959 msgid "_Generate Image File" msgstr "" -#: ../src/vikwindow.c:1962 +#: ../src/vikwindow.c:1959 msgid "Save a snapshot of the workspace into a file" msgstr "" -#: ../src/vikwindow.c:1963 +#: ../src/vikwindow.c:1960 msgid "Generate _Directory of Images" msgstr "" -#: ../src/vikwindow.c:1963 +#: ../src/vikwindow.c:1960 msgid "FIXME:IMGDIR" msgstr "" -#: ../src/vikwindow.c:1966 +#: ../src/vikwindow.c:1963 msgid "_Print..." -msgstr "" +msgstr "_Drukuj..." -#: ../src/vikwindow.c:1966 +#: ../src/vikwindow.c:1963 msgid "Print maps" -msgstr "" +msgstr "Drukuj mapy" -#: ../src/vikwindow.c:1969 +#: ../src/vikwindow.c:1966 msgid "E_xit" -msgstr "" +msgstr "_Wyjdź" -#: ../src/vikwindow.c:1969 +#: ../src/vikwindow.c:1966 msgid "Exit the program" -msgstr "" +msgstr "Wyjdź z programu" -#: ../src/vikwindow.c:1970 +#: ../src/vikwindow.c:1967 msgid "Save and Exit" -msgstr "" +msgstr "Zapisz i wyjdź" -#: ../src/vikwindow.c:1970 +#: ../src/vikwindow.c:1967 msgid "Save and Exit the program" -msgstr "" +msgstr "Zapisz i wyjdź z programu" -#: ../src/vikwindow.c:1972 +#: ../src/vikwindow.c:1969 msgid "Go To location" -msgstr "" +msgstr "Idź do poÅ‚ożenia" -#: ../src/vikwindow.c:1972 +#: ../src/vikwindow.c:1969 msgid "Go to address/place using text search" -msgstr "" +msgstr "Idź do adresu/miejsca używajÄ…c wyszukiwarki" -#: ../src/vikwindow.c:1973 +#: ../src/vikwindow.c:1970 msgid "_Go to Lat\\/Lon..." -msgstr "" +msgstr "_Idź do szer/dÅ‚ug..." -#: ../src/vikwindow.c:1973 +#: ../src/vikwindow.c:1970 msgid "Go to arbitrary lat\\/lon coordinate" msgstr "" -#: ../src/vikwindow.c:1974 +#: ../src/vikwindow.c:1971 msgid "Go to UTM..." msgstr "" -#: ../src/vikwindow.c:1974 +#: ../src/vikwindow.c:1971 msgid "Go to arbitrary UTM coordinate" msgstr "" -#: ../src/vikwindow.c:1975 +#: ../src/vikwindow.c:1972 msgid "Set Background Color..." -msgstr "" +msgstr "Ustaw kolor tÅ‚a..." -#: ../src/vikwindow.c:1976 +#: ../src/vikwindow.c:1973 msgid "Zoom _In" -msgstr "" +msgstr "Zbl_iż" -#: ../src/vikwindow.c:1977 +#: ../src/vikwindow.c:1974 msgid "Zoom _Out" -msgstr "" +msgstr "_Oddal" -#: ../src/vikwindow.c:1978 +#: ../src/vikwindow.c:1975 msgid "Zoom _To" msgstr "" -#: ../src/vikwindow.c:1979 +#: ../src/vikwindow.c:1976 msgid "0.25" -msgstr "" +msgstr "0.25" -#: ../src/vikwindow.c:1980 +#: ../src/vikwindow.c:1977 msgid "0.5" -msgstr "" +msgstr "0.5" -#: ../src/vikwindow.c:1981 +#: ../src/vikwindow.c:1978 msgid "1" -msgstr "" +msgstr "1" -#: ../src/vikwindow.c:1982 +#: ../src/vikwindow.c:1979 msgid "2" -msgstr "" +msgstr "2" -#: ../src/vikwindow.c:1983 +#: ../src/vikwindow.c:1980 msgid "4" -msgstr "" +msgstr "4" -#: ../src/vikwindow.c:1984 +#: ../src/vikwindow.c:1981 msgid "8" -msgstr "" +msgstr "8" -#: ../src/vikwindow.c:1985 +#: ../src/vikwindow.c:1982 msgid "16" -msgstr "" +msgstr "16" -#: ../src/vikwindow.c:1986 +#: ../src/vikwindow.c:1983 msgid "32" -msgstr "" +msgstr "32" -#: ../src/vikwindow.c:1987 +#: ../src/vikwindow.c:1984 msgid "64" -msgstr "" +msgstr "64" -#: ../src/vikwindow.c:1988 +#: ../src/vikwindow.c:1985 msgid "128" -msgstr "" +msgstr "128" -#: ../src/vikwindow.c:1989 +#: ../src/vikwindow.c:1986 msgid "Pan North" msgstr "" -#: ../src/vikwindow.c:1990 +#: ../src/vikwindow.c:1987 msgid "Pan East" msgstr "" -#: ../src/vikwindow.c:1991 +#: ../src/vikwindow.c:1988 msgid "Pan South" msgstr "" -#: ../src/vikwindow.c:1992 +#: ../src/vikwindow.c:1989 msgid "Pan West" msgstr "" -#: ../src/vikwindow.c:1993 +#: ../src/vikwindow.c:1990 msgid "Background _Jobs" msgstr "" -#: ../src/vikwindow.c:1995 +#: ../src/vikwindow.c:1992 msgid "Cu_t" -msgstr "" +msgstr "W_ytnij" -#: ../src/vikwindow.c:1996 +#: ../src/vikwindow.c:1993 msgid "_Copy" -msgstr "" +msgstr "_Kopiuj" -#: ../src/vikwindow.c:1997 +#: ../src/vikwindow.c:1994 msgid "_Paste" -msgstr "" +msgstr "_Wstaw" -#: ../src/vikwindow.c:1998 +#: ../src/vikwindow.c:1995 msgid "_Delete" -msgstr "" +msgstr "_Skasuj" -#: ../src/vikwindow.c:1999 +#: ../src/vikwindow.c:1996 msgid "Delete All" +msgstr "Skasuj wszystko" + +#: ../src/vikwindow.c:1997 +msgid "Flush Map cache" msgstr "" -#: ../src/vikwindow.c:2000 +#: ../src/vikwindow.c:1998 msgid "_Preferences..." -msgstr "" +msgstr "_Ustawienia..." -#: ../src/vikwindow.c:2001 +#: ../src/vikwindow.c:1999 msgid "_Properties" -msgstr "" +msgstr "_WÅ‚aÅ›ciwoÅ›ci" -#: ../src/vikwindow.c:2003 +#: ../src/vikwindow.c:2001 msgid "_About" -msgstr "" +msgstr "_O programie" -#: ../src/vikwindow.c:2008 +#: ../src/vikwindow.c:2006 msgid "_UTM Mode" -msgstr "" +msgstr "Tryb _UTM" -#: ../src/vikwindow.c:2009 +#: ../src/vikwindow.c:2007 msgid "_Expedia Mode" msgstr "" -#: ../src/vikwindow.c:2010 +#: ../src/vikwindow.c:2008 msgid "_Mercator Mode" msgstr "" -#: ../src/vikwindow.c:2014 +#: ../src/vikwindow.c:2012 msgid "Pan Tool" msgstr "" -#: ../src/vikwindow.c:2015 +#: ../src/vikwindow.c:2013 msgid "Zoom Tool" -msgstr "" +msgstr "NarzÄ™dzie zbliżania" -#: ../src/vikwindow.c:2016 +#: ../src/vikwindow.c:2014 msgid "_Ruler" -msgstr "" +msgstr "_Linijka" -#: ../src/vikwindow.c:2016 +#: ../src/vikwindow.c:2014 msgid "Ruler Tool" -msgstr "" +msgstr "NarzÄ™dzie linijki" -#: ../src/vikwindow.c:2020 +#: ../src/vikwindow.c:2018 msgid "Show Scale" -msgstr "" +msgstr "Pokaż skalÄ™" -#: ../src/vikwindow.c:2021 +#: ../src/vikwindow.c:2019 msgid "Show Center Mark" msgstr "" -#: ../src/vikwindow.c:2022 +#: ../src/vikwindow.c:2020 msgid "Full Screen" -msgstr "" +msgstr "PeÅ‚ny ekran" -#: ../src/vikwindow.c:2022 +#: ../src/vikwindow.c:2020 msgid "Activate full screen mode" -msgstr "" +msgstr "Aktywuj tryb peÅ‚nego ekranu" -#: ../src/vikwindow.c:2023 +#: ../src/vikwindow.c:2021 msgid "Show Side Panel" -msgstr "" +msgstr "Pokaż panel boczny" -#: ../src/vikwindow.c:2085 +#: ../src/vikwindow.c:2083 #, c-format msgid "New %s Layer" -msgstr "" +msgstr "Nowa %s warstwa" #: ../src/viking.desktop.in.h:1 msgid "GPS Data Manager" -msgstr "" +msgstr "Menedżer danych GPS" #: ../src/viking.desktop.in.h:2 msgid "Map Based GPS Data Manager (live data capable)." diff --git a/po/pt_BR.po b/po/pt_BR.po index ea01be6..541e782 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: viking\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-04 22:27+0100\n" +"POT-Creation-Date: 2009-08-20 09:50+0200\n" "PO-Revision-Date: 2008-09-17 02:58+0000\n" "Last-Translator: Christian Reis <kiko@async.com.br>\n" "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n" @@ -15,7 +15,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Launchpad-Export-Date: 2009-02-04 21:00+0000\n" +"X-Launchpad-Export-Date: 2009-09-09 20:12+0000\n" "X-Generator: Launchpad (build Unknown)\n" #: ../src/acquire.c:118 @@ -26,28 +26,28 @@ msgstr "Trabalhando..." msgid "Error: acquisition failed." msgstr "" -#: ../src/acquire.c:149 ../src/vikgpslayer.c:957 +#: ../src/acquire.c:149 ../src/vikgpslayer.c:953 msgid "Done." msgstr "ConcluÃdo." -#: ../src/acquire.c:326 ../src/vikgpslayer.c:996 +#: ../src/acquire.c:326 ../src/vikgpslayer.c:992 msgid "Status: detecting gpsbabel" msgstr "" -#: ../src/background.c:54 +#: ../src/background.c:57 #, c-format msgid "%d items" msgstr "" -#: ../src/background.c:212 +#: ../src/background.c:224 msgid "Job" msgstr "Trabalho" -#: ../src/background.c:216 +#: ../src/background.c:228 msgid "Progress" msgstr "Progresso" -#: ../src/background.c:227 +#: ../src/background.c:239 msgid "Viking Background Jobs" msgstr "" @@ -72,7 +72,7 @@ msgid "" "into." msgstr "" -#: ../src/curl_download.c:85 +#: ../src/curl_download.c:94 #, c-format msgid "%s() Curl perform failed: %s" msgstr "" @@ -344,14 +344,14 @@ msgstr "" msgid "using cmdline '%s' and file '%s'\n" msgstr "" -#: ../src/datasource_gps.c:150 ../src/vikgpslayer.c:711 +#: ../src/datasource_gps.c:150 ../src/vikgpslayer.c:707 #, c-format msgid "Downloading %d waypoint..." msgid_plural "Downloading %d waypoints..." msgstr[0] "" msgstr[1] "" -#: ../src/datasource_gps.c:152 ../src/vikgpslayer.c:713 +#: ../src/datasource_gps.c:152 ../src/vikgpslayer.c:709 #, c-format msgid "Downloading %d trackpoint..." msgid_plural "Downloading %d trackpoints..." @@ -368,7 +368,7 @@ msgstr "" msgid "Downloaded %d %s." msgstr "" -#: ../src/datasource_gps.c:185 ../src/vikgpslayer.c:783 +#: ../src/datasource_gps.c:185 ../src/vikgpslayer.c:779 #, c-format msgid "GPS Device: %s" msgstr "" @@ -381,7 +381,7 @@ msgstr "" msgid "Serial Port:" msgstr "" -#: ../src/datasource_gps.c:299 ../src/vikgpslayer.c:1001 +#: ../src/datasource_gps.c:299 ../src/vikgpslayer.c:997 msgid "GPS device: N/A" msgstr "" @@ -412,6 +412,10 @@ msgstr "" msgid "Draw mode '%s' no more supported" msgstr "" +#: ../src/mapcache.c:63 +msgid "Mapcache memory size (MB):" +msgstr "" + #: ../src/print.c:53 msgid "None" msgstr "" @@ -454,11 +458,11 @@ msgstr "" msgid "Image S_ize:" msgstr "" -#: ../src/util.c:75 +#: ../src/util.c:76 msgid "Could not launch web browser." msgstr "" -#: ../src/util.c:86 +#: ../src/util.c:87 msgid "Could not create new email." msgstr "" @@ -672,11 +676,11 @@ msgstr "" msgid "Downloading DEM %s" msgstr "" -#: ../src/vikfileentry.c:67 +#: ../src/vikfileentry.c:68 msgid "Browse..." msgstr "" -#: ../src/vikfileentry.c:94 +#: ../src/vikfileentry.c:96 msgid "Choose file" msgstr "" @@ -789,11 +793,11 @@ msgstr "" msgid "Gpsd Retry Interval (seconds):" msgstr "" -#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:989 +#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:985 msgid "GPS Download" msgstr "" -#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:989 +#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:985 msgid "GPS Upload" msgstr "" @@ -801,110 +805,110 @@ msgstr "" msgid "GPS Realtime Tracking" msgstr "" -#: ../src/vikgpslayer.c:373 +#: ../src/vikgpslayer.c:371 msgid "Unknown GPS Protocol" msgstr "" -#: ../src/vikgpslayer.c:379 +#: ../src/vikgpslayer.c:377 msgid "Unknown serial port device" msgstr "" -#: ../src/vikgpslayer.c:444 +#: ../src/vikgpslayer.c:442 #, c-format msgid "%s: unknown parameter" msgstr "" -#: ../src/vikgpslayer.c:545 +#: ../src/vikgpslayer.c:541 msgid "Upload to GPS" msgstr "" -#: ../src/vikgpslayer.c:550 +#: ../src/vikgpslayer.c:546 msgid "Download from GPS" msgstr "" -#: ../src/vikgpslayer.c:568 +#: ../src/vikgpslayer.c:564 msgid "Empty Upload" msgstr "" -#: ../src/vikgpslayer.c:573 +#: ../src/vikgpslayer.c:569 msgid "Empty Download" msgstr "" -#: ../src/vikgpslayer.c:578 +#: ../src/vikgpslayer.c:574 msgid "Empty All" msgstr "" -#: ../src/vikgpslayer.c:718 +#: ../src/vikgpslayer.c:714 #, c-format msgid "Uploading %d waypoint..." msgid_plural "Uploading %d waypoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:720 +#: ../src/vikgpslayer.c:716 #, c-format msgid "Uploading %d trackpoint..." msgid_plural "Uploading %d trackpoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:744 +#: ../src/vikgpslayer.c:740 #, c-format msgid "Downloaded %d out of %d waypoint..." msgid_plural "Downloaded %d out of %d waypoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:746 +#: ../src/vikgpslayer.c:742 #, c-format msgid "Downloaded %d out of %d trackpoint..." msgid_plural "Downloaded %d out of %d trackpoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:750 +#: ../src/vikgpslayer.c:746 #, c-format msgid "Uploaded %d out of %d waypoint..." msgid_plural "Uploaded %d out of %d waypoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:752 +#: ../src/vikgpslayer.c:748 #, c-format msgid "Uploaded %d out of %d trackpoint..." msgid_plural "Uploaded %d out of %d trackpoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:759 +#: ../src/vikgpslayer.c:755 #, c-format msgid "Downloaded %d waypoint" msgid_plural "Downloaded %d waypoints" msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:761 +#: ../src/vikgpslayer.c:757 #, c-format msgid "Downloaded %d trackpoint" msgid_plural "Downloaded %d trackpoints" msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:765 +#: ../src/vikgpslayer.c:761 #, c-format msgid "Uploaded %d waypoint" msgid_plural "Uploaded %d waypoints" msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:767 +#: ../src/vikgpslayer.c:763 #, c-format msgid "Uploaded %d trackpoint" msgid_plural "Uploaded %d trackpoints" msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:952 +#: ../src/vikgpslayer.c:948 msgid "Error: couldn't find gpsbabel." msgstr "" @@ -958,7 +962,7 @@ msgid "Map Type:" msgstr "" #: ../src/vikmapslayer.c:120 -msgid "Maps Directory (Optional):" +msgid "Maps Directory:" msgstr "" #: ../src/vikmapslayer.c:121 @@ -1003,52 +1007,52 @@ msgid "" "factor" msgstr "" -#: ../src/vikmapslayer.c:924 +#: ../src/vikmapslayer.c:927 #, c-format msgid "Redownloading up to %d %s map..." msgid_plural "Redownloading up to %d %s maps..." msgstr[0] "" msgstr[1] "" -#: ../src/vikmapslayer.c:926 +#: ../src/vikmapslayer.c:929 #, c-format msgid "Redownloading %d %s map..." msgid_plural "Redownloading %d %s maps..." msgstr[0] "" msgstr[1] "" -#: ../src/vikmapslayer.c:930 ../src/vikmapslayer.c:1001 +#: ../src/vikmapslayer.c:933 ../src/vikmapslayer.c:1004 #, c-format msgid "Downloading %d %s map..." msgid_plural "Downloading %d %s maps..." msgstr[0] "" msgstr[1] "" -#: ../src/vikmapslayer.c:1058 +#: ../src/vikmapslayer.c:1061 msgid "Redownload bad map(s)" msgstr "" -#: ../src/vikmapslayer.c:1062 +#: ../src/vikmapslayer.c:1065 msgid "Redownload all map(s)" msgstr "" -#: ../src/vikmapslayer.c:1142 +#: ../src/vikmapslayer.c:1145 #, c-format msgid "" "Wrong drawmode for this map.\n" "Select \"%s\" from View menu and try again." msgstr "" -#: ../src/vikmapslayer.c:1147 +#: ../src/vikmapslayer.c:1150 msgid "Wrong zoom level for this map." msgstr "" -#: ../src/vikmapslayer.c:1172 +#: ../src/vikmapslayer.c:1175 msgid "Download Onscreen Maps" msgstr "" #. TODO Add GTK_STOCK_REFRESH icon -#: ../src/vikmapslayer.c:1178 +#: ../src/vikmapslayer.c:1181 msgid "Refresh Onscreen Tiles" msgstr "" @@ -1236,12 +1240,12 @@ msgstr "" msgid "Export Layer" msgstr "" -#: ../src/viktrwlayer.c:1565 ../src/vikwindow.c:1446 ../src/vikwindow.c:1820 +#: ../src/viktrwlayer.c:1565 ../src/vikwindow.c:1438 ../src/vikwindow.c:1817 #, c-format msgid "The file \"%s\" exists, do you wish to overwrite it?" msgstr "" -#: ../src/viktrwlayer.c:1575 ../src/vikwindow.c:1464 +#: ../src/viktrwlayer.c:1575 ../src/vikwindow.c:1456 msgid "The filename you requested could not be opened for writing." msgstr "" @@ -1257,71 +1261,71 @@ msgstr "" msgid "Waypoint not found in this layer." msgstr "" -#: ../src/viktrwlayer.c:1724 +#: ../src/viktrwlayer.c:1723 msgid "Goto Center of Layer" msgstr "" -#: ../src/viktrwlayer.c:1729 +#: ../src/viktrwlayer.c:1728 msgid "Goto Waypoint" msgstr "" -#: ../src/viktrwlayer.c:1735 +#: ../src/viktrwlayer.c:1734 msgid "Export layer" msgstr "" -#: ../src/viktrwlayer.c:1740 +#: ../src/viktrwlayer.c:1739 msgid "Export as GPSPoint" msgstr "" -#: ../src/viktrwlayer.c:1745 +#: ../src/viktrwlayer.c:1744 msgid "Export as GPSMapper" msgstr "" -#: ../src/viktrwlayer.c:1750 +#: ../src/viktrwlayer.c:1749 msgid "Export as GPX" msgstr "" -#: ../src/viktrwlayer.c:1755 ../src/viktrwlayer.c:2794 +#: ../src/viktrwlayer.c:1754 ../src/viktrwlayer.c:2794 msgid "New Waypoint" msgstr "" -#: ../src/viktrwlayer.c:1762 +#: ../src/viktrwlayer.c:1761 msgid "Add Wikipedia Waypoints" msgstr "" -#: ../src/viktrwlayer.c:1767 +#: ../src/viktrwlayer.c:1766 msgid "Within layer bounds" msgstr "" -#: ../src/viktrwlayer.c:1772 +#: ../src/viktrwlayer.c:1771 msgid "Within current view" msgstr "" -#: ../src/viktrwlayer.c:1779 ../src/viktrwlayer.c:2760 +#: ../src/viktrwlayer.c:1778 ../src/viktrwlayer.c:2760 msgid "Upload to OSM" msgstr "" -#: ../src/viktrwlayer.c:2290 +#: ../src/viktrwlayer.c:2289 msgid "Failed. This track does not have timestamp" msgstr "" -#: ../src/viktrwlayer.c:2304 +#: ../src/viktrwlayer.c:2303 msgid "Failed. No other track in this layer has timestamp" msgstr "" -#: ../src/viktrwlayer.c:2310 +#: ../src/viktrwlayer.c:2309 msgid "Merge with..." msgstr "" -#: ../src/viktrwlayer.c:2310 +#: ../src/viktrwlayer.c:2309 msgid "Select track to merge with" msgstr "" -#: ../src/viktrwlayer.c:2347 +#: ../src/viktrwlayer.c:2346 msgid "Merge Threshold..." msgstr "" -#: ../src/viktrwlayer.c:2348 +#: ../src/viktrwlayer.c:2347 msgid "Merge when time between tracks less than:" msgstr "" @@ -1397,131 +1401,131 @@ msgstr "" msgid "Use with filter" msgstr "" -#: ../src/viktrwlayer.c:3736 +#: ../src/viktrwlayer.c:3735 msgid "Could not launch eog to open file." msgstr "" -#: ../src/viktrwlayer.c:3790 +#: ../src/viktrwlayer.c:3789 #, c-format msgid "Creating %d Image Thumbnails..." msgstr "" -#: ../src/viktrwlayer.c:4010 +#: ../src/viktrwlayer.c:4009 msgid "No map layer in use. Create one first" msgstr "" -#: ../src/viktrwlayer_propwin.c:658 +#: ../src/viktrwlayer_propwin.c:661 msgid "Failed spliting track. Track unchanged" msgstr "" -#: ../src/viktrwlayer_propwin.c:675 +#: ../src/viktrwlayer_propwin.c:678 msgid "Operation Aborted. Track unchanged" msgstr "" -#: ../src/viktrwlayer_propwin.c:729 +#: ../src/viktrwlayer_propwin.c:732 #, c-format msgid "%s - Track Properties" msgstr "" -#: ../src/viktrwlayer_propwin.c:734 +#: ../src/viktrwlayer_propwin.c:737 msgid "Split at Marker" msgstr "" -#: ../src/viktrwlayer_propwin.c:735 +#: ../src/viktrwlayer_propwin.c:738 msgid "Split Segments" msgstr "" -#: ../src/viktrwlayer_propwin.c:736 +#: ../src/viktrwlayer_propwin.c:739 msgid "Reverse" msgstr "" -#: ../src/viktrwlayer_propwin.c:737 +#: ../src/viktrwlayer_propwin.c:740 msgid "Delete Dupl." msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Comment:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Track Length:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Trackpoints:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Segments:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Duplicate Points:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Max Speed:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Avg. Speed:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Avg. Dist. Between TPs:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Elevation Range:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Total Elevation Gain/Loss:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Start:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>End:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Duration:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:788 ../src/viktrwlayer_propwin.c:795 -#: ../src/viktrwlayer_propwin.c:804 ../src/viktrwlayer_propwin.c:811 -#: ../src/viktrwlayer_propwin.c:850 ../src/viktrwlayer_propwin.c:851 -#: ../src/viktrwlayer_propwin.c:852 ../src/viktrwlayer_propwin.c:874 -#: ../src/viktrwlayer_propwin.c:881 +#: ../src/viktrwlayer_propwin.c:791 ../src/viktrwlayer_propwin.c:798 +#: ../src/viktrwlayer_propwin.c:807 ../src/viktrwlayer_propwin.c:814 +#: ../src/viktrwlayer_propwin.c:853 ../src/viktrwlayer_propwin.c:854 +#: ../src/viktrwlayer_propwin.c:855 ../src/viktrwlayer_propwin.c:877 +#: ../src/viktrwlayer_propwin.c:884 #, c-format msgid "No Data" msgstr "" -#: ../src/viktrwlayer_propwin.c:847 +#: ../src/viktrwlayer_propwin.c:850 #, c-format msgid "%d minutes" msgstr "" -#: ../src/viktrwlayer_propwin.c:870 +#: ../src/viktrwlayer_propwin.c:873 msgid "Statistics" msgstr "" -#: ../src/viktrwlayer_propwin.c:875 +#: ../src/viktrwlayer_propwin.c:878 msgid "<b>Track Distance:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:876 +#: ../src/viktrwlayer_propwin.c:879 msgid "Elevation-distance" msgstr "" -#: ../src/viktrwlayer_propwin.c:882 +#: ../src/viktrwlayer_propwin.c:885 msgid "<b>Track Time:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:883 +#: ../src/viktrwlayer_propwin.c:886 msgid "Speed-time" msgstr "" @@ -1561,31 +1565,47 @@ msgstr "" msgid "<b>\"Speed\" Between:</b>" msgstr "" -#: ../src/viktrwlayer_tpwin.c:117 -msgid "Trackpoint" +#: ../src/viktrwlayer_tpwin.c:110 +msgid "<b>VDOP:</b>" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:111 +msgid "<b>HDOP:</b>" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:112 +msgid "<b>PDOP:</b>" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:113 +msgid "<b>SAT/FIX:</b>" msgstr "" #: ../src/viktrwlayer_tpwin.c:122 +msgid "Trackpoint" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:127 msgid "Split Here" msgstr "" -#: ../src/viktrwlayer_tpwin.c:123 +#: ../src/viktrwlayer_tpwin.c:128 msgid "Join With Last" msgstr "" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Pan" msgstr "" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Zoom" msgstr "" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Ruler" msgstr "" -#: ../src/vikwindow.c:363 +#: ../src/vikwindow.c:364 #, c-format msgid "" "Do you want to save the changes you made to the document \"%s\"?\n" @@ -1593,441 +1613,445 @@ msgid "" "Your changes will be lost if you don't save them." msgstr "" -#: ../src/vikwindow.c:366 ../src/vikwindow.c:1314 +#: ../src/vikwindow.c:367 ../src/vikwindow.c:1306 msgid "Untitled" msgstr "" -#: ../src/vikwindow.c:367 +#: ../src/vikwindow.c:368 msgid "Don't Save" msgstr "" -#: ../src/vikwindow.c:400 +#: ../src/vikwindow.c:401 msgid "mpp" msgstr "" -#: ../src/vikwindow.c:400 +#: ../src/vikwindow.c:401 msgid "pixelfact" msgstr "" -#: ../src/vikwindow.c:527 +#: ../src/vikwindow.c:528 #, c-format msgid "%s %s %dm" msgstr "" -#: ../src/vikwindow.c:529 +#: ../src/vikwindow.c:530 #, c-format msgid "%s %s" msgstr "" -#: ../src/vikwindow.c:1113 +#: ../src/vikwindow.c:1105 msgid "You must select a layer to show its properties." msgstr "" -#: ../src/vikwindow.c:1129 +#: ../src/vikwindow.c:1121 msgid "You must select a layer to delete." msgstr "" -#: ../src/vikwindow.c:1347 +#: ../src/vikwindow.c:1339 msgid "The file you requested could not be opened." msgstr "" -#: ../src/vikwindow.c:1390 +#: ../src/vikwindow.c:1382 msgid "Please select a GPS data file to open. " msgstr "" -#: ../src/vikwindow.c:1433 +#: ../src/vikwindow.c:1425 msgid "Save as Viking File." msgstr "" -#: ../src/vikwindow.c:1667 +#: ../src/vikwindow.c:1664 msgid "" "Viewable region outside allowable pixel size bounds for image. Clipping " "width/height values." msgstr "" -#: ../src/vikwindow.c:1686 +#: ../src/vikwindow.c:1683 #, c-format msgid "Total area: %ldm x %ldm (%.3f sq. km)" msgstr "" #. todo: default for answers inside VikWindow or static (thruout instance) -#: ../src/vikwindow.c:1694 +#: ../src/vikwindow.c:1691 msgid "Save to Image File" msgstr "" -#: ../src/vikwindow.c:1712 +#: ../src/vikwindow.c:1709 msgid "Width (pixels):" msgstr "" -#: ../src/vikwindow.c:1714 +#: ../src/vikwindow.c:1711 msgid "Height (pixels):" msgstr "" -#: ../src/vikwindow.c:1717 +#: ../src/vikwindow.c:1714 msgid "Zoom (meters per pixel):" msgstr "" -#: ../src/vikwindow.c:1723 +#: ../src/vikwindow.c:1720 msgid "Area in current viewable window" msgstr "" -#: ../src/vikwindow.c:1733 +#: ../src/vikwindow.c:1730 msgid "Save as PNG" msgstr "" -#: ../src/vikwindow.c:1734 +#: ../src/vikwindow.c:1731 msgid "Save as JPEG" msgstr "" -#: ../src/vikwindow.c:1754 +#: ../src/vikwindow.c:1751 msgid "East-west image tiles:" msgstr "" -#: ../src/vikwindow.c:1756 +#: ../src/vikwindow.c:1753 msgid "North-south image tiles:" msgstr "" -#: ../src/vikwindow.c:1796 +#: ../src/vikwindow.c:1793 msgid "You must be in UTM mode to use this feature" msgstr "" -#: ../src/vikwindow.c:1807 +#: ../src/vikwindow.c:1804 msgid "Save Image" msgstr "" -#: ../src/vikwindow.c:1834 +#: ../src/vikwindow.c:1831 msgid "Choose a directory to hold images" msgstr "" -#: ../src/vikwindow.c:1920 +#: ../src/vikwindow.c:1917 msgid "Choose a background color" msgstr "" -#: ../src/vikwindow.c:1941 +#: ../src/vikwindow.c:1938 msgid "_File" msgstr "" -#: ../src/vikwindow.c:1942 +#: ../src/vikwindow.c:1939 msgid "_Edit" msgstr "" -#: ../src/vikwindow.c:1943 +#: ../src/vikwindow.c:1940 msgid "_View" msgstr "" -#: ../src/vikwindow.c:1944 ../src/vikwindow.c:2015 +#: ../src/vikwindow.c:1941 ../src/vikwindow.c:2013 msgid "_Zoom" msgstr "" -#: ../src/vikwindow.c:1945 ../src/vikwindow.c:2014 +#: ../src/vikwindow.c:1942 ../src/vikwindow.c:2012 msgid "_Pan" msgstr "" -#: ../src/vikwindow.c:1946 +#: ../src/vikwindow.c:1943 msgid "_Layers" msgstr "" -#: ../src/vikwindow.c:1947 +#: ../src/vikwindow.c:1944 msgid "_Tools" msgstr "" -#: ../src/vikwindow.c:1948 +#: ../src/vikwindow.c:1945 msgid "_Webtools" msgstr "" -#: ../src/vikwindow.c:1949 +#: ../src/vikwindow.c:1946 msgid "_Help" msgstr "" -#: ../src/vikwindow.c:1951 +#: ../src/vikwindow.c:1948 msgid "_New" msgstr "" -#: ../src/vikwindow.c:1951 +#: ../src/vikwindow.c:1948 msgid "New file" msgstr "" -#: ../src/vikwindow.c:1952 +#: ../src/vikwindow.c:1949 msgid "_Open" msgstr "" -#: ../src/vikwindow.c:1952 +#: ../src/vikwindow.c:1949 msgid "Open a file" msgstr "" -#: ../src/vikwindow.c:1953 +#: ../src/vikwindow.c:1950 msgid "A_ppend File" msgstr "" -#: ../src/vikwindow.c:1953 +#: ../src/vikwindow.c:1950 msgid "Append data from a different file" msgstr "" -#: ../src/vikwindow.c:1954 +#: ../src/vikwindow.c:1951 msgid "A_cquire" msgstr "" -#: ../src/vikwindow.c:1955 +#: ../src/vikwindow.c:1952 msgid "From _GPS" msgstr "" -#: ../src/vikwindow.c:1955 +#: ../src/vikwindow.c:1952 msgid "Transfer data from a GPS device" msgstr "" -#: ../src/vikwindow.c:1956 +#: ../src/vikwindow.c:1953 msgid "Google _Directions" msgstr "" -#: ../src/vikwindow.c:1956 +#: ../src/vikwindow.c:1953 msgid "Get driving directions from Google" msgstr "" -#: ../src/vikwindow.c:1958 +#: ../src/vikwindow.c:1955 msgid "Geo_caches" msgstr "" -#: ../src/vikwindow.c:1958 +#: ../src/vikwindow.c:1955 msgid "Get Geocaches from geocaching.com" msgstr "" -#: ../src/vikwindow.c:1960 +#: ../src/vikwindow.c:1957 msgid "_Save" msgstr "" -#: ../src/vikwindow.c:1960 +#: ../src/vikwindow.c:1957 msgid "Save the file" msgstr "" -#: ../src/vikwindow.c:1961 +#: ../src/vikwindow.c:1958 msgid "Save _As" msgstr "" -#: ../src/vikwindow.c:1961 +#: ../src/vikwindow.c:1958 msgid "Save the file under different name" msgstr "" -#: ../src/vikwindow.c:1962 +#: ../src/vikwindow.c:1959 msgid "_Generate Image File" msgstr "" -#: ../src/vikwindow.c:1962 +#: ../src/vikwindow.c:1959 msgid "Save a snapshot of the workspace into a file" msgstr "" -#: ../src/vikwindow.c:1963 +#: ../src/vikwindow.c:1960 msgid "Generate _Directory of Images" msgstr "" -#: ../src/vikwindow.c:1963 +#: ../src/vikwindow.c:1960 msgid "FIXME:IMGDIR" msgstr "" -#: ../src/vikwindow.c:1966 +#: ../src/vikwindow.c:1963 msgid "_Print..." msgstr "" -#: ../src/vikwindow.c:1966 +#: ../src/vikwindow.c:1963 msgid "Print maps" msgstr "" -#: ../src/vikwindow.c:1969 +#: ../src/vikwindow.c:1966 msgid "E_xit" msgstr "" -#: ../src/vikwindow.c:1969 +#: ../src/vikwindow.c:1966 msgid "Exit the program" msgstr "" -#: ../src/vikwindow.c:1970 +#: ../src/vikwindow.c:1967 msgid "Save and Exit" msgstr "" -#: ../src/vikwindow.c:1970 +#: ../src/vikwindow.c:1967 msgid "Save and Exit the program" msgstr "" -#: ../src/vikwindow.c:1972 +#: ../src/vikwindow.c:1969 msgid "Go To location" msgstr "" -#: ../src/vikwindow.c:1972 +#: ../src/vikwindow.c:1969 msgid "Go to address/place using text search" msgstr "" -#: ../src/vikwindow.c:1973 +#: ../src/vikwindow.c:1970 msgid "_Go to Lat\\/Lon..." msgstr "" -#: ../src/vikwindow.c:1973 +#: ../src/vikwindow.c:1970 msgid "Go to arbitrary lat\\/lon coordinate" msgstr "" -#: ../src/vikwindow.c:1974 +#: ../src/vikwindow.c:1971 msgid "Go to UTM..." msgstr "" -#: ../src/vikwindow.c:1974 +#: ../src/vikwindow.c:1971 msgid "Go to arbitrary UTM coordinate" msgstr "" -#: ../src/vikwindow.c:1975 +#: ../src/vikwindow.c:1972 msgid "Set Background Color..." msgstr "" -#: ../src/vikwindow.c:1976 +#: ../src/vikwindow.c:1973 msgid "Zoom _In" msgstr "" -#: ../src/vikwindow.c:1977 +#: ../src/vikwindow.c:1974 msgid "Zoom _Out" msgstr "" -#: ../src/vikwindow.c:1978 +#: ../src/vikwindow.c:1975 msgid "Zoom _To" msgstr "" -#: ../src/vikwindow.c:1979 +#: ../src/vikwindow.c:1976 msgid "0.25" msgstr "" -#: ../src/vikwindow.c:1980 +#: ../src/vikwindow.c:1977 msgid "0.5" msgstr "" -#: ../src/vikwindow.c:1981 +#: ../src/vikwindow.c:1978 msgid "1" msgstr "" -#: ../src/vikwindow.c:1982 +#: ../src/vikwindow.c:1979 msgid "2" msgstr "" -#: ../src/vikwindow.c:1983 +#: ../src/vikwindow.c:1980 msgid "4" msgstr "" -#: ../src/vikwindow.c:1984 +#: ../src/vikwindow.c:1981 msgid "8" msgstr "" -#: ../src/vikwindow.c:1985 +#: ../src/vikwindow.c:1982 msgid "16" msgstr "" -#: ../src/vikwindow.c:1986 +#: ../src/vikwindow.c:1983 msgid "32" msgstr "" -#: ../src/vikwindow.c:1987 +#: ../src/vikwindow.c:1984 msgid "64" msgstr "" -#: ../src/vikwindow.c:1988 +#: ../src/vikwindow.c:1985 msgid "128" msgstr "" -#: ../src/vikwindow.c:1989 +#: ../src/vikwindow.c:1986 msgid "Pan North" msgstr "" -#: ../src/vikwindow.c:1990 +#: ../src/vikwindow.c:1987 msgid "Pan East" msgstr "" -#: ../src/vikwindow.c:1991 +#: ../src/vikwindow.c:1988 msgid "Pan South" msgstr "" -#: ../src/vikwindow.c:1992 +#: ../src/vikwindow.c:1989 msgid "Pan West" msgstr "" -#: ../src/vikwindow.c:1993 +#: ../src/vikwindow.c:1990 msgid "Background _Jobs" msgstr "" -#: ../src/vikwindow.c:1995 +#: ../src/vikwindow.c:1992 msgid "Cu_t" msgstr "" -#: ../src/vikwindow.c:1996 +#: ../src/vikwindow.c:1993 msgid "_Copy" msgstr "" -#: ../src/vikwindow.c:1997 +#: ../src/vikwindow.c:1994 msgid "_Paste" msgstr "" -#: ../src/vikwindow.c:1998 +#: ../src/vikwindow.c:1995 msgid "_Delete" msgstr "" -#: ../src/vikwindow.c:1999 +#: ../src/vikwindow.c:1996 msgid "Delete All" msgstr "" -#: ../src/vikwindow.c:2000 +#: ../src/vikwindow.c:1997 +msgid "Flush Map cache" +msgstr "" + +#: ../src/vikwindow.c:1998 msgid "_Preferences..." msgstr "" -#: ../src/vikwindow.c:2001 +#: ../src/vikwindow.c:1999 msgid "_Properties" msgstr "" -#: ../src/vikwindow.c:2003 +#: ../src/vikwindow.c:2001 msgid "_About" msgstr "" -#: ../src/vikwindow.c:2008 +#: ../src/vikwindow.c:2006 msgid "_UTM Mode" msgstr "" -#: ../src/vikwindow.c:2009 +#: ../src/vikwindow.c:2007 msgid "_Expedia Mode" msgstr "" -#: ../src/vikwindow.c:2010 +#: ../src/vikwindow.c:2008 msgid "_Mercator Mode" msgstr "" -#: ../src/vikwindow.c:2014 +#: ../src/vikwindow.c:2012 msgid "Pan Tool" msgstr "" -#: ../src/vikwindow.c:2015 +#: ../src/vikwindow.c:2013 msgid "Zoom Tool" msgstr "" -#: ../src/vikwindow.c:2016 +#: ../src/vikwindow.c:2014 msgid "_Ruler" msgstr "" -#: ../src/vikwindow.c:2016 +#: ../src/vikwindow.c:2014 msgid "Ruler Tool" msgstr "" -#: ../src/vikwindow.c:2020 +#: ../src/vikwindow.c:2018 msgid "Show Scale" msgstr "" -#: ../src/vikwindow.c:2021 +#: ../src/vikwindow.c:2019 msgid "Show Center Mark" msgstr "" -#: ../src/vikwindow.c:2022 +#: ../src/vikwindow.c:2020 msgid "Full Screen" msgstr "" -#: ../src/vikwindow.c:2022 +#: ../src/vikwindow.c:2020 msgid "Activate full screen mode" msgstr "" -#: ../src/vikwindow.c:2023 +#: ../src/vikwindow.c:2021 msgid "Show Side Panel" msgstr "" -#: ../src/vikwindow.c:2085 +#: ../src/vikwindow.c:2083 #, c-format msgid "New %s Layer" msgstr "" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: viking\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-04 22:47+0100\n" +"POT-Creation-Date: 2009-08-20 09:50+0200\n" "PO-Revision-Date: 2009-02-04 22:19+0000\n" "Last-Translator: Guilhem Bonnefille <guilhem.bonnefille@gmail.com>\n" "Language-Team: Russian <ru@li.org>\n" @@ -16,7 +16,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2009-02-08 13:36+0000\n" +"X-Launchpad-Export-Date: 2009-09-09 20:12+0000\n" "X-Generator: Launchpad (build Unknown)\n" #: ../src/acquire.c:118 @@ -27,28 +27,28 @@ msgstr "ВыполнÑетÑÑ..." msgid "Error: acquisition failed." msgstr "" -#: ../src/acquire.c:149 ../src/vikgpslayer.c:957 +#: ../src/acquire.c:149 ../src/vikgpslayer.c:953 msgid "Done." msgstr "Готово." -#: ../src/acquire.c:326 ../src/vikgpslayer.c:996 +#: ../src/acquire.c:326 ../src/vikgpslayer.c:992 msgid "Status: detecting gpsbabel" msgstr "СтатуÑ: обнаружение gpsbabel" -#: ../src/background.c:54 +#: ../src/background.c:57 #, c-format msgid "%d items" msgstr "" -#: ../src/background.c:212 +#: ../src/background.c:224 msgid "Job" msgstr "ОперациÑ" -#: ../src/background.c:216 +#: ../src/background.c:228 msgid "Progress" msgstr "Ход выполнениÑ" -#: ../src/background.c:227 +#: ../src/background.c:239 msgid "Viking Background Jobs" msgstr "Фоновые задачи" @@ -73,7 +73,7 @@ msgid "" "into." msgstr "" -#: ../src/curl_download.c:85 +#: ../src/curl_download.c:94 #, c-format msgid "%s() Curl perform failed: %s" msgstr "" @@ -345,14 +345,14 @@ msgstr "Получено из GPS" msgid "using cmdline '%s' and file '%s'\n" msgstr "" -#: ../src/datasource_gps.c:150 ../src/vikgpslayer.c:711 +#: ../src/datasource_gps.c:150 ../src/vikgpslayer.c:707 #, c-format msgid "Downloading %d waypoint..." msgid_plural "Downloading %d waypoints..." msgstr[0] "" msgstr[1] "" -#: ../src/datasource_gps.c:152 ../src/vikgpslayer.c:713 +#: ../src/datasource_gps.c:152 ../src/vikgpslayer.c:709 #, c-format msgid "Downloading %d trackpoint..." msgid_plural "Downloading %d trackpoints..." @@ -369,7 +369,7 @@ msgstr "" msgid "Downloaded %d %s." msgstr "" -#: ../src/datasource_gps.c:185 ../src/vikgpslayer.c:783 +#: ../src/datasource_gps.c:185 ../src/vikgpslayer.c:779 #, c-format msgid "GPS Device: %s" msgstr "GPS : %s" @@ -382,7 +382,7 @@ msgstr "GPS протокол:" msgid "Serial Port:" msgstr "ПоÑледовательный порт:" -#: ../src/datasource_gps.c:299 ../src/vikgpslayer.c:1001 +#: ../src/datasource_gps.c:299 ../src/vikgpslayer.c:997 msgid "GPS device: N/A" msgstr "GPS уÑтройÑтво: необнаружено" @@ -413,6 +413,10 @@ msgstr "Ошибка загрузки: %s" msgid "Draw mode '%s' no more supported" msgstr "" +#: ../src/mapcache.c:63 +msgid "Mapcache memory size (MB):" +msgstr "" + #: ../src/print.c:53 msgid "None" msgstr "" @@ -455,11 +459,11 @@ msgstr "" msgid "Image S_ize:" msgstr "" -#: ../src/util.c:75 +#: ../src/util.c:76 msgid "Could not launch web browser." msgstr "" -#: ../src/util.c:86 +#: ../src/util.c:87 msgid "Could not create new email." msgstr "" @@ -673,11 +677,11 @@ msgstr "" msgid "Downloading DEM %s" msgstr "" -#: ../src/vikfileentry.c:67 +#: ../src/vikfileentry.c:68 msgid "Browse..." msgstr "Обзор..." -#: ../src/vikfileentry.c:94 +#: ../src/vikfileentry.c:96 msgid "Choose file" msgstr "Выберите файл" @@ -790,11 +794,11 @@ msgstr "Gpsd портt:" msgid "Gpsd Retry Interval (seconds):" msgstr "" -#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:989 +#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:985 msgid "GPS Download" msgstr "" -#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:989 +#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:985 msgid "GPS Upload" msgstr "" @@ -802,110 +806,110 @@ msgstr "" msgid "GPS Realtime Tracking" msgstr "" -#: ../src/vikgpslayer.c:373 +#: ../src/vikgpslayer.c:371 msgid "Unknown GPS Protocol" msgstr "ÐеизвеÑтный GPS протокол" -#: ../src/vikgpslayer.c:379 +#: ../src/vikgpslayer.c:377 msgid "Unknown serial port device" msgstr "" -#: ../src/vikgpslayer.c:444 +#: ../src/vikgpslayer.c:442 #, c-format msgid "%s: unknown parameter" msgstr "%s: неизвеÑтный параметр" -#: ../src/vikgpslayer.c:545 +#: ../src/vikgpslayer.c:541 msgid "Upload to GPS" msgstr "" -#: ../src/vikgpslayer.c:550 +#: ../src/vikgpslayer.c:546 msgid "Download from GPS" msgstr "" -#: ../src/vikgpslayer.c:568 +#: ../src/vikgpslayer.c:564 msgid "Empty Upload" msgstr "" -#: ../src/vikgpslayer.c:573 +#: ../src/vikgpslayer.c:569 msgid "Empty Download" msgstr "" -#: ../src/vikgpslayer.c:578 +#: ../src/vikgpslayer.c:574 msgid "Empty All" msgstr "" -#: ../src/vikgpslayer.c:718 +#: ../src/vikgpslayer.c:714 #, c-format msgid "Uploading %d waypoint..." msgid_plural "Uploading %d waypoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:720 +#: ../src/vikgpslayer.c:716 #, c-format msgid "Uploading %d trackpoint..." msgid_plural "Uploading %d trackpoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:744 +#: ../src/vikgpslayer.c:740 #, c-format msgid "Downloaded %d out of %d waypoint..." msgid_plural "Downloaded %d out of %d waypoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:746 +#: ../src/vikgpslayer.c:742 #, c-format msgid "Downloaded %d out of %d trackpoint..." msgid_plural "Downloaded %d out of %d trackpoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:750 +#: ../src/vikgpslayer.c:746 #, c-format msgid "Uploaded %d out of %d waypoint..." msgid_plural "Uploaded %d out of %d waypoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:752 +#: ../src/vikgpslayer.c:748 #, c-format msgid "Uploaded %d out of %d trackpoint..." msgid_plural "Uploaded %d out of %d trackpoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:759 +#: ../src/vikgpslayer.c:755 #, c-format msgid "Downloaded %d waypoint" msgid_plural "Downloaded %d waypoints" msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:761 +#: ../src/vikgpslayer.c:757 #, c-format msgid "Downloaded %d trackpoint" msgid_plural "Downloaded %d trackpoints" msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:765 +#: ../src/vikgpslayer.c:761 #, c-format msgid "Uploaded %d waypoint" msgid_plural "Uploaded %d waypoints" msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:767 +#: ../src/vikgpslayer.c:763 #, c-format msgid "Uploaded %d trackpoint" msgid_plural "Uploaded %d trackpoints" msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:952 +#: ../src/vikgpslayer.c:948 msgid "Error: couldn't find gpsbabel." msgstr "Ошибка: gpsbabel не найден." @@ -959,7 +963,7 @@ msgid "Map Type:" msgstr "" #: ../src/vikmapslayer.c:120 -msgid "Maps Directory (Optional):" +msgid "Maps Directory:" msgstr "" #: ../src/vikmapslayer.c:121 @@ -1004,52 +1008,52 @@ msgid "" "factor" msgstr "" -#: ../src/vikmapslayer.c:924 +#: ../src/vikmapslayer.c:927 #, c-format msgid "Redownloading up to %d %s map..." msgid_plural "Redownloading up to %d %s maps..." msgstr[0] "" msgstr[1] "" -#: ../src/vikmapslayer.c:926 +#: ../src/vikmapslayer.c:929 #, c-format msgid "Redownloading %d %s map..." msgid_plural "Redownloading %d %s maps..." msgstr[0] "" msgstr[1] "" -#: ../src/vikmapslayer.c:930 ../src/vikmapslayer.c:1001 +#: ../src/vikmapslayer.c:933 ../src/vikmapslayer.c:1004 #, c-format msgid "Downloading %d %s map..." msgid_plural "Downloading %d %s maps..." msgstr[0] "" msgstr[1] "" -#: ../src/vikmapslayer.c:1058 +#: ../src/vikmapslayer.c:1061 msgid "Redownload bad map(s)" msgstr "Перезагрузить иÑпорченные карты" -#: ../src/vikmapslayer.c:1062 +#: ../src/vikmapslayer.c:1065 msgid "Redownload all map(s)" msgstr "Перезагрузить вÑе карты" -#: ../src/vikmapslayer.c:1142 +#: ../src/vikmapslayer.c:1145 #, c-format msgid "" "Wrong drawmode for this map.\n" "Select \"%s\" from View menu and try again." msgstr "" -#: ../src/vikmapslayer.c:1147 +#: ../src/vikmapslayer.c:1150 msgid "Wrong zoom level for this map." msgstr "" -#: ../src/vikmapslayer.c:1172 +#: ../src/vikmapslayer.c:1175 msgid "Download Onscreen Maps" msgstr "" #. TODO Add GTK_STOCK_REFRESH icon -#: ../src/vikmapslayer.c:1178 +#: ../src/vikmapslayer.c:1181 msgid "Refresh Onscreen Tiles" msgstr "" @@ -1237,12 +1241,12 @@ msgstr "" msgid "Export Layer" msgstr "" -#: ../src/viktrwlayer.c:1565 ../src/vikwindow.c:1446 ../src/vikwindow.c:1820 +#: ../src/viktrwlayer.c:1565 ../src/vikwindow.c:1438 ../src/vikwindow.c:1817 #, c-format msgid "The file \"%s\" exists, do you wish to overwrite it?" msgstr "" -#: ../src/viktrwlayer.c:1575 ../src/vikwindow.c:1464 +#: ../src/viktrwlayer.c:1575 ../src/vikwindow.c:1456 msgid "The filename you requested could not be opened for writing." msgstr "" @@ -1258,71 +1262,71 @@ msgstr "" msgid "Waypoint not found in this layer." msgstr "" -#: ../src/viktrwlayer.c:1724 +#: ../src/viktrwlayer.c:1723 msgid "Goto Center of Layer" msgstr "" -#: ../src/viktrwlayer.c:1729 +#: ../src/viktrwlayer.c:1728 msgid "Goto Waypoint" msgstr "" -#: ../src/viktrwlayer.c:1735 +#: ../src/viktrwlayer.c:1734 msgid "Export layer" msgstr "" -#: ../src/viktrwlayer.c:1740 +#: ../src/viktrwlayer.c:1739 msgid "Export as GPSPoint" msgstr "" -#: ../src/viktrwlayer.c:1745 +#: ../src/viktrwlayer.c:1744 msgid "Export as GPSMapper" msgstr "ÐкÑпортировать в GPSMapper" -#: ../src/viktrwlayer.c:1750 +#: ../src/viktrwlayer.c:1749 msgid "Export as GPX" msgstr "ÐкÑпортировать в GPX" -#: ../src/viktrwlayer.c:1755 ../src/viktrwlayer.c:2794 +#: ../src/viktrwlayer.c:1754 ../src/viktrwlayer.c:2794 msgid "New Waypoint" msgstr "" -#: ../src/viktrwlayer.c:1762 +#: ../src/viktrwlayer.c:1761 msgid "Add Wikipedia Waypoints" msgstr "" -#: ../src/viktrwlayer.c:1767 +#: ../src/viktrwlayer.c:1766 msgid "Within layer bounds" msgstr "" -#: ../src/viktrwlayer.c:1772 +#: ../src/viktrwlayer.c:1771 msgid "Within current view" msgstr "" -#: ../src/viktrwlayer.c:1779 ../src/viktrwlayer.c:2760 +#: ../src/viktrwlayer.c:1778 ../src/viktrwlayer.c:2760 msgid "Upload to OSM" msgstr "" -#: ../src/viktrwlayer.c:2290 +#: ../src/viktrwlayer.c:2289 msgid "Failed. This track does not have timestamp" msgstr "" -#: ../src/viktrwlayer.c:2304 +#: ../src/viktrwlayer.c:2303 msgid "Failed. No other track in this layer has timestamp" msgstr "" -#: ../src/viktrwlayer.c:2310 +#: ../src/viktrwlayer.c:2309 msgid "Merge with..." msgstr "" -#: ../src/viktrwlayer.c:2310 +#: ../src/viktrwlayer.c:2309 msgid "Select track to merge with" msgstr "" -#: ../src/viktrwlayer.c:2347 +#: ../src/viktrwlayer.c:2346 msgid "Merge Threshold..." msgstr "" -#: ../src/viktrwlayer.c:2348 +#: ../src/viktrwlayer.c:2347 msgid "Merge when time between tracks less than:" msgstr "" @@ -1398,131 +1402,131 @@ msgstr "" msgid "Use with filter" msgstr "" -#: ../src/viktrwlayer.c:3736 +#: ../src/viktrwlayer.c:3735 msgid "Could not launch eog to open file." msgstr "" -#: ../src/viktrwlayer.c:3790 +#: ../src/viktrwlayer.c:3789 #, c-format msgid "Creating %d Image Thumbnails..." msgstr "" -#: ../src/viktrwlayer.c:4010 +#: ../src/viktrwlayer.c:4009 msgid "No map layer in use. Create one first" msgstr "" -#: ../src/viktrwlayer_propwin.c:658 +#: ../src/viktrwlayer_propwin.c:661 msgid "Failed spliting track. Track unchanged" msgstr "" -#: ../src/viktrwlayer_propwin.c:675 +#: ../src/viktrwlayer_propwin.c:678 msgid "Operation Aborted. Track unchanged" msgstr "" -#: ../src/viktrwlayer_propwin.c:729 +#: ../src/viktrwlayer_propwin.c:732 #, c-format msgid "%s - Track Properties" msgstr "" -#: ../src/viktrwlayer_propwin.c:734 +#: ../src/viktrwlayer_propwin.c:737 msgid "Split at Marker" msgstr "" -#: ../src/viktrwlayer_propwin.c:735 +#: ../src/viktrwlayer_propwin.c:738 msgid "Split Segments" msgstr "" -#: ../src/viktrwlayer_propwin.c:736 +#: ../src/viktrwlayer_propwin.c:739 msgid "Reverse" msgstr "" -#: ../src/viktrwlayer_propwin.c:737 +#: ../src/viktrwlayer_propwin.c:740 msgid "Delete Dupl." msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Comment:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Track Length:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Trackpoints:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Segments:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Duplicate Points:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Max Speed:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Avg. Speed:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Avg. Dist. Between TPs:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Elevation Range:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Total Elevation Gain/Loss:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Start:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>End:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Duration:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:788 ../src/viktrwlayer_propwin.c:795 -#: ../src/viktrwlayer_propwin.c:804 ../src/viktrwlayer_propwin.c:811 -#: ../src/viktrwlayer_propwin.c:850 ../src/viktrwlayer_propwin.c:851 -#: ../src/viktrwlayer_propwin.c:852 ../src/viktrwlayer_propwin.c:874 -#: ../src/viktrwlayer_propwin.c:881 +#: ../src/viktrwlayer_propwin.c:791 ../src/viktrwlayer_propwin.c:798 +#: ../src/viktrwlayer_propwin.c:807 ../src/viktrwlayer_propwin.c:814 +#: ../src/viktrwlayer_propwin.c:853 ../src/viktrwlayer_propwin.c:854 +#: ../src/viktrwlayer_propwin.c:855 ../src/viktrwlayer_propwin.c:877 +#: ../src/viktrwlayer_propwin.c:884 #, c-format msgid "No Data" msgstr "" -#: ../src/viktrwlayer_propwin.c:847 +#: ../src/viktrwlayer_propwin.c:850 #, c-format msgid "%d minutes" msgstr "" -#: ../src/viktrwlayer_propwin.c:870 +#: ../src/viktrwlayer_propwin.c:873 msgid "Statistics" msgstr "" -#: ../src/viktrwlayer_propwin.c:875 +#: ../src/viktrwlayer_propwin.c:878 msgid "<b>Track Distance:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:876 +#: ../src/viktrwlayer_propwin.c:879 msgid "Elevation-distance" msgstr "" -#: ../src/viktrwlayer_propwin.c:882 +#: ../src/viktrwlayer_propwin.c:885 msgid "<b>Track Time:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:883 +#: ../src/viktrwlayer_propwin.c:886 msgid "Speed-time" msgstr "" @@ -1562,31 +1566,47 @@ msgstr "" msgid "<b>\"Speed\" Between:</b>" msgstr "" -#: ../src/viktrwlayer_tpwin.c:117 -msgid "Trackpoint" +#: ../src/viktrwlayer_tpwin.c:110 +msgid "<b>VDOP:</b>" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:111 +msgid "<b>HDOP:</b>" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:112 +msgid "<b>PDOP:</b>" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:113 +msgid "<b>SAT/FIX:</b>" msgstr "" #: ../src/viktrwlayer_tpwin.c:122 +msgid "Trackpoint" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:127 msgid "Split Here" msgstr "" -#: ../src/viktrwlayer_tpwin.c:123 +#: ../src/viktrwlayer_tpwin.c:128 msgid "Join With Last" msgstr "" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Pan" msgstr "" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Zoom" msgstr "" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Ruler" msgstr "" -#: ../src/vikwindow.c:363 +#: ../src/vikwindow.c:364 #, c-format msgid "" "Do you want to save the changes you made to the document \"%s\"?\n" @@ -1594,441 +1614,445 @@ msgid "" "Your changes will be lost if you don't save them." msgstr "" -#: ../src/vikwindow.c:366 ../src/vikwindow.c:1314 +#: ../src/vikwindow.c:367 ../src/vikwindow.c:1306 msgid "Untitled" msgstr "" -#: ../src/vikwindow.c:367 +#: ../src/vikwindow.c:368 msgid "Don't Save" msgstr "" -#: ../src/vikwindow.c:400 +#: ../src/vikwindow.c:401 msgid "mpp" msgstr "" -#: ../src/vikwindow.c:400 +#: ../src/vikwindow.c:401 msgid "pixelfact" msgstr "" -#: ../src/vikwindow.c:527 +#: ../src/vikwindow.c:528 #, c-format msgid "%s %s %dm" msgstr "" -#: ../src/vikwindow.c:529 +#: ../src/vikwindow.c:530 #, c-format msgid "%s %s" msgstr "" -#: ../src/vikwindow.c:1113 +#: ../src/vikwindow.c:1105 msgid "You must select a layer to show its properties." msgstr "" -#: ../src/vikwindow.c:1129 +#: ../src/vikwindow.c:1121 msgid "You must select a layer to delete." msgstr "" -#: ../src/vikwindow.c:1347 +#: ../src/vikwindow.c:1339 msgid "The file you requested could not be opened." msgstr "" -#: ../src/vikwindow.c:1390 +#: ../src/vikwindow.c:1382 msgid "Please select a GPS data file to open. " msgstr "" -#: ../src/vikwindow.c:1433 +#: ../src/vikwindow.c:1425 msgid "Save as Viking File." msgstr "" -#: ../src/vikwindow.c:1667 +#: ../src/vikwindow.c:1664 msgid "" "Viewable region outside allowable pixel size bounds for image. Clipping " "width/height values." msgstr "" -#: ../src/vikwindow.c:1686 +#: ../src/vikwindow.c:1683 #, c-format msgid "Total area: %ldm x %ldm (%.3f sq. km)" msgstr "" #. todo: default for answers inside VikWindow or static (thruout instance) -#: ../src/vikwindow.c:1694 +#: ../src/vikwindow.c:1691 msgid "Save to Image File" msgstr "" -#: ../src/vikwindow.c:1712 +#: ../src/vikwindow.c:1709 msgid "Width (pixels):" msgstr "" -#: ../src/vikwindow.c:1714 +#: ../src/vikwindow.c:1711 msgid "Height (pixels):" msgstr "" -#: ../src/vikwindow.c:1717 +#: ../src/vikwindow.c:1714 msgid "Zoom (meters per pixel):" msgstr "" -#: ../src/vikwindow.c:1723 +#: ../src/vikwindow.c:1720 msgid "Area in current viewable window" msgstr "" -#: ../src/vikwindow.c:1733 +#: ../src/vikwindow.c:1730 msgid "Save as PNG" msgstr "" -#: ../src/vikwindow.c:1734 +#: ../src/vikwindow.c:1731 msgid "Save as JPEG" msgstr "" -#: ../src/vikwindow.c:1754 +#: ../src/vikwindow.c:1751 msgid "East-west image tiles:" msgstr "" -#: ../src/vikwindow.c:1756 +#: ../src/vikwindow.c:1753 msgid "North-south image tiles:" msgstr "" -#: ../src/vikwindow.c:1796 +#: ../src/vikwindow.c:1793 msgid "You must be in UTM mode to use this feature" msgstr "" -#: ../src/vikwindow.c:1807 +#: ../src/vikwindow.c:1804 msgid "Save Image" msgstr "" -#: ../src/vikwindow.c:1834 +#: ../src/vikwindow.c:1831 msgid "Choose a directory to hold images" msgstr "" -#: ../src/vikwindow.c:1920 +#: ../src/vikwindow.c:1917 msgid "Choose a background color" msgstr "" -#: ../src/vikwindow.c:1941 +#: ../src/vikwindow.c:1938 msgid "_File" msgstr "" -#: ../src/vikwindow.c:1942 +#: ../src/vikwindow.c:1939 msgid "_Edit" msgstr "" -#: ../src/vikwindow.c:1943 +#: ../src/vikwindow.c:1940 msgid "_View" msgstr "" -#: ../src/vikwindow.c:1944 ../src/vikwindow.c:2015 +#: ../src/vikwindow.c:1941 ../src/vikwindow.c:2013 msgid "_Zoom" msgstr "" -#: ../src/vikwindow.c:1945 ../src/vikwindow.c:2014 +#: ../src/vikwindow.c:1942 ../src/vikwindow.c:2012 msgid "_Pan" msgstr "" -#: ../src/vikwindow.c:1946 +#: ../src/vikwindow.c:1943 msgid "_Layers" msgstr "" -#: ../src/vikwindow.c:1947 +#: ../src/vikwindow.c:1944 msgid "_Tools" msgstr "" -#: ../src/vikwindow.c:1948 +#: ../src/vikwindow.c:1945 msgid "_Webtools" msgstr "" -#: ../src/vikwindow.c:1949 +#: ../src/vikwindow.c:1946 msgid "_Help" msgstr "" -#: ../src/vikwindow.c:1951 +#: ../src/vikwindow.c:1948 msgid "_New" msgstr "" -#: ../src/vikwindow.c:1951 +#: ../src/vikwindow.c:1948 msgid "New file" msgstr "" -#: ../src/vikwindow.c:1952 +#: ../src/vikwindow.c:1949 msgid "_Open" msgstr "" -#: ../src/vikwindow.c:1952 +#: ../src/vikwindow.c:1949 msgid "Open a file" msgstr "" -#: ../src/vikwindow.c:1953 +#: ../src/vikwindow.c:1950 msgid "A_ppend File" msgstr "" -#: ../src/vikwindow.c:1953 +#: ../src/vikwindow.c:1950 msgid "Append data from a different file" msgstr "" -#: ../src/vikwindow.c:1954 +#: ../src/vikwindow.c:1951 msgid "A_cquire" msgstr "" -#: ../src/vikwindow.c:1955 +#: ../src/vikwindow.c:1952 msgid "From _GPS" msgstr "" -#: ../src/vikwindow.c:1955 +#: ../src/vikwindow.c:1952 msgid "Transfer data from a GPS device" msgstr "" -#: ../src/vikwindow.c:1956 +#: ../src/vikwindow.c:1953 msgid "Google _Directions" msgstr "" -#: ../src/vikwindow.c:1956 +#: ../src/vikwindow.c:1953 msgid "Get driving directions from Google" msgstr "" -#: ../src/vikwindow.c:1958 +#: ../src/vikwindow.c:1955 msgid "Geo_caches" msgstr "" -#: ../src/vikwindow.c:1958 +#: ../src/vikwindow.c:1955 msgid "Get Geocaches from geocaching.com" msgstr "" -#: ../src/vikwindow.c:1960 +#: ../src/vikwindow.c:1957 msgid "_Save" msgstr "" -#: ../src/vikwindow.c:1960 +#: ../src/vikwindow.c:1957 msgid "Save the file" msgstr "" -#: ../src/vikwindow.c:1961 +#: ../src/vikwindow.c:1958 msgid "Save _As" msgstr "" -#: ../src/vikwindow.c:1961 +#: ../src/vikwindow.c:1958 msgid "Save the file under different name" msgstr "" -#: ../src/vikwindow.c:1962 +#: ../src/vikwindow.c:1959 msgid "_Generate Image File" msgstr "" -#: ../src/vikwindow.c:1962 +#: ../src/vikwindow.c:1959 msgid "Save a snapshot of the workspace into a file" msgstr "" -#: ../src/vikwindow.c:1963 +#: ../src/vikwindow.c:1960 msgid "Generate _Directory of Images" msgstr "" -#: ../src/vikwindow.c:1963 +#: ../src/vikwindow.c:1960 msgid "FIXME:IMGDIR" msgstr "" -#: ../src/vikwindow.c:1966 +#: ../src/vikwindow.c:1963 msgid "_Print..." msgstr "" -#: ../src/vikwindow.c:1966 +#: ../src/vikwindow.c:1963 msgid "Print maps" msgstr "" -#: ../src/vikwindow.c:1969 +#: ../src/vikwindow.c:1966 msgid "E_xit" msgstr "" -#: ../src/vikwindow.c:1969 +#: ../src/vikwindow.c:1966 msgid "Exit the program" msgstr "" -#: ../src/vikwindow.c:1970 +#: ../src/vikwindow.c:1967 msgid "Save and Exit" msgstr "" -#: ../src/vikwindow.c:1970 +#: ../src/vikwindow.c:1967 msgid "Save and Exit the program" msgstr "" -#: ../src/vikwindow.c:1972 +#: ../src/vikwindow.c:1969 msgid "Go To location" msgstr "" -#: ../src/vikwindow.c:1972 +#: ../src/vikwindow.c:1969 msgid "Go to address/place using text search" msgstr "" -#: ../src/vikwindow.c:1973 +#: ../src/vikwindow.c:1970 msgid "_Go to Lat\\/Lon..." msgstr "" -#: ../src/vikwindow.c:1973 +#: ../src/vikwindow.c:1970 msgid "Go to arbitrary lat\\/lon coordinate" msgstr "" -#: ../src/vikwindow.c:1974 +#: ../src/vikwindow.c:1971 msgid "Go to UTM..." msgstr "" -#: ../src/vikwindow.c:1974 +#: ../src/vikwindow.c:1971 msgid "Go to arbitrary UTM coordinate" msgstr "" -#: ../src/vikwindow.c:1975 +#: ../src/vikwindow.c:1972 msgid "Set Background Color..." msgstr "" -#: ../src/vikwindow.c:1976 +#: ../src/vikwindow.c:1973 msgid "Zoom _In" msgstr "" -#: ../src/vikwindow.c:1977 +#: ../src/vikwindow.c:1974 msgid "Zoom _Out" msgstr "" -#: ../src/vikwindow.c:1978 +#: ../src/vikwindow.c:1975 msgid "Zoom _To" msgstr "" -#: ../src/vikwindow.c:1979 +#: ../src/vikwindow.c:1976 msgid "0.25" msgstr "" -#: ../src/vikwindow.c:1980 +#: ../src/vikwindow.c:1977 msgid "0.5" msgstr "" -#: ../src/vikwindow.c:1981 +#: ../src/vikwindow.c:1978 msgid "1" msgstr "" -#: ../src/vikwindow.c:1982 +#: ../src/vikwindow.c:1979 msgid "2" msgstr "" -#: ../src/vikwindow.c:1983 +#: ../src/vikwindow.c:1980 msgid "4" msgstr "" -#: ../src/vikwindow.c:1984 +#: ../src/vikwindow.c:1981 msgid "8" msgstr "" -#: ../src/vikwindow.c:1985 +#: ../src/vikwindow.c:1982 msgid "16" msgstr "" -#: ../src/vikwindow.c:1986 +#: ../src/vikwindow.c:1983 msgid "32" msgstr "" -#: ../src/vikwindow.c:1987 +#: ../src/vikwindow.c:1984 msgid "64" msgstr "" -#: ../src/vikwindow.c:1988 +#: ../src/vikwindow.c:1985 msgid "128" msgstr "" -#: ../src/vikwindow.c:1989 +#: ../src/vikwindow.c:1986 msgid "Pan North" msgstr "" -#: ../src/vikwindow.c:1990 +#: ../src/vikwindow.c:1987 msgid "Pan East" msgstr "" -#: ../src/vikwindow.c:1991 +#: ../src/vikwindow.c:1988 msgid "Pan South" msgstr "" -#: ../src/vikwindow.c:1992 +#: ../src/vikwindow.c:1989 msgid "Pan West" msgstr "" -#: ../src/vikwindow.c:1993 +#: ../src/vikwindow.c:1990 msgid "Background _Jobs" msgstr "" -#: ../src/vikwindow.c:1995 +#: ../src/vikwindow.c:1992 msgid "Cu_t" msgstr "" -#: ../src/vikwindow.c:1996 +#: ../src/vikwindow.c:1993 msgid "_Copy" msgstr "" -#: ../src/vikwindow.c:1997 +#: ../src/vikwindow.c:1994 msgid "_Paste" msgstr "" -#: ../src/vikwindow.c:1998 +#: ../src/vikwindow.c:1995 msgid "_Delete" msgstr "" -#: ../src/vikwindow.c:1999 +#: ../src/vikwindow.c:1996 msgid "Delete All" msgstr "" -#: ../src/vikwindow.c:2000 +#: ../src/vikwindow.c:1997 +msgid "Flush Map cache" +msgstr "" + +#: ../src/vikwindow.c:1998 msgid "_Preferences..." msgstr "" -#: ../src/vikwindow.c:2001 +#: ../src/vikwindow.c:1999 msgid "_Properties" msgstr "" -#: ../src/vikwindow.c:2003 +#: ../src/vikwindow.c:2001 msgid "_About" msgstr "" -#: ../src/vikwindow.c:2008 +#: ../src/vikwindow.c:2006 msgid "_UTM Mode" msgstr "" -#: ../src/vikwindow.c:2009 +#: ../src/vikwindow.c:2007 msgid "_Expedia Mode" msgstr "" -#: ../src/vikwindow.c:2010 +#: ../src/vikwindow.c:2008 msgid "_Mercator Mode" msgstr "" -#: ../src/vikwindow.c:2014 +#: ../src/vikwindow.c:2012 msgid "Pan Tool" msgstr "" -#: ../src/vikwindow.c:2015 +#: ../src/vikwindow.c:2013 msgid "Zoom Tool" msgstr "" -#: ../src/vikwindow.c:2016 +#: ../src/vikwindow.c:2014 msgid "_Ruler" msgstr "" -#: ../src/vikwindow.c:2016 +#: ../src/vikwindow.c:2014 msgid "Ruler Tool" msgstr "" -#: ../src/vikwindow.c:2020 +#: ../src/vikwindow.c:2018 msgid "Show Scale" msgstr "" -#: ../src/vikwindow.c:2021 +#: ../src/vikwindow.c:2019 msgid "Show Center Mark" msgstr "" -#: ../src/vikwindow.c:2022 +#: ../src/vikwindow.c:2020 msgid "Full Screen" msgstr "Во веÑÑŒ Ñкран" -#: ../src/vikwindow.c:2022 +#: ../src/vikwindow.c:2020 msgid "Activate full screen mode" msgstr "" -#: ../src/vikwindow.c:2023 +#: ../src/vikwindow.c:2021 msgid "Show Side Panel" msgstr "" -#: ../src/vikwindow.c:2085 +#: ../src/vikwindow.c:2083 #, c-format msgid "New %s Layer" msgstr "" @@ -2044,20 +2068,3 @@ msgstr "" #: ../src/viking.desktop.in.h:3 msgid "Viking" msgstr "" - -#~ msgid "Transparent Google Maps" -#~ msgstr "Прозрачные карты Google" - -#~ msgid "Google Satellite Images" -#~ msgstr "Спутниковое изображение Google" - -#~ msgid "Old Google Maps" -#~ msgstr "Старые карты Google" - -#, c-format -#~ msgid "couldn't open temp file %s" -#~ msgstr "невозможно открыть временный файл %s" - -#, c-format -#~ msgid "Failed downloading %s" -#~ msgstr "Ошибка загрузки %s" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: viking\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-04 22:47+0100\n" +"POT-Creation-Date: 2009-08-20 09:50+0200\n" "PO-Revision-Date: 2009-02-04 22:19+0000\n" "Last-Translator: Guilhem Bonnefille <guilhem.bonnefille@gmail.com>\n" "Language-Team: Slovenian <sl@li.org>\n" @@ -16,7 +16,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || " "n%100==4 ? 3 : 0);\n" -"X-Launchpad-Export-Date: 2009-02-08 13:36+0000\n" +"X-Launchpad-Export-Date: 2009-09-09 20:12+0000\n" "X-Generator: Launchpad (build Unknown)\n" #: ../src/acquire.c:118 @@ -27,28 +27,28 @@ msgstr "Izvajanje ..." msgid "Error: acquisition failed." msgstr "Napaka: zajem ni uspel." -#: ../src/acquire.c:149 ../src/vikgpslayer.c:957 +#: ../src/acquire.c:149 ../src/vikgpslayer.c:953 msgid "Done." msgstr "Opravljeno." -#: ../src/acquire.c:326 ../src/vikgpslayer.c:996 +#: ../src/acquire.c:326 ../src/vikgpslayer.c:992 msgid "Status: detecting gpsbabel" msgstr "Stanje: iÅ¡Äem gpsbabel" -#: ../src/background.c:54 +#: ../src/background.c:57 #, c-format msgid "%d items" msgstr "%d predmetov" -#: ../src/background.c:212 +#: ../src/background.c:224 msgid "Job" msgstr "Opravilo" -#: ../src/background.c:216 +#: ../src/background.c:228 msgid "Progress" msgstr "Napredek" -#: ../src/background.c:227 +#: ../src/background.c:239 msgid "Viking Background Jobs" msgstr "Viking opravila v ozadju" @@ -73,7 +73,7 @@ msgid "" "into." msgstr "" -#: ../src/curl_download.c:85 +#: ../src/curl_download.c:94 #, c-format msgid "%s() Curl perform failed: %s" msgstr "%s() Izvajanje Curl ni uspelo: %s" @@ -345,14 +345,14 @@ msgstr "Zajeto iz GPS naprave" msgid "using cmdline '%s' and file '%s'\n" msgstr "" -#: ../src/datasource_gps.c:150 ../src/vikgpslayer.c:711 +#: ../src/datasource_gps.c:150 ../src/vikgpslayer.c:707 #, c-format msgid "Downloading %d waypoint..." msgid_plural "Downloading %d waypoints..." msgstr[0] "" msgstr[1] "" -#: ../src/datasource_gps.c:152 ../src/vikgpslayer.c:713 +#: ../src/datasource_gps.c:152 ../src/vikgpslayer.c:709 #, c-format msgid "Downloading %d trackpoint..." msgid_plural "Downloading %d trackpoints..." @@ -371,7 +371,7 @@ msgstr "PreneÅ¡eno %d od %d %s..." msgid "Downloaded %d %s." msgstr "PreneÅ¡eno %d %s." -#: ../src/datasource_gps.c:185 ../src/vikgpslayer.c:783 +#: ../src/datasource_gps.c:185 ../src/vikgpslayer.c:779 #, c-format msgid "GPS Device: %s" msgstr "Naprava GPS: %s" @@ -384,7 +384,7 @@ msgstr "Protokol GPS:" msgid "Serial Port:" msgstr "Zaporedni vmesnik:" -#: ../src/datasource_gps.c:299 ../src/vikgpslayer.c:1001 +#: ../src/datasource_gps.c:299 ../src/vikgpslayer.c:997 msgid "GPS device: N/A" msgstr "Naprava GPS: ni na voljo" @@ -415,6 +415,10 @@ msgstr "Napaka prenosa: %s" msgid "Draw mode '%s' no more supported" msgstr "" +#: ../src/mapcache.c:63 +msgid "Mapcache memory size (MB):" +msgstr "" + #: ../src/print.c:53 msgid "None" msgstr "Brez" @@ -457,11 +461,11 @@ msgstr "Prezri _robove strani" msgid "Image S_ize:" msgstr "_Velikost slike:" -#: ../src/util.c:75 +#: ../src/util.c:76 msgid "Could not launch web browser." msgstr "Spletnega brskalnika ni bilo mogoÄe zagnati." -#: ../src/util.c:86 +#: ../src/util.c:87 msgid "Could not create new email." msgstr "" @@ -678,11 +682,11 @@ msgstr "" msgid "Downloading DEM %s" msgstr "PrenaÅ¡anje DEM %s" -#: ../src/vikfileentry.c:67 +#: ../src/vikfileentry.c:68 msgid "Browse..." msgstr "Prebrskaj ..." -#: ../src/vikfileentry.c:94 +#: ../src/vikfileentry.c:96 msgid "Choose file" msgstr "Izberi datoteko" @@ -795,11 +799,11 @@ msgstr "Vrata gpsd" msgid "Gpsd Retry Interval (seconds):" msgstr "" -#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:989 +#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:985 msgid "GPS Download" msgstr "Prenos iz GPS" -#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:989 +#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:985 msgid "GPS Upload" msgstr "Prenos na GPS" @@ -807,110 +811,110 @@ msgstr "Prenos na GPS" msgid "GPS Realtime Tracking" msgstr "Sledenje v realnem Äasu z GPS" -#: ../src/vikgpslayer.c:373 +#: ../src/vikgpslayer.c:371 msgid "Unknown GPS Protocol" msgstr "Neznan protokol GPS" -#: ../src/vikgpslayer.c:379 +#: ../src/vikgpslayer.c:377 msgid "Unknown serial port device" msgstr "" -#: ../src/vikgpslayer.c:444 +#: ../src/vikgpslayer.c:442 #, c-format msgid "%s: unknown parameter" msgstr "%s: neznan parameter" -#: ../src/vikgpslayer.c:545 +#: ../src/vikgpslayer.c:541 msgid "Upload to GPS" msgstr "Prenos na GPS" -#: ../src/vikgpslayer.c:550 +#: ../src/vikgpslayer.c:546 msgid "Download from GPS" msgstr "Prenos iz GPS" -#: ../src/vikgpslayer.c:568 +#: ../src/vikgpslayer.c:564 msgid "Empty Upload" msgstr "Prazen prenos" -#: ../src/vikgpslayer.c:573 +#: ../src/vikgpslayer.c:569 msgid "Empty Download" msgstr "Prazen prenos" -#: ../src/vikgpslayer.c:578 +#: ../src/vikgpslayer.c:574 msgid "Empty All" msgstr "Prazno vse" -#: ../src/vikgpslayer.c:718 +#: ../src/vikgpslayer.c:714 #, c-format msgid "Uploading %d waypoint..." msgid_plural "Uploading %d waypoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:720 +#: ../src/vikgpslayer.c:716 #, c-format msgid "Uploading %d trackpoint..." msgid_plural "Uploading %d trackpoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:744 +#: ../src/vikgpslayer.c:740 #, c-format msgid "Downloaded %d out of %d waypoint..." msgid_plural "Downloaded %d out of %d waypoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:746 +#: ../src/vikgpslayer.c:742 #, c-format msgid "Downloaded %d out of %d trackpoint..." msgid_plural "Downloaded %d out of %d trackpoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:750 +#: ../src/vikgpslayer.c:746 #, c-format msgid "Uploaded %d out of %d waypoint..." msgid_plural "Uploaded %d out of %d waypoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:752 +#: ../src/vikgpslayer.c:748 #, c-format msgid "Uploaded %d out of %d trackpoint..." msgid_plural "Uploaded %d out of %d trackpoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:759 +#: ../src/vikgpslayer.c:755 #, c-format msgid "Downloaded %d waypoint" msgid_plural "Downloaded %d waypoints" msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:761 +#: ../src/vikgpslayer.c:757 #, c-format msgid "Downloaded %d trackpoint" msgid_plural "Downloaded %d trackpoints" msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:765 +#: ../src/vikgpslayer.c:761 #, c-format msgid "Uploaded %d waypoint" msgid_plural "Uploaded %d waypoints" msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:767 +#: ../src/vikgpslayer.c:763 #, c-format msgid "Uploaded %d trackpoint" msgid_plural "Uploaded %d trackpoints" msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:952 +#: ../src/vikgpslayer.c:948 msgid "Error: couldn't find gpsbabel." msgstr "Napaka: programa gpsbabel ni bilo mogoÄe najti." @@ -964,7 +968,7 @@ msgid "Map Type:" msgstr "Vrsta zemljevida:" #: ../src/vikmapslayer.c:120 -msgid "Maps Directory (Optional):" +msgid "Maps Directory:" msgstr "" #: ../src/vikmapslayer.c:121 @@ -1009,7 +1013,7 @@ msgid "" "factor" msgstr "" -#: ../src/vikmapslayer.c:924 +#: ../src/vikmapslayer.c:927 #, c-format msgid "Redownloading up to %d %s map..." msgid_plural "Redownloading up to %d %s maps..." @@ -1018,7 +1022,7 @@ msgstr[1] "Ponoven prenos do %d %s zemljevida..." msgstr[2] "Ponoven prenos do %d %s zemljevidov..." msgstr[3] "Ponoven prenos do %d %s zemljevidov..." -#: ../src/vikmapslayer.c:926 +#: ../src/vikmapslayer.c:929 #, c-format msgid "Redownloading %d %s map..." msgid_plural "Redownloading %d %s maps..." @@ -1027,7 +1031,7 @@ msgstr[1] "Ponoven prenos %d %s zemljevida..." msgstr[2] "Ponoven prenos %d %s zemljevidov..." msgstr[3] "Ponoven prenos %d %s zemljevidov..." -#: ../src/vikmapslayer.c:930 ../src/vikmapslayer.c:1001 +#: ../src/vikmapslayer.c:933 ../src/vikmapslayer.c:1004 #, c-format msgid "Downloading %d %s map..." msgid_plural "Downloading %d %s maps..." @@ -1036,31 +1040,31 @@ msgstr[1] "Prenos %d %s zemljevida..." msgstr[2] "Prenos %d %s zemljevidov..." msgstr[3] "Prenos %d %s zemljevidov..." -#: ../src/vikmapslayer.c:1058 +#: ../src/vikmapslayer.c:1061 msgid "Redownload bad map(s)" msgstr "Ponoven prenos slabih zemljevidov" -#: ../src/vikmapslayer.c:1062 +#: ../src/vikmapslayer.c:1065 msgid "Redownload all map(s)" msgstr "Ponoven prenos vseh zemljevidov" -#: ../src/vikmapslayer.c:1142 +#: ../src/vikmapslayer.c:1145 #, c-format msgid "" "Wrong drawmode for this map.\n" "Select \"%s\" from View menu and try again." msgstr "" -#: ../src/vikmapslayer.c:1147 +#: ../src/vikmapslayer.c:1150 msgid "Wrong zoom level for this map." msgstr "" -#: ../src/vikmapslayer.c:1172 +#: ../src/vikmapslayer.c:1175 msgid "Download Onscreen Maps" msgstr "" #. TODO Add GTK_STOCK_REFRESH icon -#: ../src/vikmapslayer.c:1178 +#: ../src/vikmapslayer.c:1181 msgid "Refresh Onscreen Tiles" msgstr "" @@ -1248,12 +1252,12 @@ msgstr "" msgid "Export Layer" msgstr "Izvozi plast" -#: ../src/viktrwlayer.c:1565 ../src/vikwindow.c:1446 ../src/vikwindow.c:1820 +#: ../src/viktrwlayer.c:1565 ../src/vikwindow.c:1438 ../src/vikwindow.c:1817 #, c-format msgid "The file \"%s\" exists, do you wish to overwrite it?" msgstr "Datoteka \"%s\" že obstaja. Ali jo želite prepisati?" -#: ../src/viktrwlayer.c:1575 ../src/vikwindow.c:1464 +#: ../src/viktrwlayer.c:1575 ../src/vikwindow.c:1456 msgid "The filename you requested could not be opened for writing." msgstr "" @@ -1269,71 +1273,71 @@ msgstr "" msgid "Waypoint not found in this layer." msgstr "" -#: ../src/viktrwlayer.c:1724 +#: ../src/viktrwlayer.c:1723 msgid "Goto Center of Layer" msgstr "Pojdi na srediÅ¡Äe plasti" -#: ../src/viktrwlayer.c:1729 +#: ../src/viktrwlayer.c:1728 msgid "Goto Waypoint" msgstr "" -#: ../src/viktrwlayer.c:1735 +#: ../src/viktrwlayer.c:1734 msgid "Export layer" msgstr "Izvozi plast" -#: ../src/viktrwlayer.c:1740 +#: ../src/viktrwlayer.c:1739 msgid "Export as GPSPoint" msgstr "" -#: ../src/viktrwlayer.c:1745 +#: ../src/viktrwlayer.c:1744 msgid "Export as GPSMapper" msgstr "Izvozi kot GPSMapper" -#: ../src/viktrwlayer.c:1750 +#: ../src/viktrwlayer.c:1749 msgid "Export as GPX" msgstr "Izvozi kot GPX" -#: ../src/viktrwlayer.c:1755 ../src/viktrwlayer.c:2794 +#: ../src/viktrwlayer.c:1754 ../src/viktrwlayer.c:2794 msgid "New Waypoint" msgstr "" -#: ../src/viktrwlayer.c:1762 +#: ../src/viktrwlayer.c:1761 msgid "Add Wikipedia Waypoints" msgstr "" -#: ../src/viktrwlayer.c:1767 +#: ../src/viktrwlayer.c:1766 msgid "Within layer bounds" msgstr "" -#: ../src/viktrwlayer.c:1772 +#: ../src/viktrwlayer.c:1771 msgid "Within current view" msgstr "" -#: ../src/viktrwlayer.c:1779 ../src/viktrwlayer.c:2760 +#: ../src/viktrwlayer.c:1778 ../src/viktrwlayer.c:2760 msgid "Upload to OSM" msgstr "Prenesi na OSM" -#: ../src/viktrwlayer.c:2290 +#: ../src/viktrwlayer.c:2289 msgid "Failed. This track does not have timestamp" msgstr "" -#: ../src/viktrwlayer.c:2304 +#: ../src/viktrwlayer.c:2303 msgid "Failed. No other track in this layer has timestamp" msgstr "" -#: ../src/viktrwlayer.c:2310 +#: ../src/viktrwlayer.c:2309 msgid "Merge with..." msgstr "" -#: ../src/viktrwlayer.c:2310 +#: ../src/viktrwlayer.c:2309 msgid "Select track to merge with" msgstr "" -#: ../src/viktrwlayer.c:2347 +#: ../src/viktrwlayer.c:2346 msgid "Merge Threshold..." msgstr "Meja za združevanje..." -#: ../src/viktrwlayer.c:2348 +#: ../src/viktrwlayer.c:2347 msgid "Merge when time between tracks less than:" msgstr "Združi, ko je Äas med sledmi krajÅ¡i kot:" @@ -1409,131 +1413,131 @@ msgstr "" msgid "Use with filter" msgstr "" -#: ../src/viktrwlayer.c:3736 +#: ../src/viktrwlayer.c:3735 msgid "Could not launch eog to open file." msgstr "" -#: ../src/viktrwlayer.c:3790 +#: ../src/viktrwlayer.c:3789 #, c-format msgid "Creating %d Image Thumbnails..." msgstr "" -#: ../src/viktrwlayer.c:4010 +#: ../src/viktrwlayer.c:4009 msgid "No map layer in use. Create one first" msgstr "" -#: ../src/viktrwlayer_propwin.c:658 +#: ../src/viktrwlayer_propwin.c:661 msgid "Failed spliting track. Track unchanged" msgstr "" -#: ../src/viktrwlayer_propwin.c:675 +#: ../src/viktrwlayer_propwin.c:678 msgid "Operation Aborted. Track unchanged" msgstr "Operacija preklicana. Sled nespremenjena" -#: ../src/viktrwlayer_propwin.c:729 +#: ../src/viktrwlayer_propwin.c:732 #, c-format msgid "%s - Track Properties" msgstr "%s - Lastnosti sledi" -#: ../src/viktrwlayer_propwin.c:734 +#: ../src/viktrwlayer_propwin.c:737 msgid "Split at Marker" msgstr "" -#: ../src/viktrwlayer_propwin.c:735 +#: ../src/viktrwlayer_propwin.c:738 msgid "Split Segments" msgstr "" -#: ../src/viktrwlayer_propwin.c:736 +#: ../src/viktrwlayer_propwin.c:739 msgid "Reverse" msgstr "Obrni" -#: ../src/viktrwlayer_propwin.c:737 +#: ../src/viktrwlayer_propwin.c:740 msgid "Delete Dupl." msgstr "IzbriÅ¡i podvojene" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Comment:</b>" msgstr "<b>Opomba:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Track Length:</b>" msgstr "<b>Dolžina sledi:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Trackpoints:</b>" msgstr "<b>ToÄk sledi:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Segments:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Duplicate Points:</b>" msgstr "<b>Podvojene toÄke:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Max Speed:</b>" msgstr "<b>NajviÅ¡ja hitrost:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Avg. Speed:</b>" msgstr "<b>Povp. hitrost:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Avg. Dist. Between TPs:</b>" msgstr "<b>PovpreÄna razdalja med toÄkama:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Elevation Range:</b>" msgstr "<b>Razpon viÅ¡in:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Total Elevation Gain/Loss:</b>" msgstr "<b>Skupen dvig/spust:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Start:</b>" msgstr "<b>ZaÄetek:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>End:</b>" msgstr "<b>Konec:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Duration:</b>" msgstr "<b>Trajanje:</b>" -#: ../src/viktrwlayer_propwin.c:788 ../src/viktrwlayer_propwin.c:795 -#: ../src/viktrwlayer_propwin.c:804 ../src/viktrwlayer_propwin.c:811 -#: ../src/viktrwlayer_propwin.c:850 ../src/viktrwlayer_propwin.c:851 -#: ../src/viktrwlayer_propwin.c:852 ../src/viktrwlayer_propwin.c:874 -#: ../src/viktrwlayer_propwin.c:881 +#: ../src/viktrwlayer_propwin.c:791 ../src/viktrwlayer_propwin.c:798 +#: ../src/viktrwlayer_propwin.c:807 ../src/viktrwlayer_propwin.c:814 +#: ../src/viktrwlayer_propwin.c:853 ../src/viktrwlayer_propwin.c:854 +#: ../src/viktrwlayer_propwin.c:855 ../src/viktrwlayer_propwin.c:877 +#: ../src/viktrwlayer_propwin.c:884 #, c-format msgid "No Data" msgstr "Ni podatkov" -#: ../src/viktrwlayer_propwin.c:847 +#: ../src/viktrwlayer_propwin.c:850 #, c-format msgid "%d minutes" msgstr "%d minut" -#: ../src/viktrwlayer_propwin.c:870 +#: ../src/viktrwlayer_propwin.c:873 msgid "Statistics" msgstr "" -#: ../src/viktrwlayer_propwin.c:875 +#: ../src/viktrwlayer_propwin.c:878 msgid "<b>Track Distance:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:876 +#: ../src/viktrwlayer_propwin.c:879 msgid "Elevation-distance" msgstr "ViÅ¡ina-razdalja" -#: ../src/viktrwlayer_propwin.c:882 +#: ../src/viktrwlayer_propwin.c:885 msgid "<b>Track Time:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:883 +#: ../src/viktrwlayer_propwin.c:886 msgid "Speed-time" msgstr "Hitrost-Äas" @@ -1573,31 +1577,47 @@ msgstr "<b>Razlika v Äasu:</b>" msgid "<b>\"Speed\" Between:</b>" msgstr "<b>\"Hitrost\" med:</b>" -#: ../src/viktrwlayer_tpwin.c:117 +#: ../src/viktrwlayer_tpwin.c:110 +msgid "<b>VDOP:</b>" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:111 +msgid "<b>HDOP:</b>" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:112 +msgid "<b>PDOP:</b>" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:113 +msgid "<b>SAT/FIX:</b>" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:122 msgid "Trackpoint" msgstr "ToÄka sledi" -#: ../src/viktrwlayer_tpwin.c:122 +#: ../src/viktrwlayer_tpwin.c:127 msgid "Split Here" msgstr "Razdeli tu" -#: ../src/viktrwlayer_tpwin.c:123 +#: ../src/viktrwlayer_tpwin.c:128 msgid "Join With Last" msgstr "Združi z zadnjo" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Pan" msgstr "" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Zoom" msgstr "PoveÄava" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Ruler" msgstr "Merilo" -#: ../src/vikwindow.c:363 +#: ../src/vikwindow.c:364 #, c-format msgid "" "Do you want to save the changes you made to the document \"%s\"?\n" @@ -1605,441 +1625,445 @@ msgid "" "Your changes will be lost if you don't save them." msgstr "" -#: ../src/vikwindow.c:366 ../src/vikwindow.c:1314 +#: ../src/vikwindow.c:367 ../src/vikwindow.c:1306 msgid "Untitled" msgstr "Neimenovano" -#: ../src/vikwindow.c:367 +#: ../src/vikwindow.c:368 msgid "Don't Save" msgstr "Ne shrani" -#: ../src/vikwindow.c:400 +#: ../src/vikwindow.c:401 msgid "mpp" msgstr "" -#: ../src/vikwindow.c:400 +#: ../src/vikwindow.c:401 msgid "pixelfact" msgstr "" -#: ../src/vikwindow.c:527 +#: ../src/vikwindow.c:528 #, c-format msgid "%s %s %dm" msgstr "" -#: ../src/vikwindow.c:529 +#: ../src/vikwindow.c:530 #, c-format msgid "%s %s" msgstr "" -#: ../src/vikwindow.c:1113 +#: ../src/vikwindow.c:1105 msgid "You must select a layer to show its properties." msgstr "Izbrati morate plast, katere lastnosti želite prikazati." -#: ../src/vikwindow.c:1129 +#: ../src/vikwindow.c:1121 msgid "You must select a layer to delete." msgstr "Izbrati morate plast, ki jo želite izbrisati." -#: ../src/vikwindow.c:1347 +#: ../src/vikwindow.c:1339 msgid "The file you requested could not be opened." msgstr "Datoteke, ki ste jo želeli, ni mogoÄe odpreti" -#: ../src/vikwindow.c:1390 +#: ../src/vikwindow.c:1382 msgid "Please select a GPS data file to open. " msgstr "Prosimo, izberize datoteko s podatki GPS. " -#: ../src/vikwindow.c:1433 +#: ../src/vikwindow.c:1425 msgid "Save as Viking File." msgstr "Shrani kot datoteko Viking." -#: ../src/vikwindow.c:1667 +#: ../src/vikwindow.c:1664 msgid "" "Viewable region outside allowable pixel size bounds for image. Clipping " "width/height values." msgstr "" -#: ../src/vikwindow.c:1686 +#: ../src/vikwindow.c:1683 #, c-format msgid "Total area: %ldm x %ldm (%.3f sq. km)" msgstr "Skupna povrÅ¡ina: %ldm x %ldm (%.3f km2)" #. todo: default for answers inside VikWindow or static (thruout instance) -#: ../src/vikwindow.c:1694 +#: ../src/vikwindow.c:1691 msgid "Save to Image File" msgstr "Shrani v slikovno datoteko" -#: ../src/vikwindow.c:1712 +#: ../src/vikwindow.c:1709 msgid "Width (pixels):" msgstr "Å irina (slikovnih toÄk):" -#: ../src/vikwindow.c:1714 +#: ../src/vikwindow.c:1711 msgid "Height (pixels):" msgstr "ViÅ¡ina (slikovnih toÄk):" -#: ../src/vikwindow.c:1717 +#: ../src/vikwindow.c:1714 msgid "Zoom (meters per pixel):" msgstr "PoveÄava (metrov na slikovno toÄko)" -#: ../src/vikwindow.c:1723 +#: ../src/vikwindow.c:1720 msgid "Area in current viewable window" msgstr "PovrÅ¡ina v trenutno vidnem oknu" -#: ../src/vikwindow.c:1733 +#: ../src/vikwindow.c:1730 msgid "Save as PNG" msgstr "Shrani kot PNG" -#: ../src/vikwindow.c:1734 +#: ../src/vikwindow.c:1731 msgid "Save as JPEG" msgstr "Shrani kot JPEG" -#: ../src/vikwindow.c:1754 +#: ../src/vikwindow.c:1751 msgid "East-west image tiles:" msgstr "" -#: ../src/vikwindow.c:1756 +#: ../src/vikwindow.c:1753 msgid "North-south image tiles:" msgstr "" -#: ../src/vikwindow.c:1796 +#: ../src/vikwindow.c:1793 msgid "You must be in UTM mode to use this feature" msgstr "" -#: ../src/vikwindow.c:1807 +#: ../src/vikwindow.c:1804 msgid "Save Image" msgstr "Shrani sliko" -#: ../src/vikwindow.c:1834 +#: ../src/vikwindow.c:1831 msgid "Choose a directory to hold images" msgstr "Izberite mapo za shranjevanje slik" -#: ../src/vikwindow.c:1920 +#: ../src/vikwindow.c:1917 msgid "Choose a background color" msgstr "Izberite barvo ozadja" -#: ../src/vikwindow.c:1941 +#: ../src/vikwindow.c:1938 msgid "_File" msgstr "_Datoteka" -#: ../src/vikwindow.c:1942 +#: ../src/vikwindow.c:1939 msgid "_Edit" msgstr "Ur_ejanje" -#: ../src/vikwindow.c:1943 +#: ../src/vikwindow.c:1940 msgid "_View" msgstr "_Pogled" -#: ../src/vikwindow.c:1944 ../src/vikwindow.c:2015 +#: ../src/vikwindow.c:1941 ../src/vikwindow.c:2013 msgid "_Zoom" msgstr "_PoveÄava" -#: ../src/vikwindow.c:1945 ../src/vikwindow.c:2014 +#: ../src/vikwindow.c:1942 ../src/vikwindow.c:2012 msgid "_Pan" msgstr "" -#: ../src/vikwindow.c:1946 +#: ../src/vikwindow.c:1943 msgid "_Layers" msgstr "_Plasti" -#: ../src/vikwindow.c:1947 +#: ../src/vikwindow.c:1944 msgid "_Tools" msgstr "_Orodja" -#: ../src/vikwindow.c:1948 +#: ../src/vikwindow.c:1945 msgid "_Webtools" msgstr "" -#: ../src/vikwindow.c:1949 +#: ../src/vikwindow.c:1946 msgid "_Help" msgstr "Po_moÄ" -#: ../src/vikwindow.c:1951 +#: ../src/vikwindow.c:1948 msgid "_New" msgstr "_Novo" -#: ../src/vikwindow.c:1951 +#: ../src/vikwindow.c:1948 msgid "New file" msgstr "Nova datoteka" -#: ../src/vikwindow.c:1952 +#: ../src/vikwindow.c:1949 msgid "_Open" msgstr "_Odpri" -#: ../src/vikwindow.c:1952 +#: ../src/vikwindow.c:1949 msgid "Open a file" msgstr "Odpri datoteko" -#: ../src/vikwindow.c:1953 +#: ../src/vikwindow.c:1950 msgid "A_ppend File" msgstr "_Pripni datoteko" -#: ../src/vikwindow.c:1953 +#: ../src/vikwindow.c:1950 msgid "Append data from a different file" msgstr "Pripni podatke iz druge datoteke" -#: ../src/vikwindow.c:1954 +#: ../src/vikwindow.c:1951 msgid "A_cquire" msgstr "_Zajemi" -#: ../src/vikwindow.c:1955 +#: ../src/vikwindow.c:1952 msgid "From _GPS" msgstr "Iz _GPS" -#: ../src/vikwindow.c:1955 +#: ../src/vikwindow.c:1952 msgid "Transfer data from a GPS device" msgstr "Prenos podatkov iz naprave GPS" -#: ../src/vikwindow.c:1956 +#: ../src/vikwindow.c:1953 msgid "Google _Directions" msgstr "" -#: ../src/vikwindow.c:1956 +#: ../src/vikwindow.c:1953 msgid "Get driving directions from Google" msgstr "" -#: ../src/vikwindow.c:1958 +#: ../src/vikwindow.c:1955 msgid "Geo_caches" msgstr "Geo_zakladi" -#: ../src/vikwindow.c:1958 +#: ../src/vikwindow.c:1955 msgid "Get Geocaches from geocaching.com" msgstr "Pridobi podatke o Geozakladih iz geocaching.com" -#: ../src/vikwindow.c:1960 +#: ../src/vikwindow.c:1957 msgid "_Save" msgstr "_Shrani" -#: ../src/vikwindow.c:1960 +#: ../src/vikwindow.c:1957 msgid "Save the file" msgstr "Shrani datoteko" -#: ../src/vikwindow.c:1961 +#: ../src/vikwindow.c:1958 msgid "Save _As" msgstr "Shrani _kot" -#: ../src/vikwindow.c:1961 +#: ../src/vikwindow.c:1958 msgid "Save the file under different name" msgstr "Shrani datoteko pod drugim imenom" -#: ../src/vikwindow.c:1962 +#: ../src/vikwindow.c:1959 msgid "_Generate Image File" msgstr "" -#: ../src/vikwindow.c:1962 +#: ../src/vikwindow.c:1959 msgid "Save a snapshot of the workspace into a file" msgstr "" -#: ../src/vikwindow.c:1963 +#: ../src/vikwindow.c:1960 msgid "Generate _Directory of Images" msgstr "" -#: ../src/vikwindow.c:1963 +#: ../src/vikwindow.c:1960 msgid "FIXME:IMGDIR" msgstr "" -#: ../src/vikwindow.c:1966 +#: ../src/vikwindow.c:1963 msgid "_Print..." msgstr "_Natisni..." -#: ../src/vikwindow.c:1966 +#: ../src/vikwindow.c:1963 msgid "Print maps" msgstr "Natisni zemljevide" -#: ../src/vikwindow.c:1969 +#: ../src/vikwindow.c:1966 msgid "E_xit" msgstr "_Izhod" -#: ../src/vikwindow.c:1969 +#: ../src/vikwindow.c:1966 msgid "Exit the program" msgstr "Izhod iz programa" -#: ../src/vikwindow.c:1970 +#: ../src/vikwindow.c:1967 msgid "Save and Exit" msgstr "Shrani in konÄaj" -#: ../src/vikwindow.c:1970 +#: ../src/vikwindow.c:1967 msgid "Save and Exit the program" msgstr "Shrani in konÄaj delo s programom" -#: ../src/vikwindow.c:1972 +#: ../src/vikwindow.c:1969 msgid "Go To location" msgstr "" -#: ../src/vikwindow.c:1972 +#: ../src/vikwindow.c:1969 msgid "Go to address/place using text search" msgstr "" -#: ../src/vikwindow.c:1973 +#: ../src/vikwindow.c:1970 msgid "_Go to Lat\\/Lon..." msgstr "" -#: ../src/vikwindow.c:1973 +#: ../src/vikwindow.c:1970 msgid "Go to arbitrary lat\\/lon coordinate" msgstr "" -#: ../src/vikwindow.c:1974 +#: ../src/vikwindow.c:1971 msgid "Go to UTM..." msgstr "" -#: ../src/vikwindow.c:1974 +#: ../src/vikwindow.c:1971 msgid "Go to arbitrary UTM coordinate" msgstr "" -#: ../src/vikwindow.c:1975 +#: ../src/vikwindow.c:1972 msgid "Set Background Color..." msgstr "Nastavi barvo ozadja..." -#: ../src/vikwindow.c:1976 +#: ../src/vikwindow.c:1973 msgid "Zoom _In" msgstr "Po_veÄaj" -#: ../src/vikwindow.c:1977 +#: ../src/vikwindow.c:1974 msgid "Zoom _Out" msgstr "Po_manjÅ¡aj" -#: ../src/vikwindow.c:1978 +#: ../src/vikwindow.c:1975 msgid "Zoom _To" msgstr "" -#: ../src/vikwindow.c:1979 +#: ../src/vikwindow.c:1976 msgid "0.25" msgstr "0,25" -#: ../src/vikwindow.c:1980 +#: ../src/vikwindow.c:1977 msgid "0.5" msgstr "0,5" -#: ../src/vikwindow.c:1981 +#: ../src/vikwindow.c:1978 msgid "1" msgstr "1" -#: ../src/vikwindow.c:1982 +#: ../src/vikwindow.c:1979 msgid "2" msgstr "2" -#: ../src/vikwindow.c:1983 +#: ../src/vikwindow.c:1980 msgid "4" msgstr "4" -#: ../src/vikwindow.c:1984 +#: ../src/vikwindow.c:1981 msgid "8" msgstr "8" -#: ../src/vikwindow.c:1985 +#: ../src/vikwindow.c:1982 msgid "16" msgstr "16" -#: ../src/vikwindow.c:1986 +#: ../src/vikwindow.c:1983 msgid "32" msgstr "32" -#: ../src/vikwindow.c:1987 +#: ../src/vikwindow.c:1984 msgid "64" msgstr "64" -#: ../src/vikwindow.c:1988 +#: ../src/vikwindow.c:1985 msgid "128" msgstr "128" -#: ../src/vikwindow.c:1989 +#: ../src/vikwindow.c:1986 msgid "Pan North" msgstr "Premakni na sever" -#: ../src/vikwindow.c:1990 +#: ../src/vikwindow.c:1987 msgid "Pan East" msgstr "Premakni na vzhod" -#: ../src/vikwindow.c:1991 +#: ../src/vikwindow.c:1988 msgid "Pan South" msgstr "Premakni na jug" -#: ../src/vikwindow.c:1992 +#: ../src/vikwindow.c:1989 msgid "Pan West" msgstr "Premakni na zahod" -#: ../src/vikwindow.c:1993 +#: ../src/vikwindow.c:1990 msgid "Background _Jobs" msgstr "Opravila v _ozadju" -#: ../src/vikwindow.c:1995 +#: ../src/vikwindow.c:1992 msgid "Cu_t" msgstr "_Izreži" -#: ../src/vikwindow.c:1996 +#: ../src/vikwindow.c:1993 msgid "_Copy" msgstr "_Kopiraj" -#: ../src/vikwindow.c:1997 +#: ../src/vikwindow.c:1994 msgid "_Paste" msgstr "_Prilepi" -#: ../src/vikwindow.c:1998 +#: ../src/vikwindow.c:1995 msgid "_Delete" msgstr "I_zbriÅ¡i" -#: ../src/vikwindow.c:1999 +#: ../src/vikwindow.c:1996 msgid "Delete All" msgstr "IzbriÅ¡i vse" -#: ../src/vikwindow.c:2000 +#: ../src/vikwindow.c:1997 +msgid "Flush Map cache" +msgstr "" + +#: ../src/vikwindow.c:1998 msgid "_Preferences..." msgstr "_Nastavitve..." -#: ../src/vikwindow.c:2001 +#: ../src/vikwindow.c:1999 msgid "_Properties" msgstr "_Lastnosti" -#: ../src/vikwindow.c:2003 +#: ../src/vikwindow.c:2001 msgid "_About" msgstr "_O programu" -#: ../src/vikwindow.c:2008 +#: ../src/vikwindow.c:2006 msgid "_UTM Mode" msgstr "_UTM naÄin" -#: ../src/vikwindow.c:2009 +#: ../src/vikwindow.c:2007 msgid "_Expedia Mode" msgstr "_Expedia naÄin" -#: ../src/vikwindow.c:2010 +#: ../src/vikwindow.c:2008 msgid "_Mercator Mode" msgstr "_Mercator naÄin" -#: ../src/vikwindow.c:2014 +#: ../src/vikwindow.c:2012 msgid "Pan Tool" msgstr "Orodje za premikanje" -#: ../src/vikwindow.c:2015 +#: ../src/vikwindow.c:2013 msgid "Zoom Tool" msgstr "Orodje za poveÄavo" -#: ../src/vikwindow.c:2016 +#: ../src/vikwindow.c:2014 msgid "_Ruler" msgstr "_Ravnilo" -#: ../src/vikwindow.c:2016 +#: ../src/vikwindow.c:2014 msgid "Ruler Tool" msgstr "" -#: ../src/vikwindow.c:2020 +#: ../src/vikwindow.c:2018 msgid "Show Scale" msgstr "Prikaži merilo" -#: ../src/vikwindow.c:2021 +#: ../src/vikwindow.c:2019 msgid "Show Center Mark" msgstr "Prikaži oznako srediÅ¡Äa" -#: ../src/vikwindow.c:2022 +#: ../src/vikwindow.c:2020 msgid "Full Screen" msgstr "Celozaslonsko" -#: ../src/vikwindow.c:2022 +#: ../src/vikwindow.c:2020 msgid "Activate full screen mode" msgstr "" -#: ../src/vikwindow.c:2023 +#: ../src/vikwindow.c:2021 msgid "Show Side Panel" msgstr "" -#: ../src/vikwindow.c:2085 +#: ../src/vikwindow.c:2083 #, c-format msgid "New %s Layer" msgstr "Nova plast %s" @@ -2055,38 +2079,3 @@ msgstr "" #: ../src/viking.desktop.in.h:3 msgid "Viking" msgstr "Viking" - -#~ msgid "Transparent Google Maps" -#~ msgstr "Prosojni zemljevidi Google" - -#~ msgid "Google Satellite Images" -#~ msgstr "Satelitski posnetki Google" - -#~ msgid "Google Terrain Maps" -#~ msgstr "Reliefni zemljevidi Google" - -#~ msgid "Failed getting google version numbers" -#~ msgstr "Ni bilo mogoÄe ugotoviti verzije zemljevidov Google" - -#~ msgid "Old Google Maps" -#~ msgstr "Stari zemljevidi Google" - -#~ msgid "Keep current position at center" -#~ msgstr "Ohrani trenutni položaj v srediÅ¡Äu" - -#~ msgid "_Old Google Mode" -#~ msgstr "_Stari Google naÄin" - -#~ msgid "Old _KH Mode" -#~ msgstr "Stari _KH naÄin" - -#~ msgid "_Google Mode" -#~ msgstr "_Google naÄin" - -#, c-format -#~ msgid "couldn't open temp file %s" -#~ msgstr "ZaÄasne datoteke %s ni bilo mogoÄe odpreti" - -#, c-format -#~ msgid "Failed downloading %s" -#~ msgstr "Napaka pri prenosu %s" @@ -7,15 +7,15 @@ msgid "" msgstr "" "Project-Id-Version: viking\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-04 22:47+0100\n" -"PO-Revision-Date: 2009-02-04 22:19+0000\n" -"Last-Translator: Guilhem Bonnefille <guilhem.bonnefille@gmail.com>\n" +"POT-Creation-Date: 2009-08-20 09:50+0200\n" +"PO-Revision-Date: 2009-05-01 17:36+0000\n" +"Last-Translator: Mikael Olofsson <michlos@1vb.us>\n" "Language-Team: Swedish <sv@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-02-08 13:36+0000\n" +"X-Launchpad-Export-Date: 2009-09-09 20:12+0000\n" "X-Generator: Launchpad (build Unknown)\n" #: ../src/acquire.c:118 @@ -26,28 +26,28 @@ msgstr "Arbetar..." msgid "Error: acquisition failed." msgstr "" -#: ../src/acquire.c:149 ../src/vikgpslayer.c:957 +#: ../src/acquire.c:149 ../src/vikgpslayer.c:953 msgid "Done." msgstr "Färdig." -#: ../src/acquire.c:326 ../src/vikgpslayer.c:996 +#: ../src/acquire.c:326 ../src/vikgpslayer.c:992 msgid "Status: detecting gpsbabel" msgstr "" -#: ../src/background.c:54 +#: ../src/background.c:57 #, c-format msgid "%d items" msgstr "" -#: ../src/background.c:212 +#: ../src/background.c:224 msgid "Job" msgstr "Jobb" -#: ../src/background.c:216 +#: ../src/background.c:228 msgid "Progress" msgstr "Förlopp" -#: ../src/background.c:227 +#: ../src/background.c:239 msgid "Viking Background Jobs" msgstr "" @@ -72,7 +72,7 @@ msgid "" "into." msgstr "" -#: ../src/curl_download.c:85 +#: ../src/curl_download.c:94 #, c-format msgid "%s() Curl perform failed: %s" msgstr "" @@ -107,7 +107,7 @@ msgstr "" #: ../src/dialog.c:192 msgid "Waypoint Properties" -msgstr "" +msgstr "Waypoint Egenskaper" #: ../src/dialog.c:218 msgid "Name:" @@ -235,11 +235,11 @@ msgstr "ZoomnivÃ¥:" #: ../src/expedia.c:51 msgid "Expedia Street Maps" -msgstr "" +msgstr "Expedia Street Maps" #: ../src/expedia.c:79 msgid "Invalid expedia altitude" -msgstr "" +msgstr "Ogiltig expedia altitud" #: ../src/expedia.c:110 #, c-format @@ -267,7 +267,7 @@ msgstr "" #: ../src/geonamessearch.c:135 ../src/googlesearch.c:70 msgid "I don't know that place. Do you want another search?" -msgstr "" +msgstr "Jag känner inte till den platsen. Vill du göra en ny sökning?" #: ../src/geonamessearch.c:153 ../src/googlesearch.c:88 msgid "Enter address or place name:" @@ -283,7 +283,7 @@ msgstr "kunde inte öppna temp fil" #: ../src/globals.c:41 msgid "Degree format:" -msgstr "" +msgstr "Gradformat:" #. Webtools #: ../src/google.c:34 @@ -344,14 +344,14 @@ msgstr "" msgid "using cmdline '%s' and file '%s'\n" msgstr "" -#: ../src/datasource_gps.c:150 ../src/vikgpslayer.c:711 +#: ../src/datasource_gps.c:150 ../src/vikgpslayer.c:707 #, c-format msgid "Downloading %d waypoint..." msgid_plural "Downloading %d waypoints..." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Laddar ned %d waypoint..." +msgstr[1] "Laddar ned %d waypoints..." -#: ../src/datasource_gps.c:152 ../src/vikgpslayer.c:713 +#: ../src/datasource_gps.c:152 ../src/vikgpslayer.c:709 #, c-format msgid "Downloading %d trackpoint..." msgid_plural "Downloading %d trackpoints..." @@ -368,7 +368,7 @@ msgstr "Laddade ned %d av %d %s..." msgid "Downloaded %d %s." msgstr "Laddade ned %d %s." -#: ../src/datasource_gps.c:185 ../src/vikgpslayer.c:783 +#: ../src/datasource_gps.c:185 ../src/vikgpslayer.c:779 #, c-format msgid "GPS Device: %s" msgstr "GPS enhet: %s" @@ -381,7 +381,7 @@ msgstr "GPS protokoll" msgid "Serial Port:" msgstr "Seriell Port:" -#: ../src/datasource_gps.c:299 ../src/vikgpslayer.c:1001 +#: ../src/datasource_gps.c:299 ../src/vikgpslayer.c:997 msgid "GPS device: N/A" msgstr "" @@ -412,6 +412,10 @@ msgstr "Nedladdningsfel: %s" msgid "Draw mode '%s' no more supported" msgstr "" +#: ../src/mapcache.c:63 +msgid "Mapcache memory size (MB):" +msgstr "" + #: ../src/print.c:53 msgid "None" msgstr "Ingen" @@ -452,13 +456,13 @@ msgstr "Ignorera sid_marginaler" #: ../src/print.c:632 msgid "Image S_ize:" -msgstr "" +msgstr "Bild S_torlek" -#: ../src/util.c:75 +#: ../src/util.c:76 msgid "Could not launch web browser." msgstr "Kunde inte starta webbläsare." -#: ../src/util.c:86 +#: ../src/util.c:87 msgid "Could not create new email." msgstr "" @@ -476,7 +480,7 @@ msgstr "" #: ../src/datasource_bfilter.c:46 msgid "Max number of points:" -msgstr "" +msgstr "Max antal punkter:" #: ../src/datasource_bfilter.c:54 msgid "Simplify All Tracks" @@ -488,7 +492,7 @@ msgstr "" #: ../src/datasource_bfilter.c:87 ../src/datasource_bfilter.c:88 msgid "Remove Duplicate Waypoints" -msgstr "" +msgstr "Ta bort dubbla Waypoints" #: ../src/datasource_bfilter.c:117 msgid "Waypoints Inside This" @@ -504,7 +508,7 @@ msgstr "" #: ../src/main.c:116 msgid "Use smaller symbols for waypoints" -msgstr "" +msgstr "Använd mindre symboler för waypoints" #: ../src/main.c:117 msgid "Enable debug output" @@ -520,28 +524,28 @@ msgstr "Visa version" #: ../src/osm.c:85 msgid "OSM (view)" -msgstr "" +msgstr "OSM (vy)" #: ../src/osm.c:89 msgid "OSM (edit)" -msgstr "" +msgstr "OSM (redigera)" #: ../src/osm.c:93 msgid "OSM (render)" -msgstr "" +msgstr "OSM (rendera)" #: ../src/osm-traces.c:77 msgid "OSM username:" -msgstr "" +msgstr "OSM användarnamn:" #: ../src/osm-traces.c:78 msgid "OSM password:" -msgstr "" +msgstr "OSM lösenord:" #: ../src/osm-traces.c:218 #, c-format msgid "failed to upload data: HTTP response is %ld" -msgstr "" +msgstr "kunde inte ladda upp data: HTTP svar är %ld" #: ../src/osm-traces.c:221 #, c-format @@ -606,6 +610,8 @@ msgid "" "This is the name of the file created on the server. This is not the name of " "the local file." msgstr "" +"Det här är namnet pÃ¥ den fil som skapats pÃ¥ servern. Det är inte namnet pÃ¥ " +"den lokala filen." #: ../src/osm-traces.c:370 msgid "Description:" @@ -634,7 +640,7 @@ msgstr "" #: ../src/osm-traces.c:417 #, c-format msgid "Uploading %s to OSM" -msgstr "" +msgstr "Laddar upp %s till OSM" #: ../src/uibuilder.c:134 msgid "Take care that this password will be stored clearly in a plain file." @@ -658,7 +664,7 @@ msgstr "Max höjd:" #: ../src/vikdemlayer.c:124 msgid "DEM Download/Import" -msgstr "" +msgstr "DEM Ladda ned/Importera" #: ../src/vikdemlayer.c:754 #, c-format @@ -674,11 +680,11 @@ msgstr "" msgid "Downloading DEM %s" msgstr "Laddar ned DEM %s" -#: ../src/vikfileentry.c:67 +#: ../src/vikfileentry.c:68 msgid "Browse..." msgstr "Bläddra..." -#: ../src/vikfileentry.c:94 +#: ../src/vikfileentry.c:96 msgid "Choose file" msgstr "Välj fil" @@ -713,15 +719,15 @@ msgstr "" #: ../src/vikgeoreflayer.c:309 ../src/vikgeoreflayer.c:354 msgid "Choose World file" -msgstr "" +msgstr "Välj World fil" #: ../src/vikgeoreflayer.c:322 msgid "The World file you requested could not be opened for reading." -msgstr "" +msgstr "Den Word fil du har valt kunde inte öppnas för läsning." #: ../src/vikgeoreflayer.c:367 msgid "The file you requested could not be opened for writing." -msgstr "" +msgstr "Den fil du valt kunde inte öppnas för skrivning." #: ../src/vikgeoreflayer.c:384 msgid "Layer Properties" @@ -729,7 +735,7 @@ msgstr "Lageregenskaper" #: ../src/vikgeoreflayer.c:400 msgid "World File Parameters:" -msgstr "" +msgstr "World Fil Parametrar:" #: ../src/vikgeoreflayer.c:401 msgid "Load From File..." @@ -781,21 +787,21 @@ msgstr "" #: ../src/vikgpslayer.c:140 msgid "Gpsd Host:" -msgstr "" +msgstr "Gpsd Värd:" #: ../src/vikgpslayer.c:141 msgid "Gpsd Port:" -msgstr "" +msgstr "Gpsd Port:" #: ../src/vikgpslayer.c:142 msgid "Gpsd Retry Interval (seconds):" msgstr "" -#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:989 +#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:985 msgid "GPS Download" msgstr "GPS nedladdning" -#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:989 +#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:985 msgid "GPS Upload" msgstr "GPS uppladdning" @@ -803,112 +809,112 @@ msgstr "GPS uppladdning" msgid "GPS Realtime Tracking" msgstr "" -#: ../src/vikgpslayer.c:373 +#: ../src/vikgpslayer.c:371 msgid "Unknown GPS Protocol" msgstr "Okänt GPS Protokoll" -#: ../src/vikgpslayer.c:379 +#: ../src/vikgpslayer.c:377 msgid "Unknown serial port device" msgstr "" -#: ../src/vikgpslayer.c:444 +#: ../src/vikgpslayer.c:442 #, c-format msgid "%s: unknown parameter" msgstr "%s: okänd parameter" -#: ../src/vikgpslayer.c:545 +#: ../src/vikgpslayer.c:541 msgid "Upload to GPS" msgstr "Ladda upp till GPS" -#: ../src/vikgpslayer.c:550 +#: ../src/vikgpslayer.c:546 msgid "Download from GPS" msgstr "Ladda ned frÃ¥n GPS" -#: ../src/vikgpslayer.c:568 +#: ../src/vikgpslayer.c:564 msgid "Empty Upload" msgstr "Tom uppladdning" -#: ../src/vikgpslayer.c:573 +#: ../src/vikgpslayer.c:569 msgid "Empty Download" msgstr "Tom nedladdning" -#: ../src/vikgpslayer.c:578 +#: ../src/vikgpslayer.c:574 msgid "Empty All" msgstr "Töm alla" -#: ../src/vikgpslayer.c:718 +#: ../src/vikgpslayer.c:714 #, c-format msgid "Uploading %d waypoint..." msgid_plural "Uploading %d waypoints..." msgstr[0] "Laddar upp %d waypoint..." msgstr[1] "Laddar upp %d waypoints..." -#: ../src/vikgpslayer.c:720 +#: ../src/vikgpslayer.c:716 #, c-format msgid "Uploading %d trackpoint..." msgid_plural "Uploading %d trackpoints..." msgstr[0] "Laddar upp %d trackpoint..." msgstr[1] "Laddar upp %d trackpoints..." -#: ../src/vikgpslayer.c:744 +#: ../src/vikgpslayer.c:740 #, c-format msgid "Downloaded %d out of %d waypoint..." msgid_plural "Downloaded %d out of %d waypoints..." msgstr[0] "Laddade ned %d av %d waypoint..." msgstr[1] "Laddade ned %d av %d waypoints..." -#: ../src/vikgpslayer.c:746 +#: ../src/vikgpslayer.c:742 #, c-format msgid "Downloaded %d out of %d trackpoint..." msgid_plural "Downloaded %d out of %d trackpoints..." msgstr[0] "Laddade ned %d av %d trackpoint..." msgstr[1] "Laddade ned %d av %d trackpoints..." -#: ../src/vikgpslayer.c:750 +#: ../src/vikgpslayer.c:746 #, c-format msgid "Uploaded %d out of %d waypoint..." msgid_plural "Uploaded %d out of %d waypoints..." msgstr[0] "Laddade upp %d av %d waypoint..." msgstr[1] "Laddade upp %d av %d waypoints..." -#: ../src/vikgpslayer.c:752 +#: ../src/vikgpslayer.c:748 #, c-format msgid "Uploaded %d out of %d trackpoint..." msgid_plural "Uploaded %d out of %d trackpoints..." msgstr[0] "Laddade upp %d av %d trackpoint..." msgstr[1] "Laddade upp %d av %d trackpoints..." -#: ../src/vikgpslayer.c:759 +#: ../src/vikgpslayer.c:755 #, c-format msgid "Downloaded %d waypoint" msgid_plural "Downloaded %d waypoints" msgstr[0] "Laddade ned %d waypoint" msgstr[1] "Laddade ned %d waypoints" -#: ../src/vikgpslayer.c:761 +#: ../src/vikgpslayer.c:757 #, c-format msgid "Downloaded %d trackpoint" msgid_plural "Downloaded %d trackpoints" msgstr[0] "Laddade ned %d trackpoint" msgstr[1] "Laddade ned %d trackpoints" -#: ../src/vikgpslayer.c:765 +#: ../src/vikgpslayer.c:761 #, c-format msgid "Uploaded %d waypoint" msgid_plural "Uploaded %d waypoints" msgstr[0] "Laddade upp %d waypoint" msgstr[1] "Laddade upp %d waypoints" -#: ../src/vikgpslayer.c:767 +#: ../src/vikgpslayer.c:763 #, c-format msgid "Uploaded %d trackpoint" msgid_plural "Uploaded %d trackpoints" msgstr[0] "Laddade upp %d trackpoint" msgstr[1] "Laddade upp %d trackpoints" -#: ../src/vikgpslayer.c:952 +#: ../src/vikgpslayer.c:948 msgid "Error: couldn't find gpsbabel." -msgstr "" +msgstr "Fel: kunde inte hitta gpsbabel." #: ../src/viklayerspanel.c:59 msgid "/C_ut" @@ -960,7 +966,7 @@ msgid "Map Type:" msgstr "" #: ../src/vikmapslayer.c:120 -msgid "Maps Directory (Optional):" +msgid "Maps Directory:" msgstr "" #: ../src/vikmapslayer.c:121 @@ -1005,52 +1011,52 @@ msgid "" "factor" msgstr "" -#: ../src/vikmapslayer.c:924 +#: ../src/vikmapslayer.c:927 #, c-format msgid "Redownloading up to %d %s map..." msgid_plural "Redownloading up to %d %s maps..." msgstr[0] "" msgstr[1] "" -#: ../src/vikmapslayer.c:926 +#: ../src/vikmapslayer.c:929 #, c-format msgid "Redownloading %d %s map..." msgid_plural "Redownloading %d %s maps..." msgstr[0] "" msgstr[1] "" -#: ../src/vikmapslayer.c:930 ../src/vikmapslayer.c:1001 +#: ../src/vikmapslayer.c:933 ../src/vikmapslayer.c:1004 #, c-format msgid "Downloading %d %s map..." msgid_plural "Downloading %d %s maps..." msgstr[0] "" msgstr[1] "" -#: ../src/vikmapslayer.c:1058 +#: ../src/vikmapslayer.c:1061 msgid "Redownload bad map(s)" msgstr "" -#: ../src/vikmapslayer.c:1062 +#: ../src/vikmapslayer.c:1065 msgid "Redownload all map(s)" msgstr "" -#: ../src/vikmapslayer.c:1142 +#: ../src/vikmapslayer.c:1145 #, c-format msgid "" "Wrong drawmode for this map.\n" "Select \"%s\" from View menu and try again." msgstr "" -#: ../src/vikmapslayer.c:1147 +#: ../src/vikmapslayer.c:1150 msgid "Wrong zoom level for this map." msgstr "" -#: ../src/vikmapslayer.c:1172 +#: ../src/vikmapslayer.c:1175 msgid "Download Onscreen Maps" msgstr "" #. TODO Add GTK_STOCK_REFRESH icon -#: ../src/vikmapslayer.c:1178 +#: ../src/vikmapslayer.c:1181 msgid "Refresh Onscreen Tiles" msgstr "" @@ -1085,7 +1091,7 @@ msgstr "Redigera trackpoint" #: ../src/viktrwlayer.c:327 msgid "Show Picture" -msgstr "" +msgstr "Visa Bild" #: ../src/viktrwlayer.c:330 msgid "Magic Scissors" @@ -1238,12 +1244,12 @@ msgstr "Detta lager har inga waypoints eller trackpoints." msgid "Export Layer" msgstr "Exportera lager" -#: ../src/viktrwlayer.c:1565 ../src/vikwindow.c:1446 ../src/vikwindow.c:1820 +#: ../src/viktrwlayer.c:1565 ../src/vikwindow.c:1438 ../src/vikwindow.c:1817 #, c-format msgid "The file \"%s\" exists, do you wish to overwrite it?" msgstr "Filen \"%s\" finns redan, vill du skriva över den?" -#: ../src/viktrwlayer.c:1575 ../src/vikwindow.c:1464 +#: ../src/viktrwlayer.c:1575 ../src/vikwindow.c:1456 msgid "The filename you requested could not be opened for writing." msgstr "" @@ -1257,73 +1263,73 @@ msgstr "Waypoint namn:" #: ../src/viktrwlayer.c:1626 msgid "Waypoint not found in this layer." -msgstr "" +msgstr "Waypoint hittades inte i detta lager." -#: ../src/viktrwlayer.c:1724 +#: ../src/viktrwlayer.c:1723 msgid "Goto Center of Layer" msgstr "" -#: ../src/viktrwlayer.c:1729 +#: ../src/viktrwlayer.c:1728 msgid "Goto Waypoint" msgstr "GÃ¥ till waypoint" -#: ../src/viktrwlayer.c:1735 +#: ../src/viktrwlayer.c:1734 msgid "Export layer" msgstr "Exportera lager" -#: ../src/viktrwlayer.c:1740 +#: ../src/viktrwlayer.c:1739 msgid "Export as GPSPoint" msgstr "Exportera som GPSPoint" -#: ../src/viktrwlayer.c:1745 +#: ../src/viktrwlayer.c:1744 msgid "Export as GPSMapper" msgstr "Exportera som GPSMapper" -#: ../src/viktrwlayer.c:1750 +#: ../src/viktrwlayer.c:1749 msgid "Export as GPX" msgstr "Exportera som GPX" -#: ../src/viktrwlayer.c:1755 ../src/viktrwlayer.c:2794 +#: ../src/viktrwlayer.c:1754 ../src/viktrwlayer.c:2794 msgid "New Waypoint" msgstr "Ny waypoint" -#: ../src/viktrwlayer.c:1762 +#: ../src/viktrwlayer.c:1761 msgid "Add Wikipedia Waypoints" msgstr "" -#: ../src/viktrwlayer.c:1767 +#: ../src/viktrwlayer.c:1766 msgid "Within layer bounds" msgstr "" -#: ../src/viktrwlayer.c:1772 +#: ../src/viktrwlayer.c:1771 msgid "Within current view" msgstr "" -#: ../src/viktrwlayer.c:1779 ../src/viktrwlayer.c:2760 +#: ../src/viktrwlayer.c:1778 ../src/viktrwlayer.c:2760 msgid "Upload to OSM" msgstr "Ladda upp till OSM" -#: ../src/viktrwlayer.c:2290 +#: ../src/viktrwlayer.c:2289 msgid "Failed. This track does not have timestamp" msgstr "" -#: ../src/viktrwlayer.c:2304 +#: ../src/viktrwlayer.c:2303 msgid "Failed. No other track in this layer has timestamp" msgstr "" -#: ../src/viktrwlayer.c:2310 +#: ../src/viktrwlayer.c:2309 msgid "Merge with..." msgstr "" -#: ../src/viktrwlayer.c:2310 +#: ../src/viktrwlayer.c:2309 msgid "Select track to merge with" msgstr "" -#: ../src/viktrwlayer.c:2347 +#: ../src/viktrwlayer.c:2346 msgid "Merge Threshold..." msgstr "" -#: ../src/viktrwlayer.c:2348 +#: ../src/viktrwlayer.c:2347 msgid "Merge when time between tracks less than:" msgstr "" @@ -1397,133 +1403,133 @@ msgstr "" #: ../src/viktrwlayer.c:2774 msgid "Use with filter" -msgstr "" +msgstr "Använd med filter" -#: ../src/viktrwlayer.c:3736 +#: ../src/viktrwlayer.c:3735 msgid "Could not launch eog to open file." msgstr "" -#: ../src/viktrwlayer.c:3790 +#: ../src/viktrwlayer.c:3789 #, c-format msgid "Creating %d Image Thumbnails..." msgstr "" -#: ../src/viktrwlayer.c:4010 +#: ../src/viktrwlayer.c:4009 msgid "No map layer in use. Create one first" msgstr "" -#: ../src/viktrwlayer_propwin.c:658 +#: ../src/viktrwlayer_propwin.c:661 msgid "Failed spliting track. Track unchanged" msgstr "" -#: ../src/viktrwlayer_propwin.c:675 +#: ../src/viktrwlayer_propwin.c:678 msgid "Operation Aborted. Track unchanged" msgstr "" -#: ../src/viktrwlayer_propwin.c:729 +#: ../src/viktrwlayer_propwin.c:732 #, c-format msgid "%s - Track Properties" msgstr "" -#: ../src/viktrwlayer_propwin.c:734 +#: ../src/viktrwlayer_propwin.c:737 msgid "Split at Marker" msgstr "" -#: ../src/viktrwlayer_propwin.c:735 +#: ../src/viktrwlayer_propwin.c:738 msgid "Split Segments" msgstr "" -#: ../src/viktrwlayer_propwin.c:736 +#: ../src/viktrwlayer_propwin.c:739 msgid "Reverse" msgstr "Omvänd" -#: ../src/viktrwlayer_propwin.c:737 +#: ../src/viktrwlayer_propwin.c:740 msgid "Delete Dupl." msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Comment:</b>" msgstr "<b>Kommentar:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Track Length:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Trackpoints:</b>" msgstr "<b>Trackpoints:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Segments:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Duplicate Points:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Max Speed:</b>" msgstr "<b>Max hastighet:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Avg. Speed:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Avg. Dist. Between TPs:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Elevation Range:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Total Elevation Gain/Loss:</b>" msgstr "<b>Total höjdskillnad:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Start:</b>" msgstr "<b>Start:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>End:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Duration:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:788 ../src/viktrwlayer_propwin.c:795 -#: ../src/viktrwlayer_propwin.c:804 ../src/viktrwlayer_propwin.c:811 -#: ../src/viktrwlayer_propwin.c:850 ../src/viktrwlayer_propwin.c:851 -#: ../src/viktrwlayer_propwin.c:852 ../src/viktrwlayer_propwin.c:874 -#: ../src/viktrwlayer_propwin.c:881 +#: ../src/viktrwlayer_propwin.c:791 ../src/viktrwlayer_propwin.c:798 +#: ../src/viktrwlayer_propwin.c:807 ../src/viktrwlayer_propwin.c:814 +#: ../src/viktrwlayer_propwin.c:853 ../src/viktrwlayer_propwin.c:854 +#: ../src/viktrwlayer_propwin.c:855 ../src/viktrwlayer_propwin.c:877 +#: ../src/viktrwlayer_propwin.c:884 #, c-format msgid "No Data" msgstr "Ingen data" -#: ../src/viktrwlayer_propwin.c:847 +#: ../src/viktrwlayer_propwin.c:850 #, c-format msgid "%d minutes" msgstr "%d minuter" -#: ../src/viktrwlayer_propwin.c:870 +#: ../src/viktrwlayer_propwin.c:873 msgid "Statistics" -msgstr "" +msgstr "Statistik" -#: ../src/viktrwlayer_propwin.c:875 +#: ../src/viktrwlayer_propwin.c:878 msgid "<b>Track Distance:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:876 +#: ../src/viktrwlayer_propwin.c:879 msgid "Elevation-distance" msgstr "" -#: ../src/viktrwlayer_propwin.c:882 +#: ../src/viktrwlayer_propwin.c:885 msgid "<b>Track Time:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:883 +#: ../src/viktrwlayer_propwin.c:886 msgid "Speed-time" msgstr "" @@ -1563,31 +1569,47 @@ msgstr "<b>Tidsskillnad:</b>" msgid "<b>\"Speed\" Between:</b>" msgstr "" -#: ../src/viktrwlayer_tpwin.c:117 +#: ../src/viktrwlayer_tpwin.c:110 +msgid "<b>VDOP:</b>" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:111 +msgid "<b>HDOP:</b>" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:112 +msgid "<b>PDOP:</b>" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:113 +msgid "<b>SAT/FIX:</b>" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:122 msgid "Trackpoint" msgstr "Trackpoint" -#: ../src/viktrwlayer_tpwin.c:122 +#: ../src/viktrwlayer_tpwin.c:127 msgid "Split Here" msgstr "Dela här" -#: ../src/viktrwlayer_tpwin.c:123 +#: ../src/viktrwlayer_tpwin.c:128 msgid "Join With Last" msgstr "" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Pan" msgstr "Panorera" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Zoom" msgstr "Zoom" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Ruler" msgstr "Linjal" -#: ../src/vikwindow.c:363 +#: ../src/vikwindow.c:364 #, c-format msgid "" "Do you want to save the changes you made to the document \"%s\"?\n" @@ -1598,441 +1620,445 @@ msgstr "" "\n" "Dina ändringar kommer försvinna om du inte sparar dem." -#: ../src/vikwindow.c:366 ../src/vikwindow.c:1314 +#: ../src/vikwindow.c:367 ../src/vikwindow.c:1306 msgid "Untitled" msgstr "Namnlös" -#: ../src/vikwindow.c:367 +#: ../src/vikwindow.c:368 msgid "Don't Save" msgstr "Spara inte" -#: ../src/vikwindow.c:400 +#: ../src/vikwindow.c:401 msgid "mpp" -msgstr "" +msgstr "mpp" -#: ../src/vikwindow.c:400 +#: ../src/vikwindow.c:401 msgid "pixelfact" msgstr "" -#: ../src/vikwindow.c:527 +#: ../src/vikwindow.c:528 #, c-format msgid "%s %s %dm" -msgstr "" +msgstr "%s %s %dm" -#: ../src/vikwindow.c:529 +#: ../src/vikwindow.c:530 #, c-format msgid "%s %s" -msgstr "" +msgstr "%s %s" -#: ../src/vikwindow.c:1113 +#: ../src/vikwindow.c:1105 msgid "You must select a layer to show its properties." msgstr "Du mÃ¥ste välja ett lager för att kuna se dess egenskaper." -#: ../src/vikwindow.c:1129 +#: ../src/vikwindow.c:1121 msgid "You must select a layer to delete." msgstr "Du mÃ¥ste välja ett lager för borttagning." -#: ../src/vikwindow.c:1347 +#: ../src/vikwindow.c:1339 msgid "The file you requested could not be opened." msgstr "Filen du valt kan inte öppnas." -#: ../src/vikwindow.c:1390 +#: ../src/vikwindow.c:1382 msgid "Please select a GPS data file to open. " msgstr "" -#: ../src/vikwindow.c:1433 +#: ../src/vikwindow.c:1425 msgid "Save as Viking File." msgstr "Spara som Viking fil." -#: ../src/vikwindow.c:1667 +#: ../src/vikwindow.c:1664 msgid "" "Viewable region outside allowable pixel size bounds for image. Clipping " "width/height values." msgstr "" -#: ../src/vikwindow.c:1686 +#: ../src/vikwindow.c:1683 #, c-format msgid "Total area: %ldm x %ldm (%.3f sq. km)" msgstr "" #. todo: default for answers inside VikWindow or static (thruout instance) -#: ../src/vikwindow.c:1694 +#: ../src/vikwindow.c:1691 msgid "Save to Image File" msgstr "" -#: ../src/vikwindow.c:1712 +#: ../src/vikwindow.c:1709 msgid "Width (pixels):" msgstr "Bredd (bildpunkter):" -#: ../src/vikwindow.c:1714 +#: ../src/vikwindow.c:1711 msgid "Height (pixels):" msgstr "Höjd (bildpunkter):" -#: ../src/vikwindow.c:1717 +#: ../src/vikwindow.c:1714 msgid "Zoom (meters per pixel):" msgstr "" -#: ../src/vikwindow.c:1723 +#: ../src/vikwindow.c:1720 msgid "Area in current viewable window" msgstr "" -#: ../src/vikwindow.c:1733 +#: ../src/vikwindow.c:1730 msgid "Save as PNG" msgstr "Spara som PNG" -#: ../src/vikwindow.c:1734 +#: ../src/vikwindow.c:1731 msgid "Save as JPEG" msgstr "Spara som JPEG" -#: ../src/vikwindow.c:1754 +#: ../src/vikwindow.c:1751 msgid "East-west image tiles:" msgstr "" -#: ../src/vikwindow.c:1756 +#: ../src/vikwindow.c:1753 msgid "North-south image tiles:" msgstr "" -#: ../src/vikwindow.c:1796 +#: ../src/vikwindow.c:1793 msgid "You must be in UTM mode to use this feature" -msgstr "" +msgstr "Du mÃ¥ste vara i UTM läge för att använda denna funktion" -#: ../src/vikwindow.c:1807 +#: ../src/vikwindow.c:1804 msgid "Save Image" msgstr "Spara bild" -#: ../src/vikwindow.c:1834 +#: ../src/vikwindow.c:1831 msgid "Choose a directory to hold images" msgstr "" -#: ../src/vikwindow.c:1920 +#: ../src/vikwindow.c:1917 msgid "Choose a background color" msgstr "Välj en bakgrundsfärg" -#: ../src/vikwindow.c:1941 +#: ../src/vikwindow.c:1938 msgid "_File" msgstr "_Fil" -#: ../src/vikwindow.c:1942 +#: ../src/vikwindow.c:1939 msgid "_Edit" msgstr "R_edigera" -#: ../src/vikwindow.c:1943 +#: ../src/vikwindow.c:1940 msgid "_View" msgstr "_Visa" -#: ../src/vikwindow.c:1944 ../src/vikwindow.c:2015 +#: ../src/vikwindow.c:1941 ../src/vikwindow.c:2013 msgid "_Zoom" msgstr "_Zoom" -#: ../src/vikwindow.c:1945 ../src/vikwindow.c:2014 +#: ../src/vikwindow.c:1942 ../src/vikwindow.c:2012 msgid "_Pan" msgstr "" -#: ../src/vikwindow.c:1946 +#: ../src/vikwindow.c:1943 msgid "_Layers" msgstr "_Lager" -#: ../src/vikwindow.c:1947 +#: ../src/vikwindow.c:1944 msgid "_Tools" msgstr "Verk -tyg" -#: ../src/vikwindow.c:1948 +#: ../src/vikwindow.c:1945 msgid "_Webtools" msgstr "" -#: ../src/vikwindow.c:1949 +#: ../src/vikwindow.c:1946 msgid "_Help" msgstr "_Hjälp" -#: ../src/vikwindow.c:1951 +#: ../src/vikwindow.c:1948 msgid "_New" msgstr "_Ny" -#: ../src/vikwindow.c:1951 +#: ../src/vikwindow.c:1948 msgid "New file" msgstr "Ny fil" -#: ../src/vikwindow.c:1952 +#: ../src/vikwindow.c:1949 msgid "_Open" msgstr "_Öppna" -#: ../src/vikwindow.c:1952 +#: ../src/vikwindow.c:1949 msgid "Open a file" msgstr "Öppna en fil" -#: ../src/vikwindow.c:1953 +#: ../src/vikwindow.c:1950 msgid "A_ppend File" msgstr "" -#: ../src/vikwindow.c:1953 +#: ../src/vikwindow.c:1950 msgid "Append data from a different file" msgstr "" -#: ../src/vikwindow.c:1954 +#: ../src/vikwindow.c:1951 msgid "A_cquire" msgstr "" -#: ../src/vikwindow.c:1955 +#: ../src/vikwindow.c:1952 msgid "From _GPS" msgstr "FrÃ¥n _GPS" -#: ../src/vikwindow.c:1955 +#: ../src/vikwindow.c:1952 msgid "Transfer data from a GPS device" msgstr "Överför data till en GPS enhet" -#: ../src/vikwindow.c:1956 +#: ../src/vikwindow.c:1953 msgid "Google _Directions" msgstr "" -#: ../src/vikwindow.c:1956 +#: ../src/vikwindow.c:1953 msgid "Get driving directions from Google" msgstr "" -#: ../src/vikwindow.c:1958 +#: ../src/vikwindow.c:1955 msgid "Geo_caches" msgstr "Geo_cachar" -#: ../src/vikwindow.c:1958 +#: ../src/vikwindow.c:1955 msgid "Get Geocaches from geocaching.com" msgstr "Hämta Geocachar frÃ¥n geocaching.com" -#: ../src/vikwindow.c:1960 +#: ../src/vikwindow.c:1957 msgid "_Save" msgstr "_Spara" -#: ../src/vikwindow.c:1960 +#: ../src/vikwindow.c:1957 msgid "Save the file" msgstr "Spara filen" -#: ../src/vikwindow.c:1961 +#: ../src/vikwindow.c:1958 msgid "Save _As" msgstr "Sp_ara som" -#: ../src/vikwindow.c:1961 +#: ../src/vikwindow.c:1958 msgid "Save the file under different name" msgstr "Spara filen under ett annat namn" -#: ../src/vikwindow.c:1962 +#: ../src/vikwindow.c:1959 msgid "_Generate Image File" msgstr "" -#: ../src/vikwindow.c:1962 +#: ../src/vikwindow.c:1959 msgid "Save a snapshot of the workspace into a file" msgstr "" -#: ../src/vikwindow.c:1963 +#: ../src/vikwindow.c:1960 msgid "Generate _Directory of Images" msgstr "" -#: ../src/vikwindow.c:1963 +#: ../src/vikwindow.c:1960 msgid "FIXME:IMGDIR" msgstr "" -#: ../src/vikwindow.c:1966 +#: ../src/vikwindow.c:1963 msgid "_Print..." msgstr "Skriv _ut..." -#: ../src/vikwindow.c:1966 +#: ../src/vikwindow.c:1963 msgid "Print maps" msgstr "" -#: ../src/vikwindow.c:1969 +#: ../src/vikwindow.c:1966 msgid "E_xit" msgstr "_Avsluta" -#: ../src/vikwindow.c:1969 +#: ../src/vikwindow.c:1966 msgid "Exit the program" msgstr "Avsluta programmet" -#: ../src/vikwindow.c:1970 +#: ../src/vikwindow.c:1967 msgid "Save and Exit" msgstr "Spara och avsluta" -#: ../src/vikwindow.c:1970 +#: ../src/vikwindow.c:1967 msgid "Save and Exit the program" msgstr "Spara och avsluta programmet" -#: ../src/vikwindow.c:1972 +#: ../src/vikwindow.c:1969 msgid "Go To location" msgstr "" -#: ../src/vikwindow.c:1972 +#: ../src/vikwindow.c:1969 msgid "Go to address/place using text search" msgstr "" -#: ../src/vikwindow.c:1973 +#: ../src/vikwindow.c:1970 msgid "_Go to Lat\\/Lon..." msgstr "" -#: ../src/vikwindow.c:1973 +#: ../src/vikwindow.c:1970 msgid "Go to arbitrary lat\\/lon coordinate" msgstr "" -#: ../src/vikwindow.c:1974 +#: ../src/vikwindow.c:1971 msgid "Go to UTM..." msgstr "GÃ¥ till UTM..." -#: ../src/vikwindow.c:1974 +#: ../src/vikwindow.c:1971 msgid "Go to arbitrary UTM coordinate" msgstr "" -#: ../src/vikwindow.c:1975 +#: ../src/vikwindow.c:1972 msgid "Set Background Color..." msgstr "Välj bakgrundsfärg" -#: ../src/vikwindow.c:1976 +#: ../src/vikwindow.c:1973 msgid "Zoom _In" msgstr "Zooma _in" -#: ../src/vikwindow.c:1977 +#: ../src/vikwindow.c:1974 msgid "Zoom _Out" msgstr "Zooma _ut" -#: ../src/vikwindow.c:1978 +#: ../src/vikwindow.c:1975 msgid "Zoom _To" msgstr "Zooma _till" -#: ../src/vikwindow.c:1979 +#: ../src/vikwindow.c:1976 msgid "0.25" msgstr "0,25" -#: ../src/vikwindow.c:1980 +#: ../src/vikwindow.c:1977 msgid "0.5" msgstr "0,5" -#: ../src/vikwindow.c:1981 +#: ../src/vikwindow.c:1978 msgid "1" msgstr "1" -#: ../src/vikwindow.c:1982 +#: ../src/vikwindow.c:1979 msgid "2" msgstr "2" -#: ../src/vikwindow.c:1983 +#: ../src/vikwindow.c:1980 msgid "4" msgstr "4" -#: ../src/vikwindow.c:1984 +#: ../src/vikwindow.c:1981 msgid "8" msgstr "8" -#: ../src/vikwindow.c:1985 +#: ../src/vikwindow.c:1982 msgid "16" msgstr "16" -#: ../src/vikwindow.c:1986 +#: ../src/vikwindow.c:1983 msgid "32" msgstr "32" -#: ../src/vikwindow.c:1987 +#: ../src/vikwindow.c:1984 msgid "64" msgstr "64" -#: ../src/vikwindow.c:1988 +#: ../src/vikwindow.c:1985 msgid "128" msgstr "128" -#: ../src/vikwindow.c:1989 +#: ../src/vikwindow.c:1986 msgid "Pan North" msgstr "Panorera norrut" -#: ../src/vikwindow.c:1990 +#: ../src/vikwindow.c:1987 msgid "Pan East" msgstr "Panorera österut" -#: ../src/vikwindow.c:1991 +#: ../src/vikwindow.c:1988 msgid "Pan South" msgstr "Panorera söderut" -#: ../src/vikwindow.c:1992 +#: ../src/vikwindow.c:1989 msgid "Pan West" msgstr "Panorera västerut" -#: ../src/vikwindow.c:1993 +#: ../src/vikwindow.c:1990 msgid "Background _Jobs" msgstr "" -#: ../src/vikwindow.c:1995 +#: ../src/vikwindow.c:1992 msgid "Cu_t" msgstr "Klipp _ut" -#: ../src/vikwindow.c:1996 +#: ../src/vikwindow.c:1993 msgid "_Copy" msgstr "_Kopiera" -#: ../src/vikwindow.c:1997 +#: ../src/vikwindow.c:1994 msgid "_Paste" msgstr "Klistra _in" -#: ../src/vikwindow.c:1998 +#: ../src/vikwindow.c:1995 msgid "_Delete" msgstr "_Ta bort" -#: ../src/vikwindow.c:1999 +#: ../src/vikwindow.c:1996 msgid "Delete All" msgstr "Ta bort alla" -#: ../src/vikwindow.c:2000 +#: ../src/vikwindow.c:1997 +msgid "Flush Map cache" +msgstr "" + +#: ../src/vikwindow.c:1998 msgid "_Preferences..." msgstr "_Inställningar..." -#: ../src/vikwindow.c:2001 +#: ../src/vikwindow.c:1999 msgid "_Properties" msgstr "_Egenskaper" -#: ../src/vikwindow.c:2003 +#: ../src/vikwindow.c:2001 msgid "_About" msgstr "_Om" -#: ../src/vikwindow.c:2008 +#: ../src/vikwindow.c:2006 msgid "_UTM Mode" msgstr "_UTM läge" -#: ../src/vikwindow.c:2009 +#: ../src/vikwindow.c:2007 msgid "_Expedia Mode" msgstr "_Expedia läge" -#: ../src/vikwindow.c:2010 +#: ../src/vikwindow.c:2008 msgid "_Mercator Mode" msgstr "_Mercator läge" -#: ../src/vikwindow.c:2014 +#: ../src/vikwindow.c:2012 msgid "Pan Tool" msgstr "Panoreringsverktyg" -#: ../src/vikwindow.c:2015 +#: ../src/vikwindow.c:2013 msgid "Zoom Tool" msgstr "Zoomverktyg" -#: ../src/vikwindow.c:2016 +#: ../src/vikwindow.c:2014 msgid "_Ruler" msgstr "_Linjal" -#: ../src/vikwindow.c:2016 +#: ../src/vikwindow.c:2014 msgid "Ruler Tool" msgstr "Linjalverktyg" -#: ../src/vikwindow.c:2020 +#: ../src/vikwindow.c:2018 msgid "Show Scale" msgstr "Visa skala" -#: ../src/vikwindow.c:2021 +#: ../src/vikwindow.c:2019 msgid "Show Center Mark" msgstr "" -#: ../src/vikwindow.c:2022 +#: ../src/vikwindow.c:2020 msgid "Full Screen" msgstr "Fullskärm" -#: ../src/vikwindow.c:2022 +#: ../src/vikwindow.c:2020 msgid "Activate full screen mode" -msgstr "" +msgstr "Aktivera fullskärmsläge" -#: ../src/vikwindow.c:2023 +#: ../src/vikwindow.c:2021 msgid "Show Side Panel" msgstr "" -#: ../src/vikwindow.c:2085 +#: ../src/vikwindow.c:2083 #, c-format msgid "New %s Layer" msgstr "Nytt %s lager" @@ -2047,15 +2073,4 @@ msgstr "" #: ../src/viking.desktop.in.h:3 msgid "Viking" -msgstr "" - -#~ msgid "_Google Mode" -#~ msgstr "_Google läge" - -#, c-format -#~ msgid "couldn't open temp file %s" -#~ msgstr "kunde inte öppna temp fil %s" - -#, c-format -#~ msgid "Failed downloading %s" -#~ msgstr "Kunde inte ladda ned %s" +msgstr "Viking" diff --git a/po/zh_CN.po b/po/zh_CN.po index 237320f..7adbadb 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -2,15 +2,15 @@ msgid "" msgstr "" "Project-Id-Version: Viking\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-04 22:47+0100\n" -"PO-Revision-Date: 2009-02-04 22:19+0000\n" -"Last-Translator: Guilhem Bonnefille <guilhem.bonnefille@gmail.com>\n" +"POT-Creation-Date: 2009-08-20 09:50+0200\n" +"PO-Revision-Date: 2009-09-07 07:26+0000\n" +"Last-Translator: rainofchaos <rainofchaos@gmail.com>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2009-02-08 13:36+0000\n" +"X-Launchpad-Export-Date: 2009-09-09 20:12+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Language: Simplified Chinese\n" @@ -22,28 +22,28 @@ msgstr "工作ä¸..." msgid "Error: acquisition failed." msgstr "" -#: ../src/acquire.c:149 ../src/vikgpslayer.c:957 +#: ../src/acquire.c:149 ../src/vikgpslayer.c:953 msgid "Done." -msgstr "完æˆ." +msgstr "完æˆã€‚" -#: ../src/acquire.c:326 ../src/vikgpslayer.c:996 +#: ../src/acquire.c:326 ../src/vikgpslayer.c:992 msgid "Status: detecting gpsbabel" msgstr "状æ€Â : 检测 gpsbabel" -#: ../src/background.c:54 +#: ../src/background.c:57 #, c-format msgid "%d items" msgstr "%d æ¡ç›®" -#: ../src/background.c:212 +#: ../src/background.c:224 msgid "Job" msgstr "任务" -#: ../src/background.c:216 +#: ../src/background.c:228 msgid "Progress" msgstr "进程" -#: ../src/background.c:227 +#: ../src/background.c:239 msgid "Viking Background Jobs" msgstr "Viking åŽå°ä»»åŠ¡" @@ -68,7 +68,7 @@ msgid "" "into." msgstr "" -#: ../src/curl_download.c:85 +#: ../src/curl_download.c:94 #, c-format msgid "%s() Curl perform failed: %s" msgstr "" @@ -340,14 +340,14 @@ msgstr "已从GPS获å–çš„" msgid "using cmdline '%s' and file '%s'\n" msgstr "使用命令行 '%s' 和文件 '%s'\n" -#: ../src/datasource_gps.c:150 ../src/vikgpslayer.c:711 +#: ../src/datasource_gps.c:150 ../src/vikgpslayer.c:707 #, c-format msgid "Downloading %d waypoint..." msgid_plural "Downloading %d waypoints..." msgstr[0] "" msgstr[1] "" -#: ../src/datasource_gps.c:152 ../src/vikgpslayer.c:713 +#: ../src/datasource_gps.c:152 ../src/vikgpslayer.c:709 #, c-format msgid "Downloading %d trackpoint..." msgid_plural "Downloading %d trackpoints..." @@ -364,7 +364,7 @@ msgstr "" msgid "Downloaded %d %s." msgstr "" -#: ../src/datasource_gps.c:185 ../src/vikgpslayer.c:783 +#: ../src/datasource_gps.c:185 ../src/vikgpslayer.c:779 #, c-format msgid "GPS Device: %s" msgstr "GPS设备: %s" @@ -377,7 +377,7 @@ msgstr "GPS åè®®:" msgid "Serial Port:" msgstr "串å£:" -#: ../src/datasource_gps.c:299 ../src/vikgpslayer.c:1001 +#: ../src/datasource_gps.c:299 ../src/vikgpslayer.c:997 msgid "GPS device: N/A" msgstr "GPS设备: æ— " @@ -408,6 +408,10 @@ msgstr "下载错误: %s" msgid "Draw mode '%s' no more supported" msgstr "" +#: ../src/mapcache.c:63 +msgid "Mapcache memory size (MB):" +msgstr "" + #: ../src/print.c:53 msgid "None" msgstr "æ— " @@ -450,11 +454,11 @@ msgstr "" msgid "Image S_ize:" msgstr "" -#: ../src/util.c:75 +#: ../src/util.c:76 msgid "Could not launch web browser." msgstr "" -#: ../src/util.c:86 +#: ../src/util.c:87 msgid "Could not create new email." msgstr "" @@ -668,11 +672,11 @@ msgstr "没有下载æºè¢«é€‰. 编辑图层属性." msgid "Downloading DEM %s" msgstr "æ£åœ¨ä¸‹è½½ DEM %s" -#: ../src/vikfileentry.c:67 +#: ../src/vikfileentry.c:68 msgid "Browse..." msgstr "æµè§ˆ..." -#: ../src/vikfileentry.c:94 +#: ../src/vikfileentry.c:96 msgid "Choose file" msgstr "选择一个文件" @@ -785,11 +789,11 @@ msgstr "Gpsd 端å£:" msgid "Gpsd Retry Interval (seconds):" msgstr "" -#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:989 +#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:985 msgid "GPS Download" msgstr "GPS 下载" -#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:989 +#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:985 msgid "GPS Upload" msgstr "GPS ä¸Šä¼ " @@ -797,108 +801,108 @@ msgstr "GPS ä¸Šä¼ " msgid "GPS Realtime Tracking" msgstr "GPS实时跟踪" -#: ../src/vikgpslayer.c:373 +#: ../src/vikgpslayer.c:371 msgid "Unknown GPS Protocol" msgstr "未知的GPSåè®®" -#: ../src/vikgpslayer.c:379 +#: ../src/vikgpslayer.c:377 msgid "Unknown serial port device" msgstr "未知的串å£è®¾å¤‡" -#: ../src/vikgpslayer.c:444 +#: ../src/vikgpslayer.c:442 #, c-format msgid "%s: unknown parameter" msgstr "%s: 未知的å‚æ•°" -#: ../src/vikgpslayer.c:545 +#: ../src/vikgpslayer.c:541 msgid "Upload to GPS" msgstr "ä¸Šä¼ åˆ°GPS" -#: ../src/vikgpslayer.c:550 +#: ../src/vikgpslayer.c:546 msgid "Download from GPS" msgstr "从GPS下载" -#: ../src/vikgpslayer.c:568 +#: ../src/vikgpslayer.c:564 msgid "Empty Upload" msgstr "æ¸…ç©ºä¸Šä¼ " -#: ../src/vikgpslayer.c:573 +#: ../src/vikgpslayer.c:569 msgid "Empty Download" msgstr "清空下载" -#: ../src/vikgpslayer.c:578 +#: ../src/vikgpslayer.c:574 msgid "Empty All" msgstr "清空全部" -#: ../src/vikgpslayer.c:718 +#: ../src/vikgpslayer.c:714 #, c-format msgid "Uploading %d waypoint..." msgid_plural "Uploading %d waypoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:720 +#: ../src/vikgpslayer.c:716 #, c-format msgid "Uploading %d trackpoint..." msgid_plural "Uploading %d trackpoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:744 +#: ../src/vikgpslayer.c:740 #, c-format msgid "Downloaded %d out of %d waypoint..." msgid_plural "Downloaded %d out of %d waypoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:746 +#: ../src/vikgpslayer.c:742 #, c-format msgid "Downloaded %d out of %d trackpoint..." msgid_plural "Downloaded %d out of %d trackpoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:750 +#: ../src/vikgpslayer.c:746 #, c-format msgid "Uploaded %d out of %d waypoint..." msgid_plural "Uploaded %d out of %d waypoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:752 +#: ../src/vikgpslayer.c:748 #, c-format msgid "Uploaded %d out of %d trackpoint..." msgid_plural "Uploaded %d out of %d trackpoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:759 +#: ../src/vikgpslayer.c:755 #, c-format msgid "Downloaded %d waypoint" msgid_plural "Downloaded %d waypoints" msgstr[0] "下载的 %d 航点" -#: ../src/vikgpslayer.c:761 +#: ../src/vikgpslayer.c:757 #, c-format msgid "Downloaded %d trackpoint" msgid_plural "Downloaded %d trackpoints" msgstr[0] "下载的 %d 轨迹点" -#: ../src/vikgpslayer.c:765 +#: ../src/vikgpslayer.c:761 #, c-format msgid "Uploaded %d waypoint" msgid_plural "Uploaded %d waypoints" msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:767 +#: ../src/vikgpslayer.c:763 #, c-format msgid "Uploaded %d trackpoint" msgid_plural "Uploaded %d trackpoints" msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:952 +#: ../src/vikgpslayer.c:948 msgid "Error: couldn't find gpsbabel." msgstr "错误: 没有å‘现 gpsbabel." @@ -952,8 +956,8 @@ msgid "Map Type:" msgstr "地图类型:" #: ../src/vikmapslayer.c:120 -msgid "Maps Directory (Optional):" -msgstr "地图目录(å¯é€‰):" +msgid "Maps Directory:" +msgstr "" #: ../src/vikmapslayer.c:121 msgid "Alpha:" @@ -997,51 +1001,51 @@ msgid "" "factor" msgstr "" -#: ../src/vikmapslayer.c:924 +#: ../src/vikmapslayer.c:927 #, c-format msgid "Redownloading up to %d %s map..." msgid_plural "Redownloading up to %d %s maps..." msgstr[0] "" msgstr[1] "" -#: ../src/vikmapslayer.c:926 +#: ../src/vikmapslayer.c:929 #, c-format msgid "Redownloading %d %s map..." msgid_plural "Redownloading %d %s maps..." msgstr[0] "" msgstr[1] "" -#: ../src/vikmapslayer.c:930 ../src/vikmapslayer.c:1001 +#: ../src/vikmapslayer.c:933 ../src/vikmapslayer.c:1004 #, c-format msgid "Downloading %d %s map..." msgid_plural "Downloading %d %s maps..." msgstr[0] "æ£åœ¨ä¸‹è½½ %d %s 地图..." -#: ../src/vikmapslayer.c:1058 +#: ../src/vikmapslayer.c:1061 msgid "Redownload bad map(s)" msgstr "é‡æ–°ä¸‹è½½æŸå的地图" -#: ../src/vikmapslayer.c:1062 +#: ../src/vikmapslayer.c:1065 msgid "Redownload all map(s)" msgstr "é‡æ–°ä¸‹è½½æ‰€æœ‰åœ°å›¾" -#: ../src/vikmapslayer.c:1142 +#: ../src/vikmapslayer.c:1145 #, c-format msgid "" "Wrong drawmode for this map.\n" "Select \"%s\" from View menu and try again." msgstr "" -#: ../src/vikmapslayer.c:1147 +#: ../src/vikmapslayer.c:1150 msgid "Wrong zoom level for this map." msgstr "æ¤åœ°å›¾æ— æ¤ç¼©æ”¾ç¨‹åº¦" -#: ../src/vikmapslayer.c:1172 +#: ../src/vikmapslayer.c:1175 msgid "Download Onscreen Maps" msgstr "下载å±å¹•åœ°å›¾" #. TODO Add GTK_STOCK_REFRESH icon -#: ../src/vikmapslayer.c:1178 +#: ../src/vikmapslayer.c:1181 msgid "Refresh Onscreen Tiles" msgstr "" @@ -1229,12 +1233,12 @@ msgstr "" msgid "Export Layer" msgstr "输出图层" -#: ../src/viktrwlayer.c:1565 ../src/vikwindow.c:1446 ../src/vikwindow.c:1820 +#: ../src/viktrwlayer.c:1565 ../src/vikwindow.c:1438 ../src/vikwindow.c:1817 #, c-format msgid "The file \"%s\" exists, do you wish to overwrite it?" msgstr "" -#: ../src/viktrwlayer.c:1575 ../src/vikwindow.c:1464 +#: ../src/viktrwlayer.c:1575 ../src/vikwindow.c:1456 msgid "The filename you requested could not be opened for writing." msgstr "" @@ -1250,71 +1254,71 @@ msgstr "航点å称:" msgid "Waypoint not found in this layer." msgstr "在æ¤å›¾å±‚ä¸æ²¡æœ‰å‘现航点" -#: ../src/viktrwlayer.c:1724 +#: ../src/viktrwlayer.c:1723 msgid "Goto Center of Layer" msgstr "å‰å¾€å›¾å±‚ä¸å¿ƒ" -#: ../src/viktrwlayer.c:1729 +#: ../src/viktrwlayer.c:1728 msgid "Goto Waypoint" msgstr "å‰å¾€èˆªç‚¹" -#: ../src/viktrwlayer.c:1735 +#: ../src/viktrwlayer.c:1734 msgid "Export layer" msgstr "输出图层" -#: ../src/viktrwlayer.c:1740 +#: ../src/viktrwlayer.c:1739 msgid "Export as GPSPoint" msgstr "输出æˆGPS点" -#: ../src/viktrwlayer.c:1745 +#: ../src/viktrwlayer.c:1744 msgid "Export as GPSMapper" msgstr "输出æˆGPS地图" -#: ../src/viktrwlayer.c:1750 +#: ../src/viktrwlayer.c:1749 msgid "Export as GPX" msgstr "输出æˆGPX文件" -#: ../src/viktrwlayer.c:1755 ../src/viktrwlayer.c:2794 +#: ../src/viktrwlayer.c:1754 ../src/viktrwlayer.c:2794 msgid "New Waypoint" msgstr "新航点" -#: ../src/viktrwlayer.c:1762 +#: ../src/viktrwlayer.c:1761 msgid "Add Wikipedia Waypoints" msgstr "" -#: ../src/viktrwlayer.c:1767 +#: ../src/viktrwlayer.c:1766 msgid "Within layer bounds" msgstr "" -#: ../src/viktrwlayer.c:1772 +#: ../src/viktrwlayer.c:1771 msgid "Within current view" msgstr "" -#: ../src/viktrwlayer.c:1779 ../src/viktrwlayer.c:2760 +#: ../src/viktrwlayer.c:1778 ../src/viktrwlayer.c:2760 msgid "Upload to OSM" msgstr "" -#: ../src/viktrwlayer.c:2290 +#: ../src/viktrwlayer.c:2289 msgid "Failed. This track does not have timestamp" msgstr "" -#: ../src/viktrwlayer.c:2304 +#: ../src/viktrwlayer.c:2303 msgid "Failed. No other track in this layer has timestamp" msgstr "" -#: ../src/viktrwlayer.c:2310 +#: ../src/viktrwlayer.c:2309 msgid "Merge with..." msgstr "" -#: ../src/viktrwlayer.c:2310 +#: ../src/viktrwlayer.c:2309 msgid "Select track to merge with" msgstr "" -#: ../src/viktrwlayer.c:2347 +#: ../src/viktrwlayer.c:2346 msgid "Merge Threshold..." msgstr "" -#: ../src/viktrwlayer.c:2348 +#: ../src/viktrwlayer.c:2347 msgid "Merge when time between tracks less than:" msgstr "" @@ -1390,131 +1394,131 @@ msgstr "" msgid "Use with filter" msgstr "" -#: ../src/viktrwlayer.c:3736 +#: ../src/viktrwlayer.c:3735 msgid "Could not launch eog to open file." msgstr "" -#: ../src/viktrwlayer.c:3790 +#: ../src/viktrwlayer.c:3789 #, c-format msgid "Creating %d Image Thumbnails..." msgstr "" -#: ../src/viktrwlayer.c:4010 +#: ../src/viktrwlayer.c:4009 msgid "No map layer in use. Create one first" msgstr "" -#: ../src/viktrwlayer_propwin.c:658 +#: ../src/viktrwlayer_propwin.c:661 msgid "Failed spliting track. Track unchanged" msgstr "" -#: ../src/viktrwlayer_propwin.c:675 +#: ../src/viktrwlayer_propwin.c:678 msgid "Operation Aborted. Track unchanged" msgstr "" -#: ../src/viktrwlayer_propwin.c:729 +#: ../src/viktrwlayer_propwin.c:732 #, c-format msgid "%s - Track Properties" msgstr "" -#: ../src/viktrwlayer_propwin.c:734 +#: ../src/viktrwlayer_propwin.c:737 msgid "Split at Marker" msgstr "" -#: ../src/viktrwlayer_propwin.c:735 +#: ../src/viktrwlayer_propwin.c:738 msgid "Split Segments" msgstr "" -#: ../src/viktrwlayer_propwin.c:736 +#: ../src/viktrwlayer_propwin.c:739 msgid "Reverse" msgstr "å转" -#: ../src/viktrwlayer_propwin.c:737 +#: ../src/viktrwlayer_propwin.c:740 msgid "Delete Dupl." msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Comment:</b>" msgstr "<b>说明:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Track Length:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Trackpoints:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Segments:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Duplicate Points:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Max Speed:</b>" msgstr "<b>最大速度:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Avg. Speed:</b>" msgstr "<b>å¹³å‡é€Ÿåº¦:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Avg. Dist. Between TPs:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Elevation Range:</b>" msgstr "<b>高度范围:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Total Elevation Gain/Loss:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Start:</b>" msgstr "<b>开始:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>End:</b>" msgstr "<b>结æŸ:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Duration:</b>" msgstr "<b>æŒç»æ—¶é—´:</b>" -#: ../src/viktrwlayer_propwin.c:788 ../src/viktrwlayer_propwin.c:795 -#: ../src/viktrwlayer_propwin.c:804 ../src/viktrwlayer_propwin.c:811 -#: ../src/viktrwlayer_propwin.c:850 ../src/viktrwlayer_propwin.c:851 -#: ../src/viktrwlayer_propwin.c:852 ../src/viktrwlayer_propwin.c:874 -#: ../src/viktrwlayer_propwin.c:881 +#: ../src/viktrwlayer_propwin.c:791 ../src/viktrwlayer_propwin.c:798 +#: ../src/viktrwlayer_propwin.c:807 ../src/viktrwlayer_propwin.c:814 +#: ../src/viktrwlayer_propwin.c:853 ../src/viktrwlayer_propwin.c:854 +#: ../src/viktrwlayer_propwin.c:855 ../src/viktrwlayer_propwin.c:877 +#: ../src/viktrwlayer_propwin.c:884 #, c-format msgid "No Data" msgstr "没有数æ®" -#: ../src/viktrwlayer_propwin.c:847 +#: ../src/viktrwlayer_propwin.c:850 #, c-format msgid "%d minutes" msgstr "%d 分钟" -#: ../src/viktrwlayer_propwin.c:870 +#: ../src/viktrwlayer_propwin.c:873 msgid "Statistics" msgstr "" -#: ../src/viktrwlayer_propwin.c:875 +#: ../src/viktrwlayer_propwin.c:878 msgid "<b>Track Distance:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:876 +#: ../src/viktrwlayer_propwin.c:879 msgid "Elevation-distance" msgstr "高度-è·ç¦»" -#: ../src/viktrwlayer_propwin.c:882 +#: ../src/viktrwlayer_propwin.c:885 msgid "<b>Track Time:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:883 +#: ../src/viktrwlayer_propwin.c:886 msgid "Speed-time" msgstr "速度-时间" @@ -1554,31 +1558,47 @@ msgstr "" msgid "<b>\"Speed\" Between:</b>" msgstr "" -#: ../src/viktrwlayer_tpwin.c:117 -msgid "Trackpoint" +#: ../src/viktrwlayer_tpwin.c:110 +msgid "<b>VDOP:</b>" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:111 +msgid "<b>HDOP:</b>" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:112 +msgid "<b>PDOP:</b>" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:113 +msgid "<b>SAT/FIX:</b>" msgstr "" #: ../src/viktrwlayer_tpwin.c:122 +msgid "Trackpoint" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:127 msgid "Split Here" msgstr "" -#: ../src/viktrwlayer_tpwin.c:123 +#: ../src/viktrwlayer_tpwin.c:128 msgid "Join With Last" msgstr "" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Pan" msgstr "移动" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Zoom" msgstr "缩放" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Ruler" msgstr "测è·" -#: ../src/vikwindow.c:363 +#: ../src/vikwindow.c:364 #, c-format msgid "" "Do you want to save the changes you made to the document \"%s\"?\n" @@ -1586,441 +1606,445 @@ msgid "" "Your changes will be lost if you don't save them." msgstr "" -#: ../src/vikwindow.c:366 ../src/vikwindow.c:1314 +#: ../src/vikwindow.c:367 ../src/vikwindow.c:1306 msgid "Untitled" msgstr "æ— æ ‡é¢˜" -#: ../src/vikwindow.c:367 +#: ../src/vikwindow.c:368 msgid "Don't Save" msgstr "ä¸ä¿å˜" -#: ../src/vikwindow.c:400 +#: ../src/vikwindow.c:401 msgid "mpp" msgstr "mpp" -#: ../src/vikwindow.c:400 +#: ../src/vikwindow.c:401 msgid "pixelfact" msgstr "pixelfact" -#: ../src/vikwindow.c:527 +#: ../src/vikwindow.c:528 #, c-format msgid "%s %s %dm" msgstr "" -#: ../src/vikwindow.c:529 +#: ../src/vikwindow.c:530 #, c-format msgid "%s %s" msgstr "" -#: ../src/vikwindow.c:1113 +#: ../src/vikwindow.c:1105 msgid "You must select a layer to show its properties." msgstr "您必须选一个层æ‰èƒ½æ˜¾ç¤ºå®ƒçš„属性" -#: ../src/vikwindow.c:1129 +#: ../src/vikwindow.c:1121 msgid "You must select a layer to delete." msgstr "您必须选一个层æ‰å¯åˆ 除" -#: ../src/vikwindow.c:1347 +#: ../src/vikwindow.c:1339 msgid "The file you requested could not be opened." msgstr "您选的文件ä¸èƒ½è¢«æ‰“å¼€" -#: ../src/vikwindow.c:1390 +#: ../src/vikwindow.c:1382 msgid "Please select a GPS data file to open. " msgstr "请选择一个GPSæ•°æ®æ–‡ä»¶æ¥æ‰“å¼€ " -#: ../src/vikwindow.c:1433 +#: ../src/vikwindow.c:1425 msgid "Save as Viking File." msgstr "å¦å˜ä¸ºViking文件." -#: ../src/vikwindow.c:1667 +#: ../src/vikwindow.c:1664 msgid "" "Viewable region outside allowable pixel size bounds for image. Clipping " "width/height values." msgstr "" -#: ../src/vikwindow.c:1686 +#: ../src/vikwindow.c:1683 #, c-format msgid "Total area: %ldm x %ldm (%.3f sq. km)" msgstr "全部区域: %ldm x %ldm (%.3f 平方公里)" #. todo: default for answers inside VikWindow or static (thruout instance) -#: ../src/vikwindow.c:1694 +#: ../src/vikwindow.c:1691 msgid "Save to Image File" msgstr "ä¿å˜ä¸ºå›¾ç‰‡æ–‡ä»¶" -#: ../src/vikwindow.c:1712 +#: ../src/vikwindow.c:1709 msgid "Width (pixels):" msgstr "宽度 (åƒç´ ) :" -#: ../src/vikwindow.c:1714 +#: ../src/vikwindow.c:1711 msgid "Height (pixels):" msgstr "高度 (åƒç´ ) :" -#: ../src/vikwindow.c:1717 +#: ../src/vikwindow.c:1714 msgid "Zoom (meters per pixel):" msgstr "缩放 (ç±³ï¼åƒç´ ) :" -#: ../src/vikwindow.c:1723 +#: ../src/vikwindow.c:1720 msgid "Area in current viewable window" msgstr "" -#: ../src/vikwindow.c:1733 +#: ../src/vikwindow.c:1730 msgid "Save as PNG" msgstr "ä¿å˜ä¸ºPNG" -#: ../src/vikwindow.c:1734 +#: ../src/vikwindow.c:1731 msgid "Save as JPEG" msgstr "ä¿å˜ä¸ºJPEG" -#: ../src/vikwindow.c:1754 +#: ../src/vikwindow.c:1751 msgid "East-west image tiles:" msgstr "" -#: ../src/vikwindow.c:1756 +#: ../src/vikwindow.c:1753 msgid "North-south image tiles:" msgstr "" -#: ../src/vikwindow.c:1796 +#: ../src/vikwindow.c:1793 msgid "You must be in UTM mode to use this feature" msgstr "ä½ å¿…é¡»åœ¨UTM模å¼ä¸æ¥ä½¿ç”¨è¿™ä¸ªç‰¹æ€§" -#: ../src/vikwindow.c:1807 +#: ../src/vikwindow.c:1804 msgid "Save Image" msgstr "ä¿å˜å›¾åƒ" -#: ../src/vikwindow.c:1834 +#: ../src/vikwindow.c:1831 msgid "Choose a directory to hold images" msgstr "" -#: ../src/vikwindow.c:1920 +#: ../src/vikwindow.c:1917 msgid "Choose a background color" msgstr "选择一个背景色" -#: ../src/vikwindow.c:1941 +#: ../src/vikwindow.c:1938 msgid "_File" msgstr "_F 文件" -#: ../src/vikwindow.c:1942 +#: ../src/vikwindow.c:1939 msgid "_Edit" msgstr "编辑(_E)" -#: ../src/vikwindow.c:1943 +#: ../src/vikwindow.c:1940 msgid "_View" msgstr "视图(_V)" -#: ../src/vikwindow.c:1944 ../src/vikwindow.c:2015 +#: ../src/vikwindow.c:1941 ../src/vikwindow.c:2013 msgid "_Zoom" msgstr "缩放(_Z)" -#: ../src/vikwindow.c:1945 ../src/vikwindow.c:2014 +#: ../src/vikwindow.c:1942 ../src/vikwindow.c:2012 msgid "_Pan" msgstr "平移(_P )" -#: ../src/vikwindow.c:1946 +#: ../src/vikwindow.c:1943 msgid "_Layers" msgstr "图层(_L)" -#: ../src/vikwindow.c:1947 +#: ../src/vikwindow.c:1944 msgid "_Tools" msgstr "工具(_T)" -#: ../src/vikwindow.c:1948 +#: ../src/vikwindow.c:1945 msgid "_Webtools" msgstr "" -#: ../src/vikwindow.c:1949 +#: ../src/vikwindow.c:1946 msgid "_Help" msgstr "帮助(_H)" -#: ../src/vikwindow.c:1951 +#: ../src/vikwindow.c:1948 msgid "_New" msgstr "新建(_N)" -#: ../src/vikwindow.c:1951 +#: ../src/vikwindow.c:1948 msgid "New file" msgstr "新建文件" -#: ../src/vikwindow.c:1952 +#: ../src/vikwindow.c:1949 msgid "_Open" msgstr "_O 打开" -#: ../src/vikwindow.c:1952 +#: ../src/vikwindow.c:1949 msgid "Open a file" msgstr "打开一个文件" -#: ../src/vikwindow.c:1953 +#: ../src/vikwindow.c:1950 msgid "A_ppend File" msgstr "_p å¢žåŠ æ–‡ä»¶" -#: ../src/vikwindow.c:1953 +#: ../src/vikwindow.c:1950 msgid "Append data from a different file" msgstr "从ä¸åŒçš„文件ä¸è¿½åŠ æ•°æ®" -#: ../src/vikwindow.c:1954 +#: ../src/vikwindow.c:1951 msgid "A_cquire" msgstr "_c 获å–" -#: ../src/vikwindow.c:1955 +#: ../src/vikwindow.c:1952 msgid "From _GPS" msgstr "_G 从GPS" -#: ../src/vikwindow.c:1955 +#: ../src/vikwindow.c:1952 msgid "Transfer data from a GPS device" msgstr "从一个GPS接收器获得数æ®" -#: ../src/vikwindow.c:1956 +#: ../src/vikwindow.c:1953 msgid "Google _Directions" msgstr "_D è°·æŒæ–¹ä½" -#: ../src/vikwindow.c:1956 +#: ../src/vikwindow.c:1953 msgid "Get driving directions from Google" msgstr "从谷æŒèŽ·å¾—驾驶方ä½" -#: ../src/vikwindow.c:1958 +#: ../src/vikwindow.c:1955 msgid "Geo_caches" msgstr "Geo_caches" -#: ../src/vikwindow.c:1958 +#: ../src/vikwindow.c:1955 msgid "Get Geocaches from geocaching.com" msgstr "从geocaching.com获得地ç†ç¼“å˜æ•°æ®" -#: ../src/vikwindow.c:1960 +#: ../src/vikwindow.c:1957 msgid "_Save" msgstr "_S ä¿å˜" -#: ../src/vikwindow.c:1960 +#: ../src/vikwindow.c:1957 msgid "Save the file" msgstr "ä¿å˜è¿™ä¸ªæ–‡ä»¶" -#: ../src/vikwindow.c:1961 +#: ../src/vikwindow.c:1958 msgid "Save _As" msgstr "_A å¦å˜ä¸º" -#: ../src/vikwindow.c:1961 +#: ../src/vikwindow.c:1958 msgid "Save the file under different name" msgstr "ä¿å˜ä¸ºå…¶å®ƒåå—的文件" -#: ../src/vikwindow.c:1962 +#: ../src/vikwindow.c:1959 msgid "_Generate Image File" msgstr "_G 生æˆå›¾å½¢æ–‡ä»¶" -#: ../src/vikwindow.c:1962 +#: ../src/vikwindow.c:1959 msgid "Save a snapshot of the workspace into a file" msgstr "" -#: ../src/vikwindow.c:1963 +#: ../src/vikwindow.c:1960 msgid "Generate _Directory of Images" msgstr "_D 创建图片的目录" -#: ../src/vikwindow.c:1963 +#: ../src/vikwindow.c:1960 msgid "FIXME:IMGDIR" msgstr "" -#: ../src/vikwindow.c:1966 +#: ../src/vikwindow.c:1963 msgid "_Print..." msgstr "_P 打å°" -#: ../src/vikwindow.c:1966 +#: ../src/vikwindow.c:1963 msgid "Print maps" msgstr "打å°åœ°å›¾" -#: ../src/vikwindow.c:1969 +#: ../src/vikwindow.c:1966 msgid "E_xit" msgstr "_x 退出" -#: ../src/vikwindow.c:1969 +#: ../src/vikwindow.c:1966 msgid "Exit the program" msgstr "退出程åº" -#: ../src/vikwindow.c:1970 +#: ../src/vikwindow.c:1967 msgid "Save and Exit" msgstr "ä¿å˜å¹¶é€€å‡º" -#: ../src/vikwindow.c:1970 +#: ../src/vikwindow.c:1967 msgid "Save and Exit the program" msgstr "ä¿å˜å¹¶é€€å‡ºç¨‹åº" -#: ../src/vikwindow.c:1972 +#: ../src/vikwindow.c:1969 msgid "Go To location" msgstr "" -#: ../src/vikwindow.c:1972 +#: ../src/vikwindow.c:1969 msgid "Go to address/place using text search" msgstr "" -#: ../src/vikwindow.c:1973 +#: ../src/vikwindow.c:1970 msgid "_Go to Lat\\/Lon..." msgstr "_G å‰å¾€ä¸€ä¸ªç»çº¬åº¦å€¼..." -#: ../src/vikwindow.c:1973 +#: ../src/vikwindow.c:1970 msgid "Go to arbitrary lat\\/lon coordinate" msgstr "å‰å¾€ä»»æ„çš„ç»çº¬åº¦åº§æ ‡" -#: ../src/vikwindow.c:1974 +#: ../src/vikwindow.c:1971 msgid "Go to UTM..." msgstr "å‰å¾€UTM..." -#: ../src/vikwindow.c:1974 +#: ../src/vikwindow.c:1971 msgid "Go to arbitrary UTM coordinate" msgstr "å‰å¾€ä»»æ„çš„UTMåº§æ ‡" -#: ../src/vikwindow.c:1975 +#: ../src/vikwindow.c:1972 msgid "Set Background Color..." msgstr "设置背景色 ..." -#: ../src/vikwindow.c:1976 +#: ../src/vikwindow.c:1973 msgid "Zoom _In" msgstr "_I 缩å°" -#: ../src/vikwindow.c:1977 +#: ../src/vikwindow.c:1974 msgid "Zoom _Out" msgstr "_O 放大" -#: ../src/vikwindow.c:1978 +#: ../src/vikwindow.c:1975 msgid "Zoom _To" msgstr "_T 缩放到" -#: ../src/vikwindow.c:1979 +#: ../src/vikwindow.c:1976 msgid "0.25" msgstr "0.25" -#: ../src/vikwindow.c:1980 +#: ../src/vikwindow.c:1977 msgid "0.5" msgstr "0.5" -#: ../src/vikwindow.c:1981 +#: ../src/vikwindow.c:1978 msgid "1" msgstr "1" -#: ../src/vikwindow.c:1982 +#: ../src/vikwindow.c:1979 msgid "2" msgstr "2" -#: ../src/vikwindow.c:1983 +#: ../src/vikwindow.c:1980 msgid "4" msgstr "4" -#: ../src/vikwindow.c:1984 +#: ../src/vikwindow.c:1981 msgid "8" msgstr "8" -#: ../src/vikwindow.c:1985 +#: ../src/vikwindow.c:1982 msgid "16" msgstr "16" -#: ../src/vikwindow.c:1986 +#: ../src/vikwindow.c:1983 msgid "32" msgstr "32" -#: ../src/vikwindow.c:1987 +#: ../src/vikwindow.c:1984 msgid "64" msgstr "64" -#: ../src/vikwindow.c:1988 +#: ../src/vikwindow.c:1985 msgid "128" msgstr "128" -#: ../src/vikwindow.c:1989 +#: ../src/vikwindow.c:1986 msgid "Pan North" msgstr "å‘北" -#: ../src/vikwindow.c:1990 +#: ../src/vikwindow.c:1987 msgid "Pan East" msgstr "å‘东" -#: ../src/vikwindow.c:1991 +#: ../src/vikwindow.c:1988 msgid "Pan South" msgstr "å‘å—" -#: ../src/vikwindow.c:1992 +#: ../src/vikwindow.c:1989 msgid "Pan West" msgstr "å‘西" -#: ../src/vikwindow.c:1993 +#: ../src/vikwindow.c:1990 msgid "Background _Jobs" msgstr "_J åŽå°ä»»åŠ¡" -#: ../src/vikwindow.c:1995 +#: ../src/vikwindow.c:1992 msgid "Cu_t" msgstr "_t 剪切" -#: ../src/vikwindow.c:1996 +#: ../src/vikwindow.c:1993 msgid "_Copy" msgstr "_C æ‹·è´" -#: ../src/vikwindow.c:1997 +#: ../src/vikwindow.c:1994 msgid "_Paste" msgstr "_P 粘贴" -#: ../src/vikwindow.c:1998 +#: ../src/vikwindow.c:1995 msgid "_Delete" msgstr "_D åˆ é™¤" -#: ../src/vikwindow.c:1999 +#: ../src/vikwindow.c:1996 msgid "Delete All" msgstr "å…¨éƒ¨åˆ é™¤" -#: ../src/vikwindow.c:2000 +#: ../src/vikwindow.c:1997 +msgid "Flush Map cache" +msgstr "" + +#: ../src/vikwindow.c:1998 msgid "_Preferences..." msgstr "_P 首选项..." -#: ../src/vikwindow.c:2001 +#: ../src/vikwindow.c:1999 msgid "_Properties" msgstr "属性(_P)" -#: ../src/vikwindow.c:2003 +#: ../src/vikwindow.c:2001 msgid "_About" msgstr "关于(_A)" -#: ../src/vikwindow.c:2008 +#: ../src/vikwindow.c:2006 msgid "_UTM Mode" msgstr "_UTM 模å¼" -#: ../src/vikwindow.c:2009 +#: ../src/vikwindow.c:2007 msgid "_Expedia Mode" msgstr "_Expedia 模å¼" -#: ../src/vikwindow.c:2010 +#: ../src/vikwindow.c:2008 msgid "_Mercator Mode" msgstr "" -#: ../src/vikwindow.c:2014 +#: ../src/vikwindow.c:2012 msgid "Pan Tool" msgstr "" -#: ../src/vikwindow.c:2015 +#: ../src/vikwindow.c:2013 msgid "Zoom Tool" msgstr "缩放工具" -#: ../src/vikwindow.c:2016 +#: ../src/vikwindow.c:2014 msgid "_Ruler" msgstr "_R 测è·" -#: ../src/vikwindow.c:2016 +#: ../src/vikwindow.c:2014 msgid "Ruler Tool" msgstr "测è·å·¥å…·" -#: ../src/vikwindow.c:2020 +#: ../src/vikwindow.c:2018 msgid "Show Scale" msgstr "显示比例尺" -#: ../src/vikwindow.c:2021 +#: ../src/vikwindow.c:2019 msgid "Show Center Mark" msgstr "显示ä¸å¿ƒæ ‡è®°" -#: ../src/vikwindow.c:2022 +#: ../src/vikwindow.c:2020 msgid "Full Screen" msgstr "å…¨å±" -#: ../src/vikwindow.c:2022 +#: ../src/vikwindow.c:2020 msgid "Activate full screen mode" msgstr "" -#: ../src/vikwindow.c:2023 +#: ../src/vikwindow.c:2021 msgid "Show Side Panel" msgstr "" -#: ../src/vikwindow.c:2085 +#: ../src/vikwindow.c:2083 #, c-format msgid "New %s Layer" msgstr "新图层 \"%s\"" @@ -2037,31 +2061,5 @@ msgstr "" msgid "Viking" msgstr "" -#~ msgid "Google Satellite Images" -#~ msgstr "è°·æŒå«æ˜Ÿå½±è±¡" - -#~ msgid "Google Terrain Maps" -#~ msgstr "è°·æŒåœ°å½¢åœ°å›¾" - -#~ msgid "Old Google Maps" -#~ msgstr "è€çš„è°·æŒåœ°å›¾" - -#~ msgid "Keep current position at center" -#~ msgstr "ä¿æŒçŽ°æœ‰æœªçŸ¥åœ¨ä¸å¤®" - -#~ msgid "_Old Google Mode" -#~ msgstr "_O è€çš„è°·æŒæ¨¡å¼" - -#~ msgid "Old _KH Mode" -#~ msgstr "_K è€çš„KH模å¼" - -#~ msgid "_Google Mode" -#~ msgstr "_G è°·æŒæ¨¡å¼" - -#, c-format -#~ msgid "couldn't open temp file %s" -#~ msgstr "ä¸èƒ½æ‰“开临时文件 %s" - -#, c-format -#~ msgid "Failed downloading %s" -#~ msgstr "下载 %s 失败" +#~ msgid "Maps Directory (Optional):" +#~ msgstr "地图目录(å¯é€‰):" diff --git a/po/zh_TW.po b/po/zh_TW.po index cb04e48..c991aa5 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Viking\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-04 22:47+0100\n" +"POT-Creation-Date: 2009-08-20 09:50+0200\n" "PO-Revision-Date: 2009-02-04 22:18+0000\n" "Last-Translator: Guilhem Bonnefille <guilhem.bonnefille@gmail.com>\n" "Language-Team: \n" @@ -10,7 +10,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2009-02-08 13:36+0000\n" +"X-Launchpad-Export-Date: 2009-09-09 20:12+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Language: Traditional Chinese\n" @@ -22,28 +22,28 @@ msgstr "工作ä¸..." msgid "Error: acquisition failed." msgstr "" -#: ../src/acquire.c:149 ../src/vikgpslayer.c:957 +#: ../src/acquire.c:149 ../src/vikgpslayer.c:953 msgid "Done." msgstr "完æˆ." -#: ../src/acquire.c:326 ../src/vikgpslayer.c:996 +#: ../src/acquire.c:326 ../src/vikgpslayer.c:992 msgid "Status: detecting gpsbabel" msgstr "狀態 : åµæ¸¬ gpsbabel" -#: ../src/background.c:54 +#: ../src/background.c:57 #, c-format msgid "%d items" msgstr "%d é …ç›®" -#: ../src/background.c:212 +#: ../src/background.c:224 msgid "Job" msgstr "工作" -#: ../src/background.c:216 +#: ../src/background.c:228 msgid "Progress" msgstr "程å¼" -#: ../src/background.c:227 +#: ../src/background.c:239 msgid "Viking Background Jobs" msgstr "Viking 背景工作" @@ -68,7 +68,7 @@ msgid "" "into." msgstr "" -#: ../src/curl_download.c:85 +#: ../src/curl_download.c:94 #, c-format msgid "%s() Curl perform failed: %s" msgstr "" @@ -340,14 +340,14 @@ msgstr "已從GPS抓å–çš„" msgid "using cmdline '%s' and file '%s'\n" msgstr "使用指令行 '%s' 和檔案 '%s'\n" -#: ../src/datasource_gps.c:150 ../src/vikgpslayer.c:711 +#: ../src/datasource_gps.c:150 ../src/vikgpslayer.c:707 #, c-format msgid "Downloading %d waypoint..." msgid_plural "Downloading %d waypoints..." msgstr[0] "" msgstr[1] "" -#: ../src/datasource_gps.c:152 ../src/vikgpslayer.c:713 +#: ../src/datasource_gps.c:152 ../src/vikgpslayer.c:709 #, c-format msgid "Downloading %d trackpoint..." msgid_plural "Downloading %d trackpoints..." @@ -364,7 +364,7 @@ msgstr "" msgid "Downloaded %d %s." msgstr "" -#: ../src/datasource_gps.c:185 ../src/vikgpslayer.c:783 +#: ../src/datasource_gps.c:185 ../src/vikgpslayer.c:779 #, c-format msgid "GPS Device: %s" msgstr "GPSè£ç½®: %s" @@ -377,7 +377,7 @@ msgstr "GPS å”定:" msgid "Serial Port:" msgstr "åºåˆ—åŸ :" -#: ../src/datasource_gps.c:299 ../src/vikgpslayer.c:1001 +#: ../src/datasource_gps.c:299 ../src/vikgpslayer.c:997 msgid "GPS device: N/A" msgstr "GPSè£ç½®: ç„¡" @@ -408,6 +408,10 @@ msgstr "下載錯誤: %s" msgid "Draw mode '%s' no more supported" msgstr "" +#: ../src/mapcache.c:63 +msgid "Mapcache memory size (MB):" +msgstr "" + #: ../src/print.c:53 msgid "None" msgstr "ç„¡" @@ -450,11 +454,11 @@ msgstr "" msgid "Image S_ize:" msgstr "" -#: ../src/util.c:75 +#: ../src/util.c:76 msgid "Could not launch web browser." msgstr "" -#: ../src/util.c:86 +#: ../src/util.c:87 msgid "Could not create new email." msgstr "" @@ -668,11 +672,11 @@ msgstr "没有下載æºè¢«é¸. 編輯圖層屬性." msgid "Downloading DEM %s" msgstr "æ£åœ¨ä¸‹è¼‰ DEM %s" -#: ../src/vikfileentry.c:67 +#: ../src/vikfileentry.c:68 msgid "Browse..." msgstr "ç€è¦§ ..." -#: ../src/vikfileentry.c:94 +#: ../src/vikfileentry.c:96 msgid "Choose file" msgstr "é¸å–一個檔案" @@ -785,11 +789,11 @@ msgstr "Gpsd é€šè¨ŠåŸ :" msgid "Gpsd Retry Interval (seconds):" msgstr "" -#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:989 +#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:985 msgid "GPS Download" msgstr "GPS 下載" -#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:989 +#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:985 msgid "GPS Upload" msgstr "GPS 上傳" @@ -797,108 +801,108 @@ msgstr "GPS 上傳" msgid "GPS Realtime Tracking" msgstr "GPS實時追蹤" -#: ../src/vikgpslayer.c:373 +#: ../src/vikgpslayer.c:371 msgid "Unknown GPS Protocol" msgstr "未知的GPSå”定" -#: ../src/vikgpslayer.c:379 +#: ../src/vikgpslayer.c:377 msgid "Unknown serial port device" msgstr "未知的åºåˆ—åŸ è£ç½®" -#: ../src/vikgpslayer.c:444 +#: ../src/vikgpslayer.c:442 #, c-format msgid "%s: unknown parameter" msgstr "%s: 未知的引數" -#: ../src/vikgpslayer.c:545 +#: ../src/vikgpslayer.c:541 msgid "Upload to GPS" msgstr "上傳到GPS" -#: ../src/vikgpslayer.c:550 +#: ../src/vikgpslayer.c:546 msgid "Download from GPS" msgstr "從GPS下載" -#: ../src/vikgpslayer.c:568 +#: ../src/vikgpslayer.c:564 msgid "Empty Upload" msgstr "清空上傳" -#: ../src/vikgpslayer.c:573 +#: ../src/vikgpslayer.c:569 msgid "Empty Download" msgstr "清空下載" -#: ../src/vikgpslayer.c:578 +#: ../src/vikgpslayer.c:574 msgid "Empty All" msgstr "清空全部" -#: ../src/vikgpslayer.c:718 +#: ../src/vikgpslayer.c:714 #, c-format msgid "Uploading %d waypoint..." msgid_plural "Uploading %d waypoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:720 +#: ../src/vikgpslayer.c:716 #, c-format msgid "Uploading %d trackpoint..." msgid_plural "Uploading %d trackpoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:744 +#: ../src/vikgpslayer.c:740 #, c-format msgid "Downloaded %d out of %d waypoint..." msgid_plural "Downloaded %d out of %d waypoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:746 +#: ../src/vikgpslayer.c:742 #, c-format msgid "Downloaded %d out of %d trackpoint..." msgid_plural "Downloaded %d out of %d trackpoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:750 +#: ../src/vikgpslayer.c:746 #, c-format msgid "Uploaded %d out of %d waypoint..." msgid_plural "Uploaded %d out of %d waypoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:752 +#: ../src/vikgpslayer.c:748 #, c-format msgid "Uploaded %d out of %d trackpoint..." msgid_plural "Uploaded %d out of %d trackpoints..." msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:759 +#: ../src/vikgpslayer.c:755 #, c-format msgid "Downloaded %d waypoint" msgid_plural "Downloaded %d waypoints" msgstr[0] "下載的 %d 航點" -#: ../src/vikgpslayer.c:761 +#: ../src/vikgpslayer.c:757 #, c-format msgid "Downloaded %d trackpoint" msgid_plural "Downloaded %d trackpoints" msgstr[0] "下載的 %d 軌迹點" -#: ../src/vikgpslayer.c:765 +#: ../src/vikgpslayer.c:761 #, c-format msgid "Uploaded %d waypoint" msgid_plural "Uploaded %d waypoints" msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:767 +#: ../src/vikgpslayer.c:763 #, c-format msgid "Uploaded %d trackpoint" msgid_plural "Uploaded %d trackpoints" msgstr[0] "" msgstr[1] "" -#: ../src/vikgpslayer.c:952 +#: ../src/vikgpslayer.c:948 msgid "Error: couldn't find gpsbabel." msgstr "錯誤: æ²¡æœ‰ç™¼ç¾ gpsbabel." @@ -952,8 +956,8 @@ msgid "Map Type:" msgstr "地圖類別:" #: ../src/vikmapslayer.c:120 -msgid "Maps Directory (Optional):" -msgstr "地圖目録(å¯é¸):" +msgid "Maps Directory:" +msgstr "" #: ../src/vikmapslayer.c:121 msgid "Alpha:" @@ -997,51 +1001,51 @@ msgid "" "factor" msgstr "" -#: ../src/vikmapslayer.c:924 +#: ../src/vikmapslayer.c:927 #, c-format msgid "Redownloading up to %d %s map..." msgid_plural "Redownloading up to %d %s maps..." msgstr[0] "" msgstr[1] "" -#: ../src/vikmapslayer.c:926 +#: ../src/vikmapslayer.c:929 #, c-format msgid "Redownloading %d %s map..." msgid_plural "Redownloading %d %s maps..." msgstr[0] "" msgstr[1] "" -#: ../src/vikmapslayer.c:930 ../src/vikmapslayer.c:1001 +#: ../src/vikmapslayer.c:933 ../src/vikmapslayer.c:1004 #, c-format msgid "Downloading %d %s map..." msgid_plural "Downloading %d %s maps..." msgstr[0] "æ£åœ¨ä¸‹è¼‰ %d %s 地圖..." -#: ../src/vikmapslayer.c:1058 +#: ../src/vikmapslayer.c:1061 msgid "Redownload bad map(s)" msgstr "é‡æ–°ä¸‹è¼‰æ壞的地圖" -#: ../src/vikmapslayer.c:1062 +#: ../src/vikmapslayer.c:1065 msgid "Redownload all map(s)" msgstr "é‡æ–°ä¸‹è¼‰æ‰€æœ‰åœ°åœ–" -#: ../src/vikmapslayer.c:1142 +#: ../src/vikmapslayer.c:1145 #, c-format msgid "" "Wrong drawmode for this map.\n" "Select \"%s\" from View menu and try again." msgstr "" -#: ../src/vikmapslayer.c:1147 +#: ../src/vikmapslayer.c:1150 msgid "Wrong zoom level for this map." msgstr "æ¤åœ°åœ–ç„¡æ¤ç¸®æ”¾ç¨‹åº¦" -#: ../src/vikmapslayer.c:1172 +#: ../src/vikmapslayer.c:1175 msgid "Download Onscreen Maps" msgstr "下載螢幕地圖" #. TODO Add GTK_STOCK_REFRESH icon -#: ../src/vikmapslayer.c:1178 +#: ../src/vikmapslayer.c:1181 msgid "Refresh Onscreen Tiles" msgstr "" @@ -1229,12 +1233,12 @@ msgstr "" msgid "Export Layer" msgstr "匯出圖層" -#: ../src/viktrwlayer.c:1565 ../src/vikwindow.c:1446 ../src/vikwindow.c:1820 +#: ../src/viktrwlayer.c:1565 ../src/vikwindow.c:1438 ../src/vikwindow.c:1817 #, c-format msgid "The file \"%s\" exists, do you wish to overwrite it?" msgstr "" -#: ../src/viktrwlayer.c:1575 ../src/vikwindow.c:1464 +#: ../src/viktrwlayer.c:1575 ../src/vikwindow.c:1456 msgid "The filename you requested could not be opened for writing." msgstr "" @@ -1250,71 +1254,71 @@ msgstr "航點å稱:" msgid "Waypoint not found in this layer." msgstr "在æ¤åœ–層ä¸æ²¡æœ‰ç™¼ç¾èˆªé»ž" -#: ../src/viktrwlayer.c:1724 +#: ../src/viktrwlayer.c:1723 msgid "Goto Center of Layer" msgstr "å‰å¾€åœ–層ä¸å¿ƒ" -#: ../src/viktrwlayer.c:1729 +#: ../src/viktrwlayer.c:1728 msgid "Goto Waypoint" msgstr "å‰å¾€èˆªé»ž" -#: ../src/viktrwlayer.c:1735 +#: ../src/viktrwlayer.c:1734 msgid "Export layer" msgstr "匯出圖層" -#: ../src/viktrwlayer.c:1740 +#: ../src/viktrwlayer.c:1739 msgid "Export as GPSPoint" msgstr "匯出æˆGPS點" -#: ../src/viktrwlayer.c:1745 +#: ../src/viktrwlayer.c:1744 msgid "Export as GPSMapper" msgstr "匯出æˆGPS地圖" -#: ../src/viktrwlayer.c:1750 +#: ../src/viktrwlayer.c:1749 msgid "Export as GPX" msgstr "匯出æˆGPX檔案" -#: ../src/viktrwlayer.c:1755 ../src/viktrwlayer.c:2794 +#: ../src/viktrwlayer.c:1754 ../src/viktrwlayer.c:2794 msgid "New Waypoint" msgstr "新航點" -#: ../src/viktrwlayer.c:1762 +#: ../src/viktrwlayer.c:1761 msgid "Add Wikipedia Waypoints" msgstr "" -#: ../src/viktrwlayer.c:1767 +#: ../src/viktrwlayer.c:1766 msgid "Within layer bounds" msgstr "" -#: ../src/viktrwlayer.c:1772 +#: ../src/viktrwlayer.c:1771 msgid "Within current view" msgstr "" -#: ../src/viktrwlayer.c:1779 ../src/viktrwlayer.c:2760 +#: ../src/viktrwlayer.c:1778 ../src/viktrwlayer.c:2760 msgid "Upload to OSM" msgstr "" -#: ../src/viktrwlayer.c:2290 +#: ../src/viktrwlayer.c:2289 msgid "Failed. This track does not have timestamp" msgstr "" -#: ../src/viktrwlayer.c:2304 +#: ../src/viktrwlayer.c:2303 msgid "Failed. No other track in this layer has timestamp" msgstr "" -#: ../src/viktrwlayer.c:2310 +#: ../src/viktrwlayer.c:2309 msgid "Merge with..." msgstr "" -#: ../src/viktrwlayer.c:2310 +#: ../src/viktrwlayer.c:2309 msgid "Select track to merge with" msgstr "" -#: ../src/viktrwlayer.c:2347 +#: ../src/viktrwlayer.c:2346 msgid "Merge Threshold..." msgstr "" -#: ../src/viktrwlayer.c:2348 +#: ../src/viktrwlayer.c:2347 msgid "Merge when time between tracks less than:" msgstr "" @@ -1390,131 +1394,131 @@ msgstr "" msgid "Use with filter" msgstr "" -#: ../src/viktrwlayer.c:3736 +#: ../src/viktrwlayer.c:3735 msgid "Could not launch eog to open file." msgstr "" -#: ../src/viktrwlayer.c:3790 +#: ../src/viktrwlayer.c:3789 #, c-format msgid "Creating %d Image Thumbnails..." msgstr "" -#: ../src/viktrwlayer.c:4010 +#: ../src/viktrwlayer.c:4009 msgid "No map layer in use. Create one first" msgstr "" -#: ../src/viktrwlayer_propwin.c:658 +#: ../src/viktrwlayer_propwin.c:661 msgid "Failed spliting track. Track unchanged" msgstr "" -#: ../src/viktrwlayer_propwin.c:675 +#: ../src/viktrwlayer_propwin.c:678 msgid "Operation Aborted. Track unchanged" msgstr "" -#: ../src/viktrwlayer_propwin.c:729 +#: ../src/viktrwlayer_propwin.c:732 #, c-format msgid "%s - Track Properties" msgstr "" -#: ../src/viktrwlayer_propwin.c:734 +#: ../src/viktrwlayer_propwin.c:737 msgid "Split at Marker" msgstr "" -#: ../src/viktrwlayer_propwin.c:735 +#: ../src/viktrwlayer_propwin.c:738 msgid "Split Segments" msgstr "" -#: ../src/viktrwlayer_propwin.c:736 +#: ../src/viktrwlayer_propwin.c:739 msgid "Reverse" msgstr "å轉" -#: ../src/viktrwlayer_propwin.c:737 +#: ../src/viktrwlayer_propwin.c:740 msgid "Delete Dupl." msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Comment:</b>" msgstr "<b>説明:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Track Length:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Trackpoints:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Segments:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Duplicate Points:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Max Speed:</b>" msgstr "<b>最大速度:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Avg. Speed:</b>" msgstr "<b>å¹³å‡é€Ÿåº¦:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Avg. Dist. Between TPs:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Elevation Range:</b>" msgstr "<b>高度範åœ:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Total Elevation Gain/Loss:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Start:</b>" msgstr "<b>開始:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>End:</b>" msgstr "<b>çµæŸ:</b>" -#: ../src/viktrwlayer_propwin.c:760 +#: ../src/viktrwlayer_propwin.c:763 msgid "<b>Duration:</b>" msgstr "<b>æŒçºŒæ™‚é–“:</b>" -#: ../src/viktrwlayer_propwin.c:788 ../src/viktrwlayer_propwin.c:795 -#: ../src/viktrwlayer_propwin.c:804 ../src/viktrwlayer_propwin.c:811 -#: ../src/viktrwlayer_propwin.c:850 ../src/viktrwlayer_propwin.c:851 -#: ../src/viktrwlayer_propwin.c:852 ../src/viktrwlayer_propwin.c:874 -#: ../src/viktrwlayer_propwin.c:881 +#: ../src/viktrwlayer_propwin.c:791 ../src/viktrwlayer_propwin.c:798 +#: ../src/viktrwlayer_propwin.c:807 ../src/viktrwlayer_propwin.c:814 +#: ../src/viktrwlayer_propwin.c:853 ../src/viktrwlayer_propwin.c:854 +#: ../src/viktrwlayer_propwin.c:855 ../src/viktrwlayer_propwin.c:877 +#: ../src/viktrwlayer_propwin.c:884 #, c-format msgid "No Data" msgstr "没有資料" -#: ../src/viktrwlayer_propwin.c:847 +#: ../src/viktrwlayer_propwin.c:850 #, c-format msgid "%d minutes" msgstr "%d 分é˜" -#: ../src/viktrwlayer_propwin.c:870 +#: ../src/viktrwlayer_propwin.c:873 msgid "Statistics" msgstr "" -#: ../src/viktrwlayer_propwin.c:875 +#: ../src/viktrwlayer_propwin.c:878 msgid "<b>Track Distance:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:876 +#: ../src/viktrwlayer_propwin.c:879 msgid "Elevation-distance" msgstr "高度-è·é›¢" -#: ../src/viktrwlayer_propwin.c:882 +#: ../src/viktrwlayer_propwin.c:885 msgid "<b>Track Time:</b>" msgstr "" -#: ../src/viktrwlayer_propwin.c:883 +#: ../src/viktrwlayer_propwin.c:886 msgid "Speed-time" msgstr "速度-時間" @@ -1554,31 +1558,47 @@ msgstr "" msgid "<b>\"Speed\" Between:</b>" msgstr "" -#: ../src/viktrwlayer_tpwin.c:117 -msgid "Trackpoint" +#: ../src/viktrwlayer_tpwin.c:110 +msgid "<b>VDOP:</b>" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:111 +msgid "<b>HDOP:</b>" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:112 +msgid "<b>PDOP:</b>" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:113 +msgid "<b>SAT/FIX:</b>" msgstr "" #: ../src/viktrwlayer_tpwin.c:122 +msgid "Trackpoint" +msgstr "" + +#: ../src/viktrwlayer_tpwin.c:127 msgid "Split Here" msgstr "" -#: ../src/viktrwlayer_tpwin.c:123 +#: ../src/viktrwlayer_tpwin.c:128 msgid "Join With Last" msgstr "" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Pan" msgstr "移動" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Zoom" msgstr "縮放" -#: ../src/vikwindow.c:188 +#: ../src/vikwindow.c:189 msgid "Ruler" msgstr "測è·" -#: ../src/vikwindow.c:363 +#: ../src/vikwindow.c:364 #, c-format msgid "" "Do you want to save the changes you made to the document \"%s\"?\n" @@ -1586,441 +1606,445 @@ msgid "" "Your changes will be lost if you don't save them." msgstr "" -#: ../src/vikwindow.c:366 ../src/vikwindow.c:1314 +#: ../src/vikwindow.c:367 ../src/vikwindow.c:1306 msgid "Untitled" msgstr "未命åçš„" -#: ../src/vikwindow.c:367 +#: ../src/vikwindow.c:368 msgid "Don't Save" msgstr "ä¸å„²å˜" -#: ../src/vikwindow.c:400 +#: ../src/vikwindow.c:401 msgid "mpp" msgstr "mpp" -#: ../src/vikwindow.c:400 +#: ../src/vikwindow.c:401 msgid "pixelfact" msgstr "pixelfact" -#: ../src/vikwindow.c:527 +#: ../src/vikwindow.c:528 #, c-format msgid "%s %s %dm" msgstr "" -#: ../src/vikwindow.c:529 +#: ../src/vikwindow.c:530 #, c-format msgid "%s %s" msgstr "" -#: ../src/vikwindow.c:1113 +#: ../src/vikwindow.c:1105 msgid "You must select a layer to show its properties." msgstr "æ‚¨å¿…é ˆé¸ä¸€å€‹å±¤æ‰èƒ½å¯Ÿçœ‹å®ƒçš„屬性" -#: ../src/vikwindow.c:1129 +#: ../src/vikwindow.c:1121 msgid "You must select a layer to delete." msgstr "æ‚¨å¿…é ˆé¸ä¸€å€‹å±¤æ‰å¯ç§»é™¤" -#: ../src/vikwindow.c:1347 +#: ../src/vikwindow.c:1339 msgid "The file you requested could not be opened." msgstr "您é¸çš„檔案無法被開啟" -#: ../src/vikwindow.c:1390 +#: ../src/vikwindow.c:1382 msgid "Please select a GPS data file to open. " msgstr "è«‹é¸å–一個GPS資料檔案來開啟 " -#: ../src/vikwindow.c:1433 +#: ../src/vikwindow.c:1425 msgid "Save as Viking File." msgstr "å¦å˜æ–°æª”Viking檔案." -#: ../src/vikwindow.c:1667 +#: ../src/vikwindow.c:1664 msgid "" "Viewable region outside allowable pixel size bounds for image. Clipping " "width/height values." msgstr "" -#: ../src/vikwindow.c:1686 +#: ../src/vikwindow.c:1683 #, c-format msgid "Total area: %ldm x %ldm (%.3f sq. km)" msgstr "全部å€åŸŸ: %ldm x %ldm (%.3f 平方公裡)" #. todo: default for answers inside VikWindow or static (thruout instance) -#: ../src/vikwindow.c:1694 +#: ../src/vikwindow.c:1691 msgid "Save to Image File" msgstr "儲å˜ç‚ºåœ–片檔案" -#: ../src/vikwindow.c:1712 +#: ../src/vikwindow.c:1709 msgid "Width (pixels):" msgstr "寬度 (åƒç´ ) :" -#: ../src/vikwindow.c:1714 +#: ../src/vikwindow.c:1711 msgid "Height (pixels):" msgstr "高度 (åƒç´ ) :" -#: ../src/vikwindow.c:1717 +#: ../src/vikwindow.c:1714 msgid "Zoom (meters per pixel):" msgstr "縮放 (ç±³ï¼åƒç´ ) :" -#: ../src/vikwindow.c:1723 +#: ../src/vikwindow.c:1720 msgid "Area in current viewable window" msgstr "" -#: ../src/vikwindow.c:1733 +#: ../src/vikwindow.c:1730 msgid "Save as PNG" msgstr "儲å˜ç‚ºPNG" -#: ../src/vikwindow.c:1734 +#: ../src/vikwindow.c:1731 msgid "Save as JPEG" msgstr "儲å˜ç‚ºJPEG" -#: ../src/vikwindow.c:1754 +#: ../src/vikwindow.c:1751 msgid "East-west image tiles:" msgstr "" -#: ../src/vikwindow.c:1756 +#: ../src/vikwindow.c:1753 msgid "North-south image tiles:" msgstr "" -#: ../src/vikwindow.c:1796 +#: ../src/vikwindow.c:1793 msgid "You must be in UTM mode to use this feature" msgstr "ä½ å¿…é ˆåœ¨UTMåž‹æ…‹ä¸ä¾†ä½¿ç”¨é€™å€‹ç‰¹å¾´" -#: ../src/vikwindow.c:1807 +#: ../src/vikwindow.c:1804 msgid "Save Image" msgstr "儲å˜å½±åƒ" -#: ../src/vikwindow.c:1834 +#: ../src/vikwindow.c:1831 msgid "Choose a directory to hold images" msgstr "" -#: ../src/vikwindow.c:1920 +#: ../src/vikwindow.c:1917 msgid "Choose a background color" msgstr "é¸å–一個背景色" -#: ../src/vikwindow.c:1941 +#: ../src/vikwindow.c:1938 msgid "_File" msgstr "_F 檔案" -#: ../src/vikwindow.c:1942 +#: ../src/vikwindow.c:1939 msgid "_Edit" msgstr "_E 編輯" -#: ../src/vikwindow.c:1943 +#: ../src/vikwindow.c:1940 msgid "_View" msgstr "_V 檢視" -#: ../src/vikwindow.c:1944 ../src/vikwindow.c:2015 +#: ../src/vikwindow.c:1941 ../src/vikwindow.c:2013 msgid "_Zoom" msgstr "_Z 縮放" -#: ../src/vikwindow.c:1945 ../src/vikwindow.c:2014 +#: ../src/vikwindow.c:1942 ../src/vikwindow.c:2012 msgid "_Pan" msgstr "_P 平移" -#: ../src/vikwindow.c:1946 +#: ../src/vikwindow.c:1943 msgid "_Layers" msgstr "_L 圖層" -#: ../src/vikwindow.c:1947 +#: ../src/vikwindow.c:1944 msgid "_Tools" msgstr "_T 工具" -#: ../src/vikwindow.c:1948 +#: ../src/vikwindow.c:1945 msgid "_Webtools" msgstr "" -#: ../src/vikwindow.c:1949 +#: ../src/vikwindow.c:1946 msgid "_Help" msgstr "_H 輔助說明" -#: ../src/vikwindow.c:1951 +#: ../src/vikwindow.c:1948 msgid "_New" msgstr "_N 新建" -#: ../src/vikwindow.c:1951 +#: ../src/vikwindow.c:1948 msgid "New file" msgstr "新建檔案" -#: ../src/vikwindow.c:1952 +#: ../src/vikwindow.c:1949 msgid "_Open" msgstr "_O é–‹å•Ÿ" -#: ../src/vikwindow.c:1952 +#: ../src/vikwindow.c:1949 msgid "Open a file" msgstr "開啟一個檔案" -#: ../src/vikwindow.c:1953 +#: ../src/vikwindow.c:1950 msgid "A_ppend File" msgstr "_p å¢žåŠ æª”æ¡ˆ" -#: ../src/vikwindow.c:1953 +#: ../src/vikwindow.c:1950 msgid "Append data from a different file" msgstr "從ä¸åŒçš„檔案ä¸è¿½åŠ 資料" -#: ../src/vikwindow.c:1954 +#: ../src/vikwindow.c:1951 msgid "A_cquire" msgstr "_c 抓å–" -#: ../src/vikwindow.c:1955 +#: ../src/vikwindow.c:1952 msgid "From _GPS" msgstr "_G 從GPS" -#: ../src/vikwindow.c:1955 +#: ../src/vikwindow.c:1952 msgid "Transfer data from a GPS device" msgstr "從一個GPS接收器ç²å¾—資料" -#: ../src/vikwindow.c:1956 +#: ../src/vikwindow.c:1953 msgid "Google _Directions" msgstr "_D 榖æŒæ–¹ä½" -#: ../src/vikwindow.c:1956 +#: ../src/vikwindow.c:1953 msgid "Get driving directions from Google" msgstr "從榖æŒç²å¾—駕駛方ä½" -#: ../src/vikwindow.c:1958 +#: ../src/vikwindow.c:1955 msgid "Geo_caches" msgstr "Geo_caches" -#: ../src/vikwindow.c:1958 +#: ../src/vikwindow.c:1955 msgid "Get Geocaches from geocaching.com" msgstr "從geocaching.comç²å¾—地ç†ç·©è¡å€è³‡æ–™" -#: ../src/vikwindow.c:1960 +#: ../src/vikwindow.c:1957 msgid "_Save" msgstr "_S 儲å˜" -#: ../src/vikwindow.c:1960 +#: ../src/vikwindow.c:1957 msgid "Save the file" msgstr "儲å˜é€™å€‹æª”案" -#: ../src/vikwindow.c:1961 +#: ../src/vikwindow.c:1958 msgid "Save _As" msgstr "_A å¦å˜æ–°æª”" -#: ../src/vikwindow.c:1961 +#: ../src/vikwindow.c:1958 msgid "Save the file under different name" msgstr "儲å˜ç‚ºå…¶ä»–åå—的檔案" -#: ../src/vikwindow.c:1962 +#: ../src/vikwindow.c:1959 msgid "_Generate Image File" msgstr "_G 生æˆåœ–形檔案" -#: ../src/vikwindow.c:1962 +#: ../src/vikwindow.c:1959 msgid "Save a snapshot of the workspace into a file" msgstr "" -#: ../src/vikwindow.c:1963 +#: ../src/vikwindow.c:1960 msgid "Generate _Directory of Images" msgstr "_D 建立圖片的目録" -#: ../src/vikwindow.c:1963 +#: ../src/vikwindow.c:1960 msgid "FIXME:IMGDIR" msgstr "" -#: ../src/vikwindow.c:1966 +#: ../src/vikwindow.c:1963 msgid "_Print..." msgstr "_P 列å°" -#: ../src/vikwindow.c:1966 +#: ../src/vikwindow.c:1963 msgid "Print maps" msgstr "列å°åœ°åœ–" -#: ../src/vikwindow.c:1969 +#: ../src/vikwindow.c:1966 msgid "E_xit" msgstr "_x çµæŸ" -#: ../src/vikwindow.c:1969 +#: ../src/vikwindow.c:1966 msgid "Exit the program" msgstr "çµæŸç¨‹å¼" -#: ../src/vikwindow.c:1970 +#: ../src/vikwindow.c:1967 msgid "Save and Exit" msgstr "儲å˜å¹¶çµæŸ" -#: ../src/vikwindow.c:1970 +#: ../src/vikwindow.c:1967 msgid "Save and Exit the program" msgstr "儲å˜å¹¶çµæŸç¨‹å¼" -#: ../src/vikwindow.c:1972 +#: ../src/vikwindow.c:1969 msgid "Go To location" msgstr "" -#: ../src/vikwindow.c:1972 +#: ../src/vikwindow.c:1969 msgid "Go to address/place using text search" msgstr "" -#: ../src/vikwindow.c:1973 +#: ../src/vikwindow.c:1970 msgid "_Go to Lat\\/Lon..." msgstr "_G å‰å¾€ä¸€å€‹ç¶“緯度值..." -#: ../src/vikwindow.c:1973 +#: ../src/vikwindow.c:1970 msgid "Go to arbitrary lat\\/lon coordinate" msgstr "å‰å¾€ä»»æ„的經緯度座標" -#: ../src/vikwindow.c:1974 +#: ../src/vikwindow.c:1971 msgid "Go to UTM..." msgstr "å‰å¾€UTM..." -#: ../src/vikwindow.c:1974 +#: ../src/vikwindow.c:1971 msgid "Go to arbitrary UTM coordinate" msgstr "å‰å¾€ä»»æ„çš„UTM座標" -#: ../src/vikwindow.c:1975 +#: ../src/vikwindow.c:1972 msgid "Set Background Color..." msgstr "è¨å®šèƒŒæ™¯è‰² ..." -#: ../src/vikwindow.c:1976 +#: ../src/vikwindow.c:1973 msgid "Zoom _In" msgstr "_I 縮å°" -#: ../src/vikwindow.c:1977 +#: ../src/vikwindow.c:1974 msgid "Zoom _Out" msgstr "_O 放大" -#: ../src/vikwindow.c:1978 +#: ../src/vikwindow.c:1975 msgid "Zoom _To" msgstr "_T 縮放到" -#: ../src/vikwindow.c:1979 +#: ../src/vikwindow.c:1976 msgid "0.25" msgstr "0.25" -#: ../src/vikwindow.c:1980 +#: ../src/vikwindow.c:1977 msgid "0.5" msgstr "0.5" -#: ../src/vikwindow.c:1981 +#: ../src/vikwindow.c:1978 msgid "1" msgstr "1" -#: ../src/vikwindow.c:1982 +#: ../src/vikwindow.c:1979 msgid "2" msgstr "2" -#: ../src/vikwindow.c:1983 +#: ../src/vikwindow.c:1980 msgid "4" msgstr "4" -#: ../src/vikwindow.c:1984 +#: ../src/vikwindow.c:1981 msgid "8" msgstr "8" -#: ../src/vikwindow.c:1985 +#: ../src/vikwindow.c:1982 msgid "16" msgstr "16" -#: ../src/vikwindow.c:1986 +#: ../src/vikwindow.c:1983 msgid "32" msgstr "32" -#: ../src/vikwindow.c:1987 +#: ../src/vikwindow.c:1984 msgid "64" msgstr "64" -#: ../src/vikwindow.c:1988 +#: ../src/vikwindow.c:1985 msgid "128" msgstr "128" -#: ../src/vikwindow.c:1989 +#: ../src/vikwindow.c:1986 msgid "Pan North" msgstr "å‘北" -#: ../src/vikwindow.c:1990 +#: ../src/vikwindow.c:1987 msgid "Pan East" msgstr "å‘æ±" -#: ../src/vikwindow.c:1991 +#: ../src/vikwindow.c:1988 msgid "Pan South" msgstr "å‘å—" -#: ../src/vikwindow.c:1992 +#: ../src/vikwindow.c:1989 msgid "Pan West" msgstr "å‘西" -#: ../src/vikwindow.c:1993 +#: ../src/vikwindow.c:1990 msgid "Background _Jobs" msgstr "_J 背景工作" -#: ../src/vikwindow.c:1995 +#: ../src/vikwindow.c:1992 msgid "Cu_t" msgstr "_t 剪å–" -#: ../src/vikwindow.c:1996 +#: ../src/vikwindow.c:1993 msgid "_Copy" msgstr "_C æ‹·è²" -#: ../src/vikwindow.c:1997 +#: ../src/vikwindow.c:1994 msgid "_Paste" msgstr "_P é»è²¼" -#: ../src/vikwindow.c:1998 +#: ../src/vikwindow.c:1995 msgid "_Delete" msgstr "_D 移除" -#: ../src/vikwindow.c:1999 +#: ../src/vikwindow.c:1996 msgid "Delete All" msgstr "全部移除" -#: ../src/vikwindow.c:2000 +#: ../src/vikwindow.c:1997 +msgid "Flush Map cache" +msgstr "" + +#: ../src/vikwindow.c:1998 msgid "_Preferences..." msgstr "_P 個人å好..." -#: ../src/vikwindow.c:2001 +#: ../src/vikwindow.c:1999 msgid "_Properties" msgstr "_P 屬性" -#: ../src/vikwindow.c:2003 +#: ../src/vikwindow.c:2001 msgid "_About" msgstr "_A 關于" -#: ../src/vikwindow.c:2008 +#: ../src/vikwindow.c:2006 msgid "_UTM Mode" msgstr "_UTM åž‹æ…‹" -#: ../src/vikwindow.c:2009 +#: ../src/vikwindow.c:2007 msgid "_Expedia Mode" msgstr "_Expedia åž‹æ…‹" -#: ../src/vikwindow.c:2010 +#: ../src/vikwindow.c:2008 msgid "_Mercator Mode" msgstr "" -#: ../src/vikwindow.c:2014 +#: ../src/vikwindow.c:2012 msgid "Pan Tool" msgstr "" -#: ../src/vikwindow.c:2015 +#: ../src/vikwindow.c:2013 msgid "Zoom Tool" msgstr "縮放工具" -#: ../src/vikwindow.c:2016 +#: ../src/vikwindow.c:2014 msgid "_Ruler" msgstr "_R 測è·" -#: ../src/vikwindow.c:2016 +#: ../src/vikwindow.c:2014 msgid "Ruler Tool" msgstr "測è·å·¥å…·" -#: ../src/vikwindow.c:2020 +#: ../src/vikwindow.c:2018 msgid "Show Scale" msgstr "察看比例尺" -#: ../src/vikwindow.c:2021 +#: ../src/vikwindow.c:2019 msgid "Show Center Mark" msgstr "察看ä¸å¿ƒè¨˜è™Ÿ" -#: ../src/vikwindow.c:2022 +#: ../src/vikwindow.c:2020 msgid "Full Screen" msgstr "å…¨å±" -#: ../src/vikwindow.c:2022 +#: ../src/vikwindow.c:2020 msgid "Activate full screen mode" msgstr "" -#: ../src/vikwindow.c:2023 +#: ../src/vikwindow.c:2021 msgid "Show Side Panel" msgstr "" -#: ../src/vikwindow.c:2085 +#: ../src/vikwindow.c:2083 #, c-format msgid "New %s Layer" msgstr "新圖層 \"%s\"" @@ -2037,31 +2061,5 @@ msgstr "" msgid "Viking" msgstr "" -#~ msgid "Google Satellite Images" -#~ msgstr "榖æŒè¡›æ˜Ÿå½±è±¡" - -#~ msgid "Google Terrain Maps" -#~ msgstr "榖æŒåœ°å½¢åœ°åœ–" - -#~ msgid "Old Google Maps" -#~ msgstr "è€çš„榖æŒåœ°åœ–" - -#~ msgid "Keep current position at center" -#~ msgstr "ä¿æŒç¾æœ‰æœªçŸ¥åœ¨ä¸å¤®" - -#~ msgid "_Old Google Mode" -#~ msgstr "_O è€çš„榖æŒåž‹æ…‹" - -#~ msgid "Old _KH Mode" -#~ msgstr "_K è€çš„KHåž‹æ…‹" - -#~ msgid "_Google Mode" -#~ msgstr "_G 榖æŒåž‹æ…‹" - -#, c-format -#~ msgid "couldn't open temp file %s" -#~ msgstr "無法開啟暫å˜æª” %s" - -#, c-format -#~ msgid "Failed downloading %s" -#~ msgstr "下載 %s 失敗" +#~ msgid "Maps Directory (Optional):" +#~ msgstr "地圖目録(å¯é¸):" diff --git a/src/Makefile.am b/src/Makefile.am index af98ec1..5292512 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -108,13 +108,13 @@ endif viking_SOURCES = main.c -INCLUDES = @GTK_CFLAGS@ @EXPAT_CFLAGS@ @LIBCURL_CPPFLAGS@ -LDADD = libviking.a @GTK_LIBS@ @EXPAT_LIBS@ @LIBCURL@ icons/libicons.a +LDADD = libviking.a $(PACKAGE_LIBS) @EXPAT_LIBS@ @LIBCURL@ icons/libicons.a if REALTIME_GPS_TRACKING LDADD += -lgps endif -#LDADD = -lz @GTK_LIBS@ @EXPAT_LIBS@ @LIBCURL@ -AM_CFLAGS = -Wall -g -D_GNU_SOURCE +AM_CFLAGS = -Wall -g -D_GNU_SOURCE \ + $(PACKAGE_CFLAGS) \ + @EXPAT_CFLAGS@ @LIBCURL_CPPFLAGS@ @INTLTOOL_DESKTOP_RULE@ diff --git a/src/Makefile.in b/src/Makefile.in index 6e81e7e..07d1b55 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -19,15 +19,11 @@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -144,9 +140,9 @@ am_viking_OBJECTS = main.$(OBJEXT) viking_OBJECTS = $(am_viking_OBJECTS) viking_LDADD = $(LDADD) am__DEPENDENCIES_1 = -viking_DEPENDENCIES = libviking.a icons/libicons.a \ - $(am__DEPENDENCIES_1) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I. +viking_DEPENDENCIES = libviking.a $(am__DEPENDENCIES_1) \ + icons/libicons.a $(am__DEPENDENCIES_1) +DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -157,10 +153,11 @@ SOURCES = $(libviking_a_SOURCES) $(viking_SOURCES) DIST_SOURCES = $(am__libviking_a_SOURCES_DIST) $(viking_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -169,6 +166,8 @@ am__vpath_adj = case $$p in \ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; desktopDATA_INSTALL = $(INSTALL_DATA) DATA = $(desktop_DATA) +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -176,15 +175,11 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BLUEMARBLE_FALSE = @BLUEMARBLE_FALSE@ -BLUEMARBLE_TRUE = @BLUEMARBLE_TRUE@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ @@ -197,8 +192,6 @@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DB2MAN_XSL = @DB2MAN_XSL@ DEFS = @DEFS@ -DEM24K_FALSE = @DEM24K_FALSE@ -DEM24K_TRUE = @DEM24K_TRUE@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -206,55 +199,23 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXPAT_CFLAGS = @EXPAT_CFLAGS@ -EXPAT_INSTALLED_FALSE = @EXPAT_INSTALLED_FALSE@ -EXPAT_INSTALLED_TRUE = @EXPAT_INSTALLED_TRUE@ EXPAT_LIBS = @EXPAT_LIBS@ -EXPEDIA_FALSE = @EXPEDIA_FALSE@ -EXPEDIA_TRUE = @EXPEDIA_TRUE@ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@ -GEN_MANPAGES_FALSE = @GEN_MANPAGES_FALSE@ -GEN_MANPAGES_TRUE = @GEN_MANPAGES_TRUE@ -GEOCACHES_FALSE = @GEOCACHES_FALSE@ -GEOCACHES_TRUE = @GEOCACHES_TRUE@ -GEONAMES_FALSE = @GEONAMES_FALSE@ -GEONAMES_TRUE = @GEONAMES_TRUE@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GOOGLE_FALSE = @GOOGLE_FALSE@ -GOOGLE_TRUE = @GOOGLE_TRUE@ GREP = @GREP@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ LDFLAGS = @LDFLAGS@ LIBCURL = @LIBCURL@ LIBCURL_CPPFLAGS = @LIBCURL_CPPFLAGS@ @@ -262,20 +223,20 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ OBJEXT = @OBJEXT@ -OPENAERIAL_FALSE = @OPENAERIAL_FALSE@ -OPENAERIAL_TRUE = @OPENAERIAL_TRUE@ -OPENSTREETMAP_FALSE = @OPENSTREETMAP_FALSE@ -OPENSTREETMAP_TRUE = @OPENSTREETMAP_TRUE@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_CFLAGS = @PACKAGE_CFLAGS@ +PACKAGE_LIBS = @PACKAGE_LIBS@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ @@ -285,21 +246,19 @@ POW_LIB = @POW_LIB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ -REALTIME_GPS_TRACKING_FALSE = @REALTIME_GPS_TRACKING_FALSE@ -REALTIME_GPS_TRACKING_TRUE = @REALTIME_GPS_TRACKING_TRUE@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -TERRASERVER_FALSE = @TERRASERVER_FALSE@ -TERRASERVER_TRUE = @TERRASERVER_TRUE@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XP = @XP@ _libcurl_config = @_libcurl_config@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -311,6 +270,7 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -338,8 +298,12 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ SUBDIRS = icons noinst_LIBRARIES = libviking.a BUILT_SOURCES = authors.h @@ -373,11 +337,12 @@ libviking_a_SOURCES = modules.h modules.c curl_download.c \ $(am__append_1) $(am__append_2) $(am__append_3) \ $(am__append_4) $(am__append_5) viking_SOURCES = main.c -INCLUDES = @GTK_CFLAGS@ @EXPAT_CFLAGS@ @LIBCURL_CPPFLAGS@ -LDADD = libviking.a @GTK_LIBS@ @EXPAT_LIBS@ @LIBCURL@ icons/libicons.a \ - $(am__append_6) -#LDADD = -lz @GTK_LIBS@ @EXPAT_LIBS@ @LIBCURL@ -AM_CFLAGS = -Wall -g -D_GNU_SOURCE +LDADD = libviking.a $(PACKAGE_LIBS) @EXPAT_LIBS@ @LIBCURL@ \ + icons/libicons.a $(am__append_6) +AM_CFLAGS = -Wall -g -D_GNU_SOURCE \ + $(PACKAGE_CFLAGS) \ + @EXPAT_CFLAGS@ @LIBCURL_CPPFLAGS@ + desktopdir = $(datadir)/applications desktop_in_files = viking.desktop.in desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) @@ -392,8 +357,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -421,7 +386,7 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) config.h: stamp-h1 @if test ! -f $@; then \ rm -f stamp-h1; \ - $(MAKE) stamp-h1; \ + $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ else :; fi stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @@ -443,7 +408,7 @@ libviking.a: $(libviking_a_OBJECTS) $(libviking_a_DEPENDENCIES) $(RANLIB) libviking.a install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" + test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ @@ -466,7 +431,7 @@ clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) viking$(EXEEXT): $(viking_OBJECTS) $(viking_DEPENDENCIES) @rm -f viking$(EXEEXT) - $(LINK) $(viking_LDFLAGS) $(viking_OBJECTS) $(viking_LDADD) $(LIBS) + $(LINK) $(viking_OBJECTS) $(viking_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -539,22 +504,21 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vikwindow.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -uninstall-info-am: install-desktopDATA: $(desktop_DATA) @$(NORMAL_INSTALL) - test -z "$(desktopdir)" || $(mkdir_p) "$(DESTDIR)$(desktopdir)" + test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)" @list='$(desktop_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -601,8 +565,7 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: +$(RECURSIVE_CLEAN_TARGETS): @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -646,8 +609,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -672,8 +635,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -683,13 +646,12 @@ ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -703,22 +665,21 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -732,7 +693,7 @@ distdir: $(DISTFILES) list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ @@ -740,6 +701,8 @@ distdir: $(DISTFILES) $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ distdir) \ || exit 1; \ fi; \ @@ -751,7 +714,7 @@ all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(DATA) config.h installdirs: installdirs-recursive installdirs-am: for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-recursive @@ -803,12 +766,20 @@ info-am: install-data-am: install-desktopDATA +install-dvi: install-dvi-recursive + install-exec-am: install-binPROGRAMS +install-html: install-html-recursive + install-info: install-info-recursive install-man: +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -828,25 +799,26 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-binPROGRAMS uninstall-desktopDATA \ - uninstall-info-am - -uninstall-info: uninstall-info-recursive - -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-binPROGRAMS clean-generic clean-noinstLIBRARIES \ - clean-recursive ctags ctags-recursive distclean \ - distclean-compile distclean-generic distclean-hdr \ - distclean-recursive distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-binPROGRAMS \ - install-data install-data-am install-desktopDATA install-exec \ - install-exec-am install-info install-info-am install-man \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-recursive pdf pdf-am ps ps-am \ +uninstall-am: uninstall-binPROGRAMS uninstall-desktopDATA + +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip + +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-binPROGRAMS \ + clean-generic clean-noinstLIBRARIES ctags ctags-recursive \ + distclean distclean-compile distclean-generic distclean-hdr \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-binPROGRAMS install-data \ + install-data-am install-desktopDATA install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ tags tags-recursive uninstall uninstall-am \ - uninstall-binPROGRAMS uninstall-desktopDATA uninstall-info-am + uninstall-binPROGRAMS uninstall-desktopDATA authors.h: ../AUTHORS diff --git a/src/background.c b/src/background.c index 624d78b..d1d0c9b 100644 --- a/src/background.c +++ b/src/background.c @@ -25,6 +25,9 @@ #include "vikstatus.h" #include "background.h" +static GThreadPool *thread_pool = NULL; +static gboolean stop_all_threads = FALSE; + static GtkWidget *bgwindow = NULL; static GtkWidget *bgtreeview = NULL; static GtkListStore *bgstore = NULL; @@ -55,17 +58,20 @@ static void background_thread_update () g_slist_foreach ( statusbars_to_update, (GFunc) a_background_update_status, buf ); } -void a_background_thread_progress ( gpointer callbackdata, gdouble fraction ) +int a_background_thread_progress ( gpointer callbackdata, gdouble fraction ) { gpointer *args = (gpointer *) callbackdata; - a_background_testcancel ( callbackdata ); - gdk_threads_enter(); - gtk_list_store_set( GTK_LIST_STORE(bgstore), (GtkTreeIter *) args[5], PROGRESS_COLUMN, fraction*100, -1 ); - gdk_threads_leave(); + int res = a_background_testcancel ( callbackdata ); + if (args[5] != NULL) { + gdk_threads_enter(); + gtk_list_store_set( GTK_LIST_STORE(bgstore), (GtkTreeIter *) args[5], PROGRESS_COLUMN, fraction*100, -1 ); + gdk_threads_leave(); + } args[6] = GINT_TO_POINTER(GPOINTER_TO_INT(args[6])-1); bgitemcount--; background_thread_update(); + return res; } static void thread_die ( gpointer args[6] ) @@ -82,23 +88,23 @@ static void thread_die ( gpointer args[6] ) g_free ( args[5] ); /* free iter */ g_free ( args ); - - g_thread_exit ( NULL ); } -void a_background_testcancel ( gpointer callbackdata ) +int a_background_testcancel ( gpointer callbackdata ) { gpointer *args = (gpointer *) callbackdata; - if ( args[0] ) + if ( stop_all_threads ) + return -1; + if ( args && args[0] ) { vik_thr_free_func cleanup = args[4]; if ( cleanup ) cleanup ( args[2] ); - thread_die( args ); + return -1; } + return 0; } - -void thread_helper ( gpointer args[6] ) +void thread_helper ( gpointer args[6], gpointer user_data ) { /* unpack args */ vik_thr_func func = args[1]; @@ -141,7 +147,7 @@ void a_background_thread ( GtkWindow *parent, const gchar *message, vik_thr_func -1 ); /* run the thread in the background */ - g_thread_create( (GThreadFunc) thread_helper, args, FALSE, NULL ); + g_thread_pool_push( thread_pool, args, NULL ); } void a_background_show_window () @@ -162,6 +168,7 @@ static void cancel_job_with_iter ( GtkTreeIter *piter ) args[0] = GINT_TO_POINTER(1); /* set killswitch */ gtk_list_store_remove ( bgstore, piter ); + args[5] = NULL; } static void bgwindow_response (GtkDialog *dialog, gint arg1 ) @@ -194,6 +201,11 @@ static void bgwindow_response (GtkDialog *dialog, gint arg1 ) void a_background_init() { + /* initialize thread pool */ + /* TODO parametrize this via preference and/or command line arg */ + gint max_threads = 10; /* limit maximum number of threads running at one time */ + thread_pool = g_thread_pool_new ( (GFunc) thread_helper, NULL, max_threads, FALSE, NULL ); + GtkCellRenderer *renderer; GtkTreeViewColumn *column; GtkWidget *scrolled_window; @@ -232,6 +244,13 @@ void a_background_init() } +void a_background_uninit() +{ + /* wait until all running threads stop */ + stop_all_threads = TRUE; + g_thread_pool_free ( thread_pool, TRUE, TRUE ); +} + void a_background_add_status(VikStatusbar *vs) { statusbars_to_update = g_slist_prepend(statusbars_to_update,vs); diff --git a/src/background.h b/src/background.h index 6bbb49f..e12734b 100644 --- a/src/background.h +++ b/src/background.h @@ -32,10 +32,11 @@ typedef void(*vik_thr_func)(gpointer,gpointer); /* the new way */ void a_background_thread ( GtkWindow *parent, const gchar *message, vik_thr_func func, gpointer userdata, vik_thr_free_func userdata_free_func, vik_thr_free_func userdata_cancel_cleanup_func, gint number_items ); -void a_background_thread_progress ( gpointer callbackdata, gdouble fraction ); -void a_background_testcancel ( gpointer callbackdata ); +int a_background_thread_progress ( gpointer callbackdata, gdouble fraction ); +int a_background_testcancel ( gpointer callbackdata ); void a_background_show_window (); void a_background_init (); +void a_background_uninit (); void a_background_add_status(VikStatusbar *vs); void a_background_remove_status(VikStatusbar *vs); diff --git a/src/config.h b/src/config.h index 5e206f1..745be73 100644 --- a/src/config.h +++ b/src/config.h @@ -141,7 +141,7 @@ #define LIBCURL_FEATURE_LIBZ 1 /* Defined if libcurl supports NTLM */ -/* #undef LIBCURL_FEATURE_NTLM */ +#define LIBCURL_FEATURE_NTLM 1 /* Defined if libcurl supports SSL */ #define LIBCURL_FEATURE_SSL 1 @@ -193,25 +193,28 @@ #define PACKAGE_NAME "viking" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "viking 0.9.8" +#define PACKAGE_STRING "viking 0.9.9" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "viking" +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.9.8" +#define PACKAGE_VERSION "0.9.9" /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION "0.9.8" +#define VERSION "0.9.9" /* NO ALPHABETIZED TRW */ -#define VIK_CONFIG_ALPHABETIZED_TRW +#define VIK_CONFIG_ALPHABETIZED_TRW /**/ /* BLUEMARBLE STUFF */ -#define VIK_CONFIG_BLUEMARBLE +#define VIK_CONFIG_BLUEMARBLE /**/ /* DEM24K STUFF */ /* #undef VIK_CONFIG_DEM24K */ @@ -223,22 +226,22 @@ /* #undef VIK_CONFIG_GEOCACHES */ /* GEONAMES STUFF */ -#define VIK_CONFIG_GEONAMES +#define VIK_CONFIG_GEONAMES /**/ /* GOOGLE STUFF */ -#define VIK_CONFIG_GOOGLE +#define VIK_CONFIG_GOOGLE /**/ /* Size of the map cache */ #define VIK_CONFIG_MAPCACHE_SIZE 50331648 /* OPENAERIAL STUFF */ -#define VIK_CONFIG_OPENAERIAL +#define VIK_CONFIG_OPENAERIAL /**/ /* OPENSTREETMAP STUFF */ -#define VIK_CONFIG_OPENSTREETMAP +#define VIK_CONFIG_OPENSTREETMAP /**/ /* REALTIME GPS TRACKING STUFF */ -#define VIK_CONFIG_REALTIME_GPS_TRACKING +#define VIK_CONFIG_REALTIME_GPS_TRACKING /**/ /* Method for the search */ #define VIK_CONFIG_SEARCH VIK_CONFIG_SEARCH_GOOGLE @@ -250,7 +253,7 @@ #define VIK_CONFIG_SEARCH_GOOGLE 1 /* TERRASERVER STUFF */ -#define VIK_CONFIG_TERRASERVER +#define VIK_CONFIG_TERRASERVER /**/ /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */ diff --git a/src/config.h.in b/src/config.h.in index e406a02..9e93d60 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -197,6 +197,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION diff --git a/src/curl_download.c b/src/curl_download.c index 302f4b9..f230dca 100644 --- a/src/curl_download.c +++ b/src/curl_download.c @@ -28,14 +28,18 @@ #include <glib.h> #include <glib/gstdio.h> #include <glib/gi18n.h> +#include <glib/gprintf.h> #include <gtk/gtk.h> #include <curl/curl.h> +#include "background.h" #include "file.h" #include "globals.h" #include "curl_download.h" +gchar *curl_download_user_agent; + /* * Even if writing to FILE* is supported by libcurl by default, * it seems that it is non-portable (win32 DLL specific). @@ -47,6 +51,11 @@ static size_t curl_write_func(void *ptr, size_t size, size_t nmemb, FILE *stream return fwrite(ptr, size, nmemb, stream); } +static int curl_progress_func(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow) +{ + return a_background_testcancel(NULL); +} + static gchar *get_cookie_file(gboolean init) { static gchar *cookie_file = NULL; @@ -77,7 +86,7 @@ static gchar *get_cookie_file(gboolean init) if (vik_verbose) curl_easy_setopt ( curl, CURLOPT_VERBOSE, 1 ); curl_easy_setopt(curl, CURLOPT_URL, "http://maps.google.com/"); /* google.com sets "PREF" cookie */ - curl_easy_setopt ( curl, CURLOPT_FILE, out_file ); + curl_easy_setopt ( curl, CURLOPT_WRITEDATA, out_file ); curl_easy_setopt ( curl, CURLOPT_WRITEFUNCTION, curl_write_func); curl_easy_setopt(curl, CURLOPT_COOKIEJAR, cookie_file); res = curl_easy_perform(curl); @@ -105,6 +114,7 @@ void curl_download_init() { curl_global_init(CURL_GLOBAL_ALL); get_cookie_file(TRUE); + curl_download_user_agent = g_strdup_printf ("%s/%s %s", PACKAGE, VERSION, curl_version()); } int curl_download_uri ( const char *uri, FILE *f, DownloadOptions *options ) @@ -121,8 +131,11 @@ int curl_download_uri ( const char *uri, FILE *f, DownloadOptions *options ) if (vik_verbose) curl_easy_setopt ( curl, CURLOPT_VERBOSE, 1 ); curl_easy_setopt ( curl, CURLOPT_URL, uri ); - curl_easy_setopt ( curl, CURLOPT_FILE, f ); + curl_easy_setopt ( curl, CURLOPT_WRITEDATA, f ); curl_easy_setopt ( curl, CURLOPT_WRITEFUNCTION, curl_write_func); + curl_easy_setopt ( curl, CURLOPT_NOPROGRESS, 0 ); + curl_easy_setopt ( curl, CURLOPT_PROGRESSDATA, NULL ); + curl_easy_setopt ( curl, CURLOPT_PROGRESSFUNCTION, curl_progress_func); if (options != NULL) { if(options->referer != NULL) curl_easy_setopt ( curl, CURLOPT_REFERER, options->referer); @@ -131,7 +144,7 @@ int curl_download_uri ( const char *uri, FILE *f, DownloadOptions *options ) curl_easy_setopt ( curl, CURLOPT_MAXREDIRS, options->follow_location); } } - curl_easy_setopt ( curl, CURLOPT_USERAGENT, PACKAGE "/" VERSION " libcurl/7.15.4" ); + curl_easy_setopt ( curl, CURLOPT_USERAGENT, curl_download_user_agent ); if ((cookie_file = get_cookie_file(FALSE)) != NULL) curl_easy_setopt(curl, CURLOPT_COOKIEFILE, cookie_file); res = curl_easy_perform ( curl ); @@ -441,8 +441,10 @@ VikDEM *vik_dem_new_from_file(const gchar *file) /* Header */ f = g_fopen(file, "r"); - if ( !f ) + if ( !f ) { + g_free ( rv ); return NULL; + } buffer[fread(buffer, 1, DEM_BLOCK_SIZE, f)] = '\0'; if ( ! dem_parse_header ( buffer, rv ) ) { g_free ( rv ); diff --git a/src/dialog.c b/src/dialog.c index 06965fd..a3c4bdb 100644 --- a/src/dialog.c +++ b/src/dialog.c @@ -257,7 +257,7 @@ gboolean a_dialog_new_waypoint ( GtkWindow *parent, gchar **dest, VikWaypoint *w gtk_entry_set_text(GTK_ENTRY(commententry), cmt); imagelabel = gtk_label_new (_("Image:")); - imageentry = vik_file_entry_new (); + imageentry = vik_file_entry_new (GTK_FILE_CHOOSER_ACTION_OPEN); { GtkCellRenderer *r; @@ -553,6 +553,7 @@ static void xfclose ( FILE *f ) /* 0 on failure, 1 on success (vik file) 2 on success (other file) */ gshort a_file_load ( VikAggregateLayer *top, VikViewport *vp, const gchar *filename ) { + gboolean is_gpx_file = check_file_ext ( filename, ".gpx" ); FILE *f = xfopen ( filename, "r" ); g_assert ( vp ); @@ -560,7 +561,7 @@ gshort a_file_load ( VikAggregateLayer *top, VikViewport *vp, const gchar *filen if ( ! f ) return 0; - if ( check_magic ( f, VIK_MAGIC ) ) + if ( !is_gpx_file && check_magic ( f, VIK_MAGIC ) ) { file_read ( top, f, vp ); if ( f != stdin ) @@ -573,7 +574,7 @@ gshort a_file_load ( VikAggregateLayer *top, VikViewport *vp, const gchar *filen VikLayer *vtl = vik_layer_create ( VIK_LAYER_TRW, vp, NULL, FALSE ); vik_layer_rename ( vtl, a_file_basename ( filename ) ); - if ( check_magic ( f, GPX_MAGIC ) ) + if ( is_gpx_file || check_magic ( f, GPX_MAGIC ) ) a_gpx_read_file ( VIK_TRW_LAYER(vtl), f ); else a_gpspoint_read_file ( VIK_TRW_LAYER(vtl), f ); @@ -616,6 +617,24 @@ const gchar *a_file_basename ( const gchar *filename ) return filename; } +/* example: + gboolean is_gpx = check_file_ext ( "a/b/c.gpx", ".gpx" ); +*/ +gboolean check_file_ext ( const gchar *filename, const gchar *fileext ) +{ + const gchar *basename = a_file_basename(filename); + g_assert( filename ); + g_assert( fileext && fileext[0]=='.' ); + if (!basename) + return FALSE; + + const char * dot = strrchr(basename, '.'); + if (dot && !strcmp(dot, fileext)) + return TRUE; + + return FALSE; +} + gboolean a_file_export ( VikTrwLayer *vtl, const gchar *filename, gshort file_type ) { FILE *f = g_fopen ( filename, "w" ); @@ -33,6 +33,7 @@ #define FILE_TYPE_GPX 3 const gchar *a_file_basename ( const gchar *filename ); +gboolean check_file_ext ( const gchar *filename, const gchar *fileext ); /* 0 on failure, 1 on success (vik file) 2 on success (other file) */ gshort a_file_load ( VikAggregateLayer *top, VikViewport *vp, const gchar *filename ); diff --git a/src/geonamessearch.c b/src/geonamessearch.c index ae58bef..47ea1a8 100644 --- a/src/geonamessearch.c +++ b/src/geonamessearch.c @@ -628,7 +628,6 @@ void a_geonames_wikipedia_box(VikWindow *vw, VikTrwLayer *vtl, VikLayersPanel *v while (wp_runner) { wiki_geoname = (found_geoname *)wp_runner->data; wiki_wp = vik_waypoint_new(); - wiki_wp->altitude = VIK_DEFAULT_ALTITUDE; wiki_wp->visible = TRUE; vik_coord_load_from_latlon(&(wiki_wp->coord), vik_trw_layer_get_coord_mode ( vtl ), &(wiki_geoname->ll)); vik_waypoint_set_comment(wiki_wp, wiki_geoname->desc); diff --git a/src/globals.h b/src/globals.h index b941dbf..60fb690 100644 --- a/src/globals.h +++ b/src/globals.h @@ -33,6 +33,7 @@ #define MPP_TO_ALTI 0.7134044 #define VIK_DEFAULT_ALTITUDE 0.0 +#define VIK_DEFAULT_DOP 0.0 #define VIK_GTK_WINDOW_FROM_WIDGET(x) GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(x))) #define VIK_GTK_WINDOW_FROM_LAYER(x) VIK_GTK_WINDOW_FROM_WIDGET(VIK_LAYER(x)->vt) diff --git a/src/google.c b/src/google.c index 16301b5..cf44f68 100644 --- a/src/google.c +++ b/src/google.c @@ -31,7 +31,7 @@ void google_init () { // Webtools - VikWebtoolCenter *webtool = vik_webtool_center_new_with_members ( _("Google"), "http://maps.google.com/maps?f=q&hl=fr&geocode=&ie=UTF8&ll=%s,%s&z=%d&iwloc=addr" ); + VikWebtoolCenter *webtool = vik_webtool_center_new_with_members ( _("Google"), "http://maps.google.com/maps?f=q&geocode=&ie=UTF8&ll=%s,%s&z=%d&iwloc=addr" ); vik_ext_tools_register ( VIK_EXT_TOOL ( webtool ) ); g_object_unref ( webtool ); } diff --git a/src/gpspoint.c b/src/gpspoint.c index 64defa5..96d279d 100644 --- a/src/gpspoint.c +++ b/src/gpspoint.c @@ -260,15 +260,11 @@ void a_gpspoint_read_file(VikTrwLayer *trw, FILE *f ) { tp->timestamp = line_timestamp; tp->altitude = line_altitude; if (line_extended) { - tp->extended = TRUE; tp->speed = line_speed; tp->course = line_course; tp->nsats = line_sat; tp->fix_mode = line_fix; } - else { - tp->extended = FALSE; - } current_track->trackpoints = g_list_append ( current_track->trackpoints, tp ); } @@ -386,15 +382,15 @@ static void gpspoint_process_key_and_value ( const gchar *key, gint key_len, con } else if (key_len == 8 && strncasecmp( key, "latitude", key_len ) == 0 && value != NULL) { - line_latlon.lat = g_strtod(value, NULL); + line_latlon.lat = g_ascii_strtod(value, NULL); } else if (key_len == 9 && strncasecmp( key, "longitude", key_len ) == 0 && value != NULL) { - line_latlon.lon = g_strtod(value, NULL); + line_latlon.lon = g_ascii_strtod(value, NULL); } else if (key_len == 8 && strncasecmp( key, "altitude", key_len ) == 0 && value != NULL) { - line_altitude = g_strtod(value, NULL); + line_altitude = g_ascii_strtod(value, NULL); } else if (key_len == 7 && strncasecmp( key, "visible", key_len ) == 0 && value[0] != 'y' && value[0] != 'Y' && value[0] != 't' && value[0] != 'T') { @@ -406,7 +402,7 @@ static void gpspoint_process_key_and_value ( const gchar *key, gint key_len, con } else if (key_len == 8 && strncasecmp( key, "unixtime", key_len ) == 0 && value != NULL) { - line_timestamp = g_strtod(value, NULL); + line_timestamp = g_ascii_strtod(value, NULL); if ( line_timestamp != 0x80000000 ) line_has_timestamp = TRUE; } @@ -420,11 +416,11 @@ static void gpspoint_process_key_and_value ( const gchar *key, gint key_len, con } else if (key_len == 5 && strncasecmp( key, "speed", key_len ) == 0 && value != NULL) { - line_speed = g_strtod(value, NULL); + line_speed = g_ascii_strtod(value, NULL); } else if (key_len == 6 && strncasecmp( key, "course", key_len ) == 0 && value != NULL) { - line_course = g_strtod(value, NULL); + line_course = g_ascii_strtod(value, NULL); } else if (key_len == 3 && strncasecmp( key, "sat", key_len ) == 0 && value != NULL) { @@ -497,7 +493,7 @@ static void a_gpspoint_write_trackpoint ( VikTrackpoint *tp, FILE *f ) if ( tp->newsegment ) fprintf ( f, " newsegment=\"yes\"" ); - if (tp->extended) { + if (!isnan(tp->speed) || !isnan(tp->course) || tp->nsats > 0) { fprintf ( f, " extended=\"yes\"" ); if (!isnan(tp->speed)) { gchar *s_speed = a_coords_dtostr(tp->speed); @@ -66,6 +66,10 @@ typedef enum { tt_trk_trkseg_trkpt_fix, tt_trk_trkseg_trkpt_sat, + tt_trk_trkseg_trkpt_hdop, + tt_trk_trkseg_trkpt_vdop, + tt_trk_trkseg_trkpt_pdop, + tt_waypoint, tt_waypoint_coord, tt_waypoint_name, @@ -117,6 +121,9 @@ tag_mapping tag_path_map[] = { { tt_trk_trkseg_trkpt_fix, "/gpx/trk/trkseg/trkpt/fix" }, { tt_trk_trkseg_trkpt_sat, "/gpx/trk/trkseg/trkpt/sat" }, + { tt_trk_trkseg_trkpt_hdop, "/gpx/trk/trkseg/trkpt/hdop" }, + { tt_trk_trkseg_trkpt_vdop, "/gpx/trk/trkseg/trkpt/vdop" }, + { tt_trk_trkseg_trkpt_pdop, "/gpx/trk/trkseg/trkpt/pdop" }, {0} }; @@ -166,8 +173,8 @@ static const char *get_attr ( const char **attr, const char *key ) static gboolean set_c_ll ( const char **attr ) { if ( (c_slat = get_attr ( attr, "lat" )) && (c_slon = get_attr ( attr, "lon" )) ) { - c_ll.lat = g_strtod(c_slat, NULL); - c_ll.lon = g_strtod(c_slon, NULL); + c_ll.lat = g_ascii_strtod(c_slat, NULL); + c_ll.lon = g_ascii_strtod(c_slon, NULL); return TRUE; } return FALSE; @@ -186,7 +193,6 @@ static void gpx_start(VikTrwLayer *vtl, const char *el, const char **attr) case tt_wpt: if ( set_c_ll( attr ) ) { c_wp = vik_waypoint_new (); - c_wp->altitude = VIK_DEFAULT_ALTITUDE; if ( ! get_attr ( attr, "hidden" ) ) c_wp->visible = TRUE; @@ -207,7 +213,6 @@ static void gpx_start(VikTrwLayer *vtl, const char *el, const char **attr) case tt_trk_trkseg_trkpt: if ( set_c_ll( attr ) ) { c_tp = vik_trackpoint_new (); - c_tp->altitude = VIK_DEFAULT_ALTITUDE; vik_coord_load_from_latlon ( &(c_tp->coord), vik_trw_layer_get_coord_mode ( vtl ), &c_ll ); if ( f_tr_newseg ) { c_tp->newsegment = TRUE; @@ -230,7 +235,6 @@ static void gpx_start(VikTrwLayer *vtl, const char *el, const char **attr) case tt_waypoint: c_wp = vik_waypoint_new (); - c_wp->altitude = VIK_DEFAULT_ALTITUDE; c_wp->visible = TRUE; break; @@ -294,12 +298,12 @@ static void gpx_end(VikTrwLayer *vtl, const char *el) break; case tt_wpt_ele: - c_wp->altitude = g_strtod ( c_cdata->str, NULL ); + c_wp->altitude = g_ascii_strtod ( c_cdata->str, NULL ); g_string_erase ( c_cdata, 0, -1 ); break; case tt_trk_trkseg_trkpt_ele: - c_tp->altitude = g_strtod ( c_cdata->str, NULL ); + c_tp->altitude = g_ascii_strtod ( c_cdata->str, NULL ); g_string_erase ( c_cdata, 0, -1 ); break; @@ -336,19 +340,16 @@ static void gpx_end(VikTrwLayer *vtl, const char *el) break; case tt_trk_trkseg_trkpt_course: - c_tp->extended = TRUE; - c_tp->course = g_strtod ( c_cdata->str, NULL ); + c_tp->course = g_ascii_strtod ( c_cdata->str, NULL ); g_string_erase ( c_cdata, 0, -1 ); break; case tt_trk_trkseg_trkpt_speed: - c_tp->extended = TRUE; - c_tp->speed = g_strtod ( c_cdata->str, NULL ); + c_tp->speed = g_ascii_strtod ( c_cdata->str, NULL ); g_string_erase ( c_cdata, 0, -1 ); break; case tt_trk_trkseg_trkpt_fix: - c_tp->extended = TRUE; if (!strcmp("2d", c_cdata->str)) c_tp->fix_mode = VIK_GPS_MODE_2D; else if (!strcmp("3d", c_cdata->str)) @@ -359,11 +360,25 @@ static void gpx_end(VikTrwLayer *vtl, const char *el) break; case tt_trk_trkseg_trkpt_sat: - c_tp->extended = TRUE; c_tp->nsats = atoi ( c_cdata->str ); g_string_erase ( c_cdata, 0, -1 ); break; + case tt_trk_trkseg_trkpt_hdop: + c_tp->hdop = g_strtod ( c_cdata->str, NULL ); + g_string_erase ( c_cdata, 0, -1 ); + break; + + case tt_trk_trkseg_trkpt_vdop: + c_tp->vdop = g_strtod ( c_cdata->str, NULL ); + g_string_erase ( c_cdata, 0, -1 ); + break; + + case tt_trk_trkseg_trkpt_pdop: + c_tp->pdop = g_strtod ( c_cdata->str, NULL ); + g_string_erase ( c_cdata, 0, -1 ); + break; + default: break; } @@ -386,6 +401,9 @@ static void gpx_cdata(void *dta, const XML_Char *s, int len) case tt_trk_trkseg_trkpt_speed: case tt_trk_trkseg_trkpt_fix: case tt_trk_trkseg_trkpt_sat: + case tt_trk_trkseg_trkpt_hdop: + case tt_trk_trkseg_trkpt_vdop: + case tt_trk_trkseg_trkpt_pdop: case tt_waypoint_name: /* .loc name is really description. */ g_string_append_len ( c_cdata, s, len ); break; @@ -645,7 +663,7 @@ static void gpx_write_trackpoint ( VikTrackpoint *tp, GpxWritingContext *context { FILE *f = context->file; static struct LatLon ll; - gchar *s_lat,*s_lon, *s_alt; + gchar *s_lat,*s_lon, *s_alt, *s_dop; gchar *time_iso8601; vik_coord_to_latlon ( &(tp->coord), &ll ); @@ -691,24 +709,48 @@ static void gpx_write_trackpoint ( VikTrackpoint *tp, GpxWritingContext *context g_free(time_iso8601); time_iso8601 = NULL; - if (tp->extended && (tp->fix_mode >= VIK_GPS_MODE_2D)) { - if (!isnan(tp->course)) { - gchar *s_course = a_coords_dtostr(tp->course); - fprintf ( f, " <course>%s</course>\n", s_course ); - g_free(s_course); - } - if (!isnan(tp->speed)) { - gchar *s_speed = a_coords_dtostr(tp->speed); - fprintf ( f, " <speed>%s</speed>\n", s_speed ); - g_free(s_speed); - } - if (tp->fix_mode == VIK_GPS_MODE_2D) - fprintf ( f, " <fix>2d</fix>\n"); - if (tp->fix_mode == VIK_GPS_MODE_3D) - fprintf ( f, " <fix>3d</fix>\n"); - if (tp->nsats > 0) - fprintf ( f, " <sat>%d</sat>\n", tp->nsats ); + if (!isnan(tp->course)) { + gchar *s_course = a_coords_dtostr(tp->course); + fprintf ( f, " <course>%s</course>\n", s_course ); + g_free(s_course); } + if (!isnan(tp->speed)) { + gchar *s_speed = a_coords_dtostr(tp->speed); + fprintf ( f, " <speed>%s</speed>\n", s_speed ); + g_free(s_speed); + } + if (tp->fix_mode == VIK_GPS_MODE_2D) + fprintf ( f, " <fix>2d</fix>\n"); + if (tp->fix_mode == VIK_GPS_MODE_3D) + fprintf ( f, " <fix>3d</fix>\n"); + if (tp->nsats > 0) + fprintf ( f, " <sat>%d</sat>\n", tp->nsats ); + + s_dop = NULL; + if ( tp->hdop != VIK_DEFAULT_DOP ) + { + s_dop = a_coords_dtostr ( tp->hdop ); + } + if (s_dop != NULL) + fprintf ( f, " <hdop>%s</hdop>\n", s_dop ); + g_free ( s_dop ); s_dop = NULL; + + if ( tp->vdop != VIK_DEFAULT_DOP ) + { + s_dop = a_coords_dtostr ( tp->vdop ); + } + if (s_dop != NULL) + fprintf ( f, " <vdop>%s</vdop>\n", s_dop ); + g_free ( s_dop ); s_dop = NULL; + + if ( tp->pdop != VIK_DEFAULT_DOP ) + { + s_dop = a_coords_dtostr ( tp->pdop ); + } + if (s_dop != NULL) + fprintf ( f, " <pdop>%s</pdop>\n", s_dop ); + g_free ( s_dop ); s_dop = NULL; + fprintf ( f, " </trkpt>\n" ); } @@ -796,9 +838,16 @@ static void gpx_collect_track (const gchar *name, VikTrack *track, gpx_gather_tr { if (passalong->i < passalong->n_trks) { - VikTrackpoint *first_point = (VikTrackpoint *)track->trackpoints->data; passalong->trks[passalong->i].name = name; - passalong->trks[passalong->i].first_timestamp = first_point->timestamp; + if (track && track->trackpoints && track->trackpoints->data) + { + VikTrackpoint *first_point = (VikTrackpoint *)track->trackpoints->data; + passalong->trks[passalong->i].first_timestamp = first_point->timestamp; + } + else + { + passalong->trks[passalong->i].first_timestamp = 0; + } passalong->i++; } } diff --git a/src/icons/Makefile.am b/src/icons/Makefile.am index 3515777..7b13d31 100644 --- a/src/icons/Makefile.am +++ b/src/icons/Makefile.am @@ -265,8 +265,8 @@ icons.c: $(ALL_ICONS_HEADER) $(BUILT_SOURCES): $(srcdir)/Makefile.am -INCLUDES = @GTK_CFLAGS@ -AM_CFLAGS = -Wall -g -D_GNU_SOURCE +AM_CFLAGS = -Wall -g -D_GNU_SOURCE \ + $(PACKAGE_CFLAGS) iconsdir = $(datadir)/icons/hicolor/48x48/apps icons_DATA = viking.png diff --git a/src/icons/Makefile.in b/src/icons/Makefile.in index e7c7367..f8abc1e 100644 --- a/src/icons/Makefile.in +++ b/src/icons/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,15 +15,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -55,7 +51,7 @@ libicons_a_AR = $(AR) $(ARFLAGS) libicons_a_LIBADD = am_libicons_a_OBJECTS = icons.$(OBJEXT) libicons_a_OBJECTS = $(am_libicons_a_OBJECTS) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -79,15 +75,11 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BLUEMARBLE_FALSE = @BLUEMARBLE_FALSE@ -BLUEMARBLE_TRUE = @BLUEMARBLE_TRUE@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ @@ -100,8 +92,6 @@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DB2MAN_XSL = @DB2MAN_XSL@ DEFS = @DEFS@ -DEM24K_FALSE = @DEM24K_FALSE@ -DEM24K_TRUE = @DEM24K_TRUE@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -109,55 +99,23 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXPAT_CFLAGS = @EXPAT_CFLAGS@ -EXPAT_INSTALLED_FALSE = @EXPAT_INSTALLED_FALSE@ -EXPAT_INSTALLED_TRUE = @EXPAT_INSTALLED_TRUE@ EXPAT_LIBS = @EXPAT_LIBS@ -EXPEDIA_FALSE = @EXPEDIA_FALSE@ -EXPEDIA_TRUE = @EXPEDIA_TRUE@ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@ -GEN_MANPAGES_FALSE = @GEN_MANPAGES_FALSE@ -GEN_MANPAGES_TRUE = @GEN_MANPAGES_TRUE@ -GEOCACHES_FALSE = @GEOCACHES_FALSE@ -GEOCACHES_TRUE = @GEOCACHES_TRUE@ -GEONAMES_FALSE = @GEONAMES_FALSE@ -GEONAMES_TRUE = @GEONAMES_TRUE@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GOOGLE_FALSE = @GOOGLE_FALSE@ -GOOGLE_TRUE = @GOOGLE_TRUE@ GREP = @GREP@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ LDFLAGS = @LDFLAGS@ LIBCURL = @LIBCURL@ LIBCURL_CPPFLAGS = @LIBCURL_CPPFLAGS@ @@ -165,20 +123,20 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ OBJEXT = @OBJEXT@ -OPENAERIAL_FALSE = @OPENAERIAL_FALSE@ -OPENAERIAL_TRUE = @OPENAERIAL_TRUE@ -OPENSTREETMAP_FALSE = @OPENSTREETMAP_FALSE@ -OPENSTREETMAP_TRUE = @OPENSTREETMAP_TRUE@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_CFLAGS = @PACKAGE_CFLAGS@ +PACKAGE_LIBS = @PACKAGE_LIBS@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ @@ -188,21 +146,19 @@ POW_LIB = @POW_LIB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ -REALTIME_GPS_TRACKING_FALSE = @REALTIME_GPS_TRACKING_FALSE@ -REALTIME_GPS_TRACKING_TRUE = @REALTIME_GPS_TRACKING_TRUE@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -TERRASERVER_FALSE = @TERRASERVER_FALSE@ -TERRASERVER_TRUE = @TERRASERVER_TRUE@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XP = @XP@ _libcurl_config = @_libcurl_config@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -214,6 +170,7 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -241,8 +198,12 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ WAYPOINT_ICONS = \ wp_camp.png \ wp_car.png \ @@ -422,8 +383,9 @@ BUILT_SOURCES = $(ALL_ICONS_HEADER) icons.c icons.h CLEANFILES = $(BUILT_SOURCES) noinst_LIBRARIES = libicons.a libicons_a_SOURCES = icons.c icons.h -INCLUDES = @GTK_CFLAGS@ -AM_CFLAGS = -Wall -g -D_GNU_SOURCE +AM_CFLAGS = -Wall -g -D_GNU_SOURCE \ + $(PACKAGE_CFLAGS) + iconsdir = $(datadir)/icons/hicolor/48x48/apps icons_DATA = viking.png gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor @@ -436,8 +398,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -478,22 +440,21 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/icons.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -uninstall-info-am: install-iconsDATA: $(icons_DATA) @$(NORMAL_INSTALL) - test -z "$(iconsdir)" || $(mkdir_p) "$(DESTDIR)$(iconsdir)" + test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)" @list='$(icons_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -514,8 +475,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -527,8 +488,8 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -538,13 +499,12 @@ ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -558,22 +518,21 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -590,7 +549,7 @@ check: $(BUILT_SOURCES) all-am: Makefile $(LIBRARIES) $(DATA) installdirs: for dir in "$(DESTDIR)$(iconsdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-am @@ -643,12 +602,20 @@ install-data-am: install-iconsDATA @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -668,19 +635,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-iconsDATA uninstall-info-am +uninstall-am: uninstall-iconsDATA + +.MAKE: install-am install-data-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-noinstLIBRARIES ctags distclean distclean-compile \ distclean-generic distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-data-hook install-exec install-exec-am \ + install-data-am install-data-hook install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ install-iconsDATA install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-iconsDATA \ - uninstall-info-am + tags uninstall uninstall-am uninstall-iconsDATA icons.h: $(ALL_ICONS_HEADER) diff --git a/src/icons/icons.c b/src/icons/icons.c index de8fff2..b69baca 100644 --- a/src/icons/icons.c +++ b/src/icons/icons.c @@ -32,6 +32,7 @@ #include "vikdemlayer_pixmap.h" #include "vikgeoreflayer_pixmap.h" #include "vikgpslayer_pixmap.h" +#include "viking_icon_pixmap.h" #include "viking_pixmap.h" #include "vikmapslayer_pixmap.h" #include "viktrwlayer_pixmap.h" @@ -158,7 +158,7 @@ int main( int argc, char *argv[] ) if (vik_version) { - g_printf ("%s %s, Copyright (c) 2003-2007 Evan Battaglia\n", PACKAGE_NAME, PACKAGE_VERSION); + g_printf ("%s %s, Copyright (c) 2003-2008 Evan Battaglia\n", PACKAGE_NAME, PACKAGE_VERSION); return EXIT_SUCCESS; } @@ -199,6 +199,7 @@ int main( int argc, char *argv[] ) gtk_main (); gdk_threads_leave (); + a_background_uninit (); a_mapcache_uninit (); a_dems_uninit (); a_preferences_uninit (); diff --git a/src/mapcache.c b/src/mapcache.c index ffaa352..eded74a 100644 --- a/src/mapcache.c +++ b/src/mapcache.c @@ -18,10 +18,15 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include <gtk/gtk.h> +#include <glib/gi18n.h> #include <string.h> #include "mapcache.h" +#include "preferences.h" #include "config.h" @@ -36,6 +41,7 @@ static List *queue_tail = NULL; static int queue_count = 0; static guint32 queue_size = 0; +static guint32 max_queue_size = VIK_CONFIG_MAPCACHE_SIZE; static GHashTable *cache = NULL; @@ -45,8 +51,24 @@ static GMutex *mc_mutex = NULL; #define HASHKEY_FORMAT_STRING "%d-%d-%d-%d-%d-%d-%.3f-%.3f" #define HASHKEY_FORMAT_STRING_NOSHRINK_NOR_ALPHA "%d-%d-%d-%d-%d-" +#define VIKING_PREFERENCES_GROUP_KEY "viking.globals" +#define VIKING_PREFERENCES_NAMESPACE "viking.globals." + +static VikLayerParamScale params_scales[] = { + /* min, max, step, digits (decimal places) */ + { 1, 300, 1, 0 }, +}; + +static VikLayerParam prefs[] = { + { VIKING_PREFERENCES_NAMESPACE "mapcache_size", VIK_LAYER_PARAM_UINT, VIK_LAYER_GROUP_NONE, N_("Mapcache memory size (MB):"), VIK_LAYER_WIDGET_HSCALE, params_scales, NULL }, +}; + void a_mapcache_init () { + VikLayerParamData tmp; + tmp.u = VIK_CONFIG_MAPCACHE_SIZE / 1024 / 1024; + a_preferences_register(prefs, tmp, VIKING_PREFERENCES_GROUP_KEY); + mc_mutex = g_mutex_new(); cache = g_hash_table_new_full ( g_str_hash, g_str_equal, g_free, g_object_unref ); } @@ -112,11 +134,14 @@ void a_mapcache_add ( GdkPixbuf *pixbuf, gint x, gint y, gint z, guint8 type, gu g_mutex_lock(mc_mutex); cache_add(key, pixbuf); - if ( queue_size > VIK_CONFIG_MAPCACHE_SIZE ) { + // TODO: that should be done on preference change only... + max_queue_size = a_preferences_get(VIKING_PREFERENCES_NAMESPACE "mapcache_size")->u * 1024 * 1024; + + if ( queue_size > max_queue_size ) { gchar *oldkey = list_shift_add_entry ( key ); cache_remove(oldkey); - while ( queue_size > VIK_CONFIG_MAPCACHE_SIZE && + while ( queue_size > max_queue_size && (queue_tail->next != queue_tail) ) { /* make sure there's more than one thing to delete */ oldkey = list_shift (); cache_remove(oldkey); @@ -179,6 +204,29 @@ void a_mapcache_remove_all_shrinkfactors ( gint x, gint y, gint z, guint8 type, g_mutex_unlock(mc_mutex); } +void a_mapcache_flush () +{ + List *loop = queue_tail; + List *tmp; + + if ( queue_tail == NULL ) + return; + + g_mutex_lock(mc_mutex); + do { + tmp = loop->next; + cache_remove(tmp->key); + if ( tmp == queue_tail ) /* we deleted the last thing in the queue */ + loop = queue_tail = NULL; + else + loop->next = tmp->next; + g_free ( tmp ); + tmp = NULL; + } while ( loop ); + + g_mutex_unlock(mc_mutex); +} + void a_mapcache_uninit () { g_hash_table_destroy ( cache ); diff --git a/src/mapcache.h b/src/mapcache.h index 97a3357..b2bf851 100644 --- a/src/mapcache.h +++ b/src/mapcache.h @@ -29,6 +29,7 @@ void a_mapcache_init (); void a_mapcache_add ( GdkPixbuf *pixbuf, gint x, gint y, gint z, guint8 type, guint zoom, guint8 alpha, gdouble xshrinkfactor, gdouble yshrinkfactor ); GdkPixbuf *a_mapcache_get ( gint x, gint y, gint z, guint8 type, guint zoom, guint8 alpha, gdouble xshrinkfactor, gdouble yshrinkfactor ); void a_mapcache_remove_all_shrinkfactors ( gint x, gint y, gint z, guint8 type, guint zoom ); +void a_mapcache_flush (); void a_mapcache_uninit (); #endif diff --git a/src/menu.xml.h b/src/menu.xml.h index d9cf08f..6fe7978 100644 --- a/src/menu.xml.h +++ b/src/menu.xml.h @@ -35,6 +35,7 @@ static const char *menu_xml = " <menuitem action='Delete'/>" " <menuitem action='DeleteAll'/>" " <separator/>" + " <menuitem action='MapCacheFlush'/>" " <menuitem action='Preferences'/>" " </menu>" " <menu action='View'>" diff --git a/src/osm-traces.c b/src/osm-traces.c index 2963f72..fb756fe 100644 --- a/src/osm-traces.c +++ b/src/osm-traces.c @@ -162,7 +162,7 @@ void osm_traces_upload_file(const char *user, struct curl_httppost *last=NULL; gchar *public_string; - char *base_url = "http://www.openstreetmap.org/api/0.5/gpx/create"; + char *base_url = "http://www.openstreetmap.org/api/0.6/gpx/create"; gchar *user_pass = get_login(); diff --git a/src/thumbnails.c b/src/thumbnails.c index 5a7b2a1..dc8f8a9 100644 --- a/src/thumbnails.c +++ b/src/thumbnails.c @@ -549,6 +549,6 @@ static char *md5_hash(const char *message) MD5Context ctx; MD5Init(&ctx); - MD5Update(&ctx, message, strlen(message)); + MD5Update(&ctx, (md5byte *) message, strlen(message)); return MD5Final(&ctx); } diff --git a/src/uibuilder.c b/src/uibuilder.c index a277724..d9b497c 100644 --- a/src/uibuilder.c +++ b/src/uibuilder.c @@ -138,10 +138,18 @@ GtkWidget *a_uibuilder_new_widget ( VikLayerParam *param, VikLayerParamData data case VIK_LAYER_WIDGET_FILEENTRY: if ( param->type == VIK_LAYER_PARAM_STRING ) { - rv = vik_file_entry_new (); + rv = vik_file_entry_new (GTK_FILE_CHOOSER_ACTION_OPEN); vik_file_entry_set_filename ( VIK_FILE_ENTRY(rv), data.s ); } break; + case VIK_LAYER_WIDGET_FOLDERENTRY: + if ( param->type == VIK_LAYER_PARAM_STRING ) + { + rv = vik_file_entry_new (GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER); + vik_file_entry_set_filename ( VIK_FILE_ENTRY(rv), data.s ); + } + break; + case VIK_LAYER_WIDGET_FILELIST: if ( param->type == VIK_LAYER_PARAM_STRING_LIST ) { @@ -202,6 +210,7 @@ VikLayerParamData a_uibuilder_widget_get_value ( GtkWidget *widget, VikLayerPara rv.s = gtk_entry_get_text ( GTK_ENTRY(widget) ); break; case VIK_LAYER_WIDGET_FILEENTRY: + case VIK_LAYER_WIDGET_FOLDERENTRY: rv.s = vik_file_entry_get_filename ( VIK_FILE_ENTRY(widget) ); break; case VIK_LAYER_WIDGET_FILELIST: diff --git a/src/uibuilder.h b/src/uibuilder.h index f7a4b07..b9669c4 100644 --- a/src/uibuilder.h +++ b/src/uibuilder.h @@ -58,6 +58,7 @@ VIK_LAYER_WIDGET_SPINBUTTON, VIK_LAYER_WIDGET_ENTRY, VIK_LAYER_WIDGET_PASSWORD, VIK_LAYER_WIDGET_FILEENTRY, +VIK_LAYER_WIDGET_FOLDERENTRY, VIK_LAYER_WIDGET_HSCALE, VIK_LAYER_WIDGET_COLOR, VIK_LAYER_WIDGET_COMBOBOX, @@ -26,6 +26,7 @@ #endif #include <glib/gi18n.h> +#include <glib/gprintf.h> #include "dialog.h" diff --git a/src/vikcoordlayer.c b/src/vikcoordlayer.c index c925187..2302d65 100644 --- a/src/vikcoordlayer.c +++ b/src/vikcoordlayer.c @@ -67,7 +67,7 @@ VikLayerInterface vik_coord_layer_interface = { (VikLayerFuncCreate) vik_coord_layer_create, (VikLayerFuncRealize) NULL, - coord_layer_post_read, + (VikLayerFuncPostRead) coord_layer_post_read, (VikLayerFuncFree) vik_coord_layer_free, (VikLayerFuncProperties) NULL, diff --git a/src/vikdemlayer.c b/src/vikdemlayer.c index a932ccf..3c48f74 100644 --- a/src/vikdemlayer.c +++ b/src/vikdemlayer.c @@ -62,8 +62,8 @@ #define MAPS_CACHE_DIR maps_layer_default_dir() #define SRTM_CACHE_TEMPLATE "%ssrtm3-%s%s%c%02d%c%03d.hgt.zip" -#define SRTM_FTP_SITE "e0srp01u.ecs.nasa.gov" -#define SRTM_FTP_URI "/srtm/version2/SRTM3/" +#define SRTM_HTTP_SITE "dds.cr.usgs.gov" +#define SRTM_HTTP_URI "/srtm/version2_1/SRTM3/OLD/" #ifdef VIK_CONFIG_DEM24K #define DEM24K_DOWNLOAD_SCRIPT "dem24k.pl" @@ -255,7 +255,7 @@ VikLayerInterface vik_dem_layer_interface = { (VikLayerFuncCreate) vik_dem_layer_create, (VikLayerFuncRealize) NULL, - dem_layer_post_read, + (VikLayerFuncPostRead) dem_layer_post_read, (VikLayerFuncFree) vik_dem_layer_free, (VikLayerFuncProperties) NULL, @@ -756,7 +756,7 @@ static void srtm_dem_download_thread ( DEMDownloadParams *p, gpointer threaddata } gchar *src_fn = g_strdup_printf("%s%s/%c%02d%c%03d.hgt.zip", - SRTM_FTP_URI, + SRTM_HTTP_URI, continent_dir, (intlat >= 0) ? 'N' : 'S', ABS(intlat), @@ -764,7 +764,7 @@ static void srtm_dem_download_thread ( DEMDownloadParams *p, gpointer threaddata ABS(intlon) ); static DownloadOptions options = { NULL, 0, a_check_map_file }; - a_ftp_download_get_url ( SRTM_FTP_SITE, src_fn, p->dest, &options ); + a_http_download_get_url ( SRTM_HTTP_SITE, src_fn, p->dest, &options ); g_free ( src_fn ); } diff --git a/src/vikfileentry.c b/src/vikfileentry.c index e151ef2..707fb01 100644 --- a/src/vikfileentry.c +++ b/src/vikfileentry.c @@ -34,6 +34,7 @@ struct _VikFileEntry { GtkHBox parent; GtkWidget *entry, *button; GtkWidget *file_selector; + GtkFileChooserAction action; }; GType vik_file_entry_get_type (void) @@ -60,11 +61,12 @@ GType vik_file_entry_get_type (void) return vs_type; } -GtkWidget *vik_file_entry_new () +GtkWidget *vik_file_entry_new (GtkFileChooserAction action) { VikFileEntry *vfe = VIK_FILE_ENTRY ( g_object_new ( VIK_FILE_ENTRY_TYPE, NULL ) ); vfe->entry = gtk_entry_new (); vfe->button = gtk_button_new_with_label ( _("Browse...") ); + vfe->action = action; g_signal_connect_swapped ( G_OBJECT(vfe->button), "clicked", G_CALLBACK(choose_file), vfe ); gtk_box_pack_start ( GTK_BOX(vfe), vfe->entry, TRUE, TRUE, 3 ); @@ -93,7 +95,7 @@ static void choose_file ( VikFileEntry *vfe ) g_assert ( (win = gtk_widget_get_toplevel(GTK_WIDGET(vfe))) ); vfe->file_selector = gtk_file_chooser_dialog_new (_("Choose file"), GTK_WINDOW(win), - GTK_FILE_CHOOSER_ACTION_OPEN, + vfe->action, /* open file or directory */ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); diff --git a/src/vikfileentry.h b/src/vikfileentry.h index a9f46c0..b83af58 100644 --- a/src/vikfileentry.h +++ b/src/vikfileentry.h @@ -44,7 +44,7 @@ struct _VikFileEntryClass GType vik_file_entry_get_type (); -GtkWidget *vik_file_entry_new (); +GtkWidget *vik_file_entry_new (GtkFileChooserAction action); G_CONST_RETURN gchar *vik_file_entry_get_filename ( VikFileEntry *vfe ); void vik_file_entry_set_filename ( VikFileEntry *vfe, const gchar *filename ); diff --git a/src/vikgeoreflayer.c b/src/vikgeoreflayer.c index 34947f3..9134e9f 100644 --- a/src/vikgeoreflayer.c +++ b/src/vikgeoreflayer.c @@ -416,7 +416,7 @@ static gboolean georef_layer_dialog ( VikGeorefLayer **vgl, gpointer vp, GtkWind yspin = gtk_spin_button_new ( (GtkAdjustment *) gtk_adjustment_new ( 4, VIK_VIEWPORT_MIN_ZOOM, VIK_VIEWPORT_MAX_ZOOM, 1, 5, 5 ), 1, 8 ); imagelabel = gtk_label_new ( _("Map Image:") ); - imageentry = vik_file_entry_new (); + imageentry = vik_file_entry_new (GTK_FILE_CHOOSER_ACTION_OPEN); if (*vgl) { diff --git a/src/vikgpslayer.c b/src/vikgpslayer.c index ec41a1d..d06f5a3 100644 --- a/src/vikgpslayer.c +++ b/src/vikgpslayer.c @@ -234,8 +234,6 @@ struct _VikGpsLayer { GpsFix realtime_fix; GpsFix last_fix; - enum unit realtime_gpsd_unit; - VikTrack *realtime_track; gchar *realtime_track_name; @@ -470,8 +468,6 @@ VikGpsLayer *vik_gps_layer_new (VikViewport *vp) vgl->realtime_track_pt1_gc = vik_viewport_new_gc ( vp, "red", 2 ); vgl->realtime_track_pt2_gc = vik_viewport_new_gc ( vp, "green", 2 ); vgl->realtime_track_pt_gc = vgl->realtime_track_pt1_gc; - vgl->realtime_gpsd_unit = gpsd_units(); - // fprintf(stderr, "DEBUG: gpsd_unit = %d\n", vgl->realtime_gpsd_unit); vgl->realtime_track = NULL; /* Setting params here */ @@ -1181,7 +1177,6 @@ static void create_realtime_trackpoint(VikGpsLayer *vgl, gboolean forced) tp->course = vgl->realtime_fix.fix.track; tp->nsats = vgl->realtime_fix.satellites_used; tp->fix_mode = vgl->realtime_fix.fix.mode; - tp->extended = TRUE; ll.lat = vgl->realtime_fix.fix.latitude; ll.lon = vgl->realtime_fix.fix.longitude; diff --git a/src/vikmapslayer.c b/src/vikmapslayer.c index 1021b3e..8289d30 100644 --- a/src/vikmapslayer.c +++ b/src/vikmapslayer.c @@ -117,7 +117,7 @@ static VikLayerParamScale params_scales[] = { VikLayerParam maps_layer_params[] = { { "mode", VIK_LAYER_PARAM_UINT, VIK_LAYER_GROUP_NONE, N_("Map Type:"), VIK_LAYER_WIDGET_RADIOGROUP, NULL, NULL }, - { "directory", VIK_LAYER_PARAM_STRING, VIK_LAYER_GROUP_NONE, N_("Maps Directory (Optional):"), VIK_LAYER_WIDGET_FILEENTRY }, + { "directory", VIK_LAYER_PARAM_STRING, VIK_LAYER_GROUP_NONE, N_("Maps Directory:"), VIK_LAYER_WIDGET_FOLDERENTRY }, { "alpha", VIK_LAYER_PARAM_UINT, VIK_LAYER_GROUP_NONE, N_("Alpha:"), VIK_LAYER_WIDGET_HSCALE, params_scales }, { "autodownload", VIK_LAYER_PARAM_BOOLEAN, VIK_LAYER_GROUP_NONE, N_("Autodownload maps:"), VIK_LAYER_WIDGET_CHECKBUTTON }, { "mapzoom", VIK_LAYER_PARAM_UINT, VIK_LAYER_GROUP_NONE, N_("Zoom Level:"), VIK_LAYER_WIDGET_COMBOBOX, params_mapzooms }, @@ -147,7 +147,7 @@ VikLayerInterface vik_maps_layer_interface = { (VikLayerFuncCreate) maps_layer_new, (VikLayerFuncRealize) NULL, - maps_layer_post_read, + (VikLayerFuncPostRead) maps_layer_post_read, (VikLayerFuncFree) maps_layer_free, (VikLayerFuncProperties) NULL, @@ -405,7 +405,7 @@ static VikLayerParamData maps_layer_get_param ( VikMapsLayer *vml, guint16 id ) VikLayerParamData rv; switch ( id ) { - case PARAM_CACHE_DIR: rv.s = (vml->cache_dir && strcmp(vml->cache_dir, MAPS_CACHE_DIR) != 0) ? vml->cache_dir : ""; break; + case PARAM_CACHE_DIR: rv.s = vml->cache_dir ? vml->cache_dir : ""; break; case PARAM_MAPTYPE: rv.u = map_index_to_uniq_id ( vml->maptype ); break; case PARAM_ALPHA: rv.u = vml->alpha; break; case PARAM_AUTODOWNLOAD: rv.u = vml->autodownload; break; @@ -774,7 +774,7 @@ static void weak_ref_cb(gpointer ptr, GObject * dead_vml) g_mutex_unlock(mdi->mutex); } -static void map_download_thread ( MapDownloadInfo *mdi, gpointer threaddata ) +static int map_download_thread ( MapDownloadInfo *mdi, gpointer threaddata ) { guint donemaps = 0; gint x, y; @@ -789,7 +789,9 @@ static void map_download_thread ( MapDownloadInfo *mdi, gpointer threaddata ) mdi->mapcoord.scale, mdi->mapcoord.z, x, y ); donemaps++; - a_background_thread_progress ( threaddata, ((gdouble)donemaps) / mdi->mapstoget ); /* this also calls testcancel */ + int res = a_background_thread_progress ( threaddata, ((gdouble)donemaps) / mdi->mapstoget ); /* this also calls testcancel */ + if (res != 0) + return -1; if ( mdi->redownload == REDOWNLOAD_ALL) g_remove ( mdi->filename_buf ); @@ -843,6 +845,7 @@ static void map_download_thread ( MapDownloadInfo *mdi, gpointer threaddata ) if (mdi->map_layer_alive) g_object_weak_unref(G_OBJECT(mdi->vml), weak_ref_cb, mdi); g_mutex_unlock(mdi->mutex); + return 0; } static void mdi_cancel_cleanup ( MapDownloadInfo *mdi ) diff --git a/src/viktrack.c b/src/viktrack.c index 9ce1c0f..e03d8aa 100644 --- a/src/viktrack.c +++ b/src/viktrack.c @@ -115,9 +115,12 @@ VikTrack *vik_track_copy ( const VikTrack *tr ) VikTrackpoint *vik_trackpoint_new() { VikTrackpoint *tp = g_malloc0(sizeof(VikTrackpoint)); - tp->extended = FALSE; tp->speed = NAN; tp->course = NAN; + tp->altitude = VIK_DEFAULT_ALTITUDE; + tp->hdop = VIK_DEFAULT_DOP; + tp->vdop = VIK_DEFAULT_DOP; + tp->pdop = VIK_DEFAULT_DOP; return tp; } @@ -376,8 +379,10 @@ gdouble *vik_track_make_elevation_map ( const VikTrack *tr, guint16 num_chunks ) chunk_length = total_length / num_chunks; /* Zero chunk_length (eg, track of 2 tp with the same loc) will cause crash */ - if (chunk_length <= 0) + if (chunk_length <= 0) { + g_free(pts); return NULL; + } current_dist = 0.0; current_area_under_curve = 0; diff --git a/src/viktrack.h b/src/viktrack.h index 06a1c91..ea2933b 100644 --- a/src/viktrack.h +++ b/src/viktrack.h @@ -39,17 +39,18 @@ struct _VikTrackpoint { gboolean newsegment; gboolean has_timestamp; time_t timestamp; - gdouble altitude; /* only in 3D fixes */ - /* Most GPSs provide this in realtime mode (NMEA) but not in data mode */ - gboolean extended; - gdouble speed; /* only in 3D fixes */ - gdouble course; - guint nsats; /* number of satellites used */ + gdouble altitude; /* VIK_DEFAULT_ALTITUDE if data unavailable */ + gdouble speed; /* NAN if data unavailable */ + gdouble course; /* NAN if data unavailable */ + guint nsats; /* number of satellites used. 0 if data unavailable */ #define VIK_GPS_MODE_NOT_SEEN 0 /* mode update not seen yet */ #define VIK_GPS_MODE_NO_FIX 1 /* none */ #define VIK_GPS_MODE_2D 2 /* good for latitude/longitude */ #define VIK_GPS_MODE_3D 3 /* good for altitude/climb too */ - gint fix_mode; + gint fix_mode; /* VIK_GPS_MODE_NOT_SEEN if data unavailable */ + gdouble hdop; /* VIK_DEFAULT_DOP if data unavailable */ + gdouble vdop; /* VIK_DEFAULT_DOP if data unavailable */ + gdouble pdop; /* VIK_DEFAULT_DOP if data unavailable */ }; typedef struct _VikTrack VikTrack; diff --git a/src/viktrwlayer.c b/src/viktrwlayer.c index 1cd3878..f370e7f 100644 --- a/src/viktrwlayer.c +++ b/src/viktrwlayer.c @@ -1643,7 +1643,6 @@ gboolean vik_trw_layer_new_waypoint ( VikTrwLayer *vtl, GtkWindow *w, const VikC gchar *name = highest_wp_number_get(vtl); VikWaypoint *wp = vik_waypoint_new(); wp->coord = *def_coord; - wp->altitude = VIK_DEFAULT_ALTITUDE; if ( a_dialog_new_waypoint ( w, &name, wp, vik_trw_layer_get_waypoints ( vtl ), vtl->coord_mode ) ) { @@ -2347,6 +2346,7 @@ static void trw_layer_merge_by_timestamp ( gpointer pass_along[6] ) _("Merge Threshold..."), _("Merge when time between tracks less than:"), &thr)) { + free(orig_track_name); return; } @@ -3429,7 +3429,6 @@ static gboolean tool_new_track_click ( VikTrwLayer *vtl, GdkEventButton *event, tp->newsegment = FALSE; tp->has_timestamp = FALSE; tp->timestamp = 0; - tp->altitude = VIK_DEFAULT_ALTITUDE; vtl->current_track->trackpoints = g_list_append ( vtl->current_track->trackpoints, tp ); vtl->ct_x1 = vtl->ct_x2; diff --git a/src/viktrwlayer_propwin.c b/src/viktrwlayer_propwin.c index eb96f27..f840e83 100644 --- a/src/viktrwlayer_propwin.c +++ b/src/viktrwlayer_propwin.c @@ -148,14 +148,14 @@ static VikTrackpoint *set_center_at_graph_position(gdouble event_x, gint img_wid static void draw_graph_mark(GtkWidget *image, gdouble event_x, gint img_width, GdkGC *gc, PropSaved *saved_img) { - GdkPixmap *pix; - const int saved_width = 5; + GdkPixmap *pix = NULL; /* the pixmap = margin + graph area */ gdouble x = event_x - img_width/2 + PROFILE_WIDTH/2 + MARGIN/2; // fprintf(stderr, "event_x=%f img_width=%d x=%f\n", event_x, img_width, x); gtk_image_get_pixmap(GTK_IMAGE(image), &pix, NULL); + /* Restore previously saved image */ if (saved_img->saved) { gdk_draw_image(GDK_DRAWABLE(pix), gc, saved_img->img, 0, 0, saved_img->pos, 0, -1, -1); @@ -165,17 +165,18 @@ static void draw_graph_mark(GtkWidget *image, gdouble event_x, gint img_width, G saved_img->img->width, saved_img->img->height); } if ((x >= MARGIN) && (x < (PROFILE_WIDTH + MARGIN))) { + /* Save part of the image */ if (saved_img->img) gdk_drawable_copy_to_image(GDK_DRAWABLE(pix), saved_img->img, - x - (saved_width/2), 0, 0, 0, saved_img->img->width, saved_img->img->height); + x, 0, 0, 0, saved_img->img->width, saved_img->img->height); else saved_img->img = gdk_drawable_copy_to_image(GDK_DRAWABLE(pix), - saved_img->img, x - (saved_width/2), 0, 0, 0, saved_width, PROFILE_HEIGHT); - saved_img->pos = x - (saved_width/2); + saved_img->img, x, 0, 0, 0, 1, PROFILE_HEIGHT); + saved_img->pos = x; saved_img->saved = TRUE; gdk_draw_line (GDK_DRAWABLE(pix), gc, x, 0, x, image->allocation.height); /* redraw the area which contains the line, saved_width is just convenient */ - gtk_widget_queue_draw_area(image, event_x - saved_width/2, 0, saved_width, PROFILE_HEIGHT); + gtk_widget_queue_draw_area(image, event_x, 0, 1, PROFILE_HEIGHT); } } @@ -463,8 +464,10 @@ GtkWidget *vik_trw_layer_create_vtdiag ( GtkWidget *window, VikTrack *tr, gpoint pass_along[2] = widgets; gdouble *speeds = vik_track_make_speed_map ( tr, PROFILE_WIDTH ); - if ( speeds == NULL ) + if ( speeds == NULL ) { + g_free(pass_along); return NULL; + } pix = gdk_pixmap_new( window->window, PROFILE_WIDTH + MARGIN, PROFILE_HEIGHT, -1 ); image = gtk_image_new_from_pixmap ( pix, NULL ); diff --git a/src/viktrwlayer_tpwin.c b/src/viktrwlayer_tpwin.c index 406d392..9ccfdc3 100644 --- a/src/viktrwlayer_tpwin.c +++ b/src/viktrwlayer_tpwin.c @@ -39,7 +39,7 @@ struct _VikTrwLayerTpwin { GtkDialog parent; GtkSpinButton *lat, *lon, *alt; - GtkLabel *track_name, *ts, *localtime, *diff_dist, *diff_time, *diff_speed; + GtkLabel *track_name, *ts, *localtime, *diff_dist, *diff_time, *diff_speed, *hdop, *vdop, *pdop, *sat; GList *buttons; VikTrackpoint *cur_tp; gboolean cur_tp_is_endpoint; /* for join */ @@ -106,7 +106,12 @@ VikTrwLayerTpwin *vik_trw_layer_tpwin_new ( GtkWindow *parent ) N_("<b>Time:</b>") }; static gchar *right_label_texts[] = { N_("<b>Distance Difference:</b>"), N_("<b>Time Difference:</b>"), - N_("<b>\"Speed\" Between:</b>") }; + N_("<b>\"Speed\" Between:</b>"), + N_("<b>VDOP:</b>"), + N_("<b>HDOP:</b>"), + N_("<b>PDOP:</b>"), + N_("<b>SAT/FIX:</b>") + }; VikTrwLayerTpwin *tpwin = VIK_TRW_LAYER_TPWIN ( g_object_new ( VIK_TRW_LAYER_TPWIN_TYPE, NULL ) ); GtkWidget *main_hbox, *left_vbox, *right_vbox; @@ -161,11 +166,21 @@ VikTrwLayerTpwin *vik_trw_layer_tpwin_new ( GtkWindow *parent ) tpwin->diff_time = GTK_LABEL(gtk_label_new(NULL)); tpwin->diff_speed = GTK_LABEL(gtk_label_new(NULL)); + tpwin->vdop = GTK_LABEL(gtk_label_new(NULL)); + tpwin->hdop = GTK_LABEL(gtk_label_new(NULL)); + tpwin->pdop = GTK_LABEL(gtk_label_new(NULL)); + tpwin->sat = GTK_LABEL(gtk_label_new(NULL)); + diff_right_vbox = gtk_vbox_new ( TRUE, 3 ); gtk_box_pack_start ( GTK_BOX(diff_right_vbox), GTK_WIDGET(tpwin->diff_dist), FALSE, TRUE, 5 ); gtk_box_pack_start ( GTK_BOX(diff_right_vbox), GTK_WIDGET(tpwin->diff_time), FALSE, TRUE, 5 ); gtk_box_pack_start ( GTK_BOX(diff_right_vbox), GTK_WIDGET(tpwin->diff_speed), FALSE, TRUE, 5 ); + gtk_box_pack_start ( GTK_BOX(diff_right_vbox), GTK_WIDGET(tpwin->vdop), FALSE, TRUE, 5 ); + gtk_box_pack_start ( GTK_BOX(diff_right_vbox), GTK_WIDGET(tpwin->hdop), FALSE, TRUE, 5 ); + gtk_box_pack_start ( GTK_BOX(diff_right_vbox), GTK_WIDGET(tpwin->pdop), FALSE, TRUE, 5 ); + gtk_box_pack_start ( GTK_BOX(diff_right_vbox), GTK_WIDGET(tpwin->sat), FALSE, TRUE, 5 ); + main_hbox = gtk_hbox_new( TRUE, 0 ); gtk_box_pack_start ( GTK_BOX(main_hbox), left_vbox, TRUE, TRUE, 0 ); gtk_box_pack_start ( GTK_BOX(main_hbox), right_vbox, TRUE, TRUE, 0 ); @@ -197,6 +212,10 @@ void vik_trw_layer_tpwin_set_empty ( VikTrwLayerTpwin *tpwin ) gtk_label_set_text ( tpwin->diff_dist, NULL ); gtk_label_set_text ( tpwin->diff_time, NULL ); gtk_label_set_text ( tpwin->diff_speed, NULL ); + gtk_label_set_text ( tpwin->vdop, NULL ); + gtk_label_set_text ( tpwin->hdop, NULL ); + gtk_label_set_text ( tpwin->pdop, NULL ); + gtk_label_set_text ( tpwin->sat, NULL ); tpwin->cur_tp = NULL; } @@ -274,6 +293,14 @@ void vik_trw_layer_tpwin_set_tp ( VikTrwLayerTpwin *tpwin, GList *tpl, gchar *tr } } + g_snprintf ( tmp_str, sizeof(tmp_str), "%.5f m", tp->vdop ); + gtk_label_set_text ( tpwin->vdop, tmp_str ); + g_snprintf ( tmp_str, sizeof(tmp_str), "%.5f m", tp->hdop ); + gtk_label_set_text ( tpwin->hdop, tmp_str ); + g_snprintf ( tmp_str, sizeof(tmp_str), "%.5f m", tp->pdop ); + gtk_label_set_text ( tpwin->pdop, tmp_str ); + g_snprintf ( tmp_str, sizeof(tmp_str), "%d / %d", tp->nsats, tp->fix_mode ); + gtk_label_set_text ( tpwin->sat, tmp_str ); tpwin->cur_tp = tp; tpwin->cur_tp_is_endpoint = ! (tpl->next && tpl->prev); diff --git a/src/vikwaypoint.c b/src/vikwaypoint.c index 87073e5..5762667 100644 --- a/src/vikwaypoint.c +++ b/src/vikwaypoint.c @@ -24,11 +24,13 @@ #include "coords.h" #include "vikcoord.h" #include "vikwaypoint.h" +#include "globals.h" VikWaypoint *vik_waypoint_new() { VikWaypoint *wp = g_malloc ( sizeof ( VikWaypoint ) ); + wp->altitude = VIK_DEFAULT_ALTITUDE; wp->comment = NULL; wp->image = NULL; wp->symbol = NULL; diff --git a/src/vikwindow.c b/src/vikwindow.c index e2a15c2..d670251 100644 --- a/src/vikwindow.c +++ b/src/vikwindow.c @@ -34,6 +34,7 @@ #include "geonamessearch.h" #endif #include "dems.h" +#include "mapcache.h" #include "print.h" #include "preferences.h" #include "icons/icons.h" @@ -561,42 +562,33 @@ static void draw_release ( VikWindow *vw, GdkEventButton *event ) static void draw_scroll (VikWindow *vw, GdkEventScroll *event) { - if ( event->state == GDK_CONTROL_MASK ) { + guint modifiers = event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK); + if ( modifiers == GDK_CONTROL_MASK ) { /* control == pan up & down */ if ( event->direction == GDK_SCROLL_UP ) vik_viewport_set_center_screen ( vw->viking_vvp, vik_viewport_get_width(vw->viking_vvp)/2, vik_viewport_get_height(vw->viking_vvp)/3 ); else vik_viewport_set_center_screen ( vw->viking_vvp, vik_viewport_get_width(vw->viking_vvp)/2, vik_viewport_get_height(vw->viking_vvp)*2/3 ); - } else if ( event->state == GDK_SHIFT_MASK ) { - /* control-shift == pan left & right */ + } else if ( modifiers == GDK_SHIFT_MASK ) { + /* shift == pan left & right */ if ( event->direction == GDK_SCROLL_UP ) vik_viewport_set_center_screen ( vw->viking_vvp, vik_viewport_get_width(vw->viking_vvp)/3, vik_viewport_get_height(vw->viking_vvp)/2 ); else vik_viewport_set_center_screen ( vw->viking_vvp, vik_viewport_get_width(vw->viking_vvp)*2/3, vik_viewport_get_height(vw->viking_vvp)/2 ); - } else if ( event->state == (GDK_CONTROL_MASK | GDK_SHIFT_MASK) ) { - if ( event->direction == GDK_SCROLL_UP ) { - /* make sure mouse is still over the same point on the map when we zoom */ - VikCoord coord; - gint x, y; - gint center_x = vik_viewport_get_width ( vw->viking_vvp ) / 2; - gint center_y = vik_viewport_get_height ( vw->viking_vvp ) / 2; - vik_viewport_screen_to_coord ( vw->viking_vvp, event->x, event->y, &coord ); + } else if ( modifiers == (GDK_CONTROL_MASK | GDK_SHIFT_MASK) ) { + /* control+shift == make sure mouse is still over the same point on the map when we zoom */ + VikCoord coord; + gint x, y; + gint center_x = vik_viewport_get_width ( vw->viking_vvp ) / 2; + gint center_y = vik_viewport_get_height ( vw->viking_vvp ) / 2; + vik_viewport_screen_to_coord ( vw->viking_vvp, event->x, event->y, &coord ); + if ( event->direction == GDK_SCROLL_UP ) vik_viewport_zoom_in (vw->viking_vvp); - vik_viewport_coord_to_screen ( vw->viking_vvp, &coord, &x, &y ); - vik_viewport_set_center_screen ( vw->viking_vvp, center_x + (x - event->x), - center_y + (y - event->y) ); - } - else { - VikCoord coord; - gint x, y; - gint center_x = vik_viewport_get_width ( vw->viking_vvp ) / 2; - gint center_y = vik_viewport_get_height ( vw->viking_vvp ) / 2; - vik_viewport_screen_to_coord ( vw->viking_vvp, event->x, event->y, &coord ); + else vik_viewport_zoom_out(vw->viking_vvp); - vik_viewport_coord_to_screen ( vw->viking_vvp, &coord, &x, &y ); - vik_viewport_set_center_screen ( vw->viking_vvp, center_x + (x - event->x), - center_y + (y - event->y) ); - } + vik_viewport_coord_to_screen ( vw->viking_vvp, &coord, &x, &y ); + vik_viewport_set_center_screen ( vw->viking_vvp, center_x + (x - event->x), + center_y + (y - event->y) ); } else { if ( event->direction == GDK_SCROLL_UP ) vik_viewport_zoom_in (vw->viking_vvp); @@ -1505,6 +1497,11 @@ static void goto_address( GtkAction *a, VikWindow *vw) } +static void mapcache_flush_cb ( GtkAction *a, VikWindow *vw ) +{ + a_mapcache_flush(); +} + static void preferences_cb ( GtkAction *a, VikWindow *vw ) { a_preferences_show_window ( GTK_WINDOW(vw) ); @@ -1997,7 +1994,8 @@ static GtkActionEntry entries[] = { { "Paste", GTK_STOCK_PASTE, N_("_Paste"), NULL, NULL, (GCallback)menu_paste_layer_cb }, { "Delete", GTK_STOCK_DELETE, N_("_Delete"), NULL, NULL, (GCallback)menu_delete_layer_cb }, { "DeleteAll", NULL, N_("Delete All"), NULL, NULL, (GCallback)clear_cb }, - { "Preferences",GTK_STOCK_PREFERENCES, N_("_Preferences..."), NULL, NULL, (GCallback)preferences_cb }, + { "MapCacheFlush",NULL, N_("Flush Map cache"), NULL, NULL, (GCallback)mapcache_flush_cb }, + { "Preferences",GTK_STOCK_PREFERENCES, N_("_Preferences..."), NULL, NULL, (GCallback)preferences_cb }, { "Properties",GTK_STOCK_PROPERTIES, N_("_Properties"), NULL, NULL, (GCallback)menu_properties_cb }, { "About", GTK_STOCK_ABOUT, N_("_About"), NULL, NULL, (GCallback)help_about_cb }, diff --git a/test/Makefile.am b/test/Makefile.am index 65e192b..74f39e1 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,5 +1,6 @@ -INCLUDES = -I$(top_srcdir)/src @GTK_CFLAGS@ -LDADD = @GTK_LIBS@ @EXPAT_LIBS@ @LIBCURL@ $(top_builddir)/src/icons/libicons.a +AM_CFLAGS = -I$(top_srcdir)/src \ + $(PACKAGE_CFLAGS) +LDADD = $(PACKAGE_LIBS) @EXPAT_LIBS@ @LIBCURL@ $(top_builddir)/src/icons/libicons.a if REALTIME_GPS_TRACKING LDADD += -lgps endif diff --git a/test/Makefile.in b/test/Makefile.in index c75e344..5b9a7dd 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,15 +13,11 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -51,15 +47,15 @@ CONFIG_CLEAN_FILES = am_degrees_converter_OBJECTS = degrees_converter.$(OBJEXT) degrees_converter_OBJECTS = $(am_degrees_converter_OBJECTS) am__DEPENDENCIES_1 = -am__DEPENDENCIES_2 = $(top_builddir)/src/icons/libicons.a \ - $(am__DEPENDENCIES_1) +am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) \ + $(top_builddir)/src/icons/libicons.a $(am__DEPENDENCIES_1) degrees_converter_DEPENDENCIES = \ $(top_builddir)/src/degrees_converters.o $(am__DEPENDENCIES_2) am_gpx2gpx_OBJECTS = gpx2gpx.$(OBJEXT) gpx2gpx_OBJECTS = $(am_gpx2gpx_OBJECTS) gpx2gpx_DEPENDENCIES = $(top_builddir)/src/libviking.a \ $(am__DEPENDENCIES_2) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -74,15 +70,11 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BLUEMARBLE_FALSE = @BLUEMARBLE_FALSE@ -BLUEMARBLE_TRUE = @BLUEMARBLE_TRUE@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ @@ -95,8 +87,6 @@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DB2MAN_XSL = @DB2MAN_XSL@ DEFS = @DEFS@ -DEM24K_FALSE = @DEM24K_FALSE@ -DEM24K_TRUE = @DEM24K_TRUE@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -104,55 +94,23 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXPAT_CFLAGS = @EXPAT_CFLAGS@ -EXPAT_INSTALLED_FALSE = @EXPAT_INSTALLED_FALSE@ -EXPAT_INSTALLED_TRUE = @EXPAT_INSTALLED_TRUE@ EXPAT_LIBS = @EXPAT_LIBS@ -EXPEDIA_FALSE = @EXPEDIA_FALSE@ -EXPEDIA_TRUE = @EXPEDIA_TRUE@ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@ -GEN_MANPAGES_FALSE = @GEN_MANPAGES_FALSE@ -GEN_MANPAGES_TRUE = @GEN_MANPAGES_TRUE@ -GEOCACHES_FALSE = @GEOCACHES_FALSE@ -GEOCACHES_TRUE = @GEOCACHES_TRUE@ -GEONAMES_FALSE = @GEONAMES_FALSE@ -GEONAMES_TRUE = @GEONAMES_TRUE@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GOOGLE_FALSE = @GOOGLE_FALSE@ -GOOGLE_TRUE = @GOOGLE_TRUE@ GREP = @GREP@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ LDFLAGS = @LDFLAGS@ LIBCURL = @LIBCURL@ LIBCURL_CPPFLAGS = @LIBCURL_CPPFLAGS@ @@ -160,20 +118,20 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ OBJEXT = @OBJEXT@ -OPENAERIAL_FALSE = @OPENAERIAL_FALSE@ -OPENAERIAL_TRUE = @OPENAERIAL_TRUE@ -OPENSTREETMAP_FALSE = @OPENSTREETMAP_FALSE@ -OPENSTREETMAP_TRUE = @OPENSTREETMAP_TRUE@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_CFLAGS = @PACKAGE_CFLAGS@ +PACKAGE_LIBS = @PACKAGE_LIBS@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ @@ -183,21 +141,19 @@ POW_LIB = @POW_LIB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ -REALTIME_GPS_TRACKING_FALSE = @REALTIME_GPS_TRACKING_FALSE@ -REALTIME_GPS_TRACKING_TRUE = @REALTIME_GPS_TRACKING_TRUE@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -TERRASERVER_FALSE = @TERRASERVER_FALSE@ -TERRASERVER_TRUE = @TERRASERVER_TRUE@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XP = @XP@ _libcurl_config = @_libcurl_config@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -209,6 +165,7 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -236,10 +193,16 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -INCLUDES = -I$(top_srcdir)/src @GTK_CFLAGS@ -LDADD = @GTK_LIBS@ @EXPAT_LIBS@ @LIBCURL@ \ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +AM_CFLAGS = -I$(top_srcdir)/src \ + $(PACKAGE_CFLAGS) + +LDADD = $(PACKAGE_LIBS) @EXPAT_LIBS@ @LIBCURL@ \ $(top_builddir)/src/icons/libicons.a $(am__append_1) TESTS = check_degrees_conversions.sh check_SCRIPTS = check_degrees_conversions.sh @@ -262,8 +225,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -292,10 +255,10 @@ clean-checkPROGRAMS: -test -z "$(check_PROGRAMS)" || rm -f $(check_PROGRAMS) degrees_converter$(EXEEXT): $(degrees_converter_OBJECTS) $(degrees_converter_DEPENDENCIES) @rm -f degrees_converter$(EXEEXT) - $(LINK) $(degrees_converter_LDFLAGS) $(degrees_converter_OBJECTS) $(degrees_converter_LDADD) $(LIBS) + $(LINK) $(degrees_converter_OBJECTS) $(degrees_converter_LDADD) $(LIBS) gpx2gpx$(EXEEXT): $(gpx2gpx_OBJECTS) $(gpx2gpx_DEPENDENCIES) @rm -f gpx2gpx$(EXEEXT) - $(LINK) $(gpx2gpx_LDFLAGS) $(gpx2gpx_OBJECTS) $(gpx2gpx_LDADD) $(LIBS) + $(LINK) $(gpx2gpx_OBJECTS) $(gpx2gpx_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -307,27 +270,26 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpx2gpx.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -uninstall-info-am: ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -339,8 +301,8 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -350,13 +312,12 @@ ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -372,7 +333,7 @@ distclean-tags: check-TESTS: $(TESTS) @failed=0; all=0; xfail=0; xpass=0; skip=0; \ srcdir=$(srcdir); export srcdir; \ - list='$(TESTS)'; \ + list=' $(TESTS) '; \ if test -n "$$list"; then \ for tst in $$list; do \ if test -f ./$$tst; then dir=./; \ @@ -381,7 +342,7 @@ check-TESTS: $(TESTS) if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ all=`expr $$all + 1`; \ case " $(XFAIL_TESTS) " in \ - *" $$tst "*) \ + *[\ \ ]$$tst[\ \ ]*) \ xpass=`expr $$xpass + 1`; \ failed=`expr $$failed + 1`; \ echo "XPASS: $$tst"; \ @@ -393,7 +354,7 @@ check-TESTS: $(TESTS) elif test $$? -ne 77; then \ all=`expr $$all + 1`; \ case " $(XFAIL_TESTS) " in \ - *" $$tst "*) \ + *[\ \ ]$$tst[\ \ ]*) \ xfail=`expr $$xfail + 1`; \ echo "XFAIL: $$tst"; \ ;; \ @@ -407,23 +368,36 @@ check-TESTS: $(TESTS) echo "SKIP: $$tst"; \ fi; \ done; \ + if test "$$all" -eq 1; then \ + tests="test"; \ + All=""; \ + else \ + tests="tests"; \ + All="All "; \ + fi; \ if test "$$failed" -eq 0; then \ if test "$$xfail" -eq 0; then \ - banner="All $$all tests passed"; \ + banner="$$All$$all $$tests passed"; \ else \ - banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ + if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ + banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ fi; \ else \ if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all tests failed"; \ + banner="$$failed of $$all $$tests failed"; \ else \ - banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ + if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ + banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ fi; \ fi; \ dashes="$$banner"; \ skipped=""; \ if test "$$skip" -ne 0; then \ - skipped="($$skip tests were not run)"; \ + if test "$$skip" -eq 1; then \ + skipped="($$skip test was not run)"; \ + else \ + skipped="($$skip tests were not run)"; \ + fi; \ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ dashes="$$skipped"; \ fi; \ @@ -443,22 +417,21 @@ check-TESTS: $(TESTS) else :; fi distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -521,12 +494,20 @@ info-am: install-data-am: +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -546,18 +527,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-info-am +uninstall-am: + +.MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic ctags distclean \ distclean-compile distclean-generic distclean-tags distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-info-am + uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/viking.spec b/viking.spec index 62f975e..f1a2ecf 100644 --- a/viking.spec +++ b/viking.spec @@ -3,7 +3,7 @@ #%% May be redistributed without this notice. Name: viking -Version: 0.9.8 +Version: 0.9.9 Release: 1 Summary: GPS data editor and analyzer |